diff options
| author | Tom Rini <trini@konsulko.com> | 2018-01-01 09:04:35 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2018-01-01 09:04:35 -0500 |
| commit | d167dd4883406ca852b1a2e75db5553279815f62 (patch) | |
| tree | e8ba75857253f05502b7ee144922338c8c0dc8f3 | |
| parent | 46caea7f96f0cd81cbc92fefc3d279e870442cb0 (diff) | |
| parent | f777df3628c544d2f982cbb631fbd053f4072955 (diff) | |
Merge branch 'master' of git://git.denx.de/u-boot-rockchip
| -rw-r--r-- | arch/arm/dts/rk3399-evb.dts | 3 | ||||
| -rw-r--r-- | board/theobroma-systems/puma_rk3399/Kconfig | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/arch/arm/dts/rk3399-evb.dts b/arch/arm/dts/rk3399-evb.dts index 0e5d8d79a1..f0567c9c2a 100644 --- a/arch/arm/dts/rk3399-evb.dts +++ b/arch/arm/dts/rk3399-evb.dts @@ -17,6 +17,8 @@ chosen { stdout-path = &uart2; + u-boot,spl-boot-order = \ + &sdhci, &sdmmc; }; vdd_center: vdd-center { @@ -154,6 +156,7 @@ }; &sdmmc { + u-boot,dm-pre-reloc; bus-width = <4>; status = "okay"; }; diff --git a/board/theobroma-systems/puma_rk3399/Kconfig b/board/theobroma-systems/puma_rk3399/Kconfig index 80b3460d4c..8a94cbd9ed 100644 --- a/board/theobroma-systems/puma_rk3399/Kconfig +++ b/board/theobroma-systems/puma_rk3399/Kconfig @@ -13,7 +13,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy def_bool y config ENV_SIZE - default 0x2000 if ENV_IS_IN_SPI_FLASH + default 0x2000 config ENV_OFFSET default 0x3c000 if ENV_IS_IN_SPI_FLASH |