From 53c7276bd1a18160f022c468b7ce021c5386577c Mon Sep 17 00:00:00 2001 From: Uwe Hermann Date: Sat, 13 Mar 2010 20:36:11 +0000 Subject: 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 git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5205 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1 --- src/mainboard/asus/p2b-d/Kconfig | 2 +- src/mainboard/asus/p2b-d/devicetree.cb | 4 ++-- src/mainboard/asus/p2b-ds/Kconfig | 2 +- src/mainboard/asus/p2b-ds/devicetree.cb | 4 ++-- src/mainboard/asus/p2b-f/Kconfig | 2 +- src/mainboard/asus/p2b-f/devicetree.cb | 2 +- src/mainboard/asus/p2b/Kconfig | 2 +- src/mainboard/asus/p2b/devicetree.cb | 2 +- src/mainboard/asus/p3b-f/Kconfig | 2 +- src/mainboard/asus/p3b-f/devicetree.cb | 2 +- 10 files changed, 12 insertions(+), 12 deletions(-) (limited to 'src/mainboard/asus') 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 -- cgit v1.2.3