From: Simon Glass <sjg@chromium.org>
Date: Sat, 18 May 2019 17:59:48 +0000 (-0600)
Subject: sandbox: Add a memory {} node
X-Git-Tag: v2019.10-rc1~32^2~20
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=e676f4397c019840e2b0d7330506a857c6dc5a81;p=oweals%2Fu-boot.git

sandbox: Add a memory {} node

Add a memory node which indicates the size of sandbox memory.

Signed-off-by: Simon Glass <sjg@chromium.org>
---

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