Make PCI CONF2 support a compile time option

[coreboot.git] / src / arch / x86 / Kconfig

diff --git a/src/arch/x86/Kconfig b/src/arch/x86/Kconfig
index ef86d99119941a0417cda3cc7c2549b4679f3fdd..f49d09b8729f7945609c7a839e3b4895ad22742c 100644 (file)
--- a/src/arch/x86/Kconfig
+++ b/src/arch/x86/Kconfig
@@ -1,8 +1,4 @@
-# This option is used to set the architecture of a mainboard to X86.
-# It is usually set in mainboard/*/Kconfig.
-config ARCH_X86
-       bool
-       default n
+menu "Architecture (x86)"
 
 # This is an SMP option. It relates to starting up APs.
 # It is usually set in mainboard/*/Kconfig.
@@ -12,20 +8,6 @@ config AP_IN_SIPI_WAIT
        default n
        depends on ARCH_X86
 
-# This is the name of the respective architecture subdirectory in arch/.
-config ARCH
-       string
-       default i386
-       depends on ARCH_X86
-
-config ROMBASE
-       hex
-       default 0xffff0000
-
-config ROM_IMAGE_SIZE
-       hex
-       default 0x10000
-
 config RAMBASE
        hex
        default 0x100000
@@ -44,37 +26,29 @@ config MAX_REBOOT_CNT
        int
        default 3
 
-config TINY_BOOTBLOCK
-       bool
-       default n
-
-config BIG_BOOTBLOCK
-       bool
-       default n if TINY_BOOTBLOCK
-       default y
-
+# We had to rename the choice options under arch/ because otherwise
+# the options would conflict between different architectures despite
+# the if ARCH_xxx guarding the arch/xxx/Kconfig sourcing.
 choice
        prompt "Bootblock behaviour"
-       default BOOTBLOCK_SIMPLE
-       depends on TINY_BOOTBLOCK
+       default X86_BOOTBLOCK_SIMPLE
 
-config BOOTBLOCK_SIMPLE
+config X86_BOOTBLOCK_SIMPLE
        bool "Always load fallback"
 
-config BOOTBLOCK_NORMAL
+config X86_BOOTBLOCK_NORMAL
        bool "Switch to normal if CMOS says so"
 
 endchoice
 
 config BOOTBLOCK_SOURCE
        string
-       default "bootblock_simple.c" if BOOTBLOCK_SIMPLE
-       default "bootblock_normal.c" if BOOTBLOCK_NORMAL
+       default "bootblock_simple.c" if X86_BOOTBLOCK_SIMPLE
+       default "bootblock_normal.c" if X86_BOOTBLOCK_NORMAL
 
 config UPDATE_IMAGE
        bool "Update existing coreboot.rom image"
        default n
-       depends on TINY_BOOTBLOCK
        help
          If this option is enabled, no new coreboot.rom file
          is created. Instead it is expected that there already
@@ -85,8 +59,49 @@ config ROMCC
        bool
        default n
 
+config PC80_SYSTEM
+       bool
+       default y
+
 config BOOTBLOCK_NORTHBRIDGE_INIT
        string
 
+config HAVE_CMOS_DEFAULT
+       def_bool n
+
+config CMOS_DEFAULT_FILE
+       string
+       depends on HAVE_CMOS_DEFAULT
+
 config BOOTBLOCK_SOUTHBRIDGE_INIT
        string
+
+config HAVE_ARCH_MEMSET
+       bool
+       default y
+
+config HAVE_ARCH_MEMCPY
+       bool
+       default y
+
+config BIG_ENDIAN
+       bool
+       default n
+
+config LITTLE_ENDIAN
+       bool
+       default !BIG_ENDIAN
+
+config IOAPIC_INTERRUPTS_ON_FSB
+       bool
+       default y if !IOAPIC_INTERRUPTS_ON_APIC_SERIAL_BUS
+
+config IOAPIC_INTERRUPTS_ON_APIC_SERIAL_BUS
+       bool
+       default n
+
+config PCI_CONF2
+       bool
+       default n
+
+endmenu