summaryrefslogtreecommitdiff
path: root/arch/arm/dts/rk3399-ficus-u-boot.dtsi
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2020-05-31 20:07:39 -0400
committerTom Rini <trini@konsulko.com>2020-05-31 20:07:39 -0400
commit9452b7496f8b85ca3bdda1014495df1a6235a8de (patch)
tree211e31287f621183b7cebd3929983ad0c5c367b1 /arch/arm/dts/rk3399-ficus-u-boot.dtsi
parentd09b832cd8ccb7e37e2b188394df5a73d7074c3b (diff)
parenta343b4fe739a56ef248f01d96d80d080228b4068 (diff)
downloadu-boot-9452b7496f8b85ca3bdda1014495df1a6235a8de.tar.gz
Merge tag 'u-boot-rockchip-20200531' of https://gitlab.denx.de/u-boot/custodians/u-boot-rockchipWIP/31May2020
- Fix mmc of path after syncfrom kernel dts; - Add dwc3 host support with DM for rk3399; - Add usb2phy and typec phy for rockchip platform; - Migrate board list doc to rockchip.rst; - Add rk3399 Pinebook Pro board support; - Update dram_init in board_init and add memory node in SPL;
Diffstat (limited to 'arch/arm/dts/rk3399-ficus-u-boot.dtsi')
-rw-r--r--arch/arm/dts/rk3399-ficus-u-boot.dtsi2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/dts/rk3399-ficus-u-boot.dtsi b/arch/arm/dts/rk3399-ficus-u-boot.dtsi
index f3f7aa7c45..38e0897db9 100644
--- a/arch/arm/dts/rk3399-ficus-u-boot.dtsi
+++ b/arch/arm/dts/rk3399-ficus-u-boot.dtsi
@@ -8,6 +8,6 @@
/ {
chosen {
- u-boot,spl-boot-order = &sdhci, &sdmmc;
+ u-boot,spl-boot-order = "same-as-spl", &sdhci, &sdmmc;
};
};