Hi Kever, On 2023-03-19 07:16, Kever Yang wrote: > Hi Jonas, > > I will pick other patches for fix of this series, and leave this > one after the patch set[0] from Simon get land.
Thanks, I noticed that you did not include the following two patches in your pull request. Please consider them for next pull request to master to fix booting on RK3588 / Radxa ROCK 5 Model B. rockchip: Use an external TPL binary on RK3588 (prerequisite to fixes series) - https://patchwork.ozlabs.org/project/uboot/patch/20230228213822.3583989-1-jo...@kwiboo.se/ rockchip: rk3588-rock-5b: Fix sdmmc boot (06/12 of fixes series) - https://patchwork.ozlabs.org/project/uboot/patch/20230314003755.512696-7-jo...@kwiboo.se/ The generated u-boot-rockchip.bin will not contain rockchip TPL and is not bootable by default on RK3588 without the first patch. Thanks, Jonas > > > Thanks, > > - Kever > > https://patchwork.ozlabs.org/project/uboot/patch/20230302033930.2546548-7-...@chromium.org/>> > > On 2023/3/14 08:38, Jonas Karlman wrote: >> Imply use of BOOTSTD and OF_LIBFDT_OVERLAY on RK3568 and RK3588. >> Drop the use of scripts and rely on standard boot for all operation. >> >> Signed-off-by: Jonas Karlman <jo...@kwiboo.se> >> --- >> arch/arm/mach-rockchip/Kconfig | 6 ++++++ >> include/configs/rk3568_common.h | 9 +++++++-- >> include/configs/rk3588_common.h | 9 +++++++-- >> 3 files changed, 20 insertions(+), 4 deletions(-) >> >> diff --git a/arch/arm/mach-rockchip/Kconfig b/arch/arm/mach-rockchip/Kconfig >> index e5ac58ae60b5..5e8aacc2ea14 100644 >> --- a/arch/arm/mach-rockchip/Kconfig >> +++ b/arch/arm/mach-rockchip/Kconfig >> @@ -289,6 +289,9 @@ config ROCKCHIP_RK3568 >> select DM_REGULATOR_FIXED >> select DM_RESET >> imply ROCKCHIP_COMMON_BOARD >> + imply BOOTSTD_BOOTCOMMAND >> + imply BOOTSTD_DEFAULTS >> + imply OF_LIBFDT_OVERLAY >> imply ROCKCHIP_OTP >> imply MISC_INIT_R >> help >> @@ -310,6 +313,9 @@ config ROCKCHIP_RK3588 >> select SYSCON >> select BOARD_LATE_INIT >> imply ROCKCHIP_COMMON_BOARD >> + imply BOOTSTD_BOOTCOMMAND >> + imply BOOTSTD_DEFAULTS >> + imply OF_LIBFDT_OVERLAY >> imply ROCKCHIP_OTP >> imply MISC_INIT_R >> help >> diff --git a/include/configs/rk3568_common.h >> b/include/configs/rk3568_common.h >> index a5e1dde50888..164c123d9490 100644 >> --- a/include/configs/rk3568_common.h >> +++ b/include/configs/rk3568_common.h >> @@ -17,10 +17,15 @@ >> >> #define ENV_MEM_LAYOUT_SETTINGS \ >> "scriptaddr=0x00c00000\0" \ >> + "script_offset_f=0xffe000\0" \ >> + "script_size_f=0x2000\0" \ >> "pxefile_addr_r=0x00e00000\0" \ >> "fdt_addr_r=0x0a100000\0" \ >> + "fdtoverlay_addr_r=0x02000000\0" \ >> "kernel_addr_r=0x02080000\0" \ >> - "ramdisk_addr_r=0x0a200000\0" >> + "ramdisk_addr_r=0x0a200000\0" \ >> + "kernel_comp_addr_r=0x08000000\0" \ >> + "kernel_comp_size=0x2000000\0" >> >> #include <config_distro_bootcmd.h> >> #define CFG_EXTRA_ENV_SETTINGS \ >> @@ -28,6 +33,6 @@ >> "fdtfile=" CONFIG_DEFAULT_FDT_FILE "\0" \ >> "partitions=" PARTS_DEFAULT \ >> ROCKCHIP_DEVICE_SETTINGS \ >> - BOOTENV >> + BOOTENV_BOOT_TARGETS >> >> #endif >> diff --git a/include/configs/rk3588_common.h >> b/include/configs/rk3588_common.h >> index abd20139aaf3..7ff0481a69fd 100644 >> --- a/include/configs/rk3588_common.h >> +++ b/include/configs/rk3588_common.h >> @@ -16,10 +16,15 @@ >> >> #define ENV_MEM_LAYOUT_SETTINGS \ >> "scriptaddr=0x00c00000\0" \ >> + "script_offset_f=0xffe000\0" \ >> + "script_size_f=0x2000\0" \ >> "pxefile_addr_r=0x00e00000\0" \ >> "fdt_addr_r=0x0a100000\0" \ >> + "fdtoverlay_addr_r=0x02000000\0" \ >> "kernel_addr_r=0x02080000\0" \ >> - "ramdisk_addr_r=0x0a200000\0" >> + "ramdisk_addr_r=0x0a200000\0" \ >> + "kernel_comp_addr_r=0x08000000\0" \ >> + "kernel_comp_size=0x2000000\0" >> >> #include <config_distro_bootcmd.h> >> #define CFG_EXTRA_ENV_SETTINGS \ >> @@ -27,6 +32,6 @@ >> "partitions=" PARTS_DEFAULT \ >> ENV_MEM_LAYOUT_SETTINGS \ >> ROCKCHIP_DEVICE_SETTINGS \ >> - BOOTENV >> + BOOTENV_BOOT_TARGETS >> >> #endif /* __CONFIG_RK3588_COMMON_H */
