From: Tuomas Tynkkynen Date: Tue, 6 Mar 2018 23:38:21 +0200 Subject: [U-Boot] [PATCH RFC 1/2] ARM: sunxi: Move u-boot-sunxi-with-spl.bin rule to Makefile In-Reply-To: <20180306213822.32723-1-tuomas@tuxera.com> References: <20180306213822.32723-1-tuomas@tuxera.com> Message-ID: <20180306213822.32723-2-tuomas@tuxera.com> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de 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 --- 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 c6819d5742..24a79446d8 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 76ffec9df6..0000000000 --- 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 -- 2.16.1