Re: [PATCH v3 8/9] rockchip: Move to standard boot
Hi Jonas, On Mon, 20 Mar 2023 at 20:54, Jonas Karlman 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 > > --- > > > > 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=0x03e8\0" \ > > "ramdisk_addr_r=0x0a20\0" > > > > -#include > > #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
Re: [PATCH v3 8/9] rockchip: Move to standard boot
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 > --- > > 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=0x03e8\0" \ > "ramdisk_addr_r=0x0a20\0" > > -#include > #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. Regards, Jonas > > #endif > diff --git a/include/configs/rk3036_common.h b/include/configs/rk3036_common.h > index ea6073f29446..e056555276aa 100644 > --- a/include/configs/rk3036_common.h > +++ b/include/configs/rk3036_common.h > @@ -21,15 +21,12 @@ > "kernel_addr_r=0x6200\0" \ > "ramdisk_addr_r=0x6400\0" > > -#include > - > /* Linux fails to load the fdt if it's loaded above 512M on a evb-rk3036 > board, > * so limit the fdt reallocation to that */ > #define CFG_EXTRA_ENV_SETTINGS \ > "fdt_file=" CONFIG_DEFAULT_FDT_FILE "\0" \ > "fdt_high=0x7fff\0" \ > "partitions=" PARTS_DEFAULT \ > - ENV_MEM_LAYOUT_SETTINGS \ > - BOOTENV > + ENV_MEM_LAYOUT_SETTINGS > > #endif > diff --git a/include/configs/rk3066_common.h b/include/configs/rk3066_common.h > index 1a6d3678df3e..7f4d48c1ea95 100644 > --- a/include/configs/rk3066_common.h > +++ b/include/configs/rk3066_common.h > @@ -22,14 +22,11 @@ > "kernel_addr_r=0x6200\0" \ > "ramdisk_addr_r=0x6400\0" > > -#include > - > #define CFG_EXTRA_ENV_SETTINGS \ > "fdt_high=0x6fff\0" \ > "initrd_high=0x6fff\0" \ > "partitions=" PARTS_DEFAULT \ > ENV_MEM_LAYOUT_SETTINGS \ > - ROCKCHIP_DEVICE_SETTINGS \ > - BOOTENV > + ROCKCHIP_DEVICE_SETTINGS > > #endif > diff --git a/include/configs/rk3128_common.h b/include/configs/rk3128_common.h > index 8aa17bfbd364..6d531f6bc812 100644 > --- a/include/configs/rk3128_common.h > +++ b/include/configs/rk3128_common.h > @@ -26,11 +26,9 @@ > "kernel_addr_r=0x6200\0" \ > "ramdisk_addr_r=0x6400\0" > > -#include > #define CFG_EXTRA_ENV_SETTINGS \ > ENV_MEM_LAYOUT_SETTINGS \ > "fdt_file=" CONFIG_DEFAULT_FDT_FILE "\0" \ > - "partitions=" PARTS_DEFAULT \ > - BOOTENV > + "partitions=" PARTS_DEFAULT > > #endif > diff --git a/include/configs/rk3188_common.h b/include/configs/rk3188_common.h > index ac9195672fb7..80d2619fb78f 100644 > --- a/include/configs/rk3188_common.h > +++ b/include/configs/rk3188_common.h > @@ -27,8 +27,6 @@ > "kernel_addr_r=0x6200\0" \ > "ramdisk_addr_r=0x6400\0" > > -#include > - > /* Linux fails to load the fdt if it's loaded above 256M on a Rock board, > * so limit the fdt reallocation to that */ > #define CFG_EXTRA_ENV_SETTINGS \ > @@ -37,7 +35,6 @@ > "initrd_high=0x6fff\0" \ > "partitions=" PARTS_DEFAULT \ > ENV_MEM_LAYOUT_SETTINGS \ > - ROCKCHIP_DEVICE_SETTINGS \ > - BOOTENV > + ROCKCHIP_DEVICE_SETTINGS > > #endif > diff --git a/include/configs/rk322x_common.h b/include/configs/rk322x_com
[PATCH v3 8/9] rockchip: Move to standard boot
Drop the distro-boot scripts and use standard boot instead. Signed-off-by: Simon Glass --- 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=0x03e8\0" \ "ramdisk_addr_r=0x0a20\0" -#include #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 #endif diff --git a/include/configs/rk3036_common.h b/include/configs/rk3036_common.h index ea6073f29446..e056555276aa 100644 --- a/include/configs/rk3036_common.h +++ b/include/configs/rk3036_common.h @@ -21,15 +21,12 @@ "kernel_addr_r=0x6200\0" \ "ramdisk_addr_r=0x6400\0" -#include - /* Linux fails to load the fdt if it's loaded above 512M on a evb-rk3036 board, * so limit the fdt reallocation to that */ #define CFG_EXTRA_ENV_SETTINGS \ "fdt_file=" CONFIG_DEFAULT_FDT_FILE "\0" \ "fdt_high=0x7fff\0" \ "partitions=" PARTS_DEFAULT \ - ENV_MEM_LAYOUT_SETTINGS \ - BOOTENV + ENV_MEM_LAYOUT_SETTINGS #endif diff --git a/include/configs/rk3066_common.h b/include/configs/rk3066_common.h index 1a6d3678df3e..7f4d48c1ea95 100644 --- a/include/configs/rk3066_common.h +++ b/include/configs/rk3066_common.h @@ -22,14 +22,11 @@ "kernel_addr_r=0x6200\0" \ "ramdisk_addr_r=0x6400\0" -#include - #define CFG_EXTRA_ENV_SETTINGS \ "fdt_high=0x6fff\0" \ "initrd_high=0x6fff\0" \ "partitions=" PARTS_DEFAULT \ ENV_MEM_LAYOUT_SETTINGS \ - ROCKCHIP_DEVICE_SETTINGS \ - BOOTENV + ROCKCHIP_DEVICE_SETTINGS #endif diff --git a/include/configs/rk3128_common.h b/include/configs/rk3128_common.h index 8aa17bfbd364..6d531f6bc812 100644 --- a/include/configs/rk3128_common.h +++ b/include/configs/rk3128_common.h @@ -26,11 +26,9 @@ "kernel_addr_r=0x6200\0" \ "ramdisk_addr_r=0x6400\0" -#include #define CFG_EXTRA_ENV_SETTINGS \ ENV_MEM_LAYOUT_SETTINGS \ "fdt_file=" CONFIG_DEFAULT_FDT_FILE "\0" \ - "partitions=" PARTS_DEFAULT \ - BOOTENV + "partitions=" PARTS_DEFAULT #endif diff --git a/include/configs/rk3188_common.h b/include/configs/rk3188_common.h index ac9195672fb7..80d2619fb78f 100644 --- a/include/configs/rk3188_common.h +++ b/include/configs/rk3188_common.h @@ -27,8 +27,6 @@ "kernel_addr_r=0x6200\0" \ "ramdisk_addr_r=0x6400\0" -#include - /* Linux fails to load the fdt if it's loaded above 256M on a Rock board, * so limit the fdt reallocation to that */ #define CFG_EXTRA_ENV_SETTINGS \ @@ -37,7 +35,6 @@ "initrd_high=0x6fff\0" \ "partitions=" PARTS_DEFAULT \ ENV_MEM_LAYOUT_SETTINGS \ - ROCKCHIP_DEVICE_SETTINGS \ - BOOTENV + ROCKCHIP_DEVICE_SETTINGS #endif diff --git a/include/configs/rk322x_common.h b/include/configs/rk322x_common.h index fcaf9c52c4be..fb6c1033499b 100644 --- a/include/configs/rk322x_common.h +++ b/include/configs/rk322x_common.h @@ -23,15 +23,12 @@ "kernel_addr_r=0x6200\0" \ "ramdisk_addr_r=0x6400\0" -#include - /* Linux fails to load the fdt if it's loaded above 512M on a evb-rk3036 board, * so limit the fdt reallocation to that */ #define CFG_EXTRA_ENV_SETTINGS \ "fdtfile=" CONFIG_DEFAULT_FDT_FILE "\0" \ "fdt_high=0x7fff\0" \ "partitions=" PARTS_DEFAULT \ - ENV_MEM_LAYOUT_SETTING
