[commit] r5205 - in trunk/src/mainboard: a-trend/atc-6220 a-trend/atc-6240 abit/be6-ii_v2_0 asus/p2b asus/p2b-d asus/p2b-ds asus/p2b-f asus/p3b-f azza/pt-6ibd biostar/m6tba compaq/deskpro_en_sff_p6...

[repository service]

Author: uwe
Date: Sat Mar 13 21:36:11 2010
New Revision: 5205
URL: http://tracker.coreboot.org/trac/coreboot/changeset/5205

Log:
Use CPU_INTEL_SLOT_1 for Slot 1 boards (trivial).

This fixes a longstanding TODO item.

Signed-off-by: Uwe Hermann 
Acked-by: Uwe Hermann

Modified:
   trunk/src/mainboard/a-trend/atc-6220/Kconfig
   trunk/src/mainboard/a-trend/atc-6220/devicetree.cb
   trunk/src/mainboard/a-trend/atc-6240/Kconfig
   trunk/src/mainboard/a-trend/atc-6240/devicetree.cb
   trunk/src/mainboard/abit/be6-ii_v2_0/Kconfig
   trunk/src/mainboard/abit/be6-ii_v2_0/devicetree.cb
   trunk/src/mainboard/asus/p2b-d/Kconfig
   trunk/src/mainboard/asus/p2b-d/devicetree.cb
   trunk/src/mainboard/asus/p2b-ds/Kconfig
   trunk/src/mainboard/asus/p2b-ds/devicetree.cb
   trunk/src/mainboard/asus/p2b-f/Kconfig
   trunk/src/mainboard/asus/p2b-f/devicetree.cb
   trunk/src/mainboard/asus/p2b/Kconfig
   trunk/src/mainboard/asus/p2b/devicetree.cb
   trunk/src/mainboard/asus/p3b-f/Kconfig
   trunk/src/mainboard/asus/p3b-f/devicetree.cb
   trunk/src/mainboard/azza/pt-6ibd/Kconfig
   trunk/src/mainboard/azza/pt-6ibd/devicetree.cb
   trunk/src/mainboard/biostar/m6tba/Kconfig
   trunk/src/mainboard/biostar/m6tba/devicetree.cb
   trunk/src/mainboard/compaq/deskpro_en_sff_p600/Kconfig
   trunk/src/mainboard/compaq/deskpro_en_sff_p600/devicetree.cb
   trunk/src/mainboard/gigabyte/ga-6bxc/Kconfig
   trunk/src/mainboard/gigabyte/ga-6bxc/devicetree.cb
   trunk/src/mainboard/msi/ms6119/Kconfig
   trunk/src/mainboard/msi/ms6119/devicetree.cb
   trunk/src/mainboard/msi/ms6147/Kconfig
   trunk/src/mainboard/msi/ms6147/devicetree.cb
   trunk/src/mainboard/msi/ms6156/Kconfig
   trunk/src/mainboard/msi/ms6156/devicetree.cb
   trunk/src/mainboard/soyo/sy-6ba-plus-iii/Kconfig
   trunk/src/mainboard/soyo/sy-6ba-plus-iii/devicetree.cb
   trunk/src/mainboard/tyan/s1846/Kconfig
   trunk/src/mainboard/tyan/s1846/devicetree.cb

Modified: trunk/src/mainboard/a-trend/atc-6220/Kconfig
==============================================================================
--- trunk/src/mainboard/a-trend/atc-6220/Kconfig	Sat Mar 13 21:16:48 2010	(r5204)
+++ trunk/src/mainboard/a-trend/atc-6220/Kconfig	Sat Mar 13 21:36:11 2010	(r5205)
@@ -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

Modified: trunk/src/mainboard/a-trend/atc-6220/devicetree.cb
==============================================================================
--- trunk/src/mainboard/a-trend/atc-6220/devicetree.cb	Sat Mar 13 21:16:48 2010	(r5204)
+++ trunk/src/mainboard/a-trend/atc-6220/devicetree.cb	Sat Mar 13 21:36:11 2010	(r5205)
@@ -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

Modified: trunk/src/mainboard/a-trend/atc-6240/Kconfig
==============================================================================
--- trunk/src/mainboard/a-trend/atc-6240/Kconfig	Sat Mar 13 21:16:48 2010	(r5204)
+++ trunk/src/mainboard/a-trend/atc-6240/Kconfig	Sat Mar 13 21:36:11 2010	(r5205)
@@ -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

Modified: trunk/src/mainboard/a-trend/atc-6240/devicetree.cb
==============================================================================
--- trunk/src/mainboard/a-trend/atc-6240/devicetree.cb	Sat Mar 13 21:16:48 2010	(r5204)
+++ trunk/src/mainboard/a-trend/atc-6240/devicetree.cb	Sat Mar 13 21:36:11 2010	(r5205)
@@ -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

Modified: trunk/src/mainboard/abit/be6-ii_v2_0/Kconfig
==============================================================================
--- trunk/src/mainboard/abit/be6-ii_v2_0/Kconfig	Sat Mar 13 21:16:48 2010	(r5204)
+++ trunk/src/mainboard/abit/be6-ii_v2_0/Kconfig	Sat Mar 13 21:36:11 2010	(r5205)
@@ -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

Modified: trunk/src/mainboard/abit/be6-ii_v2_0/devicetree.cb
==============================================================================
--- trunk/src/mainboard/abit/be6-ii_v2_0/devicetree.cb	Sat Mar 13 21:16:48 2010	(r5204)
+++ trunk/src/mainboard/abit/be6-ii_v2_0/devicetree.cb	Sat Mar 13 21:36:11 2010	(r5205)
@@ -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

Modified: trunk/src/mainboard/asus/p2b-d/Kconfig
==============================================================================
--- trunk/src/mainboard/asus/p2b-d/Kconfig	Sat Mar 13 21:16:48 2010	(r5204)
+++ trunk/src/mainboard/asus/p2b-d/Kconfig	Sat Mar 13 21:36:11 2010	(r5205)
@@ -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

Modified: trunk/src/mainboard/asus/p2b-d/devicetree.cb
==============================================================================
--- trunk/src/mainboard/asus/p2b-d/devicetree.cb	Sat Mar 13 21:16:48 2010	(r5204)
+++ trunk/src/mainboard/asus/p2b-d/devicetree.cb	Sat Mar 13 21:36:11 2010	(r5205)
@@ -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

Modified: trunk/src/mainboard/asus/p2b-ds/Kconfig
==============================================================================
--- trunk/src/mainboard/asus/p2b-ds/Kconfig	Sat Mar 13 21:16:48 2010	(r5204)
+++ trunk/src/mainboard/asus/p2b-ds/Kconfig	Sat Mar 13 21:36:11 2010	(r5205)
@@ -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

Modified: trunk/src/mainboard/asus/p2b-ds/devicetree.cb
==============================================================================
--- trunk/src/mainboard/asus/p2b-ds/devicetree.cb	Sat Mar 13 21:16:48 2010	(r5204)
+++ trunk/src/mainboard/asus/p2b-ds/devicetree.cb	Sat Mar 13 21:36:11 2010	(r5205)
@@ -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

Modified: trunk/src/mainboard/asus/p2b-f/Kconfig
==============================================================================
--- trunk/src/mainboard/asus/p2b-f/Kconfig	Sat Mar 13 21:16:48 2010	(r5204)
+++ trunk/src/mainboard/asus/p2b-f/Kconfig	Sat Mar 13 21:36:11 2010	(r5205)
@@ -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

Modified: trunk/src/mainboard/asus/p2b-f/devicetree.cb
==============================================================================
--- trunk/src/mainboard/asus/p2b-f/devicetree.cb	Sat Mar 13 21:16:48 2010	(r5204)
+++ trunk/src/mainboard/asus/p2b-f/devicetree.cb	Sat Mar 13 21:36:11 2010	(r5205)
@@ -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

Modified: trunk/src/mainboard/asus/p2b/Kconfig
==============================================================================
--- trunk/src/mainboard/asus/p2b/Kconfig	Sat Mar 13 21:16:48 2010	(r5204)
+++ trunk/src/mainboard/asus/p2b/Kconfig	Sat Mar 13 21:36:11 2010	(r5205)
@@ -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

Modified: trunk/src/mainboard/asus/p2b/devicetree.cb
==============================================================================
--- trunk/src/mainboard/asus/p2b/devicetree.cb	Sat Mar 13 21:16:48 2010	(r5204)
+++ trunk/src/mainboard/asus/p2b/devicetree.cb	Sat Mar 13 21:36:11 2010	(r5205)
@@ -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

Modified: trunk/src/mainboard/asus/p3b-f/Kconfig
==============================================================================
--- trunk/src/mainboard/asus/p3b-f/Kconfig	Sat Mar 13 21:16:48 2010	(r5204)
+++ trunk/src/mainboard/asus/p3b-f/Kconfig	Sat Mar 13 21:36:11 2010	(r5205)
@@ -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

Modified: trunk/src/mainboard/asus/p3b-f/devicetree.cb
==============================================================================
--- trunk/src/mainboard/asus/p3b-f/devicetree.cb	Sat Mar 13 21:16:48 2010	(r5204)
+++ trunk/src/mainboard/asus/p3b-f/devicetree.cb	Sat Mar 13 21:36:11 2010	(r5205)
@@ -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

Modified: trunk/src/mainboard/azza/pt-6ibd/Kconfig
==============================================================================
--- trunk/src/mainboard/azza/pt-6ibd/Kconfig	Sat Mar 13 21:16:48 2010	(r5204)
+++ trunk/src/mainboard/azza/pt-6ibd/Kconfig	Sat Mar 13 21:36:11 2010	(r5205)
@@ -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

Modified: trunk/src/mainboard/azza/pt-6ibd/devicetree.cb
==============================================================================
--- trunk/src/mainboard/azza/pt-6ibd/devicetree.cb	Sat Mar 13 21:16:48 2010	(r5204)
+++ trunk/src/mainboard/azza/pt-6ibd/devicetree.cb	Sat Mar 13 21:36:11 2010	(r5205)
@@ -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

Modified: trunk/src/mainboard/biostar/m6tba/Kconfig
==============================================================================
--- trunk/src/mainboard/biostar/m6tba/Kconfig	Sat Mar 13 21:16:48 2010	(r5204)
+++ trunk/src/mainboard/biostar/m6tba/Kconfig	Sat Mar 13 21:36:11 2010	(r5205)
@@ -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

Modified: trunk/src/mainboard/biostar/m6tba/devicetree.cb
==============================================================================
--- trunk/src/mainboard/biostar/m6tba/devicetree.cb	Sat Mar 13 21:16:48 2010	(r5204)
+++ trunk/src/mainboard/biostar/m6tba/devicetree.cb	Sat Mar 13 21:36:11 2010	(r5205)
@@ -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

Modified: trunk/src/mainboard/compaq/deskpro_en_sff_p600/Kconfig
==============================================================================
--- trunk/src/mainboard/compaq/deskpro_en_sff_p600/Kconfig	Sat Mar 13 21:16:48 2010	(r5204)
+++ trunk/src/mainboard/compaq/deskpro_en_sff_p600/Kconfig	Sat Mar 13 21:36:11 2010	(r5205)
@@ -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!

Modified: trunk/src/mainboard/compaq/deskpro_en_sff_p600/devicetree.cb
==============================================================================
--- trunk/src/mainboard/compaq/deskpro_en_sff_p600/devicetree.cb	Sat Mar 13 21:16:48 2010	(r5204)
+++ trunk/src/mainboard/compaq/deskpro_en_sff_p600/devicetree.cb	Sat Mar 13 21:36:11 2010	(r5205)
@@ -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

Modified: trunk/src/mainboard/gigabyte/ga-6bxc/Kconfig
==============================================================================
--- trunk/src/mainboard/gigabyte/ga-6bxc/Kconfig	Sat Mar 13 21:16:48 2010	(r5204)
+++ trunk/src/mainboard/gigabyte/ga-6bxc/Kconfig	Sat Mar 13 21:36:11 2010	(r5205)
@@ -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

Modified: trunk/src/mainboard/gigabyte/ga-6bxc/devicetree.cb
==============================================================================
--- trunk/src/mainboard/gigabyte/ga-6bxc/devicetree.cb	Sat Mar 13 21:16:48 2010	(r5204)
+++ trunk/src/mainboard/gigabyte/ga-6bxc/devicetree.cb	Sat Mar 13 21:36:11 2010	(r5205)
@@ -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

Modified: trunk/src/mainboard/msi/ms6119/Kconfig
==============================================================================
--- trunk/src/mainboard/msi/ms6119/Kconfig	Sat Mar 13 21:16:48 2010	(r5204)
+++ trunk/src/mainboard/msi/ms6119/Kconfig	Sat Mar 13 21:36:11 2010	(r5205)
@@ -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

Modified: trunk/src/mainboard/msi/ms6119/devicetree.cb
==============================================================================
--- trunk/src/mainboard/msi/ms6119/devicetree.cb	Sat Mar 13 21:16:48 2010	(r5204)
+++ trunk/src/mainboard/msi/ms6119/devicetree.cb	Sat Mar 13 21:36:11 2010	(r5205)
@@ -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

Modified: trunk/src/mainboard/msi/ms6147/Kconfig
==============================================================================
--- trunk/src/mainboard/msi/ms6147/Kconfig	Sat Mar 13 21:16:48 2010	(r5204)
+++ trunk/src/mainboard/msi/ms6147/Kconfig	Sat Mar 13 21:36:11 2010	(r5205)
@@ -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

Modified: trunk/src/mainboard/msi/ms6147/devicetree.cb
==============================================================================
--- trunk/src/mainboard/msi/ms6147/devicetree.cb	Sat Mar 13 21:16:48 2010	(r5204)
+++ trunk/src/mainboard/msi/ms6147/devicetree.cb	Sat Mar 13 21:36:11 2010	(r5205)
@@ -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

Modified: trunk/src/mainboard/msi/ms6156/Kconfig
==============================================================================
--- trunk/src/mainboard/msi/ms6156/Kconfig	Sat Mar 13 21:16:48 2010	(r5204)
+++ trunk/src/mainboard/msi/ms6156/Kconfig	Sat Mar 13 21:36:11 2010	(r5205)
@@ -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

Modified: trunk/src/mainboard/msi/ms6156/devicetree.cb
==============================================================================
--- trunk/src/mainboard/msi/ms6156/devicetree.cb	Sat Mar 13 21:16:48 2010	(r5204)
+++ trunk/src/mainboard/msi/ms6156/devicetree.cb	Sat Mar 13 21:36:11 2010	(r5205)
@@ -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

Modified: trunk/src/mainboard/soyo/sy-6ba-plus-iii/Kconfig
==============================================================================
--- trunk/src/mainboard/soyo/sy-6ba-plus-iii/Kconfig	Sat Mar 13 21:16:48 2010	(r5204)
+++ trunk/src/mainboard/soyo/sy-6ba-plus-iii/Kconfig	Sat Mar 13 21:36:11 2010	(r5205)
@@ -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

Modified: trunk/src/mainboard/soyo/sy-6ba-plus-iii/devicetree.cb
==============================================================================
--- trunk/src/mainboard/soyo/sy-6ba-plus-iii/devicetree.cb	Sat Mar 13 21:16:48 2010	(r5204)
+++ trunk/src/mainboard/soyo/sy-6ba-plus-iii/devicetree.cb	Sat Mar 13 21:36:11 2010	(r5205)
@@ -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

Modified: trunk/src/mainboard/tyan/s1846/Kconfig
==============================================================================
--- trunk/src/mainboard/tyan/s1846/Kconfig	Sat Mar 13 21:16:48 2010	(r5204)
+++ trunk/src/mainboard/tyan/s1846/Kconfig	Sat Mar 13 21:36:11 2010	(r5205)
@@ -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

Modified: trunk/src/mainboard/tyan/s1846/devicetree.cb
==============================================================================
--- trunk/src/mainboard/tyan/s1846/devicetree.cb	Sat Mar 13 21:16:48 2010	(r5204)
+++ trunk/src/mainboard/tyan/s1846/devicetree.cb	Sat Mar 13 21:36:11 2010	(r5205)
@@ -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