Add a memory node which indicates the size of sandbox memory.
Signed-off-by: Simon Glass sjg@chromium.org ---
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 9a949791a0e..16a33db87d3 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 da2b4423fdc..37a5539ff47 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 bf03baefe83..47983ced2e6 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