summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorTom Rini <trini@ti.com>2014-10-29 15:57:59 -0400
committerTom Rini <trini@ti.com>2014-10-29 15:57:59 -0400
commit2c54cb5516238ae93c930dee7f8e353291f2cdfb (patch)
tree17a1322a88f7381964bb1c89f8ed4b15472bbd3d /include
parentb8be4e365c6f7b5351037bba5d400ace9363fa0a (diff)
parent026090e4c51e00841b04abf58f48cc3a45654bc4 (diff)
downloadu-boot-imx-2c54cb5516238ae93c930dee7f8e353291f2cdfb.zip
u-boot-imx-2c54cb5516238ae93c930dee7f8e353291f2cdfb.tar.gz
u-boot-imx-2c54cb5516238ae93c930dee7f8e353291f2cdfb.tar.bz2
Merge git://git.denx.de/u-boot-x86
Diffstat (limited to 'include')
-rw-r--r--include/configs/coreboot.h4
-rw-r--r--include/image.h1
2 files changed, 4 insertions, 1 deletions
diff --git a/include/configs/coreboot.h b/include/configs/coreboot.h
index 4b90dc2..fef267f 100644
--- a/include/configs/coreboot.h
+++ b/include/configs/coreboot.h
@@ -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
diff --git a/include/image.h b/include/image.h
index a13a302..07e9aed 100644
--- a/include/image.h
+++ b/include/image.h
@@ -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