From eb50c7d922e91f0247b3705eccb2d2eec638c277 Mon Sep 17 00:00:00 2001 From: Edwin Beasant Date: Tue, 6 Jul 2010 21:05:04 +0000 Subject: Re-integrate "USE_OPTION_TABLE" code. Signed-off-by: Edwin Beasant Signed-off-by: Myles Watson Acked-by: Myles Watson git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5653 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1 --- src/mainboard/msi/ms6119/Kconfig | 5 ----- src/mainboard/msi/ms6147/Kconfig | 5 ----- src/mainboard/msi/ms6156/Kconfig | 5 ----- src/mainboard/msi/ms6178/Kconfig | 5 ----- src/mainboard/msi/ms7135/Kconfig | 1 + src/mainboard/msi/ms7135/romstage.c | 3 +-- src/mainboard/msi/ms7260/Kconfig | 1 + src/mainboard/msi/ms7260/ap_romstage.c | 3 +-- src/mainboard/msi/ms7260/romstage.c | 3 +-- src/mainboard/msi/ms9185/Kconfig | 1 + src/mainboard/msi/ms9185/romstage.c | 3 +-- src/mainboard/msi/ms9282/Kconfig | 1 + src/mainboard/msi/ms9282/romstage.c | 3 +-- src/mainboard/msi/ms9652_fam10/Kconfig | 5 ----- src/mainboard/msi/ms9652_fam10/romstage.c | 1 - 15 files changed, 9 insertions(+), 36 deletions(-) (limited to 'src/mainboard/msi') diff --git a/src/mainboard/msi/ms6119/Kconfig b/src/mainboard/msi/ms6119/Kconfig index 3a49c9d334..e786f4f02c 100644 --- a/src/mainboard/msi/ms6119/Kconfig +++ b/src/mainboard/msi/ms6119/Kconfig @@ -39,11 +39,6 @@ config MAINBOARD_PART_NUMBER default "MS-6119" depends on BOARD_MSI_MS_6119 -config HAVE_OPTION_TABLE - bool - default n - depends on BOARD_MSI_MS_6119 - config IRQ_SLOT_COUNT int default 7 diff --git a/src/mainboard/msi/ms6147/Kconfig b/src/mainboard/msi/ms6147/Kconfig index ff8a1f6563..1e443a42ae 100644 --- a/src/mainboard/msi/ms6147/Kconfig +++ b/src/mainboard/msi/ms6147/Kconfig @@ -39,11 +39,6 @@ config MAINBOARD_PART_NUMBER default "MS-6147" depends on BOARD_MSI_MS_6147 -config HAVE_OPTION_TABLE - bool - default n - depends on BOARD_MSI_MS_6147 - config IRQ_SLOT_COUNT int default 8 diff --git a/src/mainboard/msi/ms6156/Kconfig b/src/mainboard/msi/ms6156/Kconfig index 8d9ba810c9..5dcd212be3 100644 --- a/src/mainboard/msi/ms6156/Kconfig +++ b/src/mainboard/msi/ms6156/Kconfig @@ -39,11 +39,6 @@ config MAINBOARD_PART_NUMBER default "MS-6156" depends on BOARD_MSI_MS_6156 -config HAVE_OPTION_TABLE - bool - default n - depends on BOARD_MSI_MS_6156 - config IRQ_SLOT_COUNT int default 7 diff --git a/src/mainboard/msi/ms6178/Kconfig b/src/mainboard/msi/ms6178/Kconfig index b5cef0e695..605b6504bc 100644 --- a/src/mainboard/msi/ms6178/Kconfig +++ b/src/mainboard/msi/ms6178/Kconfig @@ -40,11 +40,6 @@ config MAINBOARD_PART_NUMBER default "MS-6178" depends on BOARD_MSI_MS_6178 -config HAVE_OPTION_TABLE - bool - default n - depends on BOARD_MSI_MS_6178 - config IRQ_SLOT_COUNT int default 4 diff --git a/src/mainboard/msi/ms7135/Kconfig b/src/mainboard/msi/ms7135/Kconfig index 4617c9f8f9..9f8529381a 100644 --- a/src/mainboard/msi/ms7135/Kconfig +++ b/src/mainboard/msi/ms7135/Kconfig @@ -8,6 +8,7 @@ config BOARD_MSI_MS7135 select SUPERIO_WINBOND_W83627THF select HAVE_BUS_CONFIG select HAVE_HARD_RESET + select HAVE_OPTION_TABLE select HAVE_PIRQ_TABLE select HAVE_MP_TABLE select USE_DCACHE_RAM diff --git a/src/mainboard/msi/ms7135/romstage.c b/src/mainboard/msi/ms7135/romstage.c index 67eb446c9c..50e75285aa 100644 --- a/src/mainboard/msi/ms7135/romstage.c +++ b/src/mainboard/msi/ms7135/romstage.c @@ -38,8 +38,7 @@ #include #include #include -#include "option_table.h" -#include "pc80/mc146818rtc_early.c" +#include #include "cpu/x86/lapic/boot_cpu.c" #include "northbridge/amd/amdk8/reset_test.c" #include "superio/winbond/w83627hf/w83627hf_early_serial.c" diff --git a/src/mainboard/msi/ms7260/Kconfig b/src/mainboard/msi/ms7260/Kconfig index cce07a7f94..1c1694bdb3 100644 --- a/src/mainboard/msi/ms7260/Kconfig +++ b/src/mainboard/msi/ms7260/Kconfig @@ -7,6 +7,7 @@ config BOARD_MSI_MS7260 select SOUTHBRIDGE_NVIDIA_MCP55 select SUPERIO_WINBOND_W83627EHG select HAVE_BUS_CONFIG + select HAVE_OPTION_TABLE select HAVE_PIRQ_TABLE select HAVE_MP_TABLE select USE_PRINTK_IN_CAR diff --git a/src/mainboard/msi/ms7260/ap_romstage.c b/src/mainboard/msi/ms7260/ap_romstage.c index 229e9bc397..5b88a6d989 100644 --- a/src/mainboard/msi/ms7260/ap_romstage.c +++ b/src/mainboard/msi/ms7260/ap_romstage.c @@ -36,8 +36,7 @@ #include #include #include -#include "option_table.h" -#include "pc80/mc146818rtc_early.c" +#include #include "pc80/serial.c" #include "console/console.c" diff --git a/src/mainboard/msi/ms7260/romstage.c b/src/mainboard/msi/ms7260/romstage.c index ee2118e59c..1f0738fb69 100644 --- a/src/mainboard/msi/ms7260/romstage.c +++ b/src/mainboard/msi/ms7260/romstage.c @@ -52,8 +52,7 @@ #include #include #include -#include "option_table.h" -#include "pc80/mc146818rtc_early.c" +#include #include #if CONFIG_USBDEBUG diff --git a/src/mainboard/msi/ms9185/Kconfig b/src/mainboard/msi/ms9185/Kconfig index ff9da6a965..602ba183bd 100644 --- a/src/mainboard/msi/ms9185/Kconfig +++ b/src/mainboard/msi/ms9185/Kconfig @@ -8,6 +8,7 @@ config BOARD_MSI_MS9185 select SOUTHBRIDGE_BROADCOM_BCM5785 select SUPERIO_NSC_PC87417 select HAVE_BUS_CONFIG + select HAVE_OPTION_TABLE select HAVE_PIRQ_TABLE select HAVE_MP_TABLE select USE_PRINTK_IN_CAR diff --git a/src/mainboard/msi/ms9185/romstage.c b/src/mainboard/msi/ms9185/romstage.c index 134cbe7c5a..a2bf78bf1b 100644 --- a/src/mainboard/msi/ms9185/romstage.c +++ b/src/mainboard/msi/ms9185/romstage.c @@ -47,8 +47,7 @@ #include #include #include -#include "option_table.h" -#include "pc80/mc146818rtc_early.c" +#include #include #include diff --git a/src/mainboard/msi/ms9282/Kconfig b/src/mainboard/msi/ms9282/Kconfig index cf1896d2d7..c72e49134b 100644 --- a/src/mainboard/msi/ms9282/Kconfig +++ b/src/mainboard/msi/ms9282/Kconfig @@ -7,6 +7,7 @@ config BOARD_MSI_MS9282 select SOUTHBRIDGE_NVIDIA_MCP55 select SUPERIO_WINBOND_W83627EHG select HAVE_BUS_CONFIG + select HAVE_OPTION_TABLE select HAVE_PIRQ_TABLE select HAVE_MP_TABLE select USE_PRINTK_IN_CAR diff --git a/src/mainboard/msi/ms9282/romstage.c b/src/mainboard/msi/ms9282/romstage.c index f2581db7b4..e7de603960 100644 --- a/src/mainboard/msi/ms9282/romstage.c +++ b/src/mainboard/msi/ms9282/romstage.c @@ -42,8 +42,7 @@ #include #include #include -#include "option_table.h" -#include "pc80/mc146818rtc_early.c" +#include #include #include diff --git a/src/mainboard/msi/ms9652_fam10/Kconfig b/src/mainboard/msi/ms9652_fam10/Kconfig index 499735cfb9..1f55288869 100644 --- a/src/mainboard/msi/ms9652_fam10/Kconfig +++ b/src/mainboard/msi/ms9652_fam10/Kconfig @@ -49,11 +49,6 @@ config IRQ_SLOT_COUNT default 0 depends on BOARD_MSI_MS9652_FAM10 -config HAVE_OPTION_TABLE - bool - default y - depends on BOARD_MSI_MS9652_FAM10 - config MAX_CPUS int default 8 diff --git a/src/mainboard/msi/ms9652_fam10/romstage.c b/src/mainboard/msi/ms9652_fam10/romstage.c index 9d00a8d92a..4b7fe8f1c7 100644 --- a/src/mainboard/msi/ms9652_fam10/romstage.c +++ b/src/mainboard/msi/ms9652_fam10/romstage.c @@ -43,7 +43,6 @@ #include #include #include -#include "option_table.h" #include #if CONFIG_USBDEBUG #include "southbridge/nvidia/mcp55/mcp55_enable_usbdebug.c" -- cgit v1.2.3