From fe529e6597c00a98893e5d0ab00251cb50d457a7 Mon Sep 17 00:00:00 2001 From: Jakob Unterwurzacher Date: Thu, 21 Dec 2017 11:03:01 +0100 Subject: rockchip: rk3399-puma: reduce env size to 8kiB This commit changes the size of the enviroment (for the RK3399-Q7) to 8kiB for all possible locations of the environment (i.e. even when the environment is saved to SD card). With the default of 32kiB, the environment overwrites the SPL stage which lives at 16kiB. Signed-off-by: Jakob Unterwurzacher Acked-by: Philipp Tomsich Reviewed-by: Philipp Tomsich Tested-by: Philipp Tomsich [Reworked commit-message:] Signed-off-by: Philipp Tomsich --- board/theobroma-systems/puma_rk3399/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 -- cgit From f777df3628c544d2f982cbb631fbd053f4072955 Mon Sep 17 00:00:00 2001 From: Kever Yang Date: Wed, 20 Dec 2017 10:40:40 +0800 Subject: rockchip: dts: rk3399-evb: support boot from sd-card Enable sdmmc node in SPL and add it to boot order. Signed-off-by: Kever Yang Acked-by: Philipp Tomsich Reviewed-by: Philipp Tomsich [Fixed commit tags:] Signed-off-by: Philipp Tomsich --- arch/arm/dts/rk3399-evb.dts | 3 +++ 1 file changed, 3 insertions(+) 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"; }; -- cgit