PCI_ROM_RUN and CONSOLE_VGA are global options in Kconfig and

should not be set in per-mainboard Kconfigs.

Signed-off-by: Uwe Hermann <uwe@hermann-uwe.de>
Acked-by: Uwe Hermann <uwe@hermann-uwe.de>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@4722 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

diff --git a/src/mainboard/a-trend/atc-6220/Kconfig b/src/mainboard/a-trend/atc-6220/Kconfig
index c5c705b566d6a27d557fee591e641f4e2a3a747d..12c50e45c2040eb4dd96e496a7172f8dd8bf7ca0 100644 (file)
--- a/src/mainboard/a-trend/atc-6220/Kconfig
+++ b/src/mainboard/a-trend/atc-6220/Kconfig
@@ -27,8 +27,6 @@ config BOARD_A_TREND_ATC_6220
        select SUPERIO_WINBOND_W83977TF
        select HAVE_PIRQ_TABLE
        select UDELAY_IO
-       select PCI_ROM_RUN
-       select CONSOLE_VGA
 
 config MAINBOARD_DIR
        string

diff --git a/src/mainboard/a-trend/atc-6240/Kconfig b/src/mainboard/a-trend/atc-6240/Kconfig
index 824aa2c4f0340537fd686954194458a4ec2eaa84..9f6c9e3988f1db00dcf52998929a59592c14cbfd 100644 (file)
--- a/src/mainboard/a-trend/atc-6240/Kconfig
+++ b/src/mainboard/a-trend/atc-6240/Kconfig
@@ -27,8 +27,6 @@ config BOARD_A_TREND_ATC_6240
        select SUPERIO_WINBOND_W83627HF
        select HAVE_PIRQ_TABLE
        select UDELAY_IO
-       select PCI_ROM_RUN
-       select CONSOLE_VGA
 
 config MAINBOARD_DIR
        string

diff --git a/src/mainboard/abit/be6-ii_v2_0/Kconfig b/src/mainboard/abit/be6-ii_v2_0/Kconfig
index 2d14f16e9bfc8c4716b19658e6f1f041316e5f52..d4ce4b91d65afb18c71322ec543b93689276ddec 100644 (file)
--- a/src/mainboard/abit/be6-ii_v2_0/Kconfig
+++ b/src/mainboard/abit/be6-ii_v2_0/Kconfig
@@ -27,8 +27,6 @@ config BOARD_ABIT_BE6_II_V2_0
        select SUPERIO_WINBOND_W83977TF
        select HAVE_PIRQ_TABLE
        select UDELAY_IO
-       select PCI_ROM_RUN
-       select CONSOLE_VGA
 
 config MAINBOARD_DIR
        string

diff --git a/src/mainboard/asus/mew-am/Kconfig b/src/mainboard/asus/mew-am/Kconfig
index a9aac79234ebbc1a3b78a568e936b2698293433b..1c7f052e1b5d9ee75031dde65310c27067e67453 100644 (file)
--- a/src/mainboard/asus/mew-am/Kconfig
+++ b/src/mainboard/asus/mew-am/Kconfig
@@ -27,8 +27,6 @@ config BOARD_ASUS_MEW_AM
        select SUPERIO_SMSC_SMSCSUPERIO
        select HAVE_PIRQ_TABLE
        select UDELAY_IO
-       select PCI_ROM_RUN
-       select CONSOLE_VGA
 
 config MAINBOARD_DIR
        string

diff --git a/src/mainboard/asus/mew-vm/Kconfig b/src/mainboard/asus/mew-vm/Kconfig
index 3117b3292922eddab5e04bbbded1f537820bec74..3769d2e293baaedf96c4954d36f0bad5b5274766 100644 (file)
--- a/src/mainboard/asus/mew-vm/Kconfig
+++ b/src/mainboard/asus/mew-vm/Kconfig
@@ -27,8 +27,6 @@ config BOARD_ASUS_MEW_VM
        select SUPERIO_SMSC_LPC47B272
        select HAVE_PIRQ_TABLE
        select UDELAY_IO
-       select PCI_ROM_RUN
-       select CONSOLE_VGA
 
 config MAINBOARD_DIR
        string

diff --git a/src/mainboard/asus/p2b-d/Kconfig b/src/mainboard/asus/p2b-d/Kconfig
index fc820119343999aca1dac89261f8d9f9cad94f5c..545c94f06071275fa725aba60118479daba9a5b8 100644 (file)
--- a/src/mainboard/asus/p2b-d/Kconfig
+++ b/src/mainboard/asus/p2b-d/Kconfig
@@ -30,8 +30,6 @@ config BOARD_ASUS_P2B_D
        select SMP
        select IOAPIC
        select UDELAY_IO
-       select PCI_ROM_RUN
-       select CONSOLE_VGA
 
 config MAINBOARD_DIR
        string

diff --git a/src/mainboard/asus/p2b-ds/Kconfig b/src/mainboard/asus/p2b-ds/Kconfig
index f229c347f2d0128816f424213c47bad72de601df..5bc98705bbceed9df7a370fc98961e4340007177 100644 (file)
--- a/src/mainboard/asus/p2b-ds/Kconfig
+++ b/src/mainboard/asus/p2b-ds/Kconfig
@@ -30,8 +30,6 @@ config BOARD_ASUS_P2B_DS
        select SMP
        select IOAPIC
        select UDELAY_IO
-       select PCI_ROM_RUN
-       select CONSOLE_VGA
 
 config MAINBOARD_DIR
        string

diff --git a/src/mainboard/asus/p2b-f/Kconfig b/src/mainboard/asus/p2b-f/Kconfig
index 675b33e22b557a753e089aa0352aaf41e24e3018..d86d7a1a7960f78f6926f2b56c3cf8f26e65586c 100644 (file)
--- a/src/mainboard/asus/p2b-f/Kconfig
+++ b/src/mainboard/asus/p2b-f/Kconfig
@@ -27,8 +27,6 @@ config BOARD_ASUS_P2B_F
        select SUPERIO_WINBOND_W83977TF
        select HAVE_PIRQ_TABLE
        select UDELAY_IO
-       select PCI_ROM_RUN
-       select CONSOLE_VGA
 
 config MAINBOARD_DIR
        string

diff --git a/src/mainboard/asus/p2b/Kconfig b/src/mainboard/asus/p2b/Kconfig
index 4ba8cbc98c1d17cec22d8171554cb69e779d12b4..9c5bf23f5b6b5caed056f2bad0ceda10c62fd728 100644 (file)
--- a/src/mainboard/asus/p2b/Kconfig
+++ b/src/mainboard/asus/p2b/Kconfig
@@ -27,8 +27,6 @@ config BOARD_ASUS_P2B
        select SUPERIO_WINBOND_W83977TF
        select HAVE_PIRQ_TABLE
        select UDELAY_IO
-       select PCI_ROM_RUN
-       select CONSOLE_VGA
 
 config MAINBOARD_DIR
        string

diff --git a/src/mainboard/asus/p3b-f/Kconfig b/src/mainboard/asus/p3b-f/Kconfig
index acbe5596831d518644ade1d80e74aa4f1e4452e8..094f2fcecaf6e12a5fc51b64b9d7aa47b7d92424 100644 (file)
--- a/src/mainboard/asus/p3b-f/Kconfig
+++ b/src/mainboard/asus/p3b-f/Kconfig
@@ -27,8 +27,6 @@ config BOARD_ASUS_P3B_F
        select SUPERIO_WINBOND_W83977TF
        select HAVE_PIRQ_TABLE
        select UDELAY_IO
-       select PCI_ROM_RUN
-       select CONSOLE_VGA
 
 config MAINBOARD_DIR
        string

diff --git a/src/mainboard/azza/pt-6ibd/Kconfig b/src/mainboard/azza/pt-6ibd/Kconfig
index a28a71ee3937a3ea222cc60d993c4ce5a155abd7..898e4fd8d3f624df6cc5eb2faf099e0b0e316bb3 100644 (file)
--- a/src/mainboard/azza/pt-6ibd/Kconfig
+++ b/src/mainboard/azza/pt-6ibd/Kconfig
@@ -27,8 +27,6 @@ config BOARD_AZZA_PT_6IBD
        select SUPERIO_WINBOND_W83977TF
        select HAVE_PIRQ_TABLE
        select UDELAY_IO
-       select PCI_ROM_RUN
-       select CONSOLE_VGA
 
 config MAINBOARD_DIR
        string

diff --git a/src/mainboard/biostar/m6tba/Kconfig b/src/mainboard/biostar/m6tba/Kconfig
index 28963459d2dfd18790b435bffd40989e023dc645..3c99ac251ea7b4315295bc8ffda7d60f82e2737e 100644 (file)
--- a/src/mainboard/biostar/m6tba/Kconfig
+++ b/src/mainboard/biostar/m6tba/Kconfig
@@ -27,8 +27,6 @@ config BOARD_BIOSTAR_M6TBA
        select SUPERIO_SMSC_SMSCSUPERIO
        select HAVE_PIRQ_TABLE
        select UDELAY_IO
-       select PCI_ROM_RUN
-       select CONSOLE_VGA
 
 config MAINBOARD_DIR
        string

diff --git a/src/mainboard/compaq/deskpro_en_sff_p600/Kconfig b/src/mainboard/compaq/deskpro_en_sff_p600/Kconfig
index 4af6f9ffc8ecf4173f283d524536c8ad094faf0d..13e9986a460c01b659f3c6cdceb31bbc3b06dabc 100644 (file)
--- a/src/mainboard/compaq/deskpro_en_sff_p600/Kconfig
+++ b/src/mainboard/compaq/deskpro_en_sff_p600/Kconfig
@@ -28,8 +28,6 @@ config BOARD_COMPAQ_DESKPRO_EN_SFF_P600
        select SUPERIO_NSC_PC97317
        select HAVE_PIRQ_TABLE
        select UDELAY_IO
-       select PCI_ROM_RUN
-       select CONSOLE_VGA
 
 config MAINBOARD_DIR
        string

diff --git a/src/mainboard/gigabyte/ga-6bxc/Kconfig b/src/mainboard/gigabyte/ga-6bxc/Kconfig
index 700063ad3648b0cbde8fbac3d8ce7600586ac808..b04ff087215b2145515d046961fe2a02420f1bb5 100644 (file)
--- a/src/mainboard/gigabyte/ga-6bxc/Kconfig
+++ b/src/mainboard/gigabyte/ga-6bxc/Kconfig
@@ -27,8 +27,6 @@ config BOARD_GIGABYTE_GA_6BXC
        select SUPERIO_ITE_IT8671F
        select HAVE_PIRQ_TABLE
        select UDELAY_IO
-       select PCI_ROM_RUN
-       select CONSOLE_VGA
 
 config MAINBOARD_DIR
        string

diff --git a/src/mainboard/gigabyte/m57sli/Kconfig b/src/mainboard/gigabyte/m57sli/Kconfig
index f754bcb54a704b9c512292dcc94ac4a62c2dde3b..3fd47e9f94bafd70c369d4a4622a3f0139a3b40f 100644 (file)
--- a/src/mainboard/gigabyte/m57sli/Kconfig
+++ b/src/mainboard/gigabyte/m57sli/Kconfig
@@ -18,8 +18,6 @@ config BOARD_GIGABYTE_M57SLI
        select SB_HT_CHAIN_UNITID_OFFSET_ONLY
        select HAVE_ACPI_TABLES
        select K8_REV_F_SUPPORT
-       select PCI_ROM_RUN
-       select CONSOLE_VGA
        select HAVE_FANCTL
  
 config MAINBOARD_DIR

diff --git a/src/mainboard/mitac/6513wu/Kconfig b/src/mainboard/mitac/6513wu/Kconfig
index 4a7daa419240b1022de58c9815ff831ecd0cf5e3..9d904f1177f8c23a63f2f5232a38dfbc9be22d84 100644 (file)
--- a/src/mainboard/mitac/6513wu/Kconfig
+++ b/src/mainboard/mitac/6513wu/Kconfig
@@ -27,8 +27,6 @@ config BOARD_MITAC_6513WU
        select SUPERIO_SMSC_SMSCSUPERIO
        select HAVE_PIRQ_TABLE
        select UDELAY_IO
-       select PCI_ROM_RUN
-       select CONSOLE_VGA
 
 config MAINBOARD_DIR
        string

diff --git a/src/mainboard/msi/ms6119/Kconfig b/src/mainboard/msi/ms6119/Kconfig
index e49c27c10eaf0f66f4efcabb62a5cd5cebc46fbb..68e9c57277e4fee29a0ffe1900ef95d8b9a49afb 100644 (file)
--- a/src/mainboard/msi/ms6119/Kconfig
+++ b/src/mainboard/msi/ms6119/Kconfig
@@ -27,8 +27,6 @@ config BOARD_MSI_MS_6119
        select SUPERIO_WINBOND_W83977TF
        select HAVE_PIRQ_TABLE
        select UDELAY_IO
-       select PCI_ROM_RUN
-       select CONSOLE_VGA
 
 config MAINBOARD_DIR
        string

diff --git a/src/mainboard/msi/ms6147/Kconfig b/src/mainboard/msi/ms6147/Kconfig
index 0c7b8e150a9ab44bacf20e277540e4857dae4332..a6a4fdc1450b55e2d7ef4f63c1662e002705d0b6 100644 (file)
--- a/src/mainboard/msi/ms6147/Kconfig
+++ b/src/mainboard/msi/ms6147/Kconfig
@@ -27,8 +27,6 @@ config BOARD_MSI_MS_6147
        select SUPERIO_WINBOND_W83977TF
        select HAVE_PIRQ_TABLE
        select UDELAY_IO
-       select PCI_ROM_RUN
-       select CONSOLE_VGA
 
 config MAINBOARD_DIR
        string

diff --git a/src/mainboard/msi/ms6178/Kconfig b/src/mainboard/msi/ms6178/Kconfig
index f786fe10885725b77d601e351667bfd8d825fd6d..240ea23b3a555f9c3de5b1f8f362e3d47f8891d7 100644 (file)
--- a/src/mainboard/msi/ms6178/Kconfig
+++ b/src/mainboard/msi/ms6178/Kconfig
@@ -27,8 +27,6 @@ config BOARD_MSI_MS_6178
        select SUPERIO_WINBOND_W83627HF
        select HAVE_PIRQ_TABLE
        select UDELAY_IO
-       select PCI_ROM_RUN
-       select CONSOLE_VGA
 
 config MAINBOARD_DIR
        string

diff --git a/src/mainboard/nec/powermate2000/Kconfig b/src/mainboard/nec/powermate2000/Kconfig
index 916de99fc90317ba7e169b0d803dc0ccc5bcfb4e..0c2c0c31fb04290fc1e4dc00d4da5a89d82824f5 100644 (file)
--- a/src/mainboard/nec/powermate2000/Kconfig
+++ b/src/mainboard/nec/powermate2000/Kconfig
@@ -27,8 +27,6 @@ config BOARD_NEC_POWERMATE_2000
        select SUPERIO_SMSC_SMSCSUPERIO
        select HAVE_PIRQ_TABLE
        select UDELAY_IO
-       select PCI_ROM_RUN
-       select CONSOLE_VGA
 
 config MAINBOARD_DIR
        string

diff --git a/src/mainboard/soyo/sy-6ba-plus-iii/Kconfig b/src/mainboard/soyo/sy-6ba-plus-iii/Kconfig
index 4ea1c18b119fbfd7cfbdcada9f623c2415adb30c..093403949e9cf7cfb9f095f27a3f345d3c9a5abb 100644 (file)
--- a/src/mainboard/soyo/sy-6ba-plus-iii/Kconfig
+++ b/src/mainboard/soyo/sy-6ba-plus-iii/Kconfig
@@ -27,8 +27,6 @@ config BOARD_SOYO_SY_6BA_PLUS_III
        select SUPERIO_ITE_IT8671F
        select HAVE_PIRQ_TABLE
        select UDELAY_IO
-       select PCI_ROM_RUN
-       select CONSOLE_VGA
 
 config MAINBOARD_DIR
        string

diff --git a/src/mainboard/tyan/s1846/Kconfig b/src/mainboard/tyan/s1846/Kconfig
index b03b38bbf9ac586814770275f2440d116c16f2d4..f72ba12ddff272cac5108a4c132e76648d6479bf 100644 (file)
--- a/src/mainboard/tyan/s1846/Kconfig
+++ b/src/mainboard/tyan/s1846/Kconfig
@@ -26,8 +26,6 @@ config BOARD_TYAN_S1846
        select SOUTHBRIDGE_INTEL_I82371EB
        select SUPERIO_NSC_PC87309
        select UDELAY_IO
-       select PCI_ROM_RUN
-       select CONSOLE_VGA
 
 config MAINBOARD_DIR
        string