| Message ID | 20180306213822.32723-2-tuomas@tuxera.com |
|---|---|
| State | Accepted |
| Commit | 155b116907edb92ff798e781c841b65838079db3 |
| Delegated to: | Jagannadha Sutradharudu Teki |
| Headers | show |
| Series | sunxi: Build u-boot-sunxi-with-spl.bin on ARM64 as well | expand |
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 <tuomas@tuxera.com> Reviewed-by: Andre Przywara <andre.przywara@arm.com> 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..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 >
On Wed, Mar 7, 2018 at 7:51 AM, André Przywara <andre.przywara@arm.com> wrote: > 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 <tuomas@tuxera.com> > > Reviewed-by: Andre Przywara <andre.przywara@arm.com> Reviewed-by: Jagan Teki <jagan@openedev.com>
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
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> --- 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