[coreboot-gerrit] Patch set updated for coreboot: Hack up per-board user selectable 64bit scheme

[Stefan Reinauer]

Stefan Reinauer ([e-mail]) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/11109

-gerrit

commit 39f5d780d168d48ebb07462f41a28ad8317adefa
Author: Stefan Reinauer 
Date:   Fri Jul 31 16:57:40 2015 -0700

Hack up per-board user selectable 64bit scheme

Change-Id: I91b1316896e69b081c861d99ff0c04be3c1d90c1
    Signed-off-by: Stefan Reinauer 
---
 src/arch/x86/Kconfig                |  5 +++++
 src/cpu/amd/agesa/Kconfig           | 12 ++++++++----
 src/mainboard/asrock/e350m1/Kconfig |  1 +
 3 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/src/arch/x86/Kconfig b/src/arch/x86/Kconfig
index 88b2592..8905266 100644
--- a/src/arch/x86/Kconfig
+++ b/src/arch/x86/Kconfig
@@ -138,3 +138,8 @@ config ID_SECTION_OFFSET
 config COMPILE_IN_DSDT
    bool "compile in DSDT and use that over DSDT in CBFS"
    default n
+
+config BOARD_HAS_64BIT
+	bool "Compile 64bit coreboot"
+	depends on ARCH_X86
+	default n
diff --git a/src/cpu/amd/agesa/Kconfig b/src/cpu/amd/agesa/Kconfig
index 45e1d63..e3fee59 100644
--- a/src/cpu/amd/agesa/Kconfig
+++ b/src/cpu/amd/agesa/Kconfig
@@ -27,10 +27,14 @@ config CPU_AMD_AGESA
    default y if CPU_AMD_AGESA_FAMILY15_RL
    default y if CPU_AMD_AGESA_FAMILY16_KB
    default n
-	select ARCH_BOOTBLOCK_X86_64
-	select ARCH_VERSTAGE_X86_64
-	select ARCH_ROMSTAGE_X86_64
-	select ARCH_RAMSTAGE_X86_64
+	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 TSC_SYNC_LFENCE
    select UDELAY_LAPIC
    select LAPIC_MONOTONIC_TIMER
diff --git a/src/mainboard/asrock/e350m1/Kconfig b/src/mainboard/asrock/e350m1/Kconfig
index ff3e8f4..a2d0a5a 100644
--- a/src/mainboard/asrock/e350m1/Kconfig
+++ b/src/mainboard/asrock/e350m1/Kconfig
@@ -32,6 +32,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy
    select HAVE_ACPI_TABLES
    select BOARD_ROMSIZE_KB_4096
    select GFXUMA
+	select BOARD_HAS_64BIT

config MAINBOARD_DIR
    string