summaryrefslogtreecommitdiff
path: root/src/arch
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/arch
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/arch')
-rw-r--r--src/arch/x86/Kconfig23
1 files changed, 12 insertions, 11 deletions
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