Merge git://git.denx.de/u-boot-x86
This commit is contained in:
@@ -26,6 +26,7 @@
|
||||
#define CONFIG_PHYSMEM
|
||||
#define CONFIG_SYS_EARLY_PCI_INIT
|
||||
#define CONFIG_DISPLAY_BOARDINFO_LATE
|
||||
#define CONFIG_DISPLAY_CPUINFO
|
||||
|
||||
#define CONFIG_DM
|
||||
#define CONFIG_CMD_DM
|
||||
@@ -48,6 +49,7 @@
|
||||
#define CONFIG_FIT
|
||||
#undef CONFIG_ZLIB
|
||||
#undef CONFIG_GZIP
|
||||
#define CONFIG_SYS_BOOTM_LEN (16 << 20)
|
||||
|
||||
/*-----------------------------------------------------------------------
|
||||
* Watchdog Configuration
|
||||
@@ -221,7 +223,7 @@
|
||||
|
||||
#define CONFIG_SYS_MEMTEST_START 0x00100000
|
||||
#define CONFIG_SYS_MEMTEST_END 0x01000000
|
||||
#define CONFIG_SYS_LOAD_ADDR 0x02000000
|
||||
#define CONFIG_SYS_LOAD_ADDR 0x20000000
|
||||
|
||||
/*-----------------------------------------------------------------------
|
||||
* SDRAM Configuration
|
||||
|
||||
@@ -173,6 +173,7 @@ struct lmb;
|
||||
#define IH_ARCH_OPENRISC 21 /* OpenRISC 1000 */
|
||||
#define IH_ARCH_ARM64 22 /* ARM64 */
|
||||
#define IH_ARCH_ARC 23 /* Synopsys DesignWare ARC */
|
||||
#define IH_ARCH_X86_64 24 /* AMD x86_64, Intel and Via */
|
||||
|
||||
/*
|
||||
* Image Types
|
||||
|
||||
Reference in New Issue
Block a user