diff options
| -rw-r--r-- | src/mainboard/amd/inagua/Kconfig | 8 | ||||
| -rw-r--r-- | src/mainboard/amd/persimmon/Kconfig | 8 | ||||
| -rw-r--r-- | src/mainboard/amd/south_station/Kconfig | 8 | ||||
| -rw-r--r-- | src/mainboard/amd/union_station/Kconfig | 8 | ||||
| -rw-r--r-- | src/mainboard/asrock/e350m1/Kconfig | 8 | ||||
| -rwxr-xr-x | src/mainboard/gizmosphere/gizmo/Kconfig | 8 | ||||
| -rw-r--r-- | src/mainboard/jetway/nf81-t56n-lf/Kconfig | 8 | ||||
| -rw-r--r-- | src/mainboard/lippert/frontrunner-af/Kconfig | 8 | ||||
| -rw-r--r-- | src/mainboard/lippert/toucan-af/Kconfig | 8 | ||||
| -rw-r--r-- | src/southbridge/amd/cimx/sb800/late.c | 5 |
10 files changed, 5 insertions, 72 deletions
diff --git a/src/mainboard/amd/inagua/Kconfig b/src/mainboard/amd/inagua/Kconfig index 8ce4aae87f..6713ce7e17 100644 --- a/src/mainboard/amd/inagua/Kconfig +++ b/src/mainboard/amd/inagua/Kconfig @@ -39,10 +39,6 @@ config MAINBOARD_DIR string default amd/inagua -config APIC_ID_OFFSET - hex - default 0x0 - config MAINBOARD_PART_NUMBER string default "Inagua" @@ -55,10 +51,6 @@ config MAX_CPUS int default 2 -config MAX_PHYSICAL_CPUS - int - default 1 - config HW_MEM_HOLE_SIZE_AUTO_INC bool default n diff --git a/src/mainboard/amd/persimmon/Kconfig b/src/mainboard/amd/persimmon/Kconfig index e4ae8d0ccd..e09a17086e 100644 --- a/src/mainboard/amd/persimmon/Kconfig +++ b/src/mainboard/amd/persimmon/Kconfig @@ -39,10 +39,6 @@ config MAINBOARD_DIR string default amd/persimmon -config APIC_ID_OFFSET - hex - default 0x0 - config MAINBOARD_PART_NUMBER string default "Persimmon" @@ -55,10 +51,6 @@ config MAX_CPUS int default 2 -config MAX_PHYSICAL_CPUS - int - default 1 - config HW_MEM_HOLE_SIZE_AUTO_INC bool default n diff --git a/src/mainboard/amd/south_station/Kconfig b/src/mainboard/amd/south_station/Kconfig index d7e848d90c..346a5567a1 100644 --- a/src/mainboard/amd/south_station/Kconfig +++ b/src/mainboard/amd/south_station/Kconfig @@ -39,10 +39,6 @@ config MAINBOARD_DIR string default amd/south_station -config APIC_ID_OFFSET - hex - default 0x0 - config MAINBOARD_PART_NUMBER string default "Southstation" @@ -55,10 +51,6 @@ config MAX_CPUS int default 4 -config MAX_PHYSICAL_CPUS - int - default 1 - config HW_MEM_HOLE_SIZE_AUTO_INC bool default n diff --git a/src/mainboard/amd/union_station/Kconfig b/src/mainboard/amd/union_station/Kconfig index 7d9f11537c..69f65486e5 100644 --- a/src/mainboard/amd/union_station/Kconfig +++ b/src/mainboard/amd/union_station/Kconfig @@ -38,10 +38,6 @@ config MAINBOARD_DIR string default amd/union_station -config APIC_ID_OFFSET - hex - default 0x0 - config MAINBOARD_PART_NUMBER string default "Unionstation" @@ -54,10 +50,6 @@ config MAX_CPUS int default 4 -config MAX_PHYSICAL_CPUS - int - default 1 - config HW_MEM_HOLE_SIZE_AUTO_INC bool default n diff --git a/src/mainboard/asrock/e350m1/Kconfig b/src/mainboard/asrock/e350m1/Kconfig index e43068841c..561f4bcc7b 100644 --- a/src/mainboard/asrock/e350m1/Kconfig +++ b/src/mainboard/asrock/e350m1/Kconfig @@ -39,10 +39,6 @@ config MAINBOARD_DIR string default asrock/e350m1 -config APIC_ID_OFFSET - hex - default 0x0 - config MAINBOARD_PART_NUMBER string default "E350M1" @@ -55,10 +51,6 @@ config MAX_CPUS int default 2 -config MAX_PHYSICAL_CPUS - int - default 1 - config HW_MEM_HOLE_SIZE_AUTO_INC bool default n diff --git a/src/mainboard/gizmosphere/gizmo/Kconfig b/src/mainboard/gizmosphere/gizmo/Kconfig index 85eddfb768..a4252e3943 100755 --- a/src/mainboard/gizmosphere/gizmo/Kconfig +++ b/src/mainboard/gizmosphere/gizmo/Kconfig @@ -39,10 +39,6 @@ config MAINBOARD_DIR string default gizmosphere/gizmo -config APIC_ID_OFFSET - hex - default 0x0 - config MAINBOARD_PART_NUMBER string default "Gizmo" @@ -55,10 +51,6 @@ config MAX_CPUS int default 2 -config MAX_PHYSICAL_CPUS - int - default 1 - config HW_MEM_HOLE_SIZE_AUTO_INC bool default n diff --git a/src/mainboard/jetway/nf81-t56n-lf/Kconfig b/src/mainboard/jetway/nf81-t56n-lf/Kconfig index badf59083d..85d7558c56 100644 --- a/src/mainboard/jetway/nf81-t56n-lf/Kconfig +++ b/src/mainboard/jetway/nf81-t56n-lf/Kconfig @@ -40,10 +40,6 @@ config MAINBOARD_DIR string default jetway/nf81-t56n-lf -config APIC_ID_OFFSET - hex - default 0x0 - config MAINBOARD_PART_NUMBER string default "NF81-T56N-LF" @@ -56,10 +52,6 @@ config MAX_CPUS int default 2 -config MAX_PHYSICAL_CPUS - int - default 1 - config HW_MEM_HOLE_SIZE_AUTO_INC bool default n diff --git a/src/mainboard/lippert/frontrunner-af/Kconfig b/src/mainboard/lippert/frontrunner-af/Kconfig index d4beecf0e8..f598882517 100644 --- a/src/mainboard/lippert/frontrunner-af/Kconfig +++ b/src/mainboard/lippert/frontrunner-af/Kconfig @@ -43,10 +43,6 @@ config MAINBOARD_DIR string default lippert/frontrunner-af -config APIC_ID_OFFSET - hex - default 0x0 - config MAINBOARD_PART_NUMBER string default "FrontRunner-AF" @@ -59,10 +55,6 @@ config MAX_CPUS int default 2 -config MAX_PHYSICAL_CPUS - int - default 1 - config HW_MEM_HOLE_SIZE_AUTO_INC bool default n diff --git a/src/mainboard/lippert/toucan-af/Kconfig b/src/mainboard/lippert/toucan-af/Kconfig index d984a08a0a..7660acb235 100644 --- a/src/mainboard/lippert/toucan-af/Kconfig +++ b/src/mainboard/lippert/toucan-af/Kconfig @@ -45,10 +45,6 @@ config MAINBOARD_DIR string default lippert/toucan-af -config APIC_ID_OFFSET - hex - default 0x0 - config MAINBOARD_PART_NUMBER string default "Toucan-AF" @@ -61,10 +57,6 @@ config MAX_CPUS int default 2 -config MAX_PHYSICAL_CPUS - int - default 1 - config HW_MEM_HOLE_SIZE_AUTO_INC bool default n diff --git a/src/southbridge/amd/cimx/sb800/late.c b/src/southbridge/amd/cimx/sb800/late.c index 3a534cdb48..219118aa25 100644 --- a/src/southbridge/amd/cimx/sb800/late.c +++ b/src/southbridge/amd/cimx/sb800/late.c @@ -370,6 +370,10 @@ static void sb800_enable(device_t dev) case (0x14 << 3) | 0: /* 0:14:0 SMBUS */ printk(BIOS_INFO, "sm_init().\n"); 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. */ #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 */ @@ -380,6 +384,7 @@ static void sb800_enable(device_t dev) #else #error "The processor APIC IDs must be lifted to make room for the I/O APIC ID" #endif +#endif break; case (0x14 << 3) | 1: /* 0:14:1 IDE */ |