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 0e5d8d79a19fa53d4c9c3d3d5a086528332d1a4b..f0567c9c2a26983ff8ebb1668894dd2df8b80b97 100644 (file)
--- 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 80b3460d4cd5a6369f53d87057f98ef9a7225866..8a94cbd9edbaacd973c35771ac26e2a7ab582983 100644 (file)
--- 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