Hi Simon,
On 2025-03-28 16:34, Simon Glass wrote:
> Add support for this new phase, which runs after TPL. It determines the
> state of the machine, then selects which SPL image to use. SDRAM init is
> then done in SPL, so that it is updatable.
>
> Signed-off-by: Simon Glass <s...@chromium.org>
> ---
>
> (no changes since v2)
>
> Changes in v2:
> - Rewrite help for VPL_ROCKCHIP_COMMON_BOARD
> - Skip spl-boot-order.c for VPL (rather than modifying it)
[snip]
> diff --git a/arch/arm/mach-rockchip/Kconfig b/arch/arm/mach-rockchip/Kconfig
> index 4c515593718..58ba0e0468f 100644
> --- a/arch/arm/mach-rockchip/Kconfig
> +++ b/arch/arm/mach-rockchip/Kconfig
> @@ -252,13 +252,15 @@ config ROCKCHIP_RK3399
> select SPL_ATF
> select SPL_BOARD_INIT if SPL
> select SPL_LOAD_FIT
> - select SPL_CLK if SPL
> + select SPL_CLK if SPL && !VPL
> select SPL_PINCTRL if SPL
> select SPL_RAM if SPL
> select SPL_REGMAP if SPL
> select SPL_SYSCON if SPL
> select TPL_HAVE_INIT_STACK if TPL
> - select SPL_SEPARATE_BSS
> + select VPL_HAVE_INIT_STACK if VPL
> + select SPL_SEPARATE_BSS if !VPL
SPL_SEPARATE_BSS is already implied by ARM64, so we could probably just
drop the select SPL_SEPARATE_BSS here.
> + select SPL_RAW_IMAGE_SUPPORT if VPL
We have this disabled in all RK3399 defconfigs so this can probably be
dropped. We really do not want this accidentally enabled for !VPL.
> select CLK
> select FIT
> select PINCTRL
> @@ -268,6 +270,7 @@ config ROCKCHIP_RK3399
> select DM_PMIC
> select DM_REGULATOR_FIXED
> select BOARD_LATE_INIT
> + select SUPPORT_VPL
Probably better to keep this next to the other SUPPORT_xPL.
> imply ARMV8_CRYPTO
> imply ARMV8_SET_SMPEN
> imply BOOTSTD_FULL
> @@ -296,13 +299,14 @@ config ROCKCHIP_RK3399
> imply TPL_LIBCOMMON_SUPPORT
> imply TPL_LIBGENERIC_SUPPORT
> imply TPL_OF_CONTROL
> - imply TPL_RAM
> + imply TPL_RAM if !VPL
> imply TPL_REGMAP
> imply TPL_ROCKCHIP_COMMON_BOARD
> imply TPL_SERIAL
> imply TPL_SYS_MALLOC_SIMPLE
> imply TPL_SYSCON
> imply TPL_TINY_MEMSET
> + imply TPL_DM_MMC if VPL
Please try to keep the imply statements in alphabetical order after the
commit d8ff591d9263 ("rockchip: rk3399: Sort imply statements
alphabetically").
Regards,
Jonas
> help
> The Rockchip RK3399 is a ARM-based SoC with a dual-core Cortex-A72
> and quad-core Cortex-A53.
[snip]
