Hi,
On 06/03/18 21:38, Tuomas Tynkkynen wrote:
> 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
Thanks!
Andre.
> ---
> 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..00
> --- 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
>
___
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot
