[PATCH 2/3] rockchip: Require an external TPL binary when TPL is missing

[Kever Yang]

Hi Jonas,

On 2023/2/6 20:51, Jonas Karlman wrote:
> Hi Quentin,
> On 2023-02-06 12:26, Quentin Schulz wrote:
>> Hi Jonas,
>>
>> On 2/5/23 21:21, Jonas Karlman wrote:
>>> Rockchip SoCs typically use U-Boot TPL to initialize DRAM, then jumps
>>> back to boot-rom to load the next stage of the boot flow, U-Boot SPL.
>>>
>>> For RK356x there is currently no support to initialize DRAM using U-Boot
>>> TPL and instead an external TPL binary must be used to generate a
>>> working u-boot-rockchip.bin image.
>>>
>>> Use the new external-tpl entry unless CONFIG_TPL=y to indicate that an
>>> external TPL binary must be provided to generate a working firmware.
>>>
>>> Signed-off-by: Jonas Karlman <jonas at kwiboo.se>
>>> ---
>>>    Makefile                          |  1 +
>>>    arch/arm/dts/rockchip-u-boot.dtsi | 16 ++++++++++++----
>>>    tools/binman/missing-blob-help    |  5 +++++
>>>    3 files changed, 18 insertions(+), 4 deletions(-)
>>>
>>> diff --git a/Makefile b/Makefile
>>> index 7eaf45496c1c..7e9272be937f 100644
>>> --- a/Makefile
>>> +++ b/Makefile
>>> @@ -1332,6 +1332,7 @@ cmd_binman = $(srctree)/tools/binman/binman $(if $(BINMAN_DEBUG),-D) \
>>>    		-a opensbi-path=${OPENSBI} \
>>>    		-a default-dt=$(default_dt) \
>>>    		-a scp-path=$(SCP) \
>>> +		-a external-tpl-path=$(EXTERNAL_TPL) \
>>>    		-a spl-bss-pad=$(if $(CONFIG_SPL_SEPARATE_BSS),,1) \
>>>    		-a tpl-bss-pad=$(if $(CONFIG_TPL_SEPARATE_BSS),,1) \
>>>    		-a spl-dtb=$(CONFIG_SPL_OF_REAL) \
>>> diff --git a/arch/arm/dts/rockchip-u-boot.dtsi b/arch/arm/dts/rockchip-u-boot.dtsi
>>> index 6c662a72d4f9..bc3bc9bc3e37 100644
>>> --- a/arch/arm/dts/rockchip-u-boot.dtsi
>>> +++ b/arch/arm/dts/rockchip-u-boot.dtsi
>>> @@ -20,12 +20,16 @@
>>>    		mkimage {
>>>    			filename = "idbloader.img";
>>>    			args = "-n", CONFIG_SYS_SOC, "-T", "rksd";
>>> -#ifdef CONFIG_TPL
>>>    			multiple-data-files;
>>>    
>>> +#ifdef CONFIG_TPL
>>>    			u-boot-tpl {
>>> -			};
>>> +#else
>>> +			external-tpl {
>>> +				filename = "ddr.bin";
>>> +				missing-msg = "external-tpl-rockchip";
>>>    #endif
>>> +			};
>> NACK. This forces the use of a TPL (either built by U-Boot or external)
>> which is not always the case. There are still boards without a TPL which
>> work perfectly fine (at least I would hope so :) ).
>>
>> Basically there are three possible cases:
>> SPL
>> TPL+SPL
>> TPL(external blob)+SPL
>>
>> Here you remove the ability to have SPL only.
>>
>> Hence why I suggested we add a new Kconfig option for EXTERNAL_TPL, not
>> for the path but to explicit this third possibility.
> Thanks for the feedback, I will add a Kconfig option to make this explicit.
> We could also add the optional prop in the external-tpl node to only include
> the external TPL when it is provided. This will require also fixing the
> missing/optional handling for the mkimage entry.

Could you help to send the new patchset with this update?


Thanks,

- Kever