AMD AGESA cimx/sb800: Drop APIC_ID_OFFSET and MAX_PHYSICAL_CPUS

All boards had APIC_ID_OFFSET=0 and MAX_PHYSICAL_CPUS=1.

Change-Id: I6f08ea6de92a2af79fb3a99c5edd942b3a321c43
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: http://review.coreboot.org/5538
Tested-by: build bot (Jenkins)
Reviewed-by: Alexandru Gagniuc <mr.nuke.me@gmail.com>
Reviewed-by: Edward O'Callaghan <eocallaghan@alterapraxis.com>
This commit is contained in:
Kyösti Mälkki 2014-04-17 15:07:32 +03:00
parent 9816392337
commit 35546deba6
10 changed files with 5 additions and 72 deletions

View File

@ -39,10 +39,6 @@ config MAINBOARD_DIR
string string
default amd/inagua default amd/inagua
config APIC_ID_OFFSET
hex
default 0x0
config MAINBOARD_PART_NUMBER config MAINBOARD_PART_NUMBER
string string
default "Inagua" default "Inagua"
@ -55,10 +51,6 @@ config MAX_CPUS
int int
default 2 default 2
config MAX_PHYSICAL_CPUS
int
default 1
config HW_MEM_HOLE_SIZE_AUTO_INC config HW_MEM_HOLE_SIZE_AUTO_INC
bool bool
default n default n

View File

@ -39,10 +39,6 @@ config MAINBOARD_DIR
string string
default amd/persimmon default amd/persimmon
config APIC_ID_OFFSET
hex
default 0x0
config MAINBOARD_PART_NUMBER config MAINBOARD_PART_NUMBER
string string
default "Persimmon" default "Persimmon"
@ -55,10 +51,6 @@ config MAX_CPUS
int int
default 2 default 2
config MAX_PHYSICAL_CPUS
int
default 1
config HW_MEM_HOLE_SIZE_AUTO_INC config HW_MEM_HOLE_SIZE_AUTO_INC
bool bool
default n default n

View File

@ -39,10 +39,6 @@ config MAINBOARD_DIR
string string
default amd/south_station default amd/south_station
config APIC_ID_OFFSET
hex
default 0x0
config MAINBOARD_PART_NUMBER config MAINBOARD_PART_NUMBER
string string
default "Southstation" default "Southstation"
@ -55,10 +51,6 @@ config MAX_CPUS
int int
default 4 default 4
config MAX_PHYSICAL_CPUS
int
default 1
config HW_MEM_HOLE_SIZE_AUTO_INC config HW_MEM_HOLE_SIZE_AUTO_INC
bool bool
default n default n

View File

@ -38,10 +38,6 @@ config MAINBOARD_DIR
string string
default amd/union_station default amd/union_station
config APIC_ID_OFFSET
hex
default 0x0
config MAINBOARD_PART_NUMBER config MAINBOARD_PART_NUMBER
string string
default "Unionstation" default "Unionstation"
@ -54,10 +50,6 @@ config MAX_CPUS
int int
default 4 default 4
config MAX_PHYSICAL_CPUS
int
default 1
config HW_MEM_HOLE_SIZE_AUTO_INC config HW_MEM_HOLE_SIZE_AUTO_INC
bool bool
default n default n

View File

@ -39,10 +39,6 @@ config MAINBOARD_DIR
string string
default asrock/e350m1 default asrock/e350m1
config APIC_ID_OFFSET
hex
default 0x0
config MAINBOARD_PART_NUMBER config MAINBOARD_PART_NUMBER
string string
default "E350M1" default "E350M1"
@ -55,10 +51,6 @@ config MAX_CPUS
int int
default 2 default 2
config MAX_PHYSICAL_CPUS
int
default 1
config HW_MEM_HOLE_SIZE_AUTO_INC config HW_MEM_HOLE_SIZE_AUTO_INC
bool bool
default n default n

View File

@ -39,10 +39,6 @@ config MAINBOARD_DIR
string string
default gizmosphere/gizmo default gizmosphere/gizmo
config APIC_ID_OFFSET
hex
default 0x0
config MAINBOARD_PART_NUMBER config MAINBOARD_PART_NUMBER
string string
default "Gizmo" default "Gizmo"
@ -55,10 +51,6 @@ config MAX_CPUS
int int
default 2 default 2
config MAX_PHYSICAL_CPUS
int
default 1
config HW_MEM_HOLE_SIZE_AUTO_INC config HW_MEM_HOLE_SIZE_AUTO_INC
bool bool
default n default n

View File

@ -40,10 +40,6 @@ config MAINBOARD_DIR
string string
default jetway/nf81-t56n-lf default jetway/nf81-t56n-lf
config APIC_ID_OFFSET
hex
default 0x0
config MAINBOARD_PART_NUMBER config MAINBOARD_PART_NUMBER
string string
default "NF81-T56N-LF" default "NF81-T56N-LF"
@ -56,10 +52,6 @@ config MAX_CPUS
int int
default 2 default 2
config MAX_PHYSICAL_CPUS
int
default 1
config HW_MEM_HOLE_SIZE_AUTO_INC config HW_MEM_HOLE_SIZE_AUTO_INC
bool bool
default n default n

View File

@ -43,10 +43,6 @@ config MAINBOARD_DIR
string string
default lippert/frontrunner-af default lippert/frontrunner-af
config APIC_ID_OFFSET
hex
default 0x0
config MAINBOARD_PART_NUMBER config MAINBOARD_PART_NUMBER
string string
default "FrontRunner-AF" default "FrontRunner-AF"
@ -59,10 +55,6 @@ config MAX_CPUS
int int
default 2 default 2
config MAX_PHYSICAL_CPUS
int
default 1
config HW_MEM_HOLE_SIZE_AUTO_INC config HW_MEM_HOLE_SIZE_AUTO_INC
bool bool
default n default n

View File

@ -45,10 +45,6 @@ config MAINBOARD_DIR
string string
default lippert/toucan-af default lippert/toucan-af
config APIC_ID_OFFSET
hex
default 0x0
config MAINBOARD_PART_NUMBER config MAINBOARD_PART_NUMBER
string string
default "Toucan-AF" default "Toucan-AF"
@ -61,10 +57,6 @@ config MAX_CPUS
int int
default 2 default 2
config MAX_PHYSICAL_CPUS
int
default 1
config HW_MEM_HOLE_SIZE_AUTO_INC config HW_MEM_HOLE_SIZE_AUTO_INC
bool bool
default n default n

View File

@ -370,6 +370,10 @@ static void sb800_enable(device_t dev)
case (0x14 << 3) | 0: /* 0:14:0 SMBUS */ case (0x14 << 3) | 0: /* 0:14:0 SMBUS */
printk(BIOS_INFO, "sm_init().\n"); printk(BIOS_INFO, "sm_init().\n");
clear_ioapic(IO_APIC_ADDR); clear_ioapic(IO_APIC_ADDR);
#if CONFIG_CPU_AMD_AGESA
/* Assign the ioapic ID the next available number after the processor core local APIC IDs */
setup_ioapic(IO_APIC_ADDR, CONFIG_MAX_CPUS);
#else
/* I/O APIC IDs are normally limited to 4-bits. Enforce this limit. */ /* I/O APIC IDs are normally limited to 4-bits. Enforce this limit. */
#if (CONFIG_APIC_ID_OFFSET == 0 && CONFIG_MAX_CPUS * CONFIG_MAX_PHYSICAL_CPUS < 16) #if (CONFIG_APIC_ID_OFFSET == 0 && CONFIG_MAX_CPUS * CONFIG_MAX_PHYSICAL_CPUS < 16)
/* Assign the ioapic ID the next available number after the processor core local APIC IDs */ /* Assign the ioapic ID the next available number after the processor core local APIC IDs */
@ -379,6 +383,7 @@ static void sb800_enable(device_t dev)
setup_ioapic(IO_APIC_ADDR, 0); setup_ioapic(IO_APIC_ADDR, 0);
#else #else
#error "The processor APIC IDs must be lifted to make room for the I/O APIC ID" #error "The processor APIC IDs must be lifted to make room for the I/O APIC ID"
#endif
#endif #endif
break; break;