On 8/11/20 1:34 PM, Ang, Chee Hong wrote: >> On 8/11/20 10:01 AM, Chee Hong Ang wrote: >>> Generate spl/u-boot-splx4.sfp which consist of 4 SPL images required >>> for booting up Cyclone5/Arria10. >>> >>> For Cyclone5 using NAND flash image layout for 128 KB memory blocks, >>> 'make u-boot-with-nand-spl.sfp' to generate spl/u-boot-nand-splx4.sfp >>> which contains four 128KB SPL images (each 64KB SPL is followed by >>> 64KB of zero-padding). >>> >>> Signed-off-by: Chee Hong Ang <chee.hong....@intel.com> >>> --- >> >> What changed between V1 and V2 ? Changelog is missing. > In V2, 'make u-boot-with-nand-spl.sfp' will generate > spl/u-boot-nand-splx4.sfp which contains 4 x (SPL + 64KB padding). > Commit message already mentioned how to generate this SFP file with 64Kb > padding for each SPL in SFP.
The changelog in the patches is there so it's quickly obvious what changed in the patch without searching for previous version and running a diff. >>> Makefile | 11 +++++++---- >>> 1 file changed, 7 insertions(+), 4 deletions(-) >>> >>> diff --git a/Makefile b/Makefile >>> index 4483a9b..f4631f1 100644 >>> --- a/Makefile >>> +++ b/Makefile >>> @@ -1582,8 +1582,9 @@ 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.sfp spl/u-boot-spl.sfp \ >>> - spl/u-boot-spl.sfp spl/u-boot-spl.sfp \ >>> - u-boot.img > $@ || rm -f $@ >>> + spl/u-boot-spl.sfp \ >>> + spl/u-boot-spl.sfp > spl/u-boot-splx4.sfp ; \ >>> + cat spl/u-boot-splx4.sfp u-boot.img > $@ || rm -f $@ >>> u-boot-with-spl.sfp: spl/u-boot-spl.sfp u-boot.img FORCE >>> $(call if_changed,socboot) >> >> Also, now that I look at it, if you want to generate some new target, it >> should be a Makefile target, just like u-boot-with-spl.sfp is a Makefile >> target. >> So then you can do make <target>. > > There is already a target 'u-boot-with-nand-spl.sfp' in Makefile: > u-boot-with-nand-spl.sfp: spl/u-boot-spl.sfp u-boot.img FORCE > $(call if_changed,socnandboot) Right, so there should be a new one, u-boot-with-spl-x4.sfp: spl/u-boot-spl.sfp FORCE and then whatever target needs the -x4 variant should again depend on it, e.g. u-boot-with-nand-spl.sfp: spl/u-boot-spl-x4.sfp u-boot.img FORCE