[v2] r4116 - in trunk/coreboot-v2/src: cpu/amd/dualcore cpu/amd/quadcore mainboard/amd/serengeti_cheetah mainboard/supermicro/h8dme mainboard/supermicro/h8dmr

Author: stepan
Date: 2009-04-15 08:00:01 +0200 (Wed, 15 Apr 2009)
New Revision: 4116

Modified:
   trunk/coreboot-v2/src/cpu/amd/dualcore/dualcore_id.c
   trunk/coreboot-v2/src/cpu/amd/quadcore/quadcore_id.c
   trunk/coreboot-v2/src/mainboard/amd/serengeti_cheetah/apc_auto.c
   trunk/coreboot-v2/src/mainboard/supermicro/h8dme/apc_auto.c
   trunk/coreboot-v2/src/mainboard/supermicro/h8dmr/apc_auto.c
Log:
r4097 broke the tree and it remains unfixed :-( 
Repeat: Cosmetic patches shall not break the tree for 20 revisions.

Signed-off-by: Stefan Reinauer 
Acked-by: Stefan Reinauer

Modified: trunk/coreboot-v2/src/cpu/amd/dualcore/dualcore_id.c
===================================================================
--- trunk/coreboot-v2/src/cpu/amd/dualcore/dualcore_id.c	2009-04-14 20:51:41 UTC (rev 4115)
+++ trunk/coreboot-v2/src/cpu/amd/dualcore/dualcore_id.c	2009-04-15 06:00:01 UTC (rev 4116)
@@ -47,8 +47,9 @@
    return (cpuid_ecx(0x80000008) & 0xff);
 }

-static inline struct node_core_id get_node_core_id_x(void) {
+static inline struct node_core_id get_node_core_id_x(void)
+{

-	return get_node_core_id( read_nb_cfg_54() ); // for pre_e0() nb_cfg_54 always be 0
+	return get_node_core_id(read_nb_cfg_54()); // for pre_e0() nb_cfg_54 always be 0
 }

Modified: trunk/coreboot-v2/src/cpu/amd/quadcore/quadcore_id.c
===================================================================
--- trunk/coreboot-v2/src/cpu/amd/quadcore/quadcore_id.c	2009-04-14 20:51:41 UTC (rev 4115)
+++ trunk/coreboot-v2/src/cpu/amd/quadcore/quadcore_id.c	2009-04-15 06:00:01 UTC (rev 4116)
@@ -72,8 +72,8 @@
    return (cpuid_ecx(0x80000008) & 0xff);
 }

-static struct node_core_id get_node_core_id_x(void) {
-
-	return get_node_core_id( read_nb_cfg_54() );
+static struct node_core_id get_node_core_id_x(void)
+{
+	return get_node_core_id(read_nb_cfg_54());
 }

Modified: trunk/coreboot-v2/src/mainboard/amd/serengeti_cheetah/apc_auto.c
===================================================================
--- trunk/coreboot-v2/src/mainboard/amd/serengeti_cheetah/apc_auto.c	2009-04-14 20:51:41 UTC (rev 4115)
+++ trunk/coreboot-v2/src/mainboard/amd/serengeti_cheetah/apc_auto.c	2009-04-15 06:00:01 UTC (rev 4116)
@@ -62,6 +62,11 @@
 #include "northbridge/amd/amdk8/amdk8_f_pci.c"
 #include "northbridge/amd/amdk8/raminit_f_dqs.c"

+static inline unsigned get_nodes(void)
+{
+	return ((pci_read_config32(PCI_DEV(0, 0x18, 0), 0x60)>>4) & 7) + 1;
+}
+
 #include "cpu/amd/dualcore/dualcore.c"

void hardwaremain(int ret_addr)

Modified: trunk/coreboot-v2/src/mainboard/supermicro/h8dme/apc_auto.c
===================================================================
--- trunk/coreboot-v2/src/mainboard/supermicro/h8dme/apc_auto.c	2009-04-14 20:51:41 UTC (rev 4115)
+++ trunk/coreboot-v2/src/mainboard/supermicro/h8dme/apc_auto.c	2009-04-15 06:00:01 UTC (rev 4116)
@@ -82,6 +82,11 @@
 #include "northbridge/amd/amdk8/amdk8_f_pci.c"
 #include "northbridge/amd/amdk8/raminit_f_dqs.c"

+static inline unsigned get_nodes(void)
+{
+	return ((pci_read_config32(PCI_DEV(0, 0x18, 0), 0x60)>>4) & 7) + 1;
+}
+
 #include "cpu/amd/dualcore/dualcore.c"

void hardwaremain(int ret_addr)

Modified: trunk/coreboot-v2/src/mainboard/supermicro/h8dmr/apc_auto.c
===================================================================
--- trunk/coreboot-v2/src/mainboard/supermicro/h8dmr/apc_auto.c	2009-04-14 20:51:41 UTC (rev 4115)
+++ trunk/coreboot-v2/src/mainboard/supermicro/h8dmr/apc_auto.c	2009-04-15 06:00:01 UTC (rev 4116)
@@ -82,6 +82,11 @@
 #include "northbridge/amd/amdk8/amdk8_f_pci.c"
 #include "northbridge/amd/amdk8/raminit_f_dqs.c"

+static inline unsigned get_nodes(void)
+{
+	return ((pci_read_config32(PCI_DEV(0, 0x18, 0), 0x60)>>4) & 7) + 1;
+}
+
 #include "cpu/amd/dualcore/dualcore.c"

void hardwaremain(int ret_addr)