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
This commit is contained in:
parent
57f6c08837
commit
82144571ad
|
@ -47,7 +47,8 @@ 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
|
||||
}
|
||||
|
|
|
@ -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) {
|
||||
|
||||
static struct node_core_id get_node_core_id_x(void)
|
||||
{
|
||||
return get_node_core_id(read_nb_cfg_54());
|
||||
}
|
||||
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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)
|
||||
|
|
Loading…
Reference in New Issue