Merge branch 'master' of git://git.denx.de/u-boot-rockchip

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";
 };

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