summaryrefslogtreecommitdiff
path: root/src/mainboard/asus
diff options
context:
space:
mode:
authorEdwin Beasant <edwin_beasant@virtensys.com>2010-07-06 21:05:04 +0000
committerMyles Watson <mylesgw@gmail.com>2010-07-06 21:05:04 +0000
commiteb50c7d922e91f0247b3705eccb2d2eec638c277 (patch)
tree2def570d089b2f6deb2beac165e18756a578e308 /src/mainboard/asus
parent8376831eafc1be1175529fd21e0d2fe40339d4eb (diff)
downloadcoreboot-eb50c7d922e91f0247b3705eccb2d2eec638c277.tar.xz
Re-integrate "USE_OPTION_TABLE" code.
Signed-off-by: Edwin Beasant <edwin_beasant@virtensys.com> Signed-off-by: Myles Watson <mylesgw@gmail.com> Acked-by: Myles Watson <mylesgw@gmail.com> git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5653 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
Diffstat (limited to 'src/mainboard/asus')
-rw-r--r--src/mainboard/asus/a8n_e/Kconfig1
-rw-r--r--src/mainboard/asus/a8n_e/romstage.c3
-rw-r--r--src/mainboard/asus/a8v-e_se/Kconfig1
-rw-r--r--src/mainboard/asus/a8v-e_se/romstage.c3
-rw-r--r--src/mainboard/asus/m2v-mx_se/romstage.c3
-rw-r--r--src/mainboard/asus/mew-am/Kconfig5
-rw-r--r--src/mainboard/asus/mew-vm/Kconfig1
-rw-r--r--src/mainboard/asus/p2b-d/Kconfig5
-rw-r--r--src/mainboard/asus/p2b-ds/Kconfig5
-rw-r--r--src/mainboard/asus/p2b-f/Kconfig5
-rw-r--r--src/mainboard/asus/p2b-ls/Kconfig5
-rw-r--r--src/mainboard/asus/p2b/Kconfig5
-rw-r--r--src/mainboard/asus/p3b-f/Kconfig5
13 files changed, 6 insertions, 41 deletions
diff --git a/src/mainboard/asus/a8n_e/Kconfig b/src/mainboard/asus/a8n_e/Kconfig
index 19a6d86a3e..a624e2b011 100644
--- a/src/mainboard/asus/a8n_e/Kconfig
+++ b/src/mainboard/asus/a8n_e/Kconfig
@@ -7,6 +7,7 @@ config BOARD_ASUS_A8N_E
select SOUTHBRIDGE_NVIDIA_CK804
select SUPERIO_ITE_IT8712F
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/asus/a8n_e/romstage.c b/src/mainboard/asus/a8n_e/romstage.c
index 8f2d6ba3dc..4b101d1c9c 100644
--- a/src/mainboard/asus/a8n_e/romstage.c
+++ b/src/mainboard/asus/a8n_e/romstage.c
@@ -38,8 +38,7 @@
#include <device/pnp_def.h>
#include <arch/romcc_io.h>
#include <cpu/x86/lapic.h>
-#include "option_table.h"
-#include "pc80/mc146818rtc_early.c"
+#include <pc80/mc146818rtc.h>
#include "cpu/x86/lapic/boot_cpu.c"
#include "northbridge/amd/amdk8/reset_test.c"
#include "superio/ite/it8712f/it8712f_early_serial.c"
diff --git a/src/mainboard/asus/a8v-e_se/Kconfig b/src/mainboard/asus/a8v-e_se/Kconfig
index d0dfaf50fd..f794b2a9f3 100644
--- a/src/mainboard/asus/a8v-e_se/Kconfig
+++ b/src/mainboard/asus/a8v-e_se/Kconfig
@@ -10,6 +10,7 @@ config BOARD_ASUS_A8V_E_SE
select SUPERIO_WINBOND_W83627EHG
select USE_PRINTK_IN_CAR
select USE_DCACHE_RAM
+ select HAVE_OPTION_TABLE
select HAVE_ACPI_TABLES
select HAVE_MP_TABLE
select BOARD_ROMSIZE_KB_512
diff --git a/src/mainboard/asus/a8v-e_se/romstage.c b/src/mainboard/asus/a8v-e_se/romstage.c
index 4bed32b02c..1f56947eed 100644
--- a/src/mainboard/asus/a8v-e_se/romstage.c
+++ b/src/mainboard/asus/a8v-e_se/romstage.c
@@ -44,8 +44,7 @@ unsigned int get_sbdn(unsigned bus);
#include <device/pnp_def.h>
#include <arch/romcc_io.h>
#include <cpu/x86/lapic.h>
-#include "option_table.h"
-#include "pc80/mc146818rtc_early.c"
+#include <pc80/mc146818rtc.h>
#include <console/console.h>
#include <cpu/amd/model_fxx_rev.h>
#include "northbridge/amd/amdk8/raminit.h"
diff --git a/src/mainboard/asus/m2v-mx_se/romstage.c b/src/mainboard/asus/m2v-mx_se/romstage.c
index 2ee0fb0ef9..03086ec128 100644
--- a/src/mainboard/asus/m2v-mx_se/romstage.c
+++ b/src/mainboard/asus/m2v-mx_se/romstage.c
@@ -49,8 +49,7 @@ unsigned int get_sbdn(unsigned bus);
#include <arch/romcc_io.h>
#include <cpu/amd/mtrr.h>
#include <cpu/x86/lapic.h>
-#include "option_table.h"
-#include "pc80/mc146818rtc_early.c"
+#include <pc80/mc146818rtc.h>
#include <console/console.h>
#include <cpu/amd/model_fxx_rev.h>
#include "northbridge/amd/amdk8/raminit.h"
diff --git a/src/mainboard/asus/mew-am/Kconfig b/src/mainboard/asus/mew-am/Kconfig
index c0a5da9875..fc0691cb07 100644
--- a/src/mainboard/asus/mew-am/Kconfig
+++ b/src/mainboard/asus/mew-am/Kconfig
@@ -41,11 +41,6 @@ config MAINBOARD_PART_NUMBER
default "MEW-AM"
depends on BOARD_ASUS_MEW_AM
-config HAVE_OPTION_TABLE
- bool
- default n
- depends on BOARD_ASUS_MEW_AM
-
config IRQ_SLOT_COUNT
int
default 8
diff --git a/src/mainboard/asus/mew-vm/Kconfig b/src/mainboard/asus/mew-vm/Kconfig
index cab90cc46a..886bb5b2ab 100644
--- a/src/mainboard/asus/mew-vm/Kconfig
+++ b/src/mainboard/asus/mew-vm/Kconfig
@@ -25,6 +25,7 @@ config BOARD_ASUS_MEW_VM
select SOUTHBRIDGE_INTEL_I82801AX
select SUPERIO_SMSC_LPC47B272
select ROMCC
+ select HAVE_OPTION_TABLE
select HAVE_PIRQ_TABLE
select UDELAY_TSC
select BOARD_ROMSIZE_KB_512
diff --git a/src/mainboard/asus/p2b-d/Kconfig b/src/mainboard/asus/p2b-d/Kconfig
index 1847c79850..db9b3e895f 100644
--- a/src/mainboard/asus/p2b-d/Kconfig
+++ b/src/mainboard/asus/p2b-d/Kconfig
@@ -42,11 +42,6 @@ config MAINBOARD_PART_NUMBER
default "P2B-D"
depends on BOARD_ASUS_P2B_D
-config HAVE_OPTION_TABLE
- bool
- default n
- depends on BOARD_ASUS_P2B_D
-
config IRQ_SLOT_COUNT
int
default 6
diff --git a/src/mainboard/asus/p2b-ds/Kconfig b/src/mainboard/asus/p2b-ds/Kconfig
index 1448d8146d..23a96facab 100644
--- a/src/mainboard/asus/p2b-ds/Kconfig
+++ b/src/mainboard/asus/p2b-ds/Kconfig
@@ -42,11 +42,6 @@ config MAINBOARD_PART_NUMBER
default "P2B-DS"
depends on BOARD_ASUS_P2B_DS
-config HAVE_OPTION_TABLE
- bool
- default n
- depends on BOARD_ASUS_P2B_DS
-
config IRQ_SLOT_COUNT
int
default 7
diff --git a/src/mainboard/asus/p2b-f/Kconfig b/src/mainboard/asus/p2b-f/Kconfig
index 0de9b252a6..bddc276179 100644
--- a/src/mainboard/asus/p2b-f/Kconfig
+++ b/src/mainboard/asus/p2b-f/Kconfig
@@ -39,11 +39,6 @@ config MAINBOARD_PART_NUMBER
default "P2B-F"
depends on BOARD_ASUS_P2B_F
-config HAVE_OPTION_TABLE
- bool
- default n
- depends on BOARD_ASUS_P2B_F
-
config IRQ_SLOT_COUNT
int
default 7
diff --git a/src/mainboard/asus/p2b-ls/Kconfig b/src/mainboard/asus/p2b-ls/Kconfig
index 5b836d0986..181d1b4cec 100644
--- a/src/mainboard/asus/p2b-ls/Kconfig
+++ b/src/mainboard/asus/p2b-ls/Kconfig
@@ -40,11 +40,6 @@ config MAINBOARD_PART_NUMBER
default "P2B-LS"
depends on BOARD_ASUS_P2B_LS
-config HAVE_OPTION_TABLE
- bool
- default n
- depends on BOARD_ASUS_P2B_LS
-
config IRQ_SLOT_COUNT
int
default 8
diff --git a/src/mainboard/asus/p2b/Kconfig b/src/mainboard/asus/p2b/Kconfig
index d60267be35..b5ae83e475 100644
--- a/src/mainboard/asus/p2b/Kconfig
+++ b/src/mainboard/asus/p2b/Kconfig
@@ -39,11 +39,6 @@ config MAINBOARD_PART_NUMBER
default "P2B"
depends on BOARD_ASUS_P2B
-config HAVE_OPTION_TABLE
- bool
- default n
- depends on BOARD_ASUS_P2B
-
config IRQ_SLOT_COUNT
int
default 6
diff --git a/src/mainboard/asus/p3b-f/Kconfig b/src/mainboard/asus/p3b-f/Kconfig
index fb3fda8e9b..5815f6b087 100644
--- a/src/mainboard/asus/p3b-f/Kconfig
+++ b/src/mainboard/asus/p3b-f/Kconfig
@@ -40,11 +40,6 @@ config MAINBOARD_PART_NUMBER
default "P3B-F"
depends on BOARD_ASUS_P3B_F
-config HAVE_OPTION_TABLE
- bool
- default n
- depends on BOARD_ASUS_P3B_F
-
config IRQ_SLOT_COUNT
int
default 8