summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAlexandru Gagniuc <mr.nuke.me@gmail.com>2015-10-02 18:01:18 -0700
committerAaron Durbin <adurbin@chromium.org>2016-01-21 05:37:27 +0100
commitee464b17ced5a4e85327bb11b42a663213393903 (patch)
tree2806f2f0752a649686aa562a859c00bb722fa5a7 /src
parentcc96624de4b7b80a7c502d5a99197a71be7a0cf6 (diff)
downloadcoreboot-ee464b17ced5a4e85327bb11b42a663213393903.tar.xz
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@intel.com> Reviewed-on: https://review.coreboot.org/12871 Tested-by: build bot (Jenkins) Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Diffstat (limited to 'src')
-rw-r--r--src/Kconfig6
-rw-r--r--src/arch/arm/Kconfig1
-rw-r--r--src/arch/arm64/Kconfig1
-rw-r--r--src/arch/mips/Kconfig1
-rw-r--r--src/arch/riscv/Kconfig1
-rw-r--r--src/console/Kconfig2
6 files changed, 11 insertions, 1 deletions
diff --git a/src/Kconfig b/src/Kconfig
index 6a0209dad3..f09e5061a2 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 9f14dda4e7..6d9cc7820a 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 21bbc9b939..4f4b33b077 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 d0489ace4b..9e51d9cf13 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 1849335386..9a35cf29ff 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 73c6b282a3..85b04ef48e 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