summaryrefslogtreecommitdiff
path: root/include/configs
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2015-06-28 16:31:32 -0400
committerTom Rini <trini@konsulko.com>2015-06-28 16:31:32 -0400
commit7853d76b0bdab9b1a4da0bba8da6d12b5b8a303f (patch)
tree53c3fd2064182ff7e1fe1a1c38166a3731163e26 /include/configs
parentda9971d1b3bdb554d4a4ac948119f8b2616bbcce (diff)
parent3fd38af704f6d4da50fe7dbf9ff018e43b196fb4 (diff)
Merge git://git.denx.de/u-boot-marvell
Diffstat (limited to 'include/configs')
-rw-r--r--include/configs/db-88f6820-gp.h5
-rw-r--r--include/configs/mv-common.h2
2 files changed, 7 insertions, 0 deletions
diff --git a/include/configs/db-88f6820-gp.h b/include/configs/db-88f6820-gp.h
index c32e07803c..24dbf6bf71 100644
--- a/include/configs/db-88f6820-gp.h
+++ b/include/configs/db-88f6820-gp.h
@@ -62,6 +62,11 @@
#define CONFIG_SYS_CONSOLE_INFO_QUIET /* don't print console @ startup */
#define CONFIG_SYS_ALT_MEMTEST
+/* Keep device tree and initrd in lower memory so the kernel can access them */
+#define CONFIG_EXTRA_ENV_SETTINGS \
+ "fdt_high=0x10000000\0" \
+ "initrd_high=0x10000000\0"
+
/*
* mv-common.h should be defined after CMD configs since it used them
* to enable certain macros
diff --git a/include/configs/mv-common.h b/include/configs/mv-common.h
index 0d7b34b2d8..b654fffb26 100644
--- a/include/configs/mv-common.h
+++ b/include/configs/mv-common.h
@@ -59,6 +59,8 @@
#define CONFIG_BOOTDELAY 3 /* default enable autoboot */
#define CONFIG_PREBOOT
+#define CONFIG_OF_LIBFDT /* Device tree support */
+
/*
* For booting Linux, the board info and command line data
* have to be in the first 8 MB of memory, since this is