[coreboot-gerrit] Patch set updated for coreboot: ea9d972 I/O APIC Kconfig: `select IOAPIC if !DRIVERS_GENERIC_IOAPIC`
David Hendricks (dhendrix@chromium.org)
gerrit at coreboot.org
Mon May 6 07:32:20 CEST 2013
David Hendricks (dhendrix at chromium.org) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/3196
-gerrit
commit ea9d9720fc9dce087355b14a1c86a203bc47973f
Author: Paul Menzel <paulepanter at users.sourceforge.net>
Date: Sat May 4 16:54:52 2013 +0200
I/O APIC Kconfig: `select IOAPIC if !DRIVERS_GENERIC_IOAPIC`
Using the generic I/O APIC driver
src/drivers/generic/ioapic/ioapic.c
added by Sven Schnelle in commit »Add generic IOAPIC driver« (aa03af74) [1],
the other I/O APIC source file is not needed.
src/arch/x86/lib/ioapic.c
The Kconfig variable `CONFIG_IOAPIC` is only used in
src/include/cpu/x86/lapic.h
which maybe needs to be adapted too.
Let’s see what breaks.
[1] http://review.coreboot.org/1137
Change-Id: Ieb462c9e2e8a09628ee317ea4fb0e9266bb86c33
Signed-off-by: Paul Menzel <paulepanter at users.sourceforge.net>
---
src/mainboard/asus/p2b-d/Kconfig | 2 +-
src/mainboard/asus/p2b-ds/Kconfig | 2 +-
src/northbridge/via/cx700/Kconfig | 2 +-
src/southbridge/amd/agesa/hudson/Kconfig | 2 +-
src/southbridge/amd/amd8111/Kconfig | 2 +-
src/southbridge/amd/cimx/sb700/Kconfig | 2 +-
src/southbridge/amd/cimx/sb800/Kconfig | 2 +-
src/southbridge/amd/cimx/sb900/Kconfig | 2 +-
src/southbridge/amd/sb600/Kconfig | 2 +-
src/southbridge/amd/sb700/Kconfig | 2 +-
src/southbridge/amd/sb800/Kconfig | 2 +-
src/southbridge/intel/bd82x6x/Kconfig | 2 +-
src/southbridge/intel/esb6300/Kconfig | 2 +-
src/southbridge/intel/i3100/Kconfig | 2 +-
src/southbridge/intel/i82801ax/Kconfig | 2 +-
src/southbridge/intel/i82801bx/Kconfig | 2 +-
src/southbridge/intel/i82801cx/Kconfig | 2 +-
src/southbridge/intel/i82801dx/Kconfig | 2 +-
src/southbridge/intel/i82801ex/Kconfig | 2 +-
src/southbridge/intel/i82801gx/Kconfig | 2 +-
src/southbridge/intel/i82801ix/Kconfig | 2 +-
src/southbridge/intel/lynxpoint/Kconfig | 2 +-
src/southbridge/nvidia/ck804/Kconfig | 2 +-
src/southbridge/nvidia/mcp55/Kconfig | 2 +-
src/southbridge/sis/sis966/Kconfig | 2 +-
src/southbridge/via/vt8237r/Kconfig | 2 +-
26 files changed, 26 insertions(+), 26 deletions(-)
diff --git a/src/mainboard/asus/p2b-d/Kconfig b/src/mainboard/asus/p2b-d/Kconfig
index 54a1bae..1213ba8 100644
--- a/src/mainboard/asus/p2b-d/Kconfig
+++ b/src/mainboard/asus/p2b-d/Kconfig
@@ -28,7 +28,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy
select HAVE_PIRQ_TABLE
select HAVE_MP_TABLE
select SMP
- select IOAPIC
+ select IOAPIC if !DRIVERS_GENERIC_IOAPIC
select UDELAY_TSC
select BOARD_ROMSIZE_KB_256
select SDRAMPWR_4DIMM
diff --git a/src/mainboard/asus/p2b-ds/Kconfig b/src/mainboard/asus/p2b-ds/Kconfig
index 652b31a..1cd0aac 100644
--- a/src/mainboard/asus/p2b-ds/Kconfig
+++ b/src/mainboard/asus/p2b-ds/Kconfig
@@ -28,7 +28,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy
select HAVE_PIRQ_TABLE
select HAVE_MP_TABLE
select SMP
- select IOAPIC
+ select IOAPIC if !DRIVERS_GENERIC_IOAPIC
select UDELAY_TSC
select BOARD_ROMSIZE_KB_256
select SDRAMPWR_4DIMM
diff --git a/src/northbridge/via/cx700/Kconfig b/src/northbridge/via/cx700/Kconfig
index 8f6e337..e0aa660 100644
--- a/src/northbridge/via/cx700/Kconfig
+++ b/src/northbridge/via/cx700/Kconfig
@@ -3,7 +3,7 @@ config NORTHBRIDGE_VIA_CX700
select HAVE_DEBUG_RAM_SETUP
select HAVE_DEBUG_SMBUS
select HAVE_HARD_RESET
- select IOAPIC
+ select IOAPIC if !DRIVERS_GENERIC_IOAPIC
select SMP
# TODO: What should be the per-chipset default value here?
diff --git a/src/southbridge/amd/agesa/hudson/Kconfig b/src/southbridge/amd/agesa/hudson/Kconfig
index 3e58563..7c216d9 100644
--- a/src/southbridge/amd/agesa/hudson/Kconfig
+++ b/src/southbridge/amd/agesa/hudson/Kconfig
@@ -19,7 +19,7 @@
config SOUTHBRIDGE_AMD_AGESA_HUDSON
bool
- select IOAPIC
+ select IOAPIC if !DRIVERS_GENERIC_IOAPIC
select HAVE_USBDEBUG
config BOOTBLOCK_SOUTHBRIDGE_INIT
diff --git a/src/southbridge/amd/amd8111/Kconfig b/src/southbridge/amd/amd8111/Kconfig
index e643aa8..d606feb 100644
--- a/src/southbridge/amd/amd8111/Kconfig
+++ b/src/southbridge/amd/amd8111/Kconfig
@@ -19,7 +19,7 @@
config SOUTHBRIDGE_AMD_AMD8111
bool
- select IOAPIC
+ select IOAPIC if !DRIVERS_GENERIC_IOAPIC
select HAVE_HARD_RESET
config BOOTBLOCK_SOUTHBRIDGE_INIT
diff --git a/src/southbridge/amd/cimx/sb700/Kconfig b/src/southbridge/amd/cimx/sb700/Kconfig
index e98d3ed..c7c96fa 100644
--- a/src/southbridge/amd/cimx/sb700/Kconfig
+++ b/src/southbridge/amd/cimx/sb700/Kconfig
@@ -19,7 +19,7 @@
config SOUTHBRIDGE_AMD_CIMX_SB700
bool
- select IOAPIC
+ select IOAPIC if !DRIVERS_GENERIC_IOAPIC
select AMD_SB_CIMX
if SOUTHBRIDGE_AMD_CIMX_SB700
diff --git a/src/southbridge/amd/cimx/sb800/Kconfig b/src/southbridge/amd/cimx/sb800/Kconfig
index 554d8c7..8747f57 100644
--- a/src/southbridge/amd/cimx/sb800/Kconfig
+++ b/src/southbridge/amd/cimx/sb800/Kconfig
@@ -20,7 +20,7 @@
config SOUTHBRIDGE_AMD_CIMX_SB800
bool
default n
- select IOAPIC
+ select IOAPIC if !DRIVERS_GENERIC_IOAPIC
select AMD_SB_CIMX
if SOUTHBRIDGE_AMD_CIMX_SB800
diff --git a/src/southbridge/amd/cimx/sb900/Kconfig b/src/southbridge/amd/cimx/sb900/Kconfig
index aa30e56..6572157 100755
--- a/src/southbridge/amd/cimx/sb900/Kconfig
+++ b/src/southbridge/amd/cimx/sb900/Kconfig
@@ -20,7 +20,7 @@
config SOUTHBRIDGE_AMD_CIMX_SB900
bool
default n
- select IOAPIC
+ select IOAPIC if !DRIVERS_GENERIC_IOAPIC
select AMD_SB_CIMX
if SOUTHBRIDGE_AMD_CIMX_SB900
diff --git a/src/southbridge/amd/sb600/Kconfig b/src/southbridge/amd/sb600/Kconfig
index 4ae4641..d859207 100644
--- a/src/southbridge/amd/sb600/Kconfig
+++ b/src/southbridge/amd/sb600/Kconfig
@@ -19,7 +19,7 @@
config SOUTHBRIDGE_AMD_SB600
bool
- select IOAPIC
+ select IOAPIC if !DRIVERS_GENERIC_IOAPIC
select HAVE_USBDEBUG
select HAVE_HARD_RESET
diff --git a/src/southbridge/amd/sb700/Kconfig b/src/southbridge/amd/sb700/Kconfig
index bde48fe..896b7b7 100644
--- a/src/southbridge/amd/sb700/Kconfig
+++ b/src/southbridge/amd/sb700/Kconfig
@@ -24,7 +24,7 @@ if SOUTHBRIDGE_AMD_SB700
config SOUTHBRIDGE_SPECIFIC_OPTIONS # dummy
def_bool y
- select IOAPIC
+ select IOAPIC if !DRIVERS_GENERIC_IOAPIC
select HAVE_USBDEBUG
select HAVE_HARD_RESET
diff --git a/src/southbridge/amd/sb800/Kconfig b/src/southbridge/amd/sb800/Kconfig
index 4d0e7f6..e0bf81c 100644
--- a/src/southbridge/amd/sb800/Kconfig
+++ b/src/southbridge/amd/sb800/Kconfig
@@ -19,7 +19,7 @@
config SOUTHBRIDGE_AMD_SB800
bool
- select IOAPIC
+ select IOAPIC if !DRIVERS_GENERIC_IOAPIC
select HAVE_USBDEBUG
select HAVE_HARD_RESET
diff --git a/src/southbridge/intel/bd82x6x/Kconfig b/src/southbridge/intel/bd82x6x/Kconfig
index 5dd492c..59ad5ed 100644
--- a/src/southbridge/intel/bd82x6x/Kconfig
+++ b/src/southbridge/intel/bd82x6x/Kconfig
@@ -27,7 +27,7 @@ if SOUTHBRIDGE_INTEL_BD82X6X || SOUTHBRIDGE_INTEL_C216
config SOUTH_BRIDGE_OPTIONS # dummy
def_bool y
- select IOAPIC
+ select IOAPIC if !DRIVERS_GENERIC_IOAPIC
select HAVE_HARD_RESET
select HAVE_USBDEBUG
select HAVE_SMI_HANDLER
diff --git a/src/southbridge/intel/esb6300/Kconfig b/src/southbridge/intel/esb6300/Kconfig
index 01f719e..eb67d29 100644
--- a/src/southbridge/intel/esb6300/Kconfig
+++ b/src/southbridge/intel/esb6300/Kconfig
@@ -1,4 +1,4 @@
config SOUTHBRIDGE_INTEL_ESB6300
bool
- select IOAPIC
+ select IOAPIC if !DRIVERS_GENERIC_IOAPIC
select HAVE_HARD_RESET
diff --git a/src/southbridge/intel/i3100/Kconfig b/src/southbridge/intel/i3100/Kconfig
index e0acc63..b9abe1c 100644
--- a/src/southbridge/intel/i3100/Kconfig
+++ b/src/southbridge/intel/i3100/Kconfig
@@ -1,6 +1,6 @@
config SOUTHBRIDGE_INTEL_I3100
bool
- select IOAPIC
+ select IOAPIC if !DRIVERS_GENERIC_IOAPIC
select HAVE_HARD_RESET
if SOUTHBRIDGE_INTEL_I3100
diff --git a/src/southbridge/intel/i82801ax/Kconfig b/src/southbridge/intel/i82801ax/Kconfig
index 839f735..93d62c0 100644
--- a/src/southbridge/intel/i82801ax/Kconfig
+++ b/src/southbridge/intel/i82801ax/Kconfig
@@ -19,7 +19,7 @@
config SOUTHBRIDGE_INTEL_I82801AX
bool
- select IOAPIC
+ select IOAPIC if !DRIVERS_GENERIC_IOAPIC
select HAVE_HARD_RESET
select USE_WATCHDOG_ON_BOOT
diff --git a/src/southbridge/intel/i82801bx/Kconfig b/src/southbridge/intel/i82801bx/Kconfig
index 162f40a..7238368 100644
--- a/src/southbridge/intel/i82801bx/Kconfig
+++ b/src/southbridge/intel/i82801bx/Kconfig
@@ -19,7 +19,7 @@
config SOUTHBRIDGE_INTEL_I82801BX
bool
- select IOAPIC
+ select IOAPIC if !DRIVERS_GENERIC_IOAPIC
select HAVE_HARD_RESET
select USE_WATCHDOG_ON_BOOT
diff --git a/src/southbridge/intel/i82801cx/Kconfig b/src/southbridge/intel/i82801cx/Kconfig
index 3e01cb8..fda3580 100644
--- a/src/southbridge/intel/i82801cx/Kconfig
+++ b/src/southbridge/intel/i82801cx/Kconfig
@@ -1,4 +1,4 @@
config SOUTHBRIDGE_INTEL_I82801CX
bool
- select IOAPIC
+ select IOAPIC if !DRIVERS_GENERIC_IOAPIC
select HAVE_HARD_RESET
diff --git a/src/southbridge/intel/i82801dx/Kconfig b/src/southbridge/intel/i82801dx/Kconfig
index bad9936..d0c1fb6 100644
--- a/src/southbridge/intel/i82801dx/Kconfig
+++ b/src/southbridge/intel/i82801dx/Kconfig
@@ -21,6 +21,6 @@
config SOUTHBRIDGE_INTEL_I82801DX
bool
- select IOAPIC
+ select IOAPIC if !DRIVERS_GENERIC_IOAPIC
select HAVE_HARD_RESET
select HAVE_SMI_HANDLER
diff --git a/src/southbridge/intel/i82801ex/Kconfig b/src/southbridge/intel/i82801ex/Kconfig
index 23a68b8..4fccbe4 100644
--- a/src/southbridge/intel/i82801ex/Kconfig
+++ b/src/southbridge/intel/i82801ex/Kconfig
@@ -1,5 +1,5 @@
config SOUTHBRIDGE_INTEL_I82801EX
bool
- select IOAPIC
+ select IOAPIC if !DRIVERS_GENERIC_IOAPIC
select HAVE_HARD_RESET
diff --git a/src/southbridge/intel/i82801gx/Kconfig b/src/southbridge/intel/i82801gx/Kconfig
index a991f60..c709a65 100644
--- a/src/southbridge/intel/i82801gx/Kconfig
+++ b/src/southbridge/intel/i82801gx/Kconfig
@@ -19,7 +19,7 @@
config SOUTHBRIDGE_INTEL_I82801GX
bool
- select IOAPIC
+ select IOAPIC if !DRIVERS_GENERIC_IOAPIC
select HAVE_HARD_RESET
select HAVE_USBDEBUG
select USE_WATCHDOG_ON_BOOT
diff --git a/src/southbridge/intel/i82801ix/Kconfig b/src/southbridge/intel/i82801ix/Kconfig
index 36cfefb..1ff924d 100644
--- a/src/southbridge/intel/i82801ix/Kconfig
+++ b/src/southbridge/intel/i82801ix/Kconfig
@@ -20,7 +20,7 @@
config SOUTHBRIDGE_INTEL_I82801IX
bool
- select IOAPIC
+ select IOAPIC if !DRIVERS_GENERIC_IOAPIC
select HAVE_USBDEBUG
select HAVE_HARD_RESET
select USE_WATCHDOG_ON_BOOT
diff --git a/src/southbridge/intel/lynxpoint/Kconfig b/src/southbridge/intel/lynxpoint/Kconfig
index f79e963..f2f8fd3 100644
--- a/src/southbridge/intel/lynxpoint/Kconfig
+++ b/src/southbridge/intel/lynxpoint/Kconfig
@@ -24,7 +24,7 @@ if SOUTHBRIDGE_INTEL_LYNXPOINT
config SOUTH_BRIDGE_OPTIONS # dummy
def_bool y
- select IOAPIC
+ select IOAPIC if !DRIVERS_GENERIC_IOAPIC
select HAVE_HARD_RESET
select HAVE_USBDEBUG
select USE_WATCHDOG_ON_BOOT
diff --git a/src/southbridge/nvidia/ck804/Kconfig b/src/southbridge/nvidia/ck804/Kconfig
index b6f718e..ae4c572 100644
--- a/src/southbridge/nvidia/ck804/Kconfig
+++ b/src/southbridge/nvidia/ck804/Kconfig
@@ -2,7 +2,7 @@ config SOUTHBRIDGE_NVIDIA_CK804
bool
select HAVE_HARD_RESET
select HAVE_USBDEBUG
- select IOAPIC
+ select IOAPIC if !DRIVERS_GENERIC_IOAPIC
if SOUTHBRIDGE_NVIDIA_CK804
diff --git a/src/southbridge/nvidia/mcp55/Kconfig b/src/southbridge/nvidia/mcp55/Kconfig
index cd6009d..2e805db 100644
--- a/src/southbridge/nvidia/mcp55/Kconfig
+++ b/src/southbridge/nvidia/mcp55/Kconfig
@@ -1,7 +1,7 @@
config SOUTHBRIDGE_NVIDIA_MCP55
bool
select HAVE_USBDEBUG
- select IOAPIC
+ select IOAPIC if !DRIVERS_GENERIC_IOAPIC
select HAVE_HARD_RESET
if SOUTHBRIDGE_NVIDIA_MCP55
diff --git a/src/southbridge/sis/sis966/Kconfig b/src/southbridge/sis/sis966/Kconfig
index 03dd6b1..ffea627 100644
--- a/src/southbridge/sis/sis966/Kconfig
+++ b/src/southbridge/sis/sis966/Kconfig
@@ -1,6 +1,6 @@
config SOUTHBRIDGE_SIS_SIS966
bool
- select IOAPIC
+ select IOAPIC if !DRIVERS_GENERIC_IOAPIC
select HAVE_USBDEBUG
select HAVE_HARD_RESET
diff --git a/src/southbridge/via/vt8237r/Kconfig b/src/southbridge/via/vt8237r/Kconfig
index c3854c9..9a6d68d 100644
--- a/src/southbridge/via/vt8237r/Kconfig
+++ b/src/southbridge/via/vt8237r/Kconfig
@@ -20,7 +20,7 @@
config SOUTHBRIDGE_VIA_VT8237R
bool
select HAVE_DEBUG_SMBUS
- select IOAPIC
+ select IOAPIC if !DRIVERS_GENERIC_IOAPIC
if SOUTHBRIDGE_VIA_VT8237R
More information about the coreboot-gerrit
mailing list