sravan/system76-coreboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

CBMEM console: Fix and enhance pre-RAM support

Browse Source 
Use the value of CONSOLE_PRERAM_BUFFER_SIZE to determine if we can
do CBMEM console in bootblock and romstage. Kconfig forces it to zero
if _BASE is unset or we cannot do CAR migration on x86.

Add CBMEM console to bootblock, except for x86. Only one of bootblock
and romstage clears the pre-RAM buffer.

To start with empty console log on S3 wakeup, ramstage now clears
previous contents of CBMEM buffer if there was no pre-RAM buffer.

Unify Kconfig variable naming.

TODO: ARM configurations do not define PRERAM_BUFFER_BASE values.

Change-Id: I70d82da629529dbfd7bc9491223abd703cbc0115
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: http://review.coreboot.org/7862
Tested-by: build bot (Jenkins)
Reviewed-by: Aaron Durbin <adurbin@google.com>
This commit is contained in:
Kyösti Mälkki
2014-12-21 08:55:47 +02:00
parent 4d10750d13
commit 8659e4072e
10 changed files with 66 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/arch/arm/Kconfig
View File

@@ -24,10 +24,6 @@ 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

4
src/arch/arm/bootblock.ld
View File

@@ -49,8 +49,8 @@ SECTIONS
*(.sbss.*);
} : to_load = 0xff
preram_cbmem_console = CONFIG_CBMEM_CONSOLE_PRERAM_BASE;
verstage_preram_cbmem_console = CONFIG_CBMEM_CONSOLE_PRERAM_BASE;
preram_cbmem_console = CONFIG_CONSOLE_PRERAM_BUFFER_BASE;
verstage_preram_cbmem_console = CONFIG_CONSOLE_PRERAM_BUFFER_BASE;
/DISCARD/ : {
*(.comment)

2
src/arch/arm/romstage.ld
View File

@@ -69,7 +69,7 @@ SECTIONS
_end = .;
preram_cbmem_console = CONFIG_CBMEM_CONSOLE_PRERAM_BASE;
preram_cbmem_console = CONFIG_CONSOLE_PRERAM_BUFFER_BASE;
/* Discard the sections we don't need/want */
/DISCARD/ : {