From: Tuomas Tynkkynen Date: Tue, 6 Mar 2018 21:38:22 +0000 (+0200) Subject: ARM: sunxi: Build u-boot-sunxi-with-spl.bin on ARM64 as well X-Git-Tag: v2018.05-rc1~93^2~5 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=b0b0d22f1a11b656e1a72f0e178f968b14be7ff3;p=oweals%2Fu-boot.git ARM: sunxi: Build u-boot-sunxi-with-spl.bin on ARM64 as well In README.sunxi64 we tell the user how to optionally create u-boot-sunxi-with-spl.bin by manually running cat. Instead, have the build system create the file automatically just like it does for 32-bit sunxi boards. Signed-off-by: Tuomas Tynkkynen Reviewed-by: Andre Przywara Acked-by: Maxime Ripard Reviewed-by: Jagan Teki --- diff --git a/Makefile b/Makefile index 2d825b9c41..5fa14789d9 100644 --- a/Makefile +++ b/Makefile @@ -1191,8 +1191,13 @@ u-boot-x86-16bit.bin: u-boot FORCE endif ifneq ($(CONFIG_ARCH_SUNXI),) +ifeq ($(CONFIG_ARM64),) u-boot-sunxi-with-spl.bin: spl/sunxi-spl.bin u-boot.img u-boot.dtb FORCE $(call if_changed,binman) +else +u-boot-sunxi-with-spl.bin: spl/sunxi-spl.bin u-boot.itb FORCE + $(call if_changed,cat) +endif endif ifneq ($(CONFIG_TEGRA),) diff --git a/board/sunxi/README.sunxi64 b/board/sunxi/README.sunxi64 index c492f749b8..5a363d27b8 100644 --- a/board/sunxi/README.sunxi64 +++ b/board/sunxi/README.sunxi64 @@ -95,9 +95,8 @@ Transfer the SPL and the U-Boot FIT image directly to an uSD card: (replace /dev/sdx with you SD card device file name, which could be /dev/mmcblk[x] as well). -Alternatively you can concatenate the SPL and the U-Boot FIT image into a +Alternatively you can use the SPL and the U-Boot FIT image combined into a single file and transfer that instead: -$ cat spl/sunxi-spl.bin u-boot.itb > u-boot-sunxi-with-spl.bin # dd if=u-boot-sunxi-with-spl.bin of=/dev/sdx bs=8k seek=1 You can partition the microSD card, but leave the first MB unallocated (most