summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorTom Rini <trini@ti.com>2012-11-28 13:44:40 -0700
committerTom Rini <trini@ti.com>2012-11-28 13:44:40 -0700
commite57d9d15eeab923f6c0de05d7caad317d861bbc5 (patch)
tree4c48c08c983e1b50850cdc7206ed4fb796087bed /include
parenta86fcff69519841aa1338efb1ace37ca77c16c35 (diff)
parentd02a568e9aa3c3500d9b680f60782c192fd51691 (diff)
downloadu-boot-imx-e57d9d15eeab923f6c0de05d7caad317d861bbc5.zip
u-boot-imx-e57d9d15eeab923f6c0de05d7caad317d861bbc5.tar.gz
u-boot-imx-e57d9d15eeab923f6c0de05d7caad317d861bbc5.tar.bz2
Merge branch 'master' of git://www.denx.de/git/u-boot-x86
Diffstat (limited to 'include')
-rw-r--r--include/configs/coreboot.h11
-rw-r--r--include/configs/eNET.h6
2 files changed, 7 insertions, 10 deletions
diff --git a/include/configs/coreboot.h b/include/configs/coreboot.h
index cc95e2b..5da006f 100644
--- a/include/configs/coreboot.h
+++ b/include/configs/coreboot.h
@@ -37,7 +37,7 @@
#define CONFIG_SYS_COREBOOT
#undef CONFIG_SHOW_BOOT_PROGRESS
#define CONFIG_LAST_STAGE_INIT
-
+#define CONFIG_X86_NO_RESET_VECTOR
/*-----------------------------------------------------------------------
* Watchdog Configuration
@@ -67,6 +67,10 @@
CONFIG_SYS_SCSI_MAX_LUN)
#endif
+/* Generic TPM interfaced through LPC bus */
+#define CONFIG_GENERIC_LPC_TPM
+#define CONFIG_TPM_TIS_BASE_ADDRESS 0xfed40000
+
/*-----------------------------------------------------------------------
* Real Time Clock Configuration
*/
@@ -210,12 +214,11 @@
* (128kB + Environment Sector Size) malloc pool
*/
#define CONFIG_SYS_STACK_SIZE (32 * 1024)
-#define CONFIG_SYS_INIT_SP_ADDR (256 * 1024 + 16 * 1024)
+#define CONFIG_SYS_CAR_ADDR 0x19200000
+#define CONFIG_SYS_CAR_SIZE (16 * 1024)
#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE
#define CONFIG_SYS_MONITOR_LEN (256 * 1024)
#define CONFIG_SYS_MALLOC_LEN (0x20000 + 128 * 1024)
-/* Address of temporary Global Data */
-#define CONFIG_SYS_INIT_GD_ADDR (256 * 1024)
/* allow to overwrite serial and ethaddr */
diff --git a/include/configs/eNET.h b/include/configs/eNET.h
index 4b1c219..28cf95b 100644
--- a/include/configs/eNET.h
+++ b/include/configs/eNET.h
@@ -168,16 +168,10 @@
#define CONFIG_SYS_STACK_SIZE (32 * 1024)
#define CONFIG_SYS_CAR_ADDR 0x19200000
#define CONFIG_SYS_CAR_SIZE (16 * 1024)
-#define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_CAR_ADDR + \
- CONFIG_SYS_CAR_SIZE)
#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE
#define CONFIG_SYS_MONITOR_LEN (256 * 1024)
#define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SECT_SIZE + \
128*1024)
-/* Address of temporary Global Data */
-#define CONFIG_SYS_INIT_GD_ADDR CONFIG_SYS_CAR_ADDR
-
-
/* allow to overwrite serial and ethaddr */
#define CONFIG_ENV_OVERWRITE