]> git.dujemihanovic.xyz Git - u-boot.git/commit
rockchip: rk3399: Add a default spl-boot-order prop
authorJonas Karlman <jonas@kwiboo.se>
Tue, 30 Apr 2024 15:30:18 +0000 (15:30 +0000)
committerKever Yang <kever.yang@rock-chips.com>
Tue, 7 May 2024 07:56:08 +0000 (15:56 +0800)
commit1520e81871d677612b19202806fab2de56dfe3e1
tree9faff092850a3f22be691e72e62dff4524192481
parent0f65779118db26e41760051c45bd3fe54b3abcb3
rockchip: rk3399: Add a default spl-boot-order prop

A lot of RK3399 boards use a u-boot,spl-boot-order of "same-as-spl",
&sdhci and &sdmmc.

Move this to rk3399-u-boot.dtsi and make this default for boards
currently missing a u-boot,spl-boot-order prop.

Before commit a7e69952eb6d ("rockchip: spl: Cache boot source id for
later use") it was required to include the SPI flash node in the
u-boot,spl-boot-order prop to successfully load FIT from SPI flash.

The SPI flash node reference has been dropped from spl-boot-order from
pinebook-pro, roc-pc and rockpro64 now that "same-as-spl" also gets
resolved to the SPI flash node and loading FIT from SPI flash works
without having the node explicitly referenced in spl-boot-order prop.

Signed-off-by: Jonas Karlman <jonas@kwiboo.se>
Reviewed-by: Dragan Simic <dsimic@manjaro.org>
Reviewed-by: Kever Yang <kever.yang@rock-chips.com>
15 files changed:
arch/arm/dts/rk3399-eaidk-610-u-boot.dtsi
arch/arm/dts/rk3399-evb-u-boot.dtsi
arch/arm/dts/rk3399-ficus-u-boot.dtsi
arch/arm/dts/rk3399-firefly-u-boot.dtsi
arch/arm/dts/rk3399-khadas-edge-u-boot.dtsi
arch/arm/dts/rk3399-leez-p710-u-boot.dtsi
arch/arm/dts/rk3399-nanopi4-u-boot.dtsi
arch/arm/dts/rk3399-pinebook-pro-u-boot.dtsi
arch/arm/dts/rk3399-pinephone-pro-u-boot.dtsi
arch/arm/dts/rk3399-roc-pc-u-boot.dtsi
arch/arm/dts/rk3399-rock-pi-4-u-boot.dtsi
arch/arm/dts/rk3399-rock960-u-boot.dtsi
arch/arm/dts/rk3399-rockpro64-u-boot.dtsi
arch/arm/dts/rk3399-u-boot.dtsi
arch/arm/dts/rk3399pro-rock-pi-n10-u-boot.dtsi