Hi, On Wed, 22 Feb 2023 at 11:56, Jonas Karlman <jo...@kwiboo.se> wrote: > > On 2023-02-22 19:24, Tom Rini wrote: > > On Wed, Feb 22, 2023 at 10:19:03AM -0800, Vagrant Cascadian wrote: > >> On 2023-02-21, Vagrant Cascadian wrote: > >>> On 2023-02-21, Simon Glass wrote: > >>>> This board has moved to standard boot but the old 'distro_bootcmd' > >>>> command is still active. Disable DISTRO_DEFAULTS to fix this. > >>> > >>> Works for booting rockpro64-rk3399, thanks! > >> > >> I can also confirm that applying a very similar patch for > >> pinebook-pro-rk3399 works booting with bootstd. > >> > >> Seems worth adding if there is a v2 of the patch series. > >> > >> Alternately, rather than doing this on a board-by-board basis, is there > >> some way to disable CONFIG_DISTRO_DEFAULTS when a board is using > >> BOOTSTD? > > > > I think that's possibly a bit dangerous? DISTRO_DEFAULTS and > > BOOTSTD_DEFAULTS need to be reconciled to a single new symbol, and the > > DISTRO_DEFAULTS method of select not imply for most things is also I > > suspect the right path. > > > > Another option would be to set BOOTSTD_BOOTCOMMAND=y, this is the main > issue with rk3399 at the moment, distro_bootcmd got removed from env, > yet bootcmd is still "run distro_bootcmd" due to DISTRO_DEFAULTS=y. > > > config BOOTCOMMAND > default "bootflow scan -lb" if BOOTSTD_BOOTCOMMAND && > CMD_BOOTFLOW_FULL > default "bootflow scan" if BOOTSTD_BOOTCOMMAND && !CMD_BOOTFLOW_FULL > default "run distro_bootcmd" if !BOOTSTD_BOOTCOMMAND && > DISTRO_DEFAULTS > > config BOOTSTD_BOOTCOMMAND > default y if !DISTRO_DEFAULTS
That seems reasonable to me, along with a 'depends on BOOTSTD' At present DISTRO_DEFAULTS is both enabled in defconfig files (about 350) and Kconfig (another 300). For rockchip it is the latter. It doesn't really make sense to use DISTRO_DEFAULTS when using BOOTSTD_DEFAULTS. One is 'run distro_bootcmd' and the other is 'bootflow scan', possibly with -lb flags. But we really don't want people flipping back and forward. At present, if both are enabled, then DISTRO_DEFAULTS takes precedence. I think it makes some sense this way, since DISTRO_DEFAULTS is the status quo and moving to BOOTSTD_DEFAULTS is being done over time. I just sent a rpi3 series. I can perhaps look at doing all of rockchip as well, including pinebook-pro. That would provide some amount of testing once it is in -next. I'd quite like to get rid of DISTRO_DEFAULTS entirely, perhaps in the release after this one? Regards, Simon
