[GIT PULL] u-boot-riscv/master

[Leo Liang]

On Wed, Aug 13, 2025 at 11:16:09AM +0000, Martin Herren wrote:
> [EXTERNAL MAIL]
> 
> > > So, there's a few problems here. First, checkpatch.pl finds spacing and
> > > spelling issues, which I would normally just fixup in place. But second,
> > > voyager_spl doesn't build:
> > > riscv64: + voyager_spl
> > > +(voyager_spl) In file included from include/linux/printk.h:4,
> > > +(voyager_spl) from include/linux/kernel.h:5,
> > > +(voyager_spl) from include/linux/libfdt_env.h:13,
> > > +(voyager_spl) from include/linux/libfdt.h:6,
> > > +(voyager_spl) from include/fdtdec.h:17,
> > > +(voyager_spl) from include/dm/ofnode.h:11,
> > > +(voyager_spl) from include/dm/device.h:13,
> > > +(voyager_spl) from include/dm.h:13,
> > > +(voyager_spl) from common/spl/spl.c:13:
> > > +(voyager_spl) common/spl/spl.c: In function 'spl_set_header_raw_uboot':
> > > +(voyager_spl) common/spl/spl.c:281:27: error: format '%x' expects argument of type 'unsigned int', but argument 2 has type 'long int' [-Werror=format=]
> > > +(voyager_spl) 281 | log_debug("Default load addr %x (u_boot_pos=%lx)\n",
> > > +(voyager_spl) | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
> > > +(voyager_spl) include/log.h:234:24: note: in definition of macro 'log'
> > > +(voyager_spl) 234 | printf(_fmt, ##_args); \
> > > +(voyager_spl) | ^~~~
> > > +(voyager_spl) common/spl/spl.c:281:17: note: in expansion of macro 'log_debug'
> > > +(voyager_spl) | ^~~~~~~~~
> > > +(voyager_spl) common/spl/spl.c:281:47: note: format string is defined here
> > > +(voyager_spl) | ~^
> > > +(voyager_spl) | |
> > > +(voyager_spl) | unsigned int
> > > +(voyager_spl) | %lx
> > > +(voyager_spl) cc1: all warnings being treated as errors
> > > +(voyager_spl) make[3]: *** [scripts/Makefile.build:296: spl/common/spl/spl.o] Error 1
> > > +(voyager_spl) make[2]: *** [scripts/Makefile.xpl:547: spl/common/spl] Error 2
> > > +(voyager_spl) make[1]: *** [Makefile:2358: spl/u-boot-spl] Error 2
> > > +(voyager_spl) make: *** [Makefile:198: sub-make] Error 2
> > > 
> 
> > > Please fix and re-submit, thanks.
> > 
> 
> > 
> 
> > Hi Tom,
> > 
> 
> > Sorry! I will fix these and re-submit ASAP.
> > 
> 
> > Best regards,
> > Leo
> 
> Hi Leo,
> 
> As you'll resubmit, may I propose two little cleanups ?
> 
> You merged my change to the default SYS_BOOTM_LEN, so this config for both configs/microchip_mpfs_icicle_defconfig and configs/voyager_spl_defconfig could be removed as it corresponds to the now default one.
> 
> For the Icicle board, the config has been unnecessarily re-added in the `configs: microchip_mpfs_icicle: enable CONFIG_OF_BOARD_SETUP` commit.
> 
> For the Voyager board it is a new board that I didn't address in my patch as it was not yet merged.
> 
> This way the defconfigs stay minimal and clean.
> 
> Thanks and best regards,
> 
> Martin

Hi Martin,

Thanks for the proposal.
I will fix them up in place and send out the PR to Tom.

Best regards,
Leo