summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTuomas Tynkkynen <tuomas@tuxera.com>2018-03-06 23:38:22 +0200
committerJagan Teki <jagan@amarulasolutions.com>2018-03-13 20:36:51 +0530
commitb0b0d22f1a11b656e1a72f0e178f968b14be7ff3 (patch)
tree73589540172ec88b48c04208372d90328e4dcee5
parent155b116907edb92ff798e781c841b65838079db3 (diff)
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 <tuomas@tuxera.com> Reviewed-by: Andre Przywara <andre.przywara@arm.com> Acked-by: Maxime Ripard <maxime.ripard@bootlin.com> Reviewed-by: Jagan Teki <jagan@openedev.com>
-rw-r--r--Makefile5
-rw-r--r--board/sunxi/README.sunxi643
2 files changed, 6 insertions, 2 deletions
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