Use

  select UDELAY_TSC
  select TSC_X86RDTSC_CALIBRATE_WITH_TIMER2
for all 440BX and i810 boards as per Options.lb.

The UDELAY_IO / TSC / LAPIC / HPET setup will probably be checked
and improved later when the kconfig transition is done. For now
we keep the same values as in Options.lb.

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@4729 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

diff --git a/src/mainboard/a-trend/atc-6220/Kconfig b/src/mainboard/a-trend/atc-6220/Kconfig
index 12c50e45c2040eb4dd96e496a7172f8dd8bf7ca0..eed098e2e71424f8feef2cb1b4e9aaa49859fe38 100644 (file)
--- a/src/mainboard/a-trend/atc-6220/Kconfig
+++ b/src/mainboard/a-trend/atc-6220/Kconfig
@@ -26,7 +26,8 @@ config BOARD_A_TREND_ATC_6220
        select SOUTHBRIDGE_INTEL_I82371EB
        select SUPERIO_WINBOND_W83977TF
        select HAVE_PIRQ_TABLE
-       select UDELAY_IO
+       select UDELAY_TSC
+       select TSC_X86RDTSC_CALIBRATE_WITH_TIMER2
 
 config MAINBOARD_DIR
        string

diff --git a/src/mainboard/a-trend/atc-6240/Kconfig b/src/mainboard/a-trend/atc-6240/Kconfig
index 9f6c9e3988f1db00dcf52998929a59592c14cbfd..ae488ad9bcbc64db4b74839a4d2256166033ce68 100644 (file)
--- a/src/mainboard/a-trend/atc-6240/Kconfig
+++ b/src/mainboard/a-trend/atc-6240/Kconfig
@@ -26,7 +26,8 @@ config BOARD_A_TREND_ATC_6240
        select SOUTHBRIDGE_INTEL_I82371EB
        select SUPERIO_WINBOND_W83627HF
        select HAVE_PIRQ_TABLE
-       select UDELAY_IO
+       select UDELAY_TSC
+       select TSC_X86RDTSC_CALIBRATE_WITH_TIMER2
 
 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 d4ce4b91d65afb18c71322ec543b93689276ddec..d483d247be5f6eb9d53ea88d465dcf2ca9f6cf77 100644 (file)
--- a/src/mainboard/abit/be6-ii_v2_0/Kconfig
+++ b/src/mainboard/abit/be6-ii_v2_0/Kconfig
@@ -26,7 +26,8 @@ config BOARD_ABIT_BE6_II_V2_0
        select SOUTHBRIDGE_INTEL_I82371EB
        select SUPERIO_WINBOND_W83977TF
        select HAVE_PIRQ_TABLE
-       select UDELAY_IO
+       select UDELAY_TSC
+       select TSC_X86RDTSC_CALIBRATE_WITH_TIMER2
 
 config MAINBOARD_DIR
        string

diff --git a/src/mainboard/asus/mew-am/Kconfig b/src/mainboard/asus/mew-am/Kconfig
index 1c7f052e1b5d9ee75031dde65310c27067e67453..4e45defe998cf53a170b7089ce9b9cfb629cb8a2 100644 (file)
--- a/src/mainboard/asus/mew-am/Kconfig
+++ b/src/mainboard/asus/mew-am/Kconfig
@@ -26,7 +26,8 @@ config BOARD_ASUS_MEW_AM
        select SOUTHBRIDGE_INTEL_I82801XX
        select SUPERIO_SMSC_SMSCSUPERIO
        select HAVE_PIRQ_TABLE
-       select UDELAY_IO
+       select UDELAY_TSC
+       select TSC_X86RDTSC_CALIBRATE_WITH_TIMER2
 
 config MAINBOARD_DIR
        string

diff --git a/src/mainboard/asus/mew-vm/Kconfig b/src/mainboard/asus/mew-vm/Kconfig
index 3769d2e293baaedf96c4954d36f0bad5b5274766..cbe404715fe70a0aeb3b1f7ba48a632e715adc94 100644 (file)
--- a/src/mainboard/asus/mew-vm/Kconfig
+++ b/src/mainboard/asus/mew-vm/Kconfig
@@ -26,7 +26,8 @@ config BOARD_ASUS_MEW_VM
        select SOUTHBRIDGE_INTEL_I82801XX
        select SUPERIO_SMSC_LPC47B272
        select HAVE_PIRQ_TABLE
-       select UDELAY_IO
+       select UDELAY_TSC
+       select TSC_X86RDTSC_CALIBRATE_WITH_TIMER2
 
 config MAINBOARD_DIR
        string

diff --git a/src/mainboard/asus/p2b-d/Kconfig b/src/mainboard/asus/p2b-d/Kconfig
index 545c94f06071275fa725aba60118479daba9a5b8..c80fad3ce481aba434ee273938ef9443b07cf0b9 100644 (file)
--- a/src/mainboard/asus/p2b-d/Kconfig
+++ b/src/mainboard/asus/p2b-d/Kconfig
@@ -29,7 +29,8 @@ config BOARD_ASUS_P2B_D
        select HAVE_MP_TABLE
        select SMP
        select IOAPIC
-       select UDELAY_IO
+       select UDELAY_TSC
+       select TSC_X86RDTSC_CALIBRATE_WITH_TIMER2
 
 config MAINBOARD_DIR
        string

diff --git a/src/mainboard/asus/p2b-ds/Kconfig b/src/mainboard/asus/p2b-ds/Kconfig
index 5bc98705bbceed9df7a370fc98961e4340007177..1c2626b3995e1078b7d4f035d0055314c62152ed 100644 (file)
--- a/src/mainboard/asus/p2b-ds/Kconfig
+++ b/src/mainboard/asus/p2b-ds/Kconfig
@@ -29,7 +29,8 @@ config BOARD_ASUS_P2B_DS
        select HAVE_MP_TABLE
        select SMP
        select IOAPIC
-       select UDELAY_IO
+       select UDELAY_TSC
+       select TSC_X86RDTSC_CALIBRATE_WITH_TIMER2
 
 config MAINBOARD_DIR
        string

diff --git a/src/mainboard/asus/p2b-f/Kconfig b/src/mainboard/asus/p2b-f/Kconfig
index d86d7a1a7960f78f6926f2b56c3cf8f26e65586c..114cff429b45bfe0ef294f6013f122e21a55cd1a 100644 (file)
--- a/src/mainboard/asus/p2b-f/Kconfig
+++ b/src/mainboard/asus/p2b-f/Kconfig
@@ -26,7 +26,8 @@ config BOARD_ASUS_P2B_F
        select SOUTHBRIDGE_INTEL_I82371EB
        select SUPERIO_WINBOND_W83977TF
        select HAVE_PIRQ_TABLE
-       select UDELAY_IO
+       select UDELAY_TSC
+       select TSC_X86RDTSC_CALIBRATE_WITH_TIMER2
 
 config MAINBOARD_DIR
        string

diff --git a/src/mainboard/asus/p2b/Kconfig b/src/mainboard/asus/p2b/Kconfig
index 9c5bf23f5b6b5caed056f2bad0ceda10c62fd728..6477be34eff48de16b6495be3e61c4ee174c7fe9 100644 (file)
--- a/src/mainboard/asus/p2b/Kconfig
+++ b/src/mainboard/asus/p2b/Kconfig
@@ -26,7 +26,8 @@ config BOARD_ASUS_P2B
        select SOUTHBRIDGE_INTEL_I82371EB
        select SUPERIO_WINBOND_W83977TF
        select HAVE_PIRQ_TABLE
-       select UDELAY_IO
+       select UDELAY_TSC
+       select TSC_X86RDTSC_CALIBRATE_WITH_TIMER2
 
 config MAINBOARD_DIR
        string

diff --git a/src/mainboard/asus/p3b-f/Kconfig b/src/mainboard/asus/p3b-f/Kconfig
index 094f2fcecaf6e12a5fc51b64b9d7aa47b7d92424..2bfb9e170ba271bf3388f76a4d859710e18b0ae7 100644 (file)
--- a/src/mainboard/asus/p3b-f/Kconfig
+++ b/src/mainboard/asus/p3b-f/Kconfig
@@ -26,7 +26,8 @@ config BOARD_ASUS_P3B_F
        select SOUTHBRIDGE_INTEL_I82371EB
        select SUPERIO_WINBOND_W83977TF
        select HAVE_PIRQ_TABLE
-       select UDELAY_IO
+       select UDELAY_TSC
+       select TSC_X86RDTSC_CALIBRATE_WITH_TIMER2
 
 config MAINBOARD_DIR
        string

diff --git a/src/mainboard/azza/pt-6ibd/Kconfig b/src/mainboard/azza/pt-6ibd/Kconfig
index 898e4fd8d3f624df6cc5eb2faf099e0b0e316bb3..a377562507749e9c229dd77e496b81d5ed5ad04f 100644 (file)
--- a/src/mainboard/azza/pt-6ibd/Kconfig
+++ b/src/mainboard/azza/pt-6ibd/Kconfig
@@ -26,7 +26,8 @@ config BOARD_AZZA_PT_6IBD
        select SOUTHBRIDGE_INTEL_I82371EB
        select SUPERIO_WINBOND_W83977TF
        select HAVE_PIRQ_TABLE
-       select UDELAY_IO
+       select UDELAY_TSC
+       select TSC_X86RDTSC_CALIBRATE_WITH_TIMER2
 
 config MAINBOARD_DIR
        string

diff --git a/src/mainboard/biostar/m6tba/Kconfig b/src/mainboard/biostar/m6tba/Kconfig
index 3c99ac251ea7b4315295bc8ffda7d60f82e2737e..7e67825681ac8a8d30674ccd66ddb3527aac275e 100644 (file)
--- a/src/mainboard/biostar/m6tba/Kconfig
+++ b/src/mainboard/biostar/m6tba/Kconfig
@@ -26,7 +26,8 @@ config BOARD_BIOSTAR_M6TBA
        select SOUTHBRIDGE_INTEL_I82371EB
        select SUPERIO_SMSC_SMSCSUPERIO
        select HAVE_PIRQ_TABLE
-       select UDELAY_IO
+       select UDELAY_TSC
+       select TSC_X86RDTSC_CALIBRATE_WITH_TIMER2
 
 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 13e9986a460c01b659f3c6cdceb31bbc3b06dabc..3d44589c18768708ee9b2fadeba5ea0d31d552f0 100644 (file)
--- a/src/mainboard/compaq/deskpro_en_sff_p600/Kconfig
+++ b/src/mainboard/compaq/deskpro_en_sff_p600/Kconfig
@@ -27,7 +27,8 @@ config BOARD_COMPAQ_DESKPRO_EN_SFF_P600
        # should be SUPERIO_NSC_PC97307!
        select SUPERIO_NSC_PC97317
        select HAVE_PIRQ_TABLE
-       select UDELAY_IO
+       select UDELAY_TSC
+       select TSC_X86RDTSC_CALIBRATE_WITH_TIMER2
 
 config MAINBOARD_DIR
        string

diff --git a/src/mainboard/gigabyte/ga-6bxc/Kconfig b/src/mainboard/gigabyte/ga-6bxc/Kconfig
index b04ff087215b2145515d046961fe2a02420f1bb5..2eff24dd7d64af3a6d49c4eb0f3237b1077bc855 100644 (file)
--- a/src/mainboard/gigabyte/ga-6bxc/Kconfig
+++ b/src/mainboard/gigabyte/ga-6bxc/Kconfig
@@ -26,7 +26,8 @@ config BOARD_GIGABYTE_GA_6BXC
        select SOUTHBRIDGE_INTEL_I82371EB
        select SUPERIO_ITE_IT8671F
        select HAVE_PIRQ_TABLE
-       select UDELAY_IO
+       select UDELAY_TSC
+       select TSC_X86RDTSC_CALIBRATE_WITH_TIMER2
 
 config MAINBOARD_DIR
        string

diff --git a/src/mainboard/mitac/6513wu/Kconfig b/src/mainboard/mitac/6513wu/Kconfig
index 9d904f1177f8c23a63f2f5232a38dfbc9be22d84..0ba20fb13030dc23924083b0ee133b648a2ed9b1 100644 (file)
--- a/src/mainboard/mitac/6513wu/Kconfig
+++ b/src/mainboard/mitac/6513wu/Kconfig
@@ -26,7 +26,8 @@ config BOARD_MITAC_6513WU
        select SOUTHBRIDGE_INTEL_I82801XX
        select SUPERIO_SMSC_SMSCSUPERIO
        select HAVE_PIRQ_TABLE
-       select UDELAY_IO
+       select UDELAY_TSC
+       select TSC_X86RDTSC_CALIBRATE_WITH_TIMER2
 
 config MAINBOARD_DIR
        string

diff --git a/src/mainboard/msi/ms6119/Kconfig b/src/mainboard/msi/ms6119/Kconfig
index 68e9c57277e4fee29a0ffe1900ef95d8b9a49afb..57b2b536bd9d82d63b80051d3a13dd5c2f69dd10 100644 (file)
--- a/src/mainboard/msi/ms6119/Kconfig
+++ b/src/mainboard/msi/ms6119/Kconfig
@@ -26,7 +26,8 @@ config BOARD_MSI_MS_6119
        select SOUTHBRIDGE_INTEL_I82371EB
        select SUPERIO_WINBOND_W83977TF
        select HAVE_PIRQ_TABLE
-       select UDELAY_IO
+       select UDELAY_TSC
+       select TSC_X86RDTSC_CALIBRATE_WITH_TIMER2
 
 config MAINBOARD_DIR
        string

diff --git a/src/mainboard/msi/ms6147/Kconfig b/src/mainboard/msi/ms6147/Kconfig
index a6a4fdc1450b55e2d7ef4f63c1662e002705d0b6..f3295410d142637359e7123491f78492bbeb2dfd 100644 (file)
--- a/src/mainboard/msi/ms6147/Kconfig
+++ b/src/mainboard/msi/ms6147/Kconfig
@@ -26,7 +26,8 @@ config BOARD_MSI_MS_6147
        select SOUTHBRIDGE_INTEL_I82371EB
        select SUPERIO_WINBOND_W83977TF
        select HAVE_PIRQ_TABLE
-       select UDELAY_IO
+       select UDELAY_TSC
+       select TSC_X86RDTSC_CALIBRATE_WITH_TIMER2
 
 config MAINBOARD_DIR
        string

diff --git a/src/mainboard/nec/powermate2000/Kconfig b/src/mainboard/nec/powermate2000/Kconfig
index 0c2c0c31fb04290fc1e4dc00d4da5a89d82824f5..a55a7bc4aa45cfeb1bac66aa0bc012f2004bfd6f 100644 (file)
--- a/src/mainboard/nec/powermate2000/Kconfig
+++ b/src/mainboard/nec/powermate2000/Kconfig
@@ -26,7 +26,8 @@ config BOARD_NEC_POWERMATE_2000
        select SOUTHBRIDGE_INTEL_I82801XX
        select SUPERIO_SMSC_SMSCSUPERIO
        select HAVE_PIRQ_TABLE
-       select UDELAY_IO
+       select UDELAY_TSC
+       select TSC_X86RDTSC_CALIBRATE_WITH_TIMER2
 
 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 093403949e9cf7cfb9f095f27a3f345d3c9a5abb..5111c0859dc7ac390e42e9bfdad3692510993ec1 100644 (file)
--- a/src/mainboard/soyo/sy-6ba-plus-iii/Kconfig
+++ b/src/mainboard/soyo/sy-6ba-plus-iii/Kconfig
@@ -26,7 +26,8 @@ config BOARD_SOYO_SY_6BA_PLUS_III
        select SOUTHBRIDGE_INTEL_I82371EB
        select SUPERIO_ITE_IT8671F
        select HAVE_PIRQ_TABLE
-       select UDELAY_IO
+       select UDELAY_TSC
+       select TSC_X86RDTSC_CALIBRATE_WITH_TIMER2
 
 config MAINBOARD_DIR
        string

diff --git a/src/mainboard/tyan/s1846/Kconfig b/src/mainboard/tyan/s1846/Kconfig
index 5833ff04ba4b8644df0ba1bcc8d80f14dcbf3695..86788ecaea7829ec791bca2d9088a69ac258973a 100644 (file)
--- a/src/mainboard/tyan/s1846/Kconfig
+++ b/src/mainboard/tyan/s1846/Kconfig
@@ -25,7 +25,8 @@ config BOARD_TYAN_S1846
        select NORTHBRIDGE_INTEL_I440BX
        select SOUTHBRIDGE_INTEL_I82371EB
        select SUPERIO_NSC_PC87309
-       select UDELAY_IO
+       select UDELAY_TSC
+       select TSC_X86RDTSC_CALIBRATE_WITH_TIMER2
 
 config MAINBOARD_DIR
        string