From 155b116907edb92ff798e781c841b65838079db3 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Tue, 6 Mar 2018 23:38:21 +0200 Subject: [PATCH] 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 Reviewed-by: Andre Przywara Acked-by: Maxime Ripard Reviewed-by: Jagan Teki --- Makefile | 5 +++++ arch/arm/cpu/armv7/sunxi/config.mk | 6 ------ 2 files changed, 5 insertions(+), 6 deletions(-) delete mode 100644 arch/arm/cpu/armv7/sunxi/config.mk 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