diff options
| author | Simon Glass <sjg@chromium.org> | 2019-05-18 11:59:48 -0600 |
|---|---|---|
| committer | Simon Glass <sjg@chromium.org> | 2019-07-10 16:52:58 -0600 |
| commit | e676f4397c019840e2b0d7330506a857c6dc5a81 (patch) | |
| tree | ede5eee9dc0de5f707b486db7efc19cfc150bc21 | |
| parent | e8a7b3051b50e0ea1422b5bc5983539ee17a6b55 (diff) | |
sandbox: Add a memory {} node
Add a memory node which indicates the size of sandbox memory.
Signed-off-by: Simon Glass <sjg@chromium.org>
| -rw-r--r-- | arch/sandbox/dts/sandbox.dts | 6 | ||||
| -rw-r--r-- | arch/sandbox/dts/sandbox64.dts | 6 | ||||
| -rw-r--r-- | include/configs/sandbox.h | 4 |
3 files changed, 16 insertions, 0 deletions
diff --git a/arch/sandbox/dts/sandbox.dts b/arch/sandbox/dts/sandbox.dts index 9a949791a0..16a33db87d 100644 --- a/arch/sandbox/dts/sandbox.dts +++ b/arch/sandbox/dts/sandbox.dts @@ -1,5 +1,7 @@ /dts-v1/; +#include <config.h> + / { #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 da2b4423fd..37a5539ff4 100644 --- a/arch/sandbox/dts/sandbox64.dts +++ b/arch/sandbox/dts/sandbox64.dts @@ -1,5 +1,7 @@ /dts-v1/; +#include <config.h> + / { #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 50affaf1a8..5d75021ed6 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 <config_distro_bootcmd.h> +#endif #define CONFIG_KEEP_SERVERADDR #define CONFIG_UDP_CHECKSUM |