projects
/
platform
/
kernel
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
x86: Rename pcat_ to i8254 and i8259 accordingly
[platform/kernel/u-boot.git]
/
include
/
configs
/
x86-common.h
diff --git
a/include/configs/x86-common.h
b/include/configs/x86-common.h
index
217312e
..
58d2f42
100644
(file)
--- a/
include/configs/x86-common.h
+++ b/
include/configs/x86-common.h
@@
-47,8
+47,6
@@
#endif
/* Generic TPM interfaced through LPC bus */
#endif
/* Generic TPM interfaced through LPC bus */
-#define CONFIG_TPM
-#define CONFIG_TPM_TIS_LPC
#define CONFIG_TPM_TIS_BASE_ADDRESS 0xfed40000
/*-----------------------------------------------------------------------
#define CONFIG_TPM_TIS_BASE_ADDRESS 0xfed40000
/*-----------------------------------------------------------------------
@@
-117,7
+115,6
@@
#define CONFIG_CMD_EXT2
#define CONFIG_CMD_ZBOOT
#define CONFIG_CMD_EXT2
#define CONFIG_CMD_ZBOOT
-#define CONFIG_CMD_ELF
#define CONFIG_BOOTARGS \
"root=/dev/sdb3 init=/sbin/init rootwait ro"
#define CONFIG_BOOTARGS \
"root=/dev/sdb3 init=/sbin/init rootwait ro"
@@
-158,9
+155,8
@@
*/
#define CONFIG_SYS_X86_TSC_TIMER
*/
#define CONFIG_SYS_X86_TSC_TIMER
-#define CONFIG_SYS_PCAT_INTERRUPTS
-#define CONFIG_SYS_PCAT_TIMER
-#define CONFIG_SYS_NUM_IRQS 16
+#define CONFIG_I8259_PIC
+#define CONFIG_I8254_TIMER
#define CONFIG_SYS_STACK_SIZE (32 * 1024)
#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE
#define CONFIG_SYS_STACK_SIZE (32 * 1024)
#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE
@@
-219,7
+215,7
@@
/* Default environment */
#define CONFIG_ROOTPATH "/opt/nfsroot"
/* Default environment */
#define CONFIG_ROOTPATH "/opt/nfsroot"
-#define CONFIG_HOSTNAME
"x86"
+#define CONFIG_HOSTNAME
x86
#define CONFIG_BOOTFILE "bzImage"
#define CONFIG_LOADADDR 0x1000000
#define CONFIG_BOOTFILE "bzImage"
#define CONFIG_LOADADDR 0x1000000