[coreboot-gerrit] New patch to review for coreboot: 810305e arm: Add support for a preram_cbmem_console symbol.

[Marc Jones (marc.jones@se-eng.com)]

Marc Jones (marc.jones at se-eng.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/7746

-gerrit

commit 810305e996cc344678b7281413743d365261ea0c
Author: Gabe Black <gabeblack at google.com>
Date:   Thu Apr 3 14:00:13 2014 -0700

    arm: Add support for a preram_cbmem_console symbol.
    
    This symbol is set using a config variable which can be set to something
    appropriate by the SOC. If it isn't, the symbol is set to 0 which should be
    caught by checks in the cbmem console itself.
    
    BUG=None
    TEST=Built for nyan with a cbmem buffer location set. Built for peach_pit
    without a location set.
    BRANCH=None
    
    Original-Change-Id: I92cd65bb6767a67637faf1dd3cdbe03e433724a9
    Original-Signed-off-by: Gabe Black <gabeblack at google.com>
    Original-Reviewed-on: https://chromium-review.googlesource.com/193165
    Original-Reviewed-by: Aaron Durbin <adurbin at chromium.org>
    Original-Commit-Queue: Gabe Black <gabeblack at chromium.org>
    Original-Tested-by: Gabe Black <gabeblack at chromium.org>
    (cherry picked from commit 4f38c073bfe469a753e168391787fdd7bc5c34d9)
    Signed-off-by: Marc Jones <marc.jones at se-eng.com>
    
    Change-Id: I979037fe8cda885cc516d79f3151ca1fc77adca3
---
 src/arch/arm/Kconfig      | 4 ++++
 src/arch/arm/bootblock.ld | 2 ++
 src/arch/arm/romstage.ld  | 2 ++
 3 files changed, 8 insertions(+)

diff --git a/src/arch/arm/Kconfig b/src/arch/arm/Kconfig
index 7ec5812..57849a6 100644
--- a/src/arch/arm/Kconfig
+++ b/src/arch/arm/Kconfig
@@ -20,6 +20,10 @@ config ARM_BOOTBLOCK_CUSTOM
 	bool
 	default n
 
+config CBMEM_CONSOLE_PRERAM_BASE
+	hex
+	depends on CONSOLE_CBMEM
+
 config CPU_HAS_BOOTBLOCK_INIT
 	bool
 	default n
diff --git a/src/arch/arm/bootblock.ld b/src/arch/arm/bootblock.ld
index 8d05c7b..150bf2d 100644
--- a/src/arch/arm/bootblock.ld
+++ b/src/arch/arm/bootblock.ld
@@ -49,6 +49,8 @@ SECTIONS
 		*(.sbss.*);
 	} : to_load = 0xff
 
+	preram_cbmem_console = CONFIG_CBMEM_CONSOLE_PRERAM_BASE;
+
 	/DISCARD/ : {
 		*(.comment)
 		*(.note)
diff --git a/src/arch/arm/romstage.ld b/src/arch/arm/romstage.ld
index 04d8f4b..8c32046 100644
--- a/src/arch/arm/romstage.ld
+++ b/src/arch/arm/romstage.ld
@@ -69,6 +69,8 @@ SECTIONS
 
 	_end = .;
 
+	preram_cbmem_console = CONFIG_CBMEM_CONSOLE_PRERAM_BASE;
+
 	/* Discard the sections we don't need/want */
 	/DISCARD/ : {
 		*(.comment)