| Message ID | 20190319155632.5680-8-sr@denx.de |
|---|---|
| State | Superseded |
| Delegated to: | Eugen Hristev |
| Headers | show |
| Series | [U-Boot,01/11] arm: at91: Makefile: Compile lowlevel_init only when really necessary | expand |
On 19.03.2019 17:56, Stefan Roese wrote: > External E-Mail > > > This patch moves the AT91SAM NAND booting SPL image "boot.bin" which > includes the ECC values from the root directory into the spl directory, > where all SPL related images are located. Hi Stefan, Yes, indeed, but someone may be using this fact? Removing it might break someone's expectations (scripts). Can we make a copy to spl/ dir and leave the boot.bin in the root as-is ? Unless someone has objections of course... Eugen > > Signed-off-by: Stefan Roese <sr@denx.de> > Cc: Heiko Schocher <hs@denx.de> > Cc: Andreas Bießmann <andreas@biessmann.org> > Cc: Eugen Hristev <eugen.hristev@microchip.com> > --- > scripts/Makefile.spl | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/scripts/Makefile.spl b/scripts/Makefile.spl > index 9d5921606e..37be18da4b 100644 > --- a/scripts/Makefile.spl > +++ b/scripts/Makefile.spl > @@ -179,10 +179,10 @@ MKIMAGEFLAGS_boot.bin = -T atmelimage > ifeq ($(CONFIG_SPL_GENERATE_ATMEL_PMECC_HEADER),y) > MKIMAGEFLAGS_boot.bin += -n $(shell $(obj)/../tools/atmel_pmecc_params) > > -boot.bin: $(obj)/../tools/atmel_pmecc_params > +$(obj)/boot.bin: $(obj)/../tools/atmel_pmecc_params > endif > > -boot.bin: $(obj)/u-boot-spl.bin FORCE > +$(obj)/boot.bin: $(obj)/u-boot-spl.bin FORCE > $(call if_changed,mkimage) > else > ifdef CONFIG_ARCH_ZYNQ > @@ -225,7 +225,7 @@ endif > endif > > ifeq ($(CONFIG_SYS_SOC),"at91") > -ALL-y += boot.bin > +ALL-y += $(obj)/boot.bin > endif > > ALL-$(CONFIG_SPL_X86_16BIT_INIT) += $(obj)/u-boot-x86-16bit-spl.bin >
On 25.03.19 15:22, Eugen.Hristev@microchip.com wrote: > > > On 19.03.2019 17:56, Stefan Roese wrote: >> External E-Mail >> >> >> This patch moves the AT91SAM NAND booting SPL image "boot.bin" which >> includes the ECC values from the root directory into the spl directory, >> where all SPL related images are located. > > Hi Stefan, > > Yes, indeed, but someone may be using this fact? Removing it might break > someone's expectations (scripts). Can we make a copy to spl/ dir and > leave the boot.bin in the root as-is ? That would be possible, but I find the solution to move the file to the correct directory cleaner / better. Who uses this image? I'm pretty sure that Heiko does. Heiko, do you have any comments on this SPL binary file move? Is somebody else using it? Thanks, Stefan > Unless someone has objections of course... > > Eugen > >> >> Signed-off-by: Stefan Roese <sr@denx.de> >> Cc: Heiko Schocher <hs@denx.de> >> Cc: Andreas Bießmann <andreas@biessmann.org> >> Cc: Eugen Hristev <eugen.hristev@microchip.com> >> --- >> scripts/Makefile.spl | 6 +++--- >> 1 file changed, 3 insertions(+), 3 deletions(-) >> >> diff --git a/scripts/Makefile.spl b/scripts/Makefile.spl >> index 9d5921606e..37be18da4b 100644 >> --- a/scripts/Makefile.spl >> +++ b/scripts/Makefile.spl >> @@ -179,10 +179,10 @@ MKIMAGEFLAGS_boot.bin = -T atmelimage >> ifeq ($(CONFIG_SPL_GENERATE_ATMEL_PMECC_HEADER),y) >> MKIMAGEFLAGS_boot.bin += -n $(shell $(obj)/../tools/atmel_pmecc_params) >> >> -boot.bin: $(obj)/../tools/atmel_pmecc_params >> +$(obj)/boot.bin: $(obj)/../tools/atmel_pmecc_params >> endif >> >> -boot.bin: $(obj)/u-boot-spl.bin FORCE >> +$(obj)/boot.bin: $(obj)/u-boot-spl.bin FORCE >> $(call if_changed,mkimage) >> else >> ifdef CONFIG_ARCH_ZYNQ >> @@ -225,7 +225,7 @@ endif >> endif >> >> ifeq ($(CONFIG_SYS_SOC),"at91") >> -ALL-y += boot.bin >> +ALL-y += $(obj)/boot.bin >> endif >> >> ALL-$(CONFIG_SPL_X86_16BIT_INIT) += $(obj)/u-boot-x86-16bit-spl.bin >> Viele Grüße, Stefan
Hello Stefan, Am 25.03.2019 um 15:24 schrieb Stefan Roese: > On 25.03.19 15:22, Eugen.Hristev@microchip.com wrote: >> >> >> On 19.03.2019 17:56, Stefan Roese wrote: >>> External E-Mail >>> >>> >>> This patch moves the AT91SAM NAND booting SPL image "boot.bin" which >>> includes the ECC values from the root directory into the spl directory, >>> where all SPL related images are located. >> >> Hi Stefan, >> >> Yes, indeed, but someone may be using this fact? Removing it might break >> someone's expectations (scripts). Can we make a copy to spl/ dir and >> leave the boot.bin in the root as-is ? > > That would be possible, but I find the solution to move the file > to the correct directory cleaner / better. Who uses this image? > I'm pretty sure that Heiko does. > > Heiko, do you have any comments on this SPL binary file move? Is > somebody else using it? I am fine with this move, as I also think, spl directory is the correct place for it. Yes, I have some scripts, but they are fixed very fast. Acked-by: Heiko Schocher<hs@denx.de> bye, Heiko > > Thanks, > Stefan > >> Unless someone has objections of course... >> >> Eugen >> >>> >>> Signed-off-by: Stefan Roese <sr@denx.de> >>> Cc: Heiko Schocher <hs@denx.de> >>> Cc: Andreas Bießmann <andreas@biessmann.org> >>> Cc: Eugen Hristev <eugen.hristev@microchip.com> >>> --- >>> scripts/Makefile.spl | 6 +++--- >>> 1 file changed, 3 insertions(+), 3 deletions(-) >>> >>> diff --git a/scripts/Makefile.spl b/scripts/Makefile.spl >>> index 9d5921606e..37be18da4b 100644 >>> --- a/scripts/Makefile.spl >>> +++ b/scripts/Makefile.spl >>> @@ -179,10 +179,10 @@ MKIMAGEFLAGS_boot.bin = -T atmelimage >>> ifeq ($(CONFIG_SPL_GENERATE_ATMEL_PMECC_HEADER),y) >>> MKIMAGEFLAGS_boot.bin += -n $(shell $(obj)/../tools/atmel_pmecc_params) >>> -boot.bin: $(obj)/../tools/atmel_pmecc_params >>> +$(obj)/boot.bin: $(obj)/../tools/atmel_pmecc_params >>> endif >>> -boot.bin: $(obj)/u-boot-spl.bin FORCE >>> +$(obj)/boot.bin: $(obj)/u-boot-spl.bin FORCE >>> $(call if_changed,mkimage) >>> else >>> ifdef CONFIG_ARCH_ZYNQ >>> @@ -225,7 +225,7 @@ endif >>> endif >>> ifeq ($(CONFIG_SYS_SOC),"at91") >>> -ALL-y += boot.bin >>> +ALL-y += $(obj)/boot.bin >>> endif >>> ALL-$(CONFIG_SPL_X86_16BIT_INIT) += $(obj)/u-boot-x86-16bit-spl.bin >>> > > Viele Grüße, > Stefan >
diff --git a/scripts/Makefile.spl b/scripts/Makefile.spl index 9d5921606e..37be18da4b 100644 --- a/scripts/Makefile.spl +++ b/scripts/Makefile.spl @@ -179,10 +179,10 @@ MKIMAGEFLAGS_boot.bin = -T atmelimage ifeq ($(CONFIG_SPL_GENERATE_ATMEL_PMECC_HEADER),y) MKIMAGEFLAGS_boot.bin += -n $(shell $(obj)/../tools/atmel_pmecc_params) -boot.bin: $(obj)/../tools/atmel_pmecc_params +$(obj)/boot.bin: $(obj)/../tools/atmel_pmecc_params endif -boot.bin: $(obj)/u-boot-spl.bin FORCE +$(obj)/boot.bin: $(obj)/u-boot-spl.bin FORCE $(call if_changed,mkimage) else ifdef CONFIG_ARCH_ZYNQ @@ -225,7 +225,7 @@ endif endif ifeq ($(CONFIG_SYS_SOC),"at91") -ALL-y += boot.bin +ALL-y += $(obj)/boot.bin endif ALL-$(CONFIG_SPL_X86_16BIT_INIT) += $(obj)/u-boot-x86-16bit-spl.bin
This patch moves the AT91SAM NAND booting SPL image "boot.bin" which includes the ECC values from the root directory into the spl directory, where all SPL related images are located. Signed-off-by: Stefan Roese <sr@denx.de> Cc: Heiko Schocher <hs@denx.de> Cc: Andreas Bießmann <andreas@biessmann.org> Cc: Eugen Hristev <eugen.hristev@microchip.com> --- scripts/Makefile.spl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)