rockchip: rk3399: allow deselecting SPL_ATF_NO_PLATFORM_PARAM
authorHugh Cole-Baker <sigmaris@gmail.com>
Mon, 15 Jun 2020 23:30:47 +0000 (00:30 +0100)
committerKever Yang <kever.yang@rock-chips.com>
Tue, 7 Jul 2020 11:45:57 +0000 (19:45 +0800)
SPL_ATF_NO_PLATFORM_PARAM is selected by default for RK3399 configs, to
guard against issues when used with TF-A versions that perform
insufficient validation on the platform parameter. However, since commit
8109f738ffa7 "rockchip: increase FDT buffer size" in TF-A, passing a
device tree as platform parameter no longer causes problems for upstream
TF-A for RK3399.

Since SPL_ATF_NO_PLATFORM_PARAM doesn't need to be selected when using
upstream TF-A, change the Kconfig option from select to imply. It'll
still default to being selected but can be deselected by a user if they
know they will be using a compatible version of TF-A.

Signed-off-by: Hugh Cole-Baker <sigmaris@gmail.com>
Reviewed-by: Kever Yang <kever.yang@rock-chips.com>
Tested-by: Walter Lozano <walter.lozano@collabora.com>
arch/arm/mach-rockchip/Kconfig

index 0cb1f23..e2b6326 100644 (file)
@@ -207,7 +207,6 @@ config ROCKCHIP_RK3399
        select SUPPORT_TPL
        select SPL
        select SPL_ATF
-       select SPL_ATF_NO_PLATFORM_PARAM if SPL_ATF
        select SPL_BOARD_INIT if SPL
        select SPL_LOAD_FIT
        select SPL_CLK if SPL
@@ -232,6 +231,7 @@ config ROCKCHIP_RK3399
        imply PRE_CONSOLE_BUFFER
        imply ROCKCHIP_COMMON_BOARD
        imply ROCKCHIP_SDRAM_COMMON
+       imply SPL_ATF_NO_PLATFORM_PARAM if SPL_ATF
        imply SPL_ROCKCHIP_COMMON_BOARD
        imply TPL_SERIAL_SUPPORT
        imply TPL_LIBCOMMON_SUPPORT