| Message ID | 1453753831-26411-6-git-send-email-sjg@chromium.org |
|---|---|
| State | Superseded |
| Headers | show |
On Monday, January 25, 2016 at 09:30:29 PM, Simon Glass wrote: > We don't need the -dtb suffix anymore, so drop it. > > Signed-off-by: Simon Glass <sjg@chromium.org> > --- You should also fix the MCV: $ git grep u-boot-with-spl-dtb.sfp ... include/configs/socfpga_mcvevk.h: "update_filename=u-boot-with-spl-dtb.sfp\0" I have to admit, I am not a big fan of this renaming, since it's just introducing naming chaos between versions. > Makefile | 10 +++++----- > scripts/Makefile.spl | 6 +++--- > 2 files changed, 8 insertions(+), 8 deletions(-) > > diff --git a/Makefile b/Makefile > index fa55c71..66e96cb 100644 > --- a/Makefile > +++ b/Makefile > @@ -1015,10 +1015,10 @@ u-boot.spr: spl/u-boot-spl.img u-boot.img FORCE > > ifneq ($(CONFIG_ARCH_SOCFPGA),) > quiet_cmd_socboot = SOCBOOT $@ > -cmd_socboot = cat spl/u-boot-spl-dtb.sfp spl/u-boot-spl-dtb.sfp \ > - spl/u-boot-spl-dtb.sfp spl/u-boot-spl-dtb.sfp \ > - u-boot-dtb.img > $@ || rm -f $@ > -u-boot-with-spl-dtb.sfp: spl/u-boot-spl-dtb.sfp u-boot-dtb.img FORCE > +cmd_socboot = cat spl/u-boot-spl.sfp spl/u-boot-spl.sfp \ > + spl/u-boot-spl.sfp spl/u-boot-spl.sfp \ > + u-boot.img > $@ || rm -f $@ > +u-boot-with-spl.sfp: spl/u-boot-spl.sfp u-boot.img FORCE > $(call if_changed,socboot) > endif > > @@ -1323,7 +1323,7 @@ spl/u-boot-spl: tools prepare $(if > $(CONFIG_OF_SEPARATE),dts/dt.dtb) spl/sunxi-spl.bin: spl/u-boot-spl > @: > > -spl/u-boot-spl-dtb.sfp: spl/u-boot-spl > +spl/u-boot-spl.sfp: spl/u-boot-spl > @: > > spl/boot.bin: spl/u-boot-spl > diff --git a/scripts/Makefile.spl b/scripts/Makefile.spl > index 7bf471a..aa7091c 100644 > --- a/scripts/Makefile.spl > +++ b/scripts/Makefile.spl > @@ -146,7 +146,7 @@ ALL-y += $(obj)/$(BOARD)-spl.bin > endif > > ifdef CONFIG_ARCH_SOCFPGA > -ALL-y += $(obj)/$(SPL_BIN)-dtb.sfp > +ALL-y += $(obj)/$(SPL_BIN).sfp > endif > > ifdef CONFIG_SUNXI > @@ -230,8 +230,8 @@ LDFLAGS_$(SPL_BIN) += -Ttext $(CONFIG_SPL_TEXT_BASE) > endif > > ifdef CONFIG_ARCH_SOCFPGA > -MKIMAGEFLAGS_$(SPL_BIN)-dtb.sfp = -T socfpgaimage > -$(obj)/$(SPL_BIN)-dtb.sfp: $(obj)/$(SPL_BIN)-dtb.bin FORCE > +MKIMAGEFLAGS_$(SPL_BIN).sfp = -T socfpgaimage > +$(obj)/$(SPL_BIN).sfp: $(obj)/$(SPL_BIN).bin FORCE > $(call if_changed,mkimage) > endif Best regards, Marek Vasut
Hi Marek, On 25 January 2016 at 13:43, Marek Vasut <marex@denx.de> wrote: > On Monday, January 25, 2016 at 09:30:29 PM, Simon Glass wrote: >> We don't need the -dtb suffix anymore, so drop it. >> >> Signed-off-by: Simon Glass <sjg@chromium.org> >> --- > > You should also fix the MCV: > > $ git grep u-boot-with-spl-dtb.sfp > ... > include/configs/socfpga_mcvevk.h: "update_filename=u-boot-with-spl-dtb.sfp\0" > OK > I have to admit, I am not a big fan of this renaming, since it's just > introducing naming chaos between versions. I'm rather hoping that the impact will be fairly small for the reasons I explained in the cover letter. > >> Makefile | 10 +++++----- >> scripts/Makefile.spl | 6 +++--- >> 2 files changed, 8 insertions(+), 8 deletions(-) >> >> diff --git a/Makefile b/Makefile >> index fa55c71..66e96cb 100644 >> --- a/Makefile >> +++ b/Makefile >> @@ -1015,10 +1015,10 @@ u-boot.spr: spl/u-boot-spl.img u-boot.img FORCE >> >> ifneq ($(CONFIG_ARCH_SOCFPGA),) >> quiet_cmd_socboot = SOCBOOT $@ >> -cmd_socboot = cat spl/u-boot-spl-dtb.sfp spl/u-boot-spl-dtb.sfp \ >> - spl/u-boot-spl-dtb.sfp spl/u-boot-spl-dtb.sfp \ >> - u-boot-dtb.img > $@ || rm -f $@ >> -u-boot-with-spl-dtb.sfp: spl/u-boot-spl-dtb.sfp u-boot-dtb.img FORCE >> +cmd_socboot = cat spl/u-boot-spl.sfp spl/u-boot-spl.sfp \ >> + spl/u-boot-spl.sfp spl/u-boot-spl.sfp \ >> + u-boot.img > $@ || rm -f $@ >> +u-boot-with-spl.sfp: spl/u-boot-spl.sfp u-boot.img FORCE >> $(call if_changed,socboot) >> endif >> >> @@ -1323,7 +1323,7 @@ spl/u-boot-spl: tools prepare $(if >> $(CONFIG_OF_SEPARATE),dts/dt.dtb) spl/sunxi-spl.bin: spl/u-boot-spl >> @: >> >> -spl/u-boot-spl-dtb.sfp: spl/u-boot-spl >> +spl/u-boot-spl.sfp: spl/u-boot-spl >> @: >> >> spl/boot.bin: spl/u-boot-spl >> diff --git a/scripts/Makefile.spl b/scripts/Makefile.spl >> index 7bf471a..aa7091c 100644 >> --- a/scripts/Makefile.spl >> +++ b/scripts/Makefile.spl >> @@ -146,7 +146,7 @@ ALL-y += $(obj)/$(BOARD)-spl.bin >> endif >> >> ifdef CONFIG_ARCH_SOCFPGA >> -ALL-y += $(obj)/$(SPL_BIN)-dtb.sfp >> +ALL-y += $(obj)/$(SPL_BIN).sfp >> endif >> >> ifdef CONFIG_SUNXI >> @@ -230,8 +230,8 @@ LDFLAGS_$(SPL_BIN) += -Ttext $(CONFIG_SPL_TEXT_BASE) >> endif >> >> ifdef CONFIG_ARCH_SOCFPGA >> -MKIMAGEFLAGS_$(SPL_BIN)-dtb.sfp = -T socfpgaimage >> -$(obj)/$(SPL_BIN)-dtb.sfp: $(obj)/$(SPL_BIN)-dtb.bin FORCE >> +MKIMAGEFLAGS_$(SPL_BIN).sfp = -T socfpgaimage >> +$(obj)/$(SPL_BIN).sfp: $(obj)/$(SPL_BIN).bin FORCE >> $(call if_changed,mkimage) >> endif > > Best regards, > Marek Vasut Regards, Simon
diff --git a/Makefile b/Makefile index fa55c71..66e96cb 100644 --- a/Makefile +++ b/Makefile @@ -1015,10 +1015,10 @@ u-boot.spr: spl/u-boot-spl.img u-boot.img FORCE ifneq ($(CONFIG_ARCH_SOCFPGA),) quiet_cmd_socboot = SOCBOOT $@ -cmd_socboot = cat spl/u-boot-spl-dtb.sfp spl/u-boot-spl-dtb.sfp \ - spl/u-boot-spl-dtb.sfp spl/u-boot-spl-dtb.sfp \ - u-boot-dtb.img > $@ || rm -f $@ -u-boot-with-spl-dtb.sfp: spl/u-boot-spl-dtb.sfp u-boot-dtb.img FORCE +cmd_socboot = cat spl/u-boot-spl.sfp spl/u-boot-spl.sfp \ + spl/u-boot-spl.sfp spl/u-boot-spl.sfp \ + u-boot.img > $@ || rm -f $@ +u-boot-with-spl.sfp: spl/u-boot-spl.sfp u-boot.img FORCE $(call if_changed,socboot) endif @@ -1323,7 +1323,7 @@ spl/u-boot-spl: tools prepare $(if $(CONFIG_OF_SEPARATE),dts/dt.dtb) spl/sunxi-spl.bin: spl/u-boot-spl @: -spl/u-boot-spl-dtb.sfp: spl/u-boot-spl +spl/u-boot-spl.sfp: spl/u-boot-spl @: spl/boot.bin: spl/u-boot-spl diff --git a/scripts/Makefile.spl b/scripts/Makefile.spl index 7bf471a..aa7091c 100644 --- a/scripts/Makefile.spl +++ b/scripts/Makefile.spl @@ -146,7 +146,7 @@ ALL-y += $(obj)/$(BOARD)-spl.bin endif ifdef CONFIG_ARCH_SOCFPGA -ALL-y += $(obj)/$(SPL_BIN)-dtb.sfp +ALL-y += $(obj)/$(SPL_BIN).sfp endif ifdef CONFIG_SUNXI @@ -230,8 +230,8 @@ LDFLAGS_$(SPL_BIN) += -Ttext $(CONFIG_SPL_TEXT_BASE) endif ifdef CONFIG_ARCH_SOCFPGA -MKIMAGEFLAGS_$(SPL_BIN)-dtb.sfp = -T socfpgaimage -$(obj)/$(SPL_BIN)-dtb.sfp: $(obj)/$(SPL_BIN)-dtb.bin FORCE +MKIMAGEFLAGS_$(SPL_BIN).sfp = -T socfpgaimage +$(obj)/$(SPL_BIN).sfp: $(obj)/$(SPL_BIN).bin FORCE $(call if_changed,mkimage) endif
We don't need the -dtb suffix anymore, so drop it. Signed-off-by: Simon Glass <sjg@chromium.org> --- Makefile | 10 +++++----- scripts/Makefile.spl | 6 +++--- 2 files changed, 8 insertions(+), 8 deletions(-)