Merge git://git.denx.de/u-boot-marvell

Tom Rini
2 parents da9971d1b3 3fd38af704
Showing 2 changed files Side-by-side Diff
include/configs/db-88f6820-gp.h
include/configs/mv-common.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
@@ -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
...	...	@@ -62,6 +62,11 @@
62	62	#define CONFIG_SYS_CONSOLE_INFO_QUIET /* don't print console @ startup */
63	63	#define CONFIG_SYS_ALT_MEMTEST
64	64
	65	+/* Keep device tree and initrd in lower memory so the kernel can access them */
	66	+#define CONFIG_EXTRA_ENV_SETTINGS \
	67	+ "fdt_high=0x10000000\0" \
	68	+ "initrd_high=0x10000000\0"
	69	+
65	70	/*
66	71	* mv-common.h should be defined after CMD configs since it used them
67	72	* to enable certain macros
...	...	@@ -59,6 +59,8 @@
59	59	#define CONFIG_BOOTDELAY 3 /* default enable autoboot */
60	60	#define CONFIG_PREBOOT
61	61
	62	+#define CONFIG_OF_LIBFDT /* Device tree support */
	63	+
62	64	/*
63	65	* For booting Linux, the board info and command line data
64	66	* have to be in the first 8 MB of memory, since this is