summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorSimon Glass <sjg@chromium.org>2015-03-06 13:19:03 -0700
committerSimon Glass <sjg@chromium.org>2015-06-10 19:26:55 -0600
commitaf282245462186b8b06047c379ee85f4d0ec7a9c (patch)
tree18005092a1d510762d7bd23c10888dba296e85ac /include
parenta59abd10498fed8c2bb5718748ba27310aac4ba2 (diff)
downloadu-boot-imx-af282245462186b8b06047c379ee85f4d0ec7a9c.zip
u-boot-imx-af282245462186b8b06047c379ee85f4d0ec7a9c.tar.gz
u-boot-imx-af282245462186b8b06047c379ee85f4d0ec7a9c.tar.bz2
sandbox: Move CONFIG_SANDBOX_SERIAL to Kconfig
Move this over to Kconfig and tidy up. Signed-off-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'include')
-rw-r--r--include/configs/sandbox.h1
-rw-r--r--include/fdtdec.h6
2 files changed, 6 insertions, 1 deletions
diff --git a/include/configs/sandbox.h b/include/configs/sandbox.h
index 3a857e2..3caa83c 100644
--- a/include/configs/sandbox.h
+++ b/include/configs/sandbox.h
@@ -113,7 +113,6 @@
#define CONFIG_BAUDRATE 115200
#define CONFIG_SYS_BAUDRATE_TABLE {4800, 9600, 19200, 38400, 57600,\
115200}
-#define CONFIG_SANDBOX_SERIAL
#define CONFIG_SYS_NO_FLASH
diff --git a/include/fdtdec.h b/include/fdtdec.h
index 4fb8a2a..e255998 100644
--- a/include/fdtdec.h
+++ b/include/fdtdec.h
@@ -41,6 +41,12 @@ struct fdt_memory {
fdt_addr_t end;
};
+#ifdef CONFIG_SPL_BUILD
+#define SPL_BUILD 1
+#else
+#define SPL_BUILD 0
+#endif
+
#ifdef CONFIG_OF_CONTROL
# if defined(CONFIG_SPL_BUILD) && defined(SPL_DISABLE_OF_CONTROL)
# define OF_CONTROL 0