[PATCH v3 8/9] rockchip: Move to standard boot

[Simon Glass]

Hi Jonas,

On Mon, 20 Mar 2023 at 20:54, Jonas Karlman <jonas at kwiboo.se> wrote:
>
> Hi Simon,
> On 2023-03-20 06:48, Simon Glass wrote:
> > Drop the distro-boot scripts and use standard boot instead.
> >
> > Signed-off-by: Simon Glass <sjg at chromium.org>
> > ---
> >
> > Changes in v3:
> > - Update rk3588 boards too
> >
> > Changes in v2:
> > - Add new patch to move rockchip to standard boot
> >
> >  arch/arm/Kconfig                  |  1 -
> >  include/configs/px30_common.h     |  4 +--
> >  include/configs/rk3036_common.h   |  5 +--
> >  include/configs/rk3066_common.h   |  5 +--
> >  include/configs/rk3128_common.h   |  4 +--
> >  include/configs/rk3188_common.h   |  5 +--
> >  include/configs/rk322x_common.h   |  5 +--
> >  include/configs/rk3288_common.h   |  5 +--
> >  include/configs/rk3308_common.h   |  4 +--
> >  include/configs/rk3328_common.h   |  4 +--
> >  include/configs/rk3368_common.h   |  5 +--
> >  include/configs/rk3399_common.h   |  2 +-
> >  include/configs/rk3568_common.h   |  4 +--
> >  include/configs/rk3588_common.h   |  4 +--
> >  include/configs/rockchip-common.h | 58 -------------------------------
> >  include/configs/rv1108_common.h   |  3 +-
> >  16 files changed, 14 insertions(+), 104 deletions(-)
> >
> > diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
> > index e324387ad057..5fe21413d6bc 100644
> > --- a/arch/arm/Kconfig
> > +++ b/arch/arm/Kconfig
> > @@ -1956,7 +1956,6 @@ config ARCH_ROCKCHIP
> >       imply ADC
> >       imply CMD_DM
> >       imply DEBUG_UART_BOARD_INIT
> > -     imply DISTRO_DEFAULTS if !ROCKCHIP_RK3399
> >       imply FAT_WRITE
> >       imply SARADC_ROCKCHIP
> >       imply SPL_SYSRESET
> > diff --git a/include/configs/px30_common.h b/include/configs/px30_common.h
> > index c0896e5f6281..a4c8bfebdf84 100644
> > --- a/include/configs/px30_common.h
> > +++ b/include/configs/px30_common.h
> > @@ -25,12 +25,10 @@
> >       "kernel_addr_c=0x03e80000\0" \
> >       "ramdisk_addr_r=0x0a200000\0"
> >
> > -#include <config_distro_bootcmd.h>
> >  #define CFG_EXTRA_ENV_SETTINGS \
> >       ENV_MEM_LAYOUT_SETTINGS \
> >       "fdtfile=" CONFIG_DEFAULT_FDT_FILE "\0" \
> >       "partitions=" PARTS_DEFAULT \
> > -     ROCKCHIP_DEVICE_SETTINGS \
> > -     BOOTENV
> > +     ROCKCHIP_DEVICE_SETTINGS
>
> Should BOOTENV not be replaced with:
>
>   "boot_targets=" BOOT_TARGETS "\0"
>
> as was done in the initial rk3399 conversion?
>
> Above applies to similar changes in this patch.
>
> Patch nr 7 has not hit the list yet, will runtime test on the SoCs I
> have access to once I have the complete series.

Thanks, yes I fixed that and sent a new series. But it needs another
spin as I misunderstood something.

Regards,
Simon