From e676f4397c019840e2b0d7330506a857c6dc5a81 Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Sat, 18 May 2019 11:59:48 -0600 Subject: [PATCH] sandbox: Add a memory {} node Add a memory node which indicates the size of sandbox memory. Signed-off-by: Simon Glass --- arch/sandbox/dts/sandbox.dts | 6 ++++++ arch/sandbox/dts/sandbox64.dts | 6 ++++++ include/configs/sandbox.h | 4 ++++ 3 files changed, 16 insertions(+) diff --git a/arch/sandbox/dts/sandbox.dts b/arch/sandbox/dts/sandbox.dts index 9a94979..16a33db 100644 --- a/arch/sandbox/dts/sandbox.dts +++ b/arch/sandbox/dts/sandbox.dts @@ -1,5 +1,7 @@ /dts-v1/; +#include + / { #address-cells = <1>; #size-cells = <1>; @@ -13,6 +15,10 @@ spi0 = &spi; }; + memory { + reg = <0 CONFIG_SYS_SDRAM_SIZE>; + }; + cros_ec: cros-ec { reg = <0 0>; u-boot,dm-pre-reloc; diff --git a/arch/sandbox/dts/sandbox64.dts b/arch/sandbox/dts/sandbox64.dts index da2b442..37a5539 100644 --- a/arch/sandbox/dts/sandbox64.dts +++ b/arch/sandbox/dts/sandbox64.dts @@ -1,5 +1,7 @@ /dts-v1/; +#include + / { #address-cells = <2>; #size-cells = <2>; @@ -13,6 +15,10 @@ spi0 = &spi; }; + memory { + reg = /bits/ 64 <0 CONFIG_SYS_SDRAM_SIZE>; + }; + cros_ec: cros-ec { reg = <0 0 0 0>; u-boot,dm-pre-reloc; diff --git a/include/configs/sandbox.h b/include/configs/sandbox.h index 50affaf..5d75021 100644 --- a/include/configs/sandbox.h +++ b/include/configs/sandbox.h @@ -63,7 +63,11 @@ func(HOST, host, 1) \ func(HOST, host, 0) +#ifdef __ASSEMBLY__ +#define BOOTENV +#else #include +#endif #define CONFIG_KEEP_SERVERADDR #define CONFIG_UDP_CHECKSUM -- 2.7.4