- 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

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

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
+
+