summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorStefan Reinauer <stepan@coreboot.org>2010-12-16 23:37:17 +0000
committerStefan Reinauer <stepan@openbios.org>2010-12-16 23:37:17 +0000
commit8aedcbc436db37986d6e8a41873ac5c523a8df0a (patch)
treefb022003f2b3878451e6402adcddd6d97de6bc7e /src
parent259a39f3930a4032f0ebc8946d26549c5a79bcea (diff)
downloadcoreboot-8aedcbc436db37986d6e8a41873ac5c523a8df0a.tar.xz
- Fix shortcoming in Kconfig when handling multiple "choice"s
- move some variables where they belong Signed-off-by: Stefan Reinauer <stepan@coreboot.org> Acked-by: Stefan Reinauer <stepan@coreboot.org> git-svn-id: svn://svn.coreboot.org/coreboot/trunk@6186 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
Diffstat (limited to 'src')
-rw-r--r--src/Kconfig18
-rw-r--r--src/arch/x86/Kconfig23
-rw-r--r--src/cpu/Kconfig4
-rw-r--r--src/cpu/x86/Kconfig10
4 files changed, 35 insertions, 20 deletions
diff --git a/src/Kconfig b/src/Kconfig
index 4c1fcf46ac..ca28feb836 100644
--- a/src/Kconfig
+++ b/src/Kconfig
@@ -101,7 +101,16 @@ config USE_OPTION_TABLE
endmenu
source src/mainboard/Kconfig
+
+# 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
+
+if ARCH_X86
source src/arch/x86/Kconfig
+endif
menu "Chipset"
@@ -133,15 +142,6 @@ config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID
config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID
hex
default 0x0
-
-config CPU_ADDR_BITS
- int
- default 36
-
-config LOGICAL_CPUS
- bool
- default y
-
config PCI_ROM_RUN
bool
default n
diff --git a/src/arch/x86/Kconfig b/src/arch/x86/Kconfig
index ef86d99119..6591159095 100644
--- a/src/arch/x86/Kconfig
+++ b/src/arch/x86/Kconfig
@@ -1,9 +1,3 @@
-# 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
-
# This is an SMP option. It relates to starting up APs.
# It is usually set in mainboard/*/Kconfig.
# TODO: Improve description.
@@ -53,23 +47,26 @@ config BIG_BOOTBLOCK
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
+ default X86_BOOTBLOCK_SIMPLE
depends on TINY_BOOTBLOCK
-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"
@@ -85,6 +82,10 @@ config ROMCC
bool
default n
+config PC80_SYSTEM
+ bool
+ default y
+
config BOOTBLOCK_NORTHBRIDGE_INIT
string
diff --git a/src/cpu/Kconfig b/src/cpu/Kconfig
index 1031db0bb6..6e6518618b 100644
--- a/src/cpu/Kconfig
+++ b/src/cpu/Kconfig
@@ -1,3 +1,5 @@
+if ARCH_X86
+
source src/cpu/amd/Kconfig
source src/cpu/intel/Kconfig
source src/cpu/via/Kconfig
@@ -57,3 +59,5 @@ config VAR_MTRR_HOLE
help
Unset this if you don't want the MTRR code to use
subtractive MTRRs
+
+endif # ARCH_X86
diff --git a/src/cpu/x86/Kconfig b/src/cpu/x86/Kconfig
index 3658ee7edc..ec559b5043 100644
--- a/src/cpu/x86/Kconfig
+++ b/src/cpu/x86/Kconfig
@@ -30,3 +30,13 @@ config XIP_ROM_BASE
config XIP_ROM_SIZE
hex
default 0x10000
+
+config CPU_ADDR_BITS
+ int
+ default 36
+
+config LOGICAL_CPUS
+ bool
+ default y
+
+