[Buildroot] [PATCH v2, 1/1] package/uboot-tools: fix MKIMAGE_ARCH handling

Yann E. MORIN yann.morin.1998 at free.fr
Sat Sep 11 12:55:00 UTC 2021


Fabrice, All,

On 2021-09-08 18:45 +0200, Fabrice Fontaine spake thusly:
> Fix MKIMAGE_ARCH handling to avoid the following build failure:
> 
> /home/buildroot/autobuild/instance-0/output-1/build/host-uboot-tools-2021.07/tools/mkimage -C none -A openrisc -T script -d /home/buildroot/autobuild/instance-0/output-1/boot_script.txt /home/buildroot/autobuild/instance-0/output-1/build/host-uboot-tools-2021.07/tools/boot.scr
> 
> Invalid architecture, supported are:
[--SNIP--]
> 
> Strangely enough, we only have autobuilder failures since July 2021 even
> if or1k must be used since the addition of openriscv support in 2012:
> https://github.com/u-boot/u-boot/commit/3ddcaccda3824e1c7f7266d543e4c0eb3ea9851c

... even as or1k has been used since ...

> Fixes:
>  - http://autobuild.buildroot.org/results/c3f0f2a3fb87d74bfdaccf9b94c66f0b5bae7520
> 
> Signed-off-by: Fabrice Fontaine <fontaine.fabrice at gmail.com>
> ---
> Changes v1 -> v2:
>  - Fix commit message to specify that autobuilder failures are raised
>    since July 2021
> 
>  package/uboot-tools/uboot-tools.mk | 14 +++++++-------
>  1 file changed, 7 insertions(+), 7 deletions(-)
> 
> diff --git a/package/uboot-tools/uboot-tools.mk b/package/uboot-tools/uboot-tools.mk
> index a87956d028..81f60963ec 100644
> --- a/package/uboot-tools/uboot-tools.mk
> +++ b/package/uboot-tools/uboot-tools.mk
> @@ -206,15 +206,15 @@ $(eval $(host-generic-package))
>  
>  MKIMAGE = $(HOST_DIR)/bin/mkimage
>  
> -# mkimage supports arm blackfin m68k microblaze mips mips64 nios2 powerpc ppc sh sparc sparc64 x86
> +# mkimage supports alpha arc arm arm64 blackfin ia64 invalid m68k microblaze mips mips64 nds32 nios2 or1k powerpc riscv s390 sandbox sh sparc sparc64 x86 x86_64 xtensa
>  # KERNEL_ARCH can be arm64 arc arm blackfin m68k microblaze mips nios2 powerpc sh sparc i386 x86_64 xtensa
> -# For arm64, arc, xtensa we'll just keep KERNEL_ARCH
> -# For mips64, we'll just keep mips
> -# For i386 and x86_64, we need to convert
> -ifeq ($(KERNEL_ARCH),x86_64)
> -MKIMAGE_ARCH = x86
> -else ifeq ($(KERNEL_ARCH),i386)
> +# For i386, we need to convert
> +# For openrisc, we need to convert
> +# For others, we'll just keep KERNEL_ARCH
> +ifeq ($(KERNEL_ARCH),i386)
>  MKIMAGE_ARCH = x86

But then, x86_64 should still be changed to x86, no?

Regards,
Yann E. MORIN.

> +else ifeq ($(KERNEL_ARCH),openrisc)
> +MKIMAGE_ARCH = or1k
>  else
>  MKIMAGE_ARCH = $(KERNEL_ARCH)
>  endif
> -- 
> 2.33.0
> 
> _______________________________________________
> buildroot mailing list
> buildroot at lists.buildroot.org
> https://lists.buildroot.org/mailman/listinfo/buildroot

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'


More information about the buildroot mailing list