Merge git://git.denx.de/u-boot-marvell
diff --git a/include/configs/db-88f6820-gp.h b/include/configs/db-88f6820-gp.h
index c32e078..24dbf6b 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 0d7b34b..b654fff 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