diff options
| author | Uwe Hermann <uwe@hermann-uwe.de> | 2010-03-13 20:36:11 +0000 |
|---|---|---|
| committer | Uwe Hermann <uwe@hermann-uwe.de> | 2010-03-13 20:36:11 +0000 |
| commit | 53c7276bd1a18160f022c468b7ce021c5386577c (patch) | |
| tree | 3aaae550b28a2b50c3e1770e84ba816a37646357 /src | |
| parent | 9c1e1f0d3a562d6f1fb1a1bad5a8f58f62bf4613 (diff) | |
| download | coreboot-53c7276bd1a18160f022c468b7ce021c5386577c.tar.xz | |
Use CPU_INTEL_SLOT_1 for Slot 1 boards (trivial).
This fixes a longstanding TODO item.
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@5205 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
Diffstat (limited to 'src')
34 files changed, 36 insertions, 36 deletions
diff --git a/src/mainboard/a-trend/atc-6220/Kconfig b/src/mainboard/a-trend/atc-6220/Kconfig index 4bdca3a790..95f4e462a7 100644 --- a/src/mainboard/a-trend/atc-6220/Kconfig +++ b/src/mainboard/a-trend/atc-6220/Kconfig @@ -21,7 +21,7 @@ config BOARD_A_TREND_ATC_6220 bool "ATC-6220" select ARCH_X86 - select CPU_INTEL_SLOT_2 + select CPU_INTEL_SLOT_1 select NORTHBRIDGE_INTEL_I440BX select SOUTHBRIDGE_INTEL_I82371EB select SUPERIO_WINBOND_W83977TF diff --git a/src/mainboard/a-trend/atc-6220/devicetree.cb b/src/mainboard/a-trend/atc-6220/devicetree.cb index 700f7c471b..2435b835cb 100644 --- a/src/mainboard/a-trend/atc-6220/devicetree.cb +++ b/src/mainboard/a-trend/atc-6220/devicetree.cb @@ -1,6 +1,6 @@ chip northbridge/intel/i440bx # Northbridge device apic_cluster 0 on # APIC cluster - chip cpu/intel/slot_2 # CPU (FIXME: It's slot 1, actually) + chip cpu/intel/slot_1 # CPU device apic 0 on end # APIC end end diff --git a/src/mainboard/a-trend/atc-6240/Kconfig b/src/mainboard/a-trend/atc-6240/Kconfig index f885a9e210..d8556feff4 100644 --- a/src/mainboard/a-trend/atc-6240/Kconfig +++ b/src/mainboard/a-trend/atc-6240/Kconfig @@ -21,7 +21,7 @@ config BOARD_A_TREND_ATC_6240 bool "ATC-6240" select ARCH_X86 - select CPU_INTEL_SLOT_2 + select CPU_INTEL_SLOT_1 select NORTHBRIDGE_INTEL_I440BX select SOUTHBRIDGE_INTEL_I82371EB select SUPERIO_WINBOND_W83627HF diff --git a/src/mainboard/a-trend/atc-6240/devicetree.cb b/src/mainboard/a-trend/atc-6240/devicetree.cb index 2a8caec160..57656040c0 100644 --- a/src/mainboard/a-trend/atc-6240/devicetree.cb +++ b/src/mainboard/a-trend/atc-6240/devicetree.cb @@ -1,6 +1,6 @@ chip northbridge/intel/i440bx # Northbridge device apic_cluster 0 on # APIC cluster - chip cpu/intel/slot_2 # CPU (FIXME: It's slot 1, actually) + chip cpu/intel/slot_1 # CPU device apic 0 on end # APIC end end diff --git a/src/mainboard/abit/be6-ii_v2_0/Kconfig b/src/mainboard/abit/be6-ii_v2_0/Kconfig index 3aab797aa5..6e2d1436b6 100644 --- a/src/mainboard/abit/be6-ii_v2_0/Kconfig +++ b/src/mainboard/abit/be6-ii_v2_0/Kconfig @@ -21,7 +21,7 @@ config BOARD_ABIT_BE6_II_V2_0 bool "BE6-II V2.0" select ARCH_X86 - select CPU_INTEL_SLOT_2 + select CPU_INTEL_SLOT_1 select NORTHBRIDGE_INTEL_I440BX select SOUTHBRIDGE_INTEL_I82371EB select SUPERIO_WINBOND_W83977TF diff --git a/src/mainboard/abit/be6-ii_v2_0/devicetree.cb b/src/mainboard/abit/be6-ii_v2_0/devicetree.cb index d2200d2824..48205c04d6 100644 --- a/src/mainboard/abit/be6-ii_v2_0/devicetree.cb +++ b/src/mainboard/abit/be6-ii_v2_0/devicetree.cb @@ -1,6 +1,6 @@ chip northbridge/intel/i440bx # Northbridge device apic_cluster 0 on # APIC cluster - chip cpu/intel/slot_2 # CPU (FIXME: It's slot 1, actually) + chip cpu/intel/slot_1 # CPU device apic 0 on end # APIC end end diff --git a/src/mainboard/asus/p2b-d/Kconfig b/src/mainboard/asus/p2b-d/Kconfig index 4f18006541..3502cfe047 100644 --- a/src/mainboard/asus/p2b-d/Kconfig +++ b/src/mainboard/asus/p2b-d/Kconfig @@ -21,7 +21,7 @@ config BOARD_ASUS_P2B_D bool "P2B-D" select ARCH_X86 - select CPU_INTEL_SLOT_2 + select CPU_INTEL_SLOT_1 select NORTHBRIDGE_INTEL_I440BX select SOUTHBRIDGE_INTEL_I82371EB select SUPERIO_WINBOND_W83977TF diff --git a/src/mainboard/asus/p2b-d/devicetree.cb b/src/mainboard/asus/p2b-d/devicetree.cb index befd946cc9..fd57f07f60 100644 --- a/src/mainboard/asus/p2b-d/devicetree.cb +++ b/src/mainboard/asus/p2b-d/devicetree.cb @@ -1,9 +1,9 @@ chip northbridge/intel/i440bx # Northbridge device apic_cluster 0 on # APIC cluster - chip cpu/intel/slot_2 # CPU (FIXME: It's slot 1, actually) + chip cpu/intel/slot_1 # CPU device apic 0 on end # APIC end - chip cpu/intel/slot_2 # CPU (FIXME: It's slot 1, actually) + chip cpu/intel/slot_1 # CPU device apic 1 on end # APIC end end diff --git a/src/mainboard/asus/p2b-ds/Kconfig b/src/mainboard/asus/p2b-ds/Kconfig index dc77f19289..26eede15fd 100644 --- a/src/mainboard/asus/p2b-ds/Kconfig +++ b/src/mainboard/asus/p2b-ds/Kconfig @@ -21,7 +21,7 @@ config BOARD_ASUS_P2B_DS bool "P2B-DS" select ARCH_X86 - select CPU_INTEL_SLOT_2 + select CPU_INTEL_SLOT_1 select NORTHBRIDGE_INTEL_I440BX select SOUTHBRIDGE_INTEL_I82371EB select SUPERIO_WINBOND_W83977TF diff --git a/src/mainboard/asus/p2b-ds/devicetree.cb b/src/mainboard/asus/p2b-ds/devicetree.cb index d40c96d27e..8fdfe771c3 100644 --- a/src/mainboard/asus/p2b-ds/devicetree.cb +++ b/src/mainboard/asus/p2b-ds/devicetree.cb @@ -1,9 +1,9 @@ chip northbridge/intel/i440bx # Northbridge device apic_cluster 0 on # APIC cluster - chip cpu/intel/slot_2 # CPU (FIXME: It's slot 1, actually) + chip cpu/intel/slot_1 # CPU device apic 0 on end # APIC end - chip cpu/intel/slot_2 # CPU (FIXME: It's slot 1, actually) + chip cpu/intel/slot_1 # CPU device apic 1 on end # APIC end end diff --git a/src/mainboard/asus/p2b-f/Kconfig b/src/mainboard/asus/p2b-f/Kconfig index 6509b25a27..ef3b41ad86 100644 --- a/src/mainboard/asus/p2b-f/Kconfig +++ b/src/mainboard/asus/p2b-f/Kconfig @@ -21,7 +21,7 @@ config BOARD_ASUS_P2B_F bool "P2B-F" select ARCH_X86 - select CPU_INTEL_SLOT_2 + select CPU_INTEL_SLOT_1 select NORTHBRIDGE_INTEL_I440BX select SOUTHBRIDGE_INTEL_I82371EB select SUPERIO_WINBOND_W83977TF diff --git a/src/mainboard/asus/p2b-f/devicetree.cb b/src/mainboard/asus/p2b-f/devicetree.cb index 183e9a2d0a..ff78a4bd67 100644 --- a/src/mainboard/asus/p2b-f/devicetree.cb +++ b/src/mainboard/asus/p2b-f/devicetree.cb @@ -1,6 +1,6 @@ chip northbridge/intel/i440bx # Northbridge device apic_cluster 0 on # APIC cluster - chip cpu/intel/slot_2 # CPU (FIXME: It's slot 1, actually) + chip cpu/intel/slot_1 # CPU device apic 0 on end # APIC end end diff --git a/src/mainboard/asus/p2b/Kconfig b/src/mainboard/asus/p2b/Kconfig index 721529bc6f..3b443d221b 100644 --- a/src/mainboard/asus/p2b/Kconfig +++ b/src/mainboard/asus/p2b/Kconfig @@ -21,7 +21,7 @@ config BOARD_ASUS_P2B bool "P2B" select ARCH_X86 - select CPU_INTEL_SLOT_2 + select CPU_INTEL_SLOT_1 select NORTHBRIDGE_INTEL_I440BX select SOUTHBRIDGE_INTEL_I82371EB select SUPERIO_WINBOND_W83977TF diff --git a/src/mainboard/asus/p2b/devicetree.cb b/src/mainboard/asus/p2b/devicetree.cb index e682fc19d9..45e1149456 100644 --- a/src/mainboard/asus/p2b/devicetree.cb +++ b/src/mainboard/asus/p2b/devicetree.cb @@ -1,6 +1,6 @@ chip northbridge/intel/i440bx # Northbridge device apic_cluster 0 on # APIC cluster - chip cpu/intel/slot_2 # CPU (FIXME: It's slot 1, actually) + chip cpu/intel/slot_1 # CPU device apic 0 on end # APIC end end diff --git a/src/mainboard/asus/p3b-f/Kconfig b/src/mainboard/asus/p3b-f/Kconfig index 4e00e1224c..a51ae151d2 100644 --- a/src/mainboard/asus/p3b-f/Kconfig +++ b/src/mainboard/asus/p3b-f/Kconfig @@ -21,7 +21,7 @@ config BOARD_ASUS_P3B_F bool "P3B-F" select ARCH_X86 - select CPU_INTEL_SLOT_2 + select CPU_INTEL_SLOT_1 select NORTHBRIDGE_INTEL_I440BX select SOUTHBRIDGE_INTEL_I82371EB select SUPERIO_WINBOND_W83977TF diff --git a/src/mainboard/asus/p3b-f/devicetree.cb b/src/mainboard/asus/p3b-f/devicetree.cb index 183e9a2d0a..ff78a4bd67 100644 --- a/src/mainboard/asus/p3b-f/devicetree.cb +++ b/src/mainboard/asus/p3b-f/devicetree.cb @@ -1,6 +1,6 @@ chip northbridge/intel/i440bx # Northbridge device apic_cluster 0 on # APIC cluster - chip cpu/intel/slot_2 # CPU (FIXME: It's slot 1, actually) + chip cpu/intel/slot_1 # CPU device apic 0 on end # APIC end end diff --git a/src/mainboard/azza/pt-6ibd/Kconfig b/src/mainboard/azza/pt-6ibd/Kconfig index a65399f0cc..9da3c1fc23 100644 --- a/src/mainboard/azza/pt-6ibd/Kconfig +++ b/src/mainboard/azza/pt-6ibd/Kconfig @@ -21,7 +21,7 @@ config BOARD_AZZA_PT_6IBD bool "PT-6IBD" select ARCH_X86 - select CPU_INTEL_SLOT_2 + select CPU_INTEL_SLOT_1 select NORTHBRIDGE_INTEL_I440BX select SOUTHBRIDGE_INTEL_I82371EB select SUPERIO_WINBOND_W83977TF diff --git a/src/mainboard/azza/pt-6ibd/devicetree.cb b/src/mainboard/azza/pt-6ibd/devicetree.cb index 06bbaed6ba..5e4c2682cc 100644 --- a/src/mainboard/azza/pt-6ibd/devicetree.cb +++ b/src/mainboard/azza/pt-6ibd/devicetree.cb @@ -1,6 +1,6 @@ chip northbridge/intel/i440bx # Northbridge device apic_cluster 0 on # APIC cluster - chip cpu/intel/slot_2 # CPU (FIXME: It's slot 1, actually) + chip cpu/intel/slot_1 # CPU device apic 0 on end # APIC end end diff --git a/src/mainboard/biostar/m6tba/Kconfig b/src/mainboard/biostar/m6tba/Kconfig index 7167444da0..587f074b3d 100644 --- a/src/mainboard/biostar/m6tba/Kconfig +++ b/src/mainboard/biostar/m6tba/Kconfig @@ -21,7 +21,7 @@ config BOARD_BIOSTAR_M6TBA bool "M6TBA" select ARCH_X86 - select CPU_INTEL_SLOT_2 + select CPU_INTEL_SLOT_1 select NORTHBRIDGE_INTEL_I440BX select SOUTHBRIDGE_INTEL_I82371EB select SUPERIO_SMSC_SMSCSUPERIO diff --git a/src/mainboard/biostar/m6tba/devicetree.cb b/src/mainboard/biostar/m6tba/devicetree.cb index ed6af3124d..c13a70ef35 100644 --- a/src/mainboard/biostar/m6tba/devicetree.cb +++ b/src/mainboard/biostar/m6tba/devicetree.cb @@ -1,6 +1,6 @@ chip northbridge/intel/i440bx # Northbridge device apic_cluster 0 on # APIC cluster - chip cpu/intel/slot_2 # CPU (FIXME: It's slot 1, actually) + chip cpu/intel/slot_1 # CPU device apic 0 on end # APIC end end diff --git a/src/mainboard/compaq/deskpro_en_sff_p600/Kconfig b/src/mainboard/compaq/deskpro_en_sff_p600/Kconfig index 49c8eaae02..e5bbe029c1 100644 --- a/src/mainboard/compaq/deskpro_en_sff_p600/Kconfig +++ b/src/mainboard/compaq/deskpro_en_sff_p600/Kconfig @@ -21,7 +21,7 @@ config BOARD_COMPAQ_DESKPRO_EN_SFF_P600 bool "Deskpro EN SFF P600" select ARCH_X86 - select CPU_INTEL_SLOT_2 + select CPU_INTEL_SLOT_1 select NORTHBRIDGE_INTEL_I440BX select SOUTHBRIDGE_INTEL_I82371EB # should be SUPERIO_NSC_PC97307! diff --git a/src/mainboard/compaq/deskpro_en_sff_p600/devicetree.cb b/src/mainboard/compaq/deskpro_en_sff_p600/devicetree.cb index be23f2f810..0a8f9c86e8 100644 --- a/src/mainboard/compaq/deskpro_en_sff_p600/devicetree.cb +++ b/src/mainboard/compaq/deskpro_en_sff_p600/devicetree.cb @@ -1,6 +1,6 @@ chip northbridge/intel/i440bx # Northbridge device apic_cluster 0 on # APIC cluster - chip cpu/intel/slot_2 # CPU (FIXME: It's slot 1, actually) + chip cpu/intel/slot_1 # CPU device apic 0 on end # APIC end end diff --git a/src/mainboard/gigabyte/ga-6bxc/Kconfig b/src/mainboard/gigabyte/ga-6bxc/Kconfig index 5e297e9f96..9843b78501 100644 --- a/src/mainboard/gigabyte/ga-6bxc/Kconfig +++ b/src/mainboard/gigabyte/ga-6bxc/Kconfig @@ -21,7 +21,7 @@ config BOARD_GIGABYTE_GA_6BXC bool "GA-6BXC" select ARCH_X86 - select CPU_INTEL_SLOT_2 + select CPU_INTEL_SLOT_1 select NORTHBRIDGE_INTEL_I440BX select SOUTHBRIDGE_INTEL_I82371EB select SUPERIO_ITE_IT8671F diff --git a/src/mainboard/gigabyte/ga-6bxc/devicetree.cb b/src/mainboard/gigabyte/ga-6bxc/devicetree.cb index d75ae19da9..729b6b8a80 100644 --- a/src/mainboard/gigabyte/ga-6bxc/devicetree.cb +++ b/src/mainboard/gigabyte/ga-6bxc/devicetree.cb @@ -1,6 +1,6 @@ chip northbridge/intel/i440bx # Northbridge device apic_cluster 0 on # APIC cluster - chip cpu/intel/slot_2 # CPU (FIXME: It's slot 1, actually) + chip cpu/intel/slot_1 # CPU device apic 0 on end # APIC end end diff --git a/src/mainboard/msi/ms6119/Kconfig b/src/mainboard/msi/ms6119/Kconfig index 516ab203fb..f7f716a51c 100644 --- a/src/mainboard/msi/ms6119/Kconfig +++ b/src/mainboard/msi/ms6119/Kconfig @@ -21,7 +21,7 @@ config BOARD_MSI_MS_6119 bool "MS-6119" select ARCH_X86 - select CPU_INTEL_SLOT_2 + select CPU_INTEL_SLOT_1 select NORTHBRIDGE_INTEL_I440BX select SOUTHBRIDGE_INTEL_I82371EB select SUPERIO_WINBOND_W83977TF diff --git a/src/mainboard/msi/ms6119/devicetree.cb b/src/mainboard/msi/ms6119/devicetree.cb index e5b7bb3a47..d02b63075c 100644 --- a/src/mainboard/msi/ms6119/devicetree.cb +++ b/src/mainboard/msi/ms6119/devicetree.cb @@ -1,6 +1,6 @@ chip northbridge/intel/i440bx # Northbridge device apic_cluster 0 on # APIC cluster - chip cpu/intel/slot_2 # CPU (FIXME: It's slot 1, actually) + chip cpu/intel/slot_1 # CPU device apic 0 on end # APIC end end diff --git a/src/mainboard/msi/ms6147/Kconfig b/src/mainboard/msi/ms6147/Kconfig index 21537b867b..8a137e55a1 100644 --- a/src/mainboard/msi/ms6147/Kconfig +++ b/src/mainboard/msi/ms6147/Kconfig @@ -21,7 +21,7 @@ config BOARD_MSI_MS_6147 bool "MS-6147" select ARCH_X86 - select CPU_INTEL_SLOT_2 + select CPU_INTEL_SLOT_1 select NORTHBRIDGE_INTEL_I440BX select SOUTHBRIDGE_INTEL_I82371EB select SUPERIO_WINBOND_W83977TF diff --git a/src/mainboard/msi/ms6147/devicetree.cb b/src/mainboard/msi/ms6147/devicetree.cb index 7eff7f4320..d31b73da24 100644 --- a/src/mainboard/msi/ms6147/devicetree.cb +++ b/src/mainboard/msi/ms6147/devicetree.cb @@ -1,6 +1,6 @@ chip northbridge/intel/i440bx # Northbridge device apic_cluster 0 on # APIC cluster - chip cpu/intel/slot_2 # CPU (FIXME: It's slot 1, actually) + chip cpu/intel/slot_1 # CPU device apic 0 on end # APIC end end diff --git a/src/mainboard/msi/ms6156/Kconfig b/src/mainboard/msi/ms6156/Kconfig index aa55d30e52..abf51b3873 100644 --- a/src/mainboard/msi/ms6156/Kconfig +++ b/src/mainboard/msi/ms6156/Kconfig @@ -21,7 +21,7 @@ config BOARD_MSI_MS_6156 bool "MS-6156" select ARCH_X86 - select CPU_INTEL_SLOT_2 + select CPU_INTEL_SLOT_1 select NORTHBRIDGE_INTEL_I440BX select SOUTHBRIDGE_INTEL_I82371EB select SUPERIO_WINBOND_W83977TF diff --git a/src/mainboard/msi/ms6156/devicetree.cb b/src/mainboard/msi/ms6156/devicetree.cb index 7db143f16d..8b3e3caf2f 100644 --- a/src/mainboard/msi/ms6156/devicetree.cb +++ b/src/mainboard/msi/ms6156/devicetree.cb @@ -20,7 +20,7 @@ chip northbridge/intel/i440bx # Northbridge device apic_cluster 0 on # APIC cluster - chip cpu/intel/slot_2 # CPU (FIXME: It's slot 1, actually) + chip cpu/intel/slot_1 # CPU device apic 0 on end # APIC end end diff --git a/src/mainboard/soyo/sy-6ba-plus-iii/Kconfig b/src/mainboard/soyo/sy-6ba-plus-iii/Kconfig index c00cc2b7e9..b7fbb846f2 100644 --- a/src/mainboard/soyo/sy-6ba-plus-iii/Kconfig +++ b/src/mainboard/soyo/sy-6ba-plus-iii/Kconfig @@ -21,7 +21,7 @@ config BOARD_SOYO_SY_6BA_PLUS_III bool "SY-6BA+ III" select ARCH_X86 - select CPU_INTEL_SLOT_2 + select CPU_INTEL_SLOT_1 select NORTHBRIDGE_INTEL_I440BX select SOUTHBRIDGE_INTEL_I82371EB select SUPERIO_ITE_IT8671F diff --git a/src/mainboard/soyo/sy-6ba-plus-iii/devicetree.cb b/src/mainboard/soyo/sy-6ba-plus-iii/devicetree.cb index b51ebe6f81..3c092e087c 100644 --- a/src/mainboard/soyo/sy-6ba-plus-iii/devicetree.cb +++ b/src/mainboard/soyo/sy-6ba-plus-iii/devicetree.cb @@ -20,7 +20,7 @@ chip northbridge/intel/i440bx # Northbridge device apic_cluster 0 on # APIC cluster - chip cpu/intel/slot_2 # CPU (FIXME: It's slot 1, actually) + chip cpu/intel/slot_1 # CPU device apic 0 on end # APIC end end diff --git a/src/mainboard/tyan/s1846/Kconfig b/src/mainboard/tyan/s1846/Kconfig index 74dc70650f..4b965ea733 100644 --- a/src/mainboard/tyan/s1846/Kconfig +++ b/src/mainboard/tyan/s1846/Kconfig @@ -21,7 +21,7 @@ config BOARD_TYAN_S1846 bool "S1846 (Tsunami ATX)" select ARCH_X86 - select CPU_INTEL_SLOT_2 + select CPU_INTEL_SLOT_1 select NORTHBRIDGE_INTEL_I440BX select SOUTHBRIDGE_INTEL_I82371EB select SUPERIO_NSC_PC87309 diff --git a/src/mainboard/tyan/s1846/devicetree.cb b/src/mainboard/tyan/s1846/devicetree.cb index b938fa3786..b4d2046c78 100644 --- a/src/mainboard/tyan/s1846/devicetree.cb +++ b/src/mainboard/tyan/s1846/devicetree.cb @@ -1,6 +1,6 @@ chip northbridge/intel/i440bx # Northbridge device apic_cluster 0 on # APIC cluster - chip cpu/intel/slot_2 # CPU (FIXME: It's slot 1, actually) + chip cpu/intel/slot_1 # CPU device apic 0 on end # APIC end end |