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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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!

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

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

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

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

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

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

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

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

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

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

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

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

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