diff options
| author | Tom Rini <trini@konsulko.com> | 2020-06-08 08:51:30 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-06-08 08:51:30 -0400 |
| commit | 325b83e04072e22c19d6395f69264bf6bf800146 (patch) | |
| tree | 84097b656cae3180a483f8843a2d8070bc959970 /arch/arm/dts/rk3399-rockpro64-u-boot.dtsi | |
| parent | 62005e20832135bda2d7539a29f7d2e9026f590a (diff) | |
| parent | 187ab38e766393cda7bf3bf4926c1e55f48ad0cb (diff) | |
Merge tag 'u-boot-rockchip-20200607' of https://gitlab.denx.de/u-boot/custodians/u-boot-rockchip
- revive rk3399 puma board to adapt mainline dts;
- Fix rk3399-evb stdout path;
- Enable PCIe for rk3399: Rockpro64, firefly, pinebookpro;
- Add rk3328 Rock-pi-e board;
- Enable SPI boot for rockpro64 and roc-pc-rk3399;
Diffstat (limited to 'arch/arm/dts/rk3399-rockpro64-u-boot.dtsi')
| -rw-r--r-- | arch/arm/dts/rk3399-rockpro64-u-boot.dtsi | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/arch/arm/dts/rk3399-rockpro64-u-boot.dtsi b/arch/arm/dts/rk3399-rockpro64-u-boot.dtsi index deaa3efd39..bac09df4a3 100644 --- a/arch/arm/dts/rk3399-rockpro64-u-boot.dtsi +++ b/arch/arm/dts/rk3399-rockpro64-u-boot.dtsi @@ -11,7 +11,17 @@ }; chosen { - u-boot,spl-boot-order = "same-as-spl", &sdmmc, &sdhci; + u-boot,spl-boot-order = "same-as-spl", &spi_flash, &sdmmc, &sdhci; + }; + + config { + u-boot,spl-payload-offset = <0x60000>; /* @ 384KB */ + }; +}; + +&spi1 { + spi_flash: flash@0 { + u-boot,dm-pre-reloc; }; }; |