aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTuomas Tynkkynen <tuomas@tuxera.com>2018-03-06 23:38:21 +0200
committerJagan Teki <jagan@amarulasolutions.com>2018-03-13 20:36:16 +0530
commit155b116907edb92ff798e781c841b65838079db3 (patch)
treea39d5c0925dde87a968472a770d259de64b3bc56
parent8be4e61d01c5c66c888c600ef10cc4d7d465f7b1 (diff)
downloadu-boot-155b116907edb92ff798e781c841b65838079db3.zip
u-boot-155b116907edb92ff798e781c841b65838079db3.tar.gz
u-boot-155b116907edb92ff798e781c841b65838079db3.tar.bz2
ARM: sunxi: Move u-boot-sunxi-with-spl.bin rule to Makefile
We're going to need this logic for 64-bit builds as well, so move it out from under arch/arm/cpu/armv7. 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--arch/arm/cpu/armv7/sunxi/config.mk6
2 files changed, 5 insertions, 6 deletions
diff --git a/Makefile b/Makefile
index 6b2aac6..2d825b9 100644
--- a/Makefile
+++ b/Makefile
@@ -800,6 +800,11 @@ ifneq ($(BUILD_ROM)$(CONFIG_BUILD_ROM),)
ALL-$(CONFIG_X86_RESET_VECTOR) += u-boot.rom
endif
+# Build a combined spl + u-boot image for sunxi
+ifeq ($(CONFIG_ARCH_SUNXI)$(CONFIG_SPL),yy)
+ALL-y += u-boot-sunxi-with-spl.bin
+endif
+
# enable combined SPL/u-boot/dtb rules for tegra
ifeq ($(CONFIG_TEGRA)$(CONFIG_SPL),yy)
ALL-y += u-boot-tegra.bin u-boot-nodtb-tegra.bin
diff --git a/arch/arm/cpu/armv7/sunxi/config.mk b/arch/arm/cpu/armv7/sunxi/config.mk
deleted file mode 100644
index 76ffec9..0000000
--- a/arch/arm/cpu/armv7/sunxi/config.mk
+++ /dev/null
@@ -1,6 +0,0 @@
-# Build a combined spl + u-boot image
-ifdef CONFIG_SPL
-ifndef CONFIG_SPL_BUILD
-ALL-y += u-boot-sunxi-with-spl.bin
-endif
-endif