[PATCH] rockchip: rk3399: allow deselecting SPL_ATF_NO_PLATFORM_PARAM

[Walter Lozano]

On 27/6/20 11:36, Kever Yang wrote:
>
> On 2020/6/16 上午7:30, Hugh Cole-Baker wrote:
>> 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 at gmail.com>
>
> Reviewed-by: Kever Yang <kever.yang at rock-chips.com>
>
Thanks for this patch. Now with the latest TF-A and deselecting 
SPL_ATF_NO_PLATFORM_PARAM is it possible to get console output at the 
correct baudrate on TF.


Tested-by: Walter Lozano <walter.lozano at collabora.com>

Regards,

Walter

>> ---
>> For some background, see this thread on the TF-A list [1].
>>
>> Since the corresponding required change isn't in a tagged version of
>> TF-A yet, and I don't know how many RK3399 boards are normally used with
>> older TF-A versions which required this option, I think it's safest to
>> keep the default as not sending a platform param to TF-A. Once the next
>> TF-A version is released, SPL_ATF_NO_PLATFORM_PARAM could be turned off
>> in defconfigs for boards that use the latest upstream TF-A.
>>
>> [1]: 
>> https://lists.trustedfirmware.org/pipermail/tf-a/2020-June/000502.html
>>
>>   arch/arm/mach-rockchip/Kconfig | 2 +-
>>   1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/arch/arm/mach-rockchip/Kconfig 
>> b/arch/arm/mach-rockchip/Kconfig
>> index 0cb1f23d0f3..e2b63265846 100644
>> --- a/arch/arm/mach-rockchip/Kconfig
>> +++ b/arch/arm/mach-rockchip/Kconfig
>> @@ -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
>
>