[PATCH COVER] rockchip: rk3399: fix SPI-NOR flash not found in U-Boot pre-reloc

Jonas Karlman jonas at kwiboo.se
Mon Jun 17 15:44:35 CEST 2024


Hi Quentin,

On 2024-06-17 15:29, Quentin Schulz wrote:
> Hi Jonas,
> 
> On 6/17/24 3:26 PM, Jonas Karlman wrote:
>> Hi Quentin,
>>
>> On 2024-06-17 15:10, Quentin Schulz wrote:
>>> From: Quentin Schulz <quentin.schulz at cherry.de>
>>>
>>> In commit 100f489f58a6 ("rockchip: rk3399: Fix loading FIT from SD-card
>>> when booting from eMMC"), the spi1 bootph properties were mistakenly
>>> removed meaning, so re-add them back to fix SPI-NOR flash not being
>>> found in U-Boot pre-reloc as required for RK3399 Puma.
>>
>> Good catch, for TPL/SPL the bootph props is propagated, something that
>> is not done for pre-reloc.
>>
> 
> Can you tell us a bit more about this? I know that the pinctrl nodes 
> marked for pre-reloc recursively apply the same to their parent, but 
> couldn't find anything similar for other subsystems for example. What 
> did I miss in my 5m search?

v2024.04-rc1 added support to propagate bootph props using fdtgrep for
the u-boot-tpl/spl.dtb files, however pre-reloc the main u-boot.dtb (or
possible the FDT included in FIT) that is not processed by fdtgrep.

fdtgrep: Allow propagating properties up to supernodes
https://source.denx.de/u-boot/u-boot/-/commit/7a06cc2027c0169c462da63a68fa269c0d59a950

Makefile: Use the fdtgrep -u flag
https://source.denx.de/u-boot/u-boot/-/commit/aca95282c1b72c41d8e72984b1dceb15f396b2f8

I solely relied, wrongly, on this new propagation to justify the removal
of the spi1 node, without ever thinking about that pre-reloc uses an
unprocessed version of the device tree.

Regards,
Jonas

> 
> Cheers,
> Quentin



More information about the U-Boot mailing list