diff options
| author | Gabe Black <gabeblack@google.com> | 2014-04-03 14:00:13 -0700 |
|---|---|---|
| committer | Marc Jones <marc.jones@se-eng.com> | 2014-12-15 23:27:53 +0100 |
| commit | 2339a3030bc8c8884b1ed28c1e52d94c113a4f1d (patch) | |
| tree | 4adfb823d5b2c2e8af8aa127023d4881d9e2cf73 /src/arch | |
| parent | 638015b98b918655fde3ca46cf437c44bd49039f (diff) | |
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@google.com>
Original-Reviewed-on: https://chromium-review.googlesource.com/193165
Original-Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Original-Commit-Queue: Gabe Black <gabeblack@chromium.org>
Original-Tested-by: Gabe Black <gabeblack@chromium.org>
(cherry picked from commit 4f38c073bfe469a753e168391787fdd7bc5c34d9)
Signed-off-by: Marc Jones <marc.jones@se-eng.com>
Change-Id: I979037fe8cda885cc516d79f3151ca1fc77adca3
Reviewed-on: http://review.coreboot.org/7746
Tested-by: build bot (Jenkins)
Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
Diffstat (limited to 'src/arch')
| -rw-r--r-- | src/arch/arm/Kconfig | 4 | ||||
| -rw-r--r-- | src/arch/arm/bootblock.ld | 2 | ||||
| -rw-r--r-- | src/arch/arm/romstage.ld | 2 |
3 files changed, 8 insertions, 0 deletions
diff --git a/src/arch/arm/Kconfig b/src/arch/arm/Kconfig index 7ec5812417..57849a64fc 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 8d05c7b5a5..150bf2df6b 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 04d8f4b339..8c3204609f 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) |