diff mbox

[U-Boot,1/2] rockchip: dts: rk3399-puma: put environment (in MMC/SD configurations) before SPL

Message ID 1500467543-45347-1-git-send-email-philipp.tomsich@theobroma-systems.com
State Accepted
Commit 56f580d3eb8d1f8d62d51f6155f6d22e975ceefd
Delegated to: Philipp Tomsich
Headers show

Commit Message

Philipp Tomsich July 19, 2017, 12:32 p.m. UTC
As our SPL stage can grow quite large (80KB+ are not unusual) on the
RK3399-Q7, the default setting for the environment location (in
include/configs/rockchip-common.h) can overlap our SPL.

This change finally makes use of the 'u-boot,mmc-env-offset' DTS
property to override the environment location and put it at 16KB into
the device, which is right before the SPL (located at 32KB).

Signed-off-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
---

 arch/arm/dts/rk3399-puma.dtsi | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Comments

Philipp Tomsich July 19, 2017, 12:42 p.m. UTC | #1
> As our SPL stage can grow quite large (80KB+ are not unusual) on the
> RK3399-Q7, the default setting for the environment location (in
> include/configs/rockchip-common.h) can overlap our SPL.
> 
> This change finally makes use of the 'u-boot,mmc-env-offset' DTS
> property to override the environment location and put it at 16KB into
> the device, which is right before the SPL (located at 32KB).
> 
> Signed-off-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
> ---
> 
>  arch/arm/dts/rk3399-puma.dtsi | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 

Acked-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
Simon Glass July 27, 2017, 3:14 p.m. UTC | #2
On 19 July 2017 at 06:32, Philipp Tomsich
<philipp.tomsich@theobroma-systems.com> wrote:
> As our SPL stage can grow quite large (80KB+ are not unusual) on the
> RK3399-Q7, the default setting for the environment location (in
> include/configs/rockchip-common.h) can overlap our SPL.
>
> This change finally makes use of the 'u-boot,mmc-env-offset' DTS
> property to override the environment location and put it at 16KB into
> the device, which is right before the SPL (located at 32KB).
>
> Signed-off-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
> ---
>
>  arch/arm/dts/rk3399-puma.dtsi | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
>

Reviewed-by: Simon Glass <sjg@chromium.org>
diff mbox

Patch

diff --git a/arch/arm/dts/rk3399-puma.dtsi b/arch/arm/dts/rk3399-puma.dtsi
index 1aad6c5..0491886 100644
--- a/arch/arm/dts/rk3399-puma.dtsi
+++ b/arch/arm/dts/rk3399-puma.dtsi
@@ -12,7 +12,8 @@ 
 	compatible = "tsd,rk3399-q7", "tsd,puma", "rockchip,rk3399";
 
 	config {
-		u-boot,spl-payload-offset = <0x40000>; /* 256kbyte */
+		u-boot,spl-payload-offset = <0x40000>; /* @ 256KB */
+		u-boot,mmc-env-offset = <0x4000>;      /* @  16KB */
 		u-boot,boot-led = "module_led";
 	};