[coreboot] [commit] r6186 - in trunk/src: . arch/x86 cpu cpu/x86
repository service
svn at coreboot.org
Fri Dec 17 00:37:24 CET 2010
Author: stepan
Date: Fri Dec 17 00:37:17 2010
New Revision: 6186
URL: https://tracker.coreboot.org/trac/coreboot/changeset/6186
Log:
- Fix shortcoming in Kconfig when handling multiple "choice"s
- move some variables where they belong
Signed-off-by: Stefan Reinauer <stepan at coreboot.org>
Acked-by: Stefan Reinauer <stepan at coreboot.org>
Modified:
trunk/src/Kconfig
trunk/src/arch/x86/Kconfig
trunk/src/cpu/Kconfig
trunk/src/cpu/x86/Kconfig
Modified: trunk/src/Kconfig
==============================================================================
--- trunk/src/Kconfig Fri Dec 17 00:24:27 2010 (r6185)
+++ trunk/src/Kconfig Fri Dec 17 00:37:17 2010 (r6186)
@@ -101,7 +101,16 @@
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_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
Modified: trunk/src/arch/x86/Kconfig
==============================================================================
--- trunk/src/arch/x86/Kconfig Fri Dec 17 00:24:27 2010 (r6185)
+++ trunk/src/arch/x86/Kconfig Fri Dec 17 00:37:17 2010 (r6186)
@@ -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 @@
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 @@
bool
default n
+config PC80_SYSTEM
+ bool
+ default y
+
config BOOTBLOCK_NORTHBRIDGE_INIT
string
Modified: trunk/src/cpu/Kconfig
==============================================================================
--- trunk/src/cpu/Kconfig Fri Dec 17 00:24:27 2010 (r6185)
+++ trunk/src/cpu/Kconfig Fri Dec 17 00:37:17 2010 (r6186)
@@ -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 @@
help
Unset this if you don't want the MTRR code to use
subtractive MTRRs
+
+endif # ARCH_X86
Modified: trunk/src/cpu/x86/Kconfig
==============================================================================
--- trunk/src/cpu/x86/Kconfig Fri Dec 17 00:24:27 2010 (r6185)
+++ trunk/src/cpu/x86/Kconfig Fri Dec 17 00:37:17 2010 (r6186)
@@ -30,3 +30,13 @@
config XIP_ROM_SIZE
hex
default 0x10000
+
+config CPU_ADDR_BITS
+ int
+ default 36
+
+config LOGICAL_CPUS
+ bool
+ default y
+
+
More information about the coreboot
mailing list