diff options
| author | Stefan Reinauer <stepan@coresystems.de> | 2009-04-15 06:00:01 +0000 |
|---|---|---|
| committer | Stefan Reinauer <stepan@openbios.org> | 2009-04-15 06:00:01 +0000 |
| commit | 82144571adb315197ded9d6f3ada29a86637117c (patch) | |
| tree | cd684fb126eebf40ee26386034cbbb9e0fe0bd26 | |
| parent | 57f6c08837380e60153bceab75e042d535746daa (diff) | |
| download | coreboot-82144571adb315197ded9d6f3ada29a86637117c.tar.xz | |
r4097 broke the tree and it remains unfixed :-(
Repeat: Cosmetic patches shall not break the tree for 20 revisions.
Signed-off-by: Stefan Reinauer <stepan@coresystems.de>
Acked-by: Stefan Reinauer <stepan@coresystems.de>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@4116 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
| -rw-r--r-- | src/cpu/amd/dualcore/dualcore_id.c | 5 | ||||
| -rw-r--r-- | src/cpu/amd/quadcore/quadcore_id.c | 6 | ||||
| -rw-r--r-- | src/mainboard/amd/serengeti_cheetah/apc_auto.c | 5 | ||||
| -rw-r--r-- | src/mainboard/supermicro/h8dme/apc_auto.c | 5 | ||||
| -rw-r--r-- | src/mainboard/supermicro/h8dmr/apc_auto.c | 5 |
5 files changed, 21 insertions, 5 deletions
diff --git a/src/cpu/amd/dualcore/dualcore_id.c b/src/cpu/amd/dualcore/dualcore_id.c index c8c8d8d443..67beb94dd5 100644 --- a/src/cpu/amd/dualcore/dualcore_id.c +++ b/src/cpu/amd/dualcore/dualcore_id.c @@ -47,8 +47,9 @@ static inline unsigned get_core_num(void) 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 } diff --git a/src/cpu/amd/quadcore/quadcore_id.c b/src/cpu/amd/quadcore/quadcore_id.c index 4597f6b70d..c4eab24a80 100644 --- a/src/cpu/amd/quadcore/quadcore_id.c +++ b/src/cpu/amd/quadcore/quadcore_id.c @@ -72,8 +72,8 @@ static u32 get_core_num(void) 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()); } diff --git a/src/mainboard/amd/serengeti_cheetah/apc_auto.c b/src/mainboard/amd/serengeti_cheetah/apc_auto.c index a69ae164e1..63a8a085eb 100644 --- a/src/mainboard/amd/serengeti_cheetah/apc_auto.c +++ b/src/mainboard/amd/serengeti_cheetah/apc_auto.c @@ -62,6 +62,11 @@ static void post_code(uint8_t value) { #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) diff --git a/src/mainboard/supermicro/h8dme/apc_auto.c b/src/mainboard/supermicro/h8dme/apc_auto.c index b514715e3f..6e8f301626 100644 --- a/src/mainboard/supermicro/h8dme/apc_auto.c +++ b/src/mainboard/supermicro/h8dme/apc_auto.c @@ -82,6 +82,11 @@ static void post_code(uint8_t value) { #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) diff --git a/src/mainboard/supermicro/h8dmr/apc_auto.c b/src/mainboard/supermicro/h8dmr/apc_auto.c index b514715e3f..6e8f301626 100644 --- a/src/mainboard/supermicro/h8dmr/apc_auto.c +++ b/src/mainboard/supermicro/h8dmr/apc_auto.c @@ -82,6 +82,11 @@ static void post_code(uint8_t value) { #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) |