diff options
| author | Kyösti Mälkki <kyosti.malkki@gmail.com> | 2019-09-13 10:49:20 +0300 |
|---|---|---|
| committer | Kyösti Mälkki <kyosti.malkki@gmail.com> | 2019-09-14 11:16:17 +0000 |
| commit | e3acc8fcf3f1cbf4a527cfcd6aa9aba9bd9d5e2b (patch) | |
| tree | e3e162a29482d6b4e0928f2f440881a4e43368d9 /src/lib/cbmem_console.c | |
| parent | 4a637802fa6fd8c532ce32e6595298e60e84f6d6 (diff) | |
| download | coreboot-e3acc8fcf3f1cbf4a527cfcd6aa9aba9bd9d5e2b.tar.gz coreboot-e3acc8fcf3f1cbf4a527cfcd6aa9aba9bd9d5e2b.tar.bz2 coreboot-e3acc8fcf3f1cbf4a527cfcd6aa9aba9bd9d5e2b.zip | |
src/: Replace some __PRE_RAM__ use
Change-Id: Iaa56e7b98aad33eeb876edd7465c56c80fd1ac18
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/35398
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Diffstat (limited to 'src/lib/cbmem_console.c')
| -rw-r--r-- | src/lib/cbmem_console.c | 23 |
1 files changed, 8 insertions, 15 deletions
diff --git a/src/lib/cbmem_console.c b/src/lib/cbmem_console.c index 18c3b71b4ff3..7876ff510ac5 100644 --- a/src/lib/cbmem_console.c +++ b/src/lib/cbmem_console.c @@ -51,16 +51,11 @@ _Static_assert(CONFIG_CONSOLE_CBMEM_BUFFER_SIZE <= MAX_SIZE, static struct cbmem_console *cbmem_console_p CAR_GLOBAL; -#ifdef __PRE_RAM__ /* * While running from ROM, before DRAM is initialized, some area in cache as * RAM space is used for the console buffer storage. The size and location of * the area are defined by the linker script with _(e)preram_cbmem_console. - */ - -#else - -/* + * * When running from RAM, some console output is generated before CBMEM is * reinitialized. This static buffer is used to store that output temporarily, * to be concatenated with the CBMEM console buffer contents accumulated @@ -69,7 +64,6 @@ static struct cbmem_console *cbmem_console_p CAR_GLOBAL; #define STATIC_CONSOLE_SIZE 1024 static u8 static_console[STATIC_CONSOLE_SIZE]; -#endif static struct cbmem_console *current_console(void) { @@ -107,14 +101,13 @@ static void init_console_ptr(void *storage, u32 total_space) void cbmemc_init(void) { -#ifdef __PRE_RAM__ - /* Pre-RAM environments use special buffer placed by linker script. */ - init_console_ptr(_preram_cbmem_console, - REGION_SIZE(preram_cbmem_console)); -#else - /* Post-RAM uses static (BSS) buffer before CBMEM is reinitialized. */ - init_console_ptr(static_console, sizeof(static_console)); -#endif + if (ENV_ROMSTAGE_OR_BEFORE) { + /* Pre-RAM environments use special buffer placed by linker script. */ + init_console_ptr(_preram_cbmem_console, REGION_SIZE(preram_cbmem_console)); + } else { + /* Post-RAM uses static (BSS) buffer before CBMEM is reinitialized. */ + init_console_ptr(static_console, sizeof(static_console)); + } } void cbmemc_tx_byte(unsigned char data) |