[coreboot-gerrit] Patch set updated for coreboot: console: Simplify bootblock console Kconfig selection logic

Alexandru Gagniuc (mr.nuke.me@gmail.com) gerrit at coreboot.org
Wed Jan 20 21:43:12 CET 2016


Alexandru Gagniuc (mr.nuke.me at gmail.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/12871

-gerrit

commit 59a6979d6d3cf2d63bf312333eee01c0a9b0decc
Author: Alexandru Gagniuc <mr.nuke.me at gmail.com>
Date:   Fri Oct 2 18:01:18 2015 -0700

    console: Simplify bootblock console Kconfig selection logic
    
    Instead of depending BOOTBLOCK_CONSOLE on a set of architectures,
    allow the arch or platform to specify whether it can provide a C
    environment. This simplifies the selection logic.
    
    Change-Id: Ia3e41796d9aea197cee0a073acce63761823c3aa
    Signed-off-by: Alexandru Gagniuc <alexandrux.gagniuc at intel.com>
---
 src/Kconfig            | 6 ++++++
 src/arch/arm/Kconfig   | 1 +
 src/arch/arm64/Kconfig | 1 +
 src/arch/mips/Kconfig  | 1 +
 src/arch/riscv/Kconfig | 1 +
 src/console/Kconfig    | 2 +-
 6 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/Kconfig b/src/Kconfig
index 6a0209d..f09e506 100644
--- a/src/Kconfig
+++ b/src/Kconfig
@@ -271,6 +271,12 @@ config BOOTBLOCK_SOURCE
 	default "bootblock_simple.c" if BOOTBLOCK_SIMPLE
 	default "bootblock_normal.c" if BOOTBLOCK_NORMAL
 
+# To be selected by arch or platform if a C environment is available during the
+# bootblock. Normally this signifies availability of RW memory (e.g. SRAM).
+config C_ENVIRONMENT_BOOTBLOCK
+       bool
+       default n
+
 config SKIP_MAX_REBOOT_CNT_CLEAR
 	bool "Do not clear reboot count after successful boot"
 	default n
diff --git a/src/arch/arm/Kconfig b/src/arch/arm/Kconfig
index 9f14dda..6d9cc78 100644
--- a/src/arch/arm/Kconfig
+++ b/src/arch/arm/Kconfig
@@ -6,6 +6,7 @@ config ARCH_BOOTBLOCK_ARM
 	bool
 	default n
 	select ARCH_ARM
+	select C_ENVIRONMENT_BOOTBLOCK
 
 config ARCH_VERSTAGE_ARM
 	bool
diff --git a/src/arch/arm64/Kconfig b/src/arch/arm64/Kconfig
index 21bbc9b..4f4b33b 100644
--- a/src/arch/arm64/Kconfig
+++ b/src/arch/arm64/Kconfig
@@ -6,6 +6,7 @@ config ARCH_BOOTBLOCK_ARM64
 	bool
 	default n
 	select ARCH_ARM64
+	select C_ENVIRONMENT_BOOTBLOCK
 
 config ARCH_VERSTAGE_ARM64
 	bool
diff --git a/src/arch/mips/Kconfig b/src/arch/mips/Kconfig
index d0489ac..9e51d9c 100644
--- a/src/arch/mips/Kconfig
+++ b/src/arch/mips/Kconfig
@@ -23,6 +23,7 @@ config ARCH_BOOTBLOCK_MIPS
 	default n
 	select ARCH_MIPS
 	select BOOTBLOCK_CUSTOM
+	select C_ENVIRONMENT_BOOTBLOCK
 
 config ARCH_VERSTAGE_MIPS
 	bool
diff --git a/src/arch/riscv/Kconfig b/src/arch/riscv/Kconfig
index 1849335..9a35cf2 100644
--- a/src/arch/riscv/Kconfig
+++ b/src/arch/riscv/Kconfig
@@ -7,6 +7,7 @@ config ARCH_BOOTBLOCK_RISCV
 	default n
 	select ARCH_RISCV
 	select BOOTBLOCK_CUSTOM
+	select C_ENVIRONMENT_BOOTBLOCK
 
 config ARCH_VERSTAGE_RISCV
 	bool
diff --git a/src/console/Kconfig b/src/console/Kconfig
index 73c6b28..85b04ef 100644
--- a/src/console/Kconfig
+++ b/src/console/Kconfig
@@ -2,7 +2,7 @@ menu "Console"
 
 config BOOTBLOCK_CONSOLE
 	bool "Enable early (bootblock) console output."
-	depends on ARCH_ARM || ARCH_ARM64 || ARCH_RISCV || ARCH_MIPS
+	depends on C_ENVIRONMENT_BOOTBLOCK
 	default n
 	help
 	  Use console during the bootblock if supported



More information about the coreboot-gerrit mailing list