[coreboot-gerrit] Patch set updated for coreboot: DO NOT SUBMIT: run 64 bit builds on all x86 boards

[Stefan Reinauer (stefan.reinauer@coreboot.org)]

Stefan Reinauer (stefan.reinauer at coreboot.org) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/11111

-gerrit

commit e8923e3b5bf24777c260e5ce47674a18ac61a041
Author: Stefan Reinauer <reinauer at chromium.org>
Date:   Sat Aug 1 14:40:01 2015 -0700

    DO NOT SUBMIT: run 64 bit builds on all x86 boards
    
    Change-Id: Ia3f30ead6bd4a70967de0dd66544cf301b7b592a
    Signed-off-by: Stefan Reinauer <stefan.reinauer at coreboot.org>
---
 src/arch/x86/Kconfig                     |  2 +-
 src/cpu/amd/model_10xxx/Kconfig          | 12 ++++++++----
 src/cpu/amd/model_fxx/Kconfig            | 12 ++++++++----
 src/mainboard/packardbell/ms2290/Kconfig | 11 ++++++++---
 4 files changed, 25 insertions(+), 12 deletions(-)

diff --git a/src/arch/x86/Kconfig b/src/arch/x86/Kconfig
index 8905266..7b579ee 100644
--- a/src/arch/x86/Kconfig
+++ b/src/arch/x86/Kconfig
@@ -142,4 +142,4 @@ config COMPILE_IN_DSDT
 config BOARD_HAS_64BIT
 	bool "Compile 64bit coreboot"
 	depends on ARCH_X86
-	default n
+	default y
diff --git a/src/cpu/amd/model_10xxx/Kconfig b/src/cpu/amd/model_10xxx/Kconfig
index ebd282a..659ad82 100644
--- a/src/cpu/amd/model_10xxx/Kconfig
+++ b/src/cpu/amd/model_10xxx/Kconfig
@@ -1,9 +1,13 @@
 config CPU_AMD_MODEL_10XXX
 	bool
-	select ARCH_BOOTBLOCK_X86_32
-	select ARCH_VERSTAGE_X86_32
-	select ARCH_ROMSTAGE_X86_32
-	select ARCH_RAMSTAGE_X86_32
+	select ARCH_BOOTBLOCK_X86_64 if BOARD_HAS_64BIT
+	select ARCH_VERSTAGE_X86_64 if BOARD_HAS_64BIT
+	select ARCH_ROMSTAGE_X86_64 if BOARD_HAS_64BIT
+	select ARCH_RAMSTAGE_X86_64 if BOARD_HAS_64BIT
+	select ARCH_BOOTBLOCK_X86_32 if !BOARD_HAS_64BIT
+	select ARCH_VERSTAGE_X86_32 if !BOARD_HAS_64BIT
+	select ARCH_ROMSTAGE_X86_32 if !BOARD_HAS_64BIT
+	select ARCH_RAMSTAGE_X86_32 if !BOARD_HAS_64BIT
 	select SSE
 	select SSE2
 	select MMCONF_SUPPORT_DEFAULT
diff --git a/src/cpu/amd/model_fxx/Kconfig b/src/cpu/amd/model_fxx/Kconfig
index 1172d29..738caa3 100644
--- a/src/cpu/amd/model_fxx/Kconfig
+++ b/src/cpu/amd/model_fxx/Kconfig
@@ -1,9 +1,13 @@
 config CPU_AMD_MODEL_FXX
 	bool
-	select ARCH_BOOTBLOCK_X86_32
-	select ARCH_VERSTAGE_X86_32
-	select ARCH_ROMSTAGE_X86_32
-	select ARCH_RAMSTAGE_X86_32
+	select ARCH_BOOTBLOCK_X86_64 if BOARD_HAS_64BIT
+	select ARCH_VERSTAGE_X86_64 if BOARD_HAS_64BIT
+	select ARCH_ROMSTAGE_X86_64 if BOARD_HAS_64BIT
+	select ARCH_RAMSTAGE_X86_64 if BOARD_HAS_64BIT
+	select ARCH_BOOTBLOCK_X86_32 if !BOARD_HAS_64BIT
+	select ARCH_VERSTAGE_X86_32 if !BOARD_HAS_64BIT
+	select ARCH_ROMSTAGE_X86_32 if !BOARD_HAS_64BIT
+	select ARCH_RAMSTAGE_X86_32 if !BOARD_HAS_64BIT
 	select MMX
 	select SSE
 	select SSE2
diff --git a/src/mainboard/packardbell/ms2290/Kconfig b/src/mainboard/packardbell/ms2290/Kconfig
index 3ea302a..480dc3c 100644
--- a/src/mainboard/packardbell/ms2290/Kconfig
+++ b/src/mainboard/packardbell/ms2290/Kconfig
@@ -3,9 +3,14 @@ if BOARD_PACKARDBELL_MS2290
 config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
 	select SYSTEM_TYPE_LAPTOP
-	select ARCH_BOOTBLOCK_X86_32
-	select ARCH_ROMSTAGE_X86_32
-	select ARCH_RAMSTAGE_X86_32
+	select ARCH_BOOTBLOCK_X86_64 if BOARD_HAS_64BIT
+	select ARCH_VERSTAGE_X86_64 if BOARD_HAS_64BIT
+	select ARCH_ROMSTAGE_X86_64 if BOARD_HAS_64BIT
+	select ARCH_RAMSTAGE_X86_64 if BOARD_HAS_64BIT
+	select ARCH_BOOTBLOCK_X86_32 if !BOARD_HAS_64BIT
+	select ARCH_VERSTAGE_X86_32 if !BOARD_HAS_64BIT
+	select ARCH_ROMSTAGE_X86_32 if !BOARD_HAS_64BIT
+	select ARCH_RAMSTAGE_X86_32 if !BOARD_HAS_64BIT
 	select NORTHBRIDGE_INTEL_NEHALEM
 	select SOUTHBRIDGE_INTEL_IBEXPEAK
 	select HAVE_OPTION_TABLE