Merge branch 'master' of git://git.denx.de/u-boot-rockchip
diff --git a/arch/arm/dts/rk3399-evb.dts b/arch/arm/dts/rk3399-evb.dts
index 0e5d8d7..f0567c9 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 80b3460..8a94cbd 100644
--- a/board/theobroma-systems/puma_rk3399/Kconfig
+++ b/board/theobroma-systems/puma_rk3399/Kconfig
@@ -13,7 +13,7 @@
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