- Updates to config.g so that it works more reliably and has initial support
for paths - Renamed some configuration variables SMP -> CONFIG_SMP MAX_CPUS -> CONFIG_MAX_CPUS MAX_PHYSICAL_CPUS -> CONFIG_MAX_PHYSICAL_CPUS - Removed some dead configuration variables MAX_CPUS -> CONFIG_MAX_CPUS MAX_PHYSICAL_CPUS -> CONFIG_MAX_PHYSICAL_CPUS SMP -> CONFIG_SMP FINAL_MAINBOARD_FIXUP SIO_BASE SIO_SYSTEM_CLK_INPUT NO_KEYBOARD USE_NORMAL_IMAGE SERIAL_CONSOLE USE_ELF_BOOT ENABLE_FIXED_AND_VARIABLE_MTRRS START_CPU_SEG DISABLE_WATCHDOG ENABLE_IOMMU AMD8111_DEV - Removed some assembly files that are no longer needed killed src/southbridge/amd/amd8111/smbus.inc killed src/southbrideg/amd/amd8111/cmos_boot_failover.inc killed src/ram/ramtest.inc - Updates to config.g so that it works more reliably and has initial support for paths - Renamed some configuration variables SMP -> CONFIG_SMP MAX_CPUS -> CONFIG_MAX_CPUS MAX_PHYSICAL_CPUS -> CONFIG_MAX_PHYSICAL_CPUS - Removed some dead configuration variables MAX_CPUS -> CONFIG_MAX_CPUS MAX_PHYSICAL_CPUS -> CONFIG_MAX_PHYSICAL_CPUS SMP -> CONFIG_SMP FINAL_MAINBOARD_FIXUP SIO_BASE SIO_SYSTEM_CLK_INPUT NO_KEYBOARD USE_NORMAL_IMAGE SERIAL_CONSOLE USE_ELF_BOOT ENABLE_FIXED_AND_VARIABLE_MTRRS START_CPU_SEG DISABLE_WATCHDOG ENABLE_IOMMU AMD8111_DEV - Removed some assembly files that are no longer needed killed src/southbridge/amd/amd8111/smbus.inc killed src/southbrideg/amd/amd8111/cmos_boot_failover.inc killed src/ram/ramtest.inc killed src/sdram/generic_dump_spd.inc killed src/sdram/generic_dump_spd.inc - Updated the arima/hdama to build with the new configuration system - Updated config.g to list all of the variables with make echo git-svn-id: svn://svn.coreboot.org/coreboot/trunk@1093 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
This commit is contained in:
@@ -20,7 +20,7 @@ static void remove_logical_cpus(unsigned long *processor_map)
|
||||
if (disable_logical_cpus) {
|
||||
/* disable logical cpus */
|
||||
int cnt;
|
||||
for(cnt=MAX_PHYSICAL_CPUS;cnt<MAX_CPUS;cnt++)
|
||||
for(cnt=CONFIG_MAX_PHYSICAL_CPUS;cnt<CONFIG_MAX_CPUS;cnt++)
|
||||
processor_map[cnt]=0;
|
||||
printk_debug("logical cpus disabled\n");
|
||||
}
|
||||
|
@@ -268,7 +268,7 @@ void *smp_write_floating_table(unsigned long addr);
|
||||
unsigned long write_smp_table(unsigned long addr, unsigned long *processor_map);
|
||||
|
||||
/* A table (per mainboard) listing the initial apicid of each cpu. */
|
||||
extern unsigned long initial_apicid[MAX_CPUS];
|
||||
extern unsigned long initial_apicid[CONFIG_MAX_CPUS];
|
||||
|
||||
#else /* HAVE_MP_TABLE */
|
||||
static inline
|
||||
|
@@ -45,10 +45,10 @@ _start:
|
||||
movl APIC_ID(%edi), %eax
|
||||
shrl $24, %eax
|
||||
|
||||
/* Get the cpu index (MAX_CPUS on error) */
|
||||
/* Get the cpu index (CONFIG_MAX_CPUS on error) */
|
||||
movl $-4, %ebx
|
||||
1: addl $4, %ebx
|
||||
cmpl $(MAX_CPUS << 2), %ebx
|
||||
cmpl $(CONFIG_MAX_CPUS << 2), %ebx
|
||||
je 2
|
||||
cmpl %eax, initial_apicid(%ebx)
|
||||
jne 1b
|
||||
|
@@ -108,7 +108,7 @@ void smp_write_processors(struct mp_config_table *mc,
|
||||
cpuid(1, &eax, &ebx, &ecx, &edx);
|
||||
cpu_features = eax;
|
||||
cpu_feature_flags = edx;
|
||||
for(i = 0; i < MAX_CPUS; i++) {
|
||||
for(i = 0; i < CONFIG_MAX_CPUS; i++) {
|
||||
unsigned long cpu_apicid = initial_apicid[i];
|
||||
unsigned long cpu_flag;
|
||||
if(initial_apicid[i]==-1)
|
||||
|
@@ -48,10 +48,10 @@ _secondary_start:
|
||||
movl (APIC_ID + APIC_DEFAULT_BASE), %edi
|
||||
shrl $24, %edi
|
||||
|
||||
/* Get the cpu index (MAX_CPUS on error) */
|
||||
/* Get the cpu index (CONFIG_MAX_CPUS on error) */
|
||||
movl $-4, %ebx
|
||||
1: addl $4, %ebx
|
||||
cmpl $(MAX_CPUS << 2), %ebx
|
||||
cmpl $(CONFIG_MAX_CPUS << 2), %ebx
|
||||
je 2
|
||||
cmpl %edi, initial_apicid(%ebx)
|
||||
jne 1b
|
||||
|
@@ -5,13 +5,6 @@
|
||||
#include <string.h>
|
||||
#include <console/console.h>
|
||||
|
||||
#ifndef START_CPU_SEG
|
||||
#define START_CPU_SEG 0x90000
|
||||
#endif
|
||||
#if (START_CPU_SEG&0xffff) != 0
|
||||
#error START_CPU_SEG must be 64k aligned
|
||||
#endif
|
||||
|
||||
static inline void hlt(void)
|
||||
{
|
||||
asm("hlt");
|
||||
@@ -26,7 +19,7 @@ unsigned long this_processors_id(void)
|
||||
int processor_index(unsigned long apicid)
|
||||
{
|
||||
int i;
|
||||
for(i = 0; i < MAX_CPUS; i++) {
|
||||
for(i = 0; i < CONFIG_MAX_CPUS; i++) {
|
||||
if (initial_apicid[i] == apicid) {
|
||||
return i;
|
||||
}
|
||||
@@ -230,7 +223,7 @@ void startup_other_cpus(unsigned long *processor_map)
|
||||
int i;
|
||||
|
||||
/* Assume the cpus are densly packed by apicid */
|
||||
for(i = 0; i < MAX_CPUS; i++) {
|
||||
for(i = 0; i < CONFIG_MAX_CPUS; i++) {
|
||||
unsigned long cpu_apicid = initial_apicid[i];
|
||||
if (cpu_apicid == -1) {
|
||||
printk_err("CPU %d not found\n",i);
|
||||
|
Reference in New Issue
Block a user