[v2] r4169 - in trunk/coreboot-v2/src: cpu/intel cpu/intel/socket_mPGA604 mainboard/dell/s1850 mainboard/intel/jarrell mainboard/intel/xe7501devkit mainboard/supermicro/x6dai_g mainboard/supermicro/x6dhe_g mainboard/supermicro/x6dhe_g2 mainboard/supermicro/x6dhr_ig mainboard/supermicro/x6dhr_ig2 mainboard/tyan/s2735

Author: stepan
Date: 2009-04-22 10:56:50 +0200 (Wed, 22 Apr 2009)
New Revision: 4169

Added:
   trunk/coreboot-v2/src/cpu/intel/socket_mPGA604/
   trunk/coreboot-v2/src/cpu/intel/socket_mPGA604/Config.lb
   trunk/coreboot-v2/src/cpu/intel/socket_mPGA604/chip.h
   trunk/coreboot-v2/src/cpu/intel/socket_mPGA604/socket_mPGA604.c
Removed:
   trunk/coreboot-v2/src/cpu/intel/socket_mPGA604_533Mhz/
   trunk/coreboot-v2/src/cpu/intel/socket_mPGA604_800Mhz/
Modified:
   trunk/coreboot-v2/src/mainboard/dell/s1850/Config.lb
   trunk/coreboot-v2/src/mainboard/intel/jarrell/Config.lb
   trunk/coreboot-v2/src/mainboard/intel/xe7501devkit/Config.lb
   trunk/coreboot-v2/src/mainboard/supermicro/x6dai_g/Config.lb
   trunk/coreboot-v2/src/mainboard/supermicro/x6dhe_g/Config.lb
   trunk/coreboot-v2/src/mainboard/supermicro/x6dhe_g2/Config.lb
   trunk/coreboot-v2/src/mainboard/supermicro/x6dhr_ig/Config.lb
   trunk/coreboot-v2/src/mainboard/supermicro/x6dhr_ig2/Config.lb
   trunk/coreboot-v2/src/mainboard/tyan/s2735/Config.lb
Log:
This patch unifies the socket_mPGA604_800Mhz and socket_mPGA604_533Mhz to a
combined socket_mPGA604. No other sockets come with clock rates, and there is
no difference in code, except for the number of microcode patches included in a
build.

Signed-off-by: Stefan Reinauer 
Acked-by: Carl-Daniel Hailfinger

Added: trunk/coreboot-v2/src/cpu/intel/socket_mPGA604/Config.lb
===================================================================
--- trunk/coreboot-v2/src/cpu/intel/socket_mPGA604/Config.lb	                        (rev 0)
+++ trunk/coreboot-v2/src/cpu/intel/socket_mPGA604/Config.lb	2009-04-22 08:56:50 UTC (rev 4169)
@@ -0,0 +1,5 @@
+config chip.h
+object socket_mPGA604.o
+dir /cpu/intel/model_f2x
+dir /cpu/intel/model_f3x
+dir /cpu/intel/model_f4x

Added: trunk/coreboot-v2/src/cpu/intel/socket_mPGA604/chip.h
===================================================================
--- trunk/coreboot-v2/src/cpu/intel/socket_mPGA604/chip.h	                        (rev 0)
+++ trunk/coreboot-v2/src/cpu/intel/socket_mPGA604/chip.h	2009-04-22 08:56:50 UTC (rev 4169)
@@ -0,0 +1,4 @@
+extern struct chip_operations cpu_intel_socket_mPGA604_800Mhz_ops;
+
+struct cpu_intel_socket_mPGA604_800Mhz_config {
+};

Added: trunk/coreboot-v2/src/cpu/intel/socket_mPGA604/socket_mPGA604.c
===================================================================
--- trunk/coreboot-v2/src/cpu/intel/socket_mPGA604/socket_mPGA604.c	                        (rev 0)
+++ trunk/coreboot-v2/src/cpu/intel/socket_mPGA604/socket_mPGA604.c	2009-04-22 08:56:50 UTC (rev 4169)
@@ -0,0 +1,7 @@
+#include <device/device.h>
+#include "chip.h"
+
+
+struct chip_operations cpu_intel_socket_mPGA604_800Mhz_ops = {
+	CHIP_NAME("Socket mPGA604 CPU")
+};

Modified: trunk/coreboot-v2/src/mainboard/dell/s1850/Config.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/dell/s1850/Config.lb	2009-04-22 08:18:37 UTC (rev 4168)
+++ trunk/coreboot-v2/src/mainboard/dell/s1850/Config.lb	2009-04-22 08:56:50 UTC (rev 4169)
@@ -193,10 +193,10 @@
    	device pci 06.0 on end
    end
    device apic_cluster 0 on
-		chip cpu/intel/socket_mPGA604_800Mhz # cpu 0
+		chip cpu/intel/socket_mPGA604 # cpu 0
    		device apic 0 on end
    	end
-		chip cpu/intel/socket_mPGA604_800Mhz # cpu 1
+		chip cpu/intel/socket_mPGA604 # cpu 1
    		device apic 6 on end
    	end
    end

Modified: trunk/coreboot-v2/src/mainboard/intel/jarrell/Config.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/intel/jarrell/Config.lb	2009-04-22 08:18:37 UTC (rev 4168)
+++ trunk/coreboot-v2/src/mainboard/intel/jarrell/Config.lb	2009-04-22 08:56:50 UTC (rev 4169)
@@ -203,10 +203,10 @@
    	end
    end
    device apic_cluster 0 on
-		chip cpu/intel/socket_mPGA604_800Mhz # cpu 0
+		chip cpu/intel/socket_mPGA604 # cpu 0
    		device apic 0 on end
    	end
-		chip cpu/intel/socket_mPGA604_800Mhz # cpu 1
+		chip cpu/intel/socket_mPGA604 # cpu 1
    		device apic 6 on end
    	end
    end

Modified: trunk/coreboot-v2/src/mainboard/intel/xe7501devkit/Config.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/intel/xe7501devkit/Config.lb	2009-04-22 08:18:37 UTC (rev 4168)
+++ trunk/coreboot-v2/src/mainboard/intel/xe7501devkit/Config.lb	2009-04-22 08:56:50 UTC (rev 4169)
@@ -212,10 +212,10 @@
    	end # SB
    end # PCI_DOMAIN
    device apic_cluster 0 on
-		chip cpu/intel/socket_mPGA604_533Mhz
+		chip cpu/intel/socket_mPGA604
    		device apic 0 on end
    	end
-		chip cpu/intel/socket_mPGA604_533Mhz
+		chip cpu/intel/socket_mPGA604
    		device apic 6 on end
    	end
    end

Modified: trunk/coreboot-v2/src/mainboard/supermicro/x6dai_g/Config.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/supermicro/x6dai_g/Config.lb	2009-04-22 08:18:37 UTC (rev 4168)
+++ trunk/coreboot-v2/src/mainboard/supermicro/x6dai_g/Config.lb	2009-04-22 08:56:50 UTC (rev 4169)
@@ -187,10 +187,10 @@
    	device pci 08.0 on end
    end
    device apic_cluster 0 on
-		chip cpu/intel/socket_mPGA604_800Mhz # cpu0
+		chip cpu/intel/socket_mPGA604 # cpu0
    		device apic 0 on end
    	end
-		chip cpu/intel/socket_mPGA604_800Mhz # cpu1
+		chip cpu/intel/socket_mPGA604 # cpu1
    		device apic 6 on end
    	end
    end

Modified: trunk/coreboot-v2/src/mainboard/supermicro/x6dhe_g/Config.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/supermicro/x6dhe_g/Config.lb	2009-04-22 08:18:37 UTC (rev 4168)
+++ trunk/coreboot-v2/src/mainboard/supermicro/x6dhe_g/Config.lb	2009-04-22 08:56:50 UTC (rev 4169)
@@ -210,10 +210,10 @@
    end

device apic_cluster 0 on
-		chip cpu/intel/socket_mPGA604_800Mhz  	# CPU 0
+		chip cpu/intel/socket_mPGA604  	# CPU 0
    		device apic 0 on end
    	end
-		chip cpu/intel/socket_mPGA604_800Mhz 	# CPU 1
+		chip cpu/intel/socket_mPGA604 	# CPU 1
    		device apic 6 on end
    	end
    end

Modified: trunk/coreboot-v2/src/mainboard/supermicro/x6dhe_g2/Config.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/supermicro/x6dhe_g2/Config.lb	2009-04-22 08:18:37 UTC (rev 4168)
+++ trunk/coreboot-v2/src/mainboard/supermicro/x6dhe_g2/Config.lb	2009-04-22 08:56:50 UTC (rev 4169)
@@ -210,10 +210,10 @@
    end

device apic_cluster 0 on
-		chip cpu/intel/socket_mPGA604_800Mhz  	# CPU 0
+		chip cpu/intel/socket_mPGA604  	# CPU 0
    		device apic 0 on end
    	end
-		chip cpu/intel/socket_mPGA604_800Mhz 	# CPU 1
+		chip cpu/intel/socket_mPGA604 	# CPU 1
    		device apic 6 on end
    	end
    end

Modified: trunk/coreboot-v2/src/mainboard/supermicro/x6dhr_ig/Config.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/supermicro/x6dhr_ig/Config.lb	2009-04-22 08:18:37 UTC (rev 4168)
+++ trunk/coreboot-v2/src/mainboard/supermicro/x6dhr_ig/Config.lb	2009-04-22 08:56:50 UTC (rev 4169)
@@ -206,10 +206,10 @@
    	device pci 06.0 on end
    end
    device apic_cluster 0 on
-		chip cpu/intel/socket_mPGA604_800Mhz # cpu 0
+		chip cpu/intel/socket_mPGA604 # cpu 0
    		device apic 0 on end
    	end
-		chip cpu/intel/socket_mPGA604_800Mhz # cpu 1
+		chip cpu/intel/socket_mPGA604 # cpu 1
    		device apic 6 on end
    	end
    end

Modified: trunk/coreboot-v2/src/mainboard/supermicro/x6dhr_ig2/Config.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/supermicro/x6dhr_ig2/Config.lb	2009-04-22 08:18:37 UTC (rev 4168)
+++ trunk/coreboot-v2/src/mainboard/supermicro/x6dhr_ig2/Config.lb	2009-04-22 08:56:50 UTC (rev 4169)
@@ -197,10 +197,10 @@
    	device pci 06.0 on end
    end
    device apic_cluster 0 on
-		chip cpu/intel/socket_mPGA604_800Mhz # cpu 0
+		chip cpu/intel/socket_mPGA604 # cpu 0
    		device apic 0 on end
    	end
-		chip cpu/intel/socket_mPGA604_800Mhz # cpu 1
+		chip cpu/intel/socket_mPGA604 # cpu 1
    		device apic 6 on end
    	end
    end

Modified: trunk/coreboot-v2/src/mainboard/tyan/s2735/Config.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/tyan/s2735/Config.lb	2009-04-22 08:18:37 UTC (rev 4168)
+++ trunk/coreboot-v2/src/mainboard/tyan/s2735/Config.lb	2009-04-22 08:56:50 UTC (rev 4169)
@@ -172,10 +172,10 @@
    	end # SB
         end # PCI_DOMAIN
         device apic_cluster 0 on
-                chip cpu/intel/socket_mPGA604_533Mhz
+                chip cpu/intel/socket_mPGA604
                         device apic 0 on end
                 end
-                chip cpu/intel/socket_mPGA604_533Mhz
+                chip cpu/intel/socket_mPGA604
                         device apic 6 on end
                 end
         end