Merge git://git.denx.de/u-boot-marvell
This commit is contained in:
commit
7853d76b0b
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue