| Message ID | 20190221013034.9099-6-andre.przywara@arm.com |
|---|---|
| State | Deferred |
| Delegated to: | Jagannadha Sutradharudu Teki |
| Headers | show |
| Series | sunxi: Allow FEL capable SPLs with 32bit builds | expand |
On 21.02.19 02:30, Andre Przywara wrote: > Even though we introduced FIT image support for the SPL to cover the > 64-bit SoCs, there is no technical limitation to those parts. > > Change the Makefile stanza to always create a FIT image if the > particular config either provided a script or an .its file. > > Signed-off-by: Andre Przywara <andre.przywara@arm.com> > --- > Makefile | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/Makefile b/Makefile > index d6e7c69f40..3a560e29bf 100644 > --- a/Makefile > +++ b/Makefile > @@ -1350,7 +1350,7 @@ u-boot-x86-16bit.bin: u-boot FORCE > endif > > ifneq ($(CONFIG_ARCH_SUNXI),) > -ifeq ($(CONFIG_ARM64),) > +ifeq ($(CONFIG_SPL_FIT_SOURCE)$(CONFIG_SPL_FIT_GENERATOR),) The commit message sounds as if this should be an "ifneq"? Alex > u-boot-sunxi-with-spl.bin: spl/sunxi-spl.bin u-boot.img u-boot.dtb FORCE > $(call if_changed,binman) > else >
On 22/02/2019 08:06, Alexander Graf wrote: > > > On 21.02.19 02:30, Andre Przywara wrote: >> Even though we introduced FIT image support for the SPL to cover the >> 64-bit SoCs, there is no technical limitation to those parts. >> >> Change the Makefile stanza to always create a FIT image if the >> particular config either provided a script or an .its file. >> >> Signed-off-by: Andre Przywara <andre.przywara@arm.com> >> --- >> Makefile | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) >> >> diff --git a/Makefile b/Makefile >> index d6e7c69f40..3a560e29bf 100644 >> --- a/Makefile >> +++ b/Makefile >> @@ -1350,7 +1350,7 @@ u-boot-x86-16bit.bin: u-boot FORCE >> endif >> >> ifneq ($(CONFIG_ARCH_SUNXI),) >> -ifeq ($(CONFIG_ARM64),) >> +ifeq ($(CONFIG_SPL_FIT_SOURCE)$(CONFIG_SPL_FIT_GENERATOR),) > > The commit message sounds as if this should be an "ifneq"? If find those ifeq(something,) constructs always confusing, but I think it's right here: The line in the if-clause creates the *legacy* U-Boot image, so the two strings must be both empty for it to match and to execute those commands. If only one of them is "y", the comparison with the empty string will fail and the else clause will be called, which creates the FIT image. Or did I trick myself? Cheers, Andre. >> u-boot-sunxi-with-spl.bin: spl/sunxi-spl.bin u-boot.img u-boot.dtb FORCE >> $(call if_changed,binman) >> else >>
On 23.02.19 02:10, André Przywara wrote: > On 22/02/2019 08:06, Alexander Graf wrote: >> >> >> On 21.02.19 02:30, Andre Przywara wrote: >>> Even though we introduced FIT image support for the SPL to cover the >>> 64-bit SoCs, there is no technical limitation to those parts. >>> >>> Change the Makefile stanza to always create a FIT image if the >>> particular config either provided a script or an .its file. >>> >>> Signed-off-by: Andre Przywara <andre.przywara@arm.com> >>> --- >>> Makefile | 2 +- >>> 1 file changed, 1 insertion(+), 1 deletion(-) >>> >>> diff --git a/Makefile b/Makefile >>> index d6e7c69f40..3a560e29bf 100644 >>> --- a/Makefile >>> +++ b/Makefile >>> @@ -1350,7 +1350,7 @@ u-boot-x86-16bit.bin: u-boot FORCE >>> endif >>> >>> ifneq ($(CONFIG_ARCH_SUNXI),) >>> -ifeq ($(CONFIG_ARM64),) >>> +ifeq ($(CONFIG_SPL_FIT_SOURCE)$(CONFIG_SPL_FIT_GENERATOR),) >> >> The commit message sounds as if this should be an "ifneq"? > > If find those ifeq(something,) constructs always confusing, but I think > it's right here: The line in the if-clause creates the *legacy* U-Boot > image, so the two strings must be both empty for it to match and to > execute those commands. If only one of them is "y", the comparison with > the empty string will fail and the else clause will be called, which > creates the FIT image. > > Or did I trick myself? No, I just got confused myself, sorry :). All good. Reviewed-by: Alexander Graf <agraf@suse.de> Alex
diff --git a/Makefile b/Makefile index d6e7c69f40..3a560e29bf 100644 --- a/Makefile +++ b/Makefile @@ -1350,7 +1350,7 @@ u-boot-x86-16bit.bin: u-boot FORCE endif ifneq ($(CONFIG_ARCH_SUNXI),) -ifeq ($(CONFIG_ARM64),) +ifeq ($(CONFIG_SPL_FIT_SOURCE)$(CONFIG_SPL_FIT_GENERATOR),) u-boot-sunxi-with-spl.bin: spl/sunxi-spl.bin u-boot.img u-boot.dtb FORCE $(call if_changed,binman) else
Even though we introduced FIT image support for the SPL to cover the 64-bit SoCs, there is no technical limitation to those parts. Change the Makefile stanza to always create a FIT image if the particular config either provided a script or an .its file. Signed-off-by: Andre Przywara <andre.przywara@arm.com> --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)