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/amd/db800/Kconfig | 5 ----- src/mainboard/amd/dbm690t/Kconfig | 1 + src/mainboard/amd/dbm690t/romstage.c | 3 +-- src/mainboard/amd/mahogany/Kconfig | 1 + src/mainboard/amd/mahogany/romstage.c | 3 +-- src/mainboard/amd/mahogany_fam10/Kconfig | 1 + src/mainboard/amd/mahogany_fam10/romstage.c | 1 - src/mainboard/amd/norwich/Kconfig | 5 ----- src/mainboard/amd/pistachio/Kconfig | 1 + src/mainboard/amd/pistachio/romstage.c | 3 +-- src/mainboard/amd/rumba/Kconfig | 5 ----- src/mainboard/amd/serengeti_cheetah/Kconfig | 1 + src/mainboard/amd/serengeti_cheetah/ap_romstage.c | 3 +-- src/mainboard/amd/serengeti_cheetah/romstage.c | 3 +-- src/mainboard/amd/serengeti_cheetah_fam10/Kconfig | 1 + src/mainboard/amd/serengeti_cheetah_fam10/romstage.c | 1 - src/mainboard/amd/tilapia_fam10/Kconfig | 1 + src/mainboard/amd/tilapia_fam10/romstage.c | 1 - 18 files changed, 12 insertions(+), 28 deletions(-) (limited to 'src/mainboard/amd') diff --git a/src/mainboard/amd/db800/Kconfig b/src/mainboard/amd/db800/Kconfig index 95cd0e7b97..e25af727ef 100644 --- a/src/mainboard/amd/db800/Kconfig +++ b/src/mainboard/amd/db800/Kconfig @@ -22,11 +22,6 @@ config MAINBOARD_PART_NUMBER default "DB800" depends on BOARD_AMD_DB800 -config HAVE_OPTION_TABLE - bool - default n - depends on BOARD_AMD_DB800 - config IRQ_SLOT_COUNT int default 4 diff --git a/src/mainboard/amd/dbm690t/Kconfig b/src/mainboard/amd/dbm690t/Kconfig index 0ba834dcc9..3071da61a5 100644 --- a/src/mainboard/amd/dbm690t/Kconfig +++ b/src/mainboard/amd/dbm690t/Kconfig @@ -11,6 +11,7 @@ config BOARD_AMD_DBM690T select GENERATE_ACPI_TABLES select GENERATE_MP_TABLE select GENERATE_PIRQ_TABLE + select HAVE_OPTION_TABLE select HAVE_MAINBOARD_RESOURCES select HAVE_BUS_CONFIG select USE_PRINTK_IN_CAR diff --git a/src/mainboard/amd/dbm690t/romstage.c b/src/mainboard/amd/dbm690t/romstage.c index 005de2c409..5988b75cd7 100644 --- a/src/mainboard/amd/dbm690t/romstage.c +++ b/src/mainboard/amd/dbm690t/romstage.c @@ -40,8 +40,7 @@ #include #include #include -#include "option_table.h" -#include "pc80/mc146818rtc_early.c" +#include #include #include diff --git a/src/mainboard/amd/mahogany/Kconfig b/src/mainboard/amd/mahogany/Kconfig index 2723da1126..f159ad325f 100644 --- a/src/mainboard/amd/mahogany/Kconfig +++ b/src/mainboard/amd/mahogany/Kconfig @@ -11,6 +11,7 @@ config BOARD_AMD_MAHOGANY select GENERATE_ACPI_TABLES select GENERATE_MP_TABLE select GENERATE_PIRQ_TABLE + select HAVE_OPTION_TABLE select HAVE_MAINBOARD_RESOURCES select HAVE_BUS_CONFIG select LIFT_BSP_APIC_ID diff --git a/src/mainboard/amd/mahogany/romstage.c b/src/mainboard/amd/mahogany/romstage.c index af0b5cd163..1b3275599e 100644 --- a/src/mainboard/amd/mahogany/romstage.c +++ b/src/mainboard/amd/mahogany/romstage.c @@ -40,8 +40,7 @@ #include #include #include -#include "option_table.h" -#include "pc80/mc146818rtc_early.c" +#include #include #include diff --git a/src/mainboard/amd/mahogany_fam10/Kconfig b/src/mainboard/amd/mahogany_fam10/Kconfig index 339b9e81db..8c66e46630 100644 --- a/src/mainboard/amd/mahogany_fam10/Kconfig +++ b/src/mainboard/amd/mahogany_fam10/Kconfig @@ -8,6 +8,7 @@ config BOARD_AMD_MAHOGANY_FAM10 select SUPERIO_ITE_IT8718F select BOARD_HAS_FADT select HAVE_BUS_CONFIG + select HAVE_OPTION_TABLE select GENERATE_PIRQ_TABLE select GENERATE_MP_TABLE select USE_PRINTK_IN_CAR diff --git a/src/mainboard/amd/mahogany_fam10/romstage.c b/src/mainboard/amd/mahogany_fam10/romstage.c index fa08e357b3..707d7f2a7b 100644 --- a/src/mainboard/amd/mahogany_fam10/romstage.c +++ b/src/mainboard/amd/mahogany_fam10/romstage.c @@ -45,7 +45,6 @@ #include #include #include -#include "option_table.h" #include #include "lib/ramtest.c" #include diff --git a/src/mainboard/amd/norwich/Kconfig b/src/mainboard/amd/norwich/Kconfig index 007d8502d2..2dd968882c 100644 --- a/src/mainboard/amd/norwich/Kconfig +++ b/src/mainboard/amd/norwich/Kconfig @@ -21,11 +21,6 @@ config MAINBOARD_PART_NUMBER default "Norwich" depends on BOARD_AMD_NORWICH -config HAVE_OPTION_TABLE - bool - default n - depends on BOARD_AMD_NORWICH - config IRQ_SLOT_COUNT int default 6 diff --git a/src/mainboard/amd/pistachio/Kconfig b/src/mainboard/amd/pistachio/Kconfig index 9e866b23e4..a15163db23 100644 --- a/src/mainboard/amd/pistachio/Kconfig +++ b/src/mainboard/amd/pistachio/Kconfig @@ -8,6 +8,7 @@ config BOARD_AMD_PISTACHIO select SOUTHBRIDGE_AMD_SB600 select BOARD_HAS_FADT 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/amd/pistachio/romstage.c b/src/mainboard/amd/pistachio/romstage.c index 58806e8ba9..182fab8a0b 100644 --- a/src/mainboard/amd/pistachio/romstage.c +++ b/src/mainboard/amd/pistachio/romstage.c @@ -34,8 +34,7 @@ #include #include #include -#include "option_table.h" -#include "pc80/mc146818rtc_early.c" +#include #include #include diff --git a/src/mainboard/amd/rumba/Kconfig b/src/mainboard/amd/rumba/Kconfig index 20aa08a431..98bea7e33c 100644 --- a/src/mainboard/amd/rumba/Kconfig +++ b/src/mainboard/amd/rumba/Kconfig @@ -38,11 +38,6 @@ config MAINBOARD_PART_NUMBER default "Rumba" depends on BOARD_AMD_RUMBA -config HAVE_OPTION_TABLE - bool - default n - depends on BOARD_AMD_RUMBA - config IRQ_SLOT_COUNT int default 2 diff --git a/src/mainboard/amd/serengeti_cheetah/Kconfig b/src/mainboard/amd/serengeti_cheetah/Kconfig index 9aba165cc2..2640d231ff 100644 --- a/src/mainboard/amd/serengeti_cheetah/Kconfig +++ b/src/mainboard/amd/serengeti_cheetah/Kconfig @@ -9,6 +9,7 @@ config BOARD_AMD_SERENGETI_CHEETAH select SUPERIO_WINBOND_W83627HF select BOARD_HAS_FADT 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/amd/serengeti_cheetah/ap_romstage.c b/src/mainboard/amd/serengeti_cheetah/ap_romstage.c index f132ec727c..3d7a514dea 100644 --- a/src/mainboard/amd/serengeti_cheetah/ap_romstage.c +++ b/src/mainboard/amd/serengeti_cheetah/ap_romstage.c @@ -18,8 +18,7 @@ #include #include #include -#include "option_table.h" -#include "pc80/mc146818rtc_early.c" +#include #include "pc80/serial.c" #include "./arch/i386/lib/printk_init.c" diff --git a/src/mainboard/amd/serengeti_cheetah/romstage.c b/src/mainboard/amd/serengeti_cheetah/romstage.c index f89ea846ab..65cabe9a4f 100644 --- a/src/mainboard/amd/serengeti_cheetah/romstage.c +++ b/src/mainboard/amd/serengeti_cheetah/romstage.c @@ -26,8 +26,7 @@ #include #include #include -#include "option_table.h" -#include "pc80/mc146818rtc_early.c" +#include #include #include diff --git a/src/mainboard/amd/serengeti_cheetah_fam10/Kconfig b/src/mainboard/amd/serengeti_cheetah_fam10/Kconfig index 94a44ea579..a25bac4ae9 100644 --- a/src/mainboard/amd/serengeti_cheetah_fam10/Kconfig +++ b/src/mainboard/amd/serengeti_cheetah_fam10/Kconfig @@ -8,6 +8,7 @@ config BOARD_AMD_SERENGETI_CHEETAH_FAM10 select SUPERIO_WINBOND_W83627HF select BOARD_HAS_FADT 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/amd/serengeti_cheetah_fam10/romstage.c b/src/mainboard/amd/serengeti_cheetah_fam10/romstage.c index 038fbedff9..742700575b 100644 --- a/src/mainboard/amd/serengeti_cheetah_fam10/romstage.c +++ b/src/mainboard/amd/serengeti_cheetah_fam10/romstage.c @@ -45,7 +45,6 @@ #include #include #include -#include "option_table.h" #include #include "lib/ramtest.c" #include diff --git a/src/mainboard/amd/tilapia_fam10/Kconfig b/src/mainboard/amd/tilapia_fam10/Kconfig index 1a6c59e3c0..ca527b5783 100644 --- a/src/mainboard/amd/tilapia_fam10/Kconfig +++ b/src/mainboard/amd/tilapia_fam10/Kconfig @@ -8,6 +8,7 @@ config BOARD_AMD_TILAPIA_FAM10 select SUPERIO_ITE_IT8718F select BOARD_HAS_FADT select HAVE_BUS_CONFIG + select HAVE_OPTION_TABLE select GENERATE_PIRQ_TABLE select GENERATE_MP_TABLE select USE_PRINTK_IN_CAR diff --git a/src/mainboard/amd/tilapia_fam10/romstage.c b/src/mainboard/amd/tilapia_fam10/romstage.c index d8458d7fb1..70ba6a7e00 100644 --- a/src/mainboard/amd/tilapia_fam10/romstage.c +++ b/src/mainboard/amd/tilapia_fam10/romstage.c @@ -45,7 +45,6 @@ #include #include #include -#include "option_table.h" #include #include "lib/ramtest.c" #include -- cgit v1.2.3