diff options
Diffstat (limited to 'src/arch')
| -rw-r--r-- | src/arch/arm/include/arch/early_variables.h | 1 | ||||
| -rw-r--r-- | src/arch/x86/include/arch/early_variables.h | 2 | ||||
| -rw-r--r-- | src/arch/x86/init/romstage.ld | 14 |
3 files changed, 7 insertions, 10 deletions
diff --git a/src/arch/arm/include/arch/early_variables.h b/src/arch/arm/include/arch/early_variables.h index 041d0ae7ad..5b58baa271 100644 --- a/src/arch/arm/include/arch/early_variables.h +++ b/src/arch/arm/include/arch/early_variables.h @@ -21,7 +21,6 @@ #define ARCH_EARLY_VARIABLES_H #define CAR_GLOBAL -#define CAR_CBMEM #define CAR_MIGRATE(migrate_fn_) static inline void *car_get_var_ptr(void *var) { return var; } diff --git a/src/arch/x86/include/arch/early_variables.h b/src/arch/x86/include/arch/early_variables.h index ea1a133ae0..80e82d6408 100644 --- a/src/arch/x86/include/arch/early_variables.h +++ b/src/arch/x86/include/arch/early_variables.h @@ -26,10 +26,8 @@ asm(".previous"); asm(".section .car.cbmem_console,\"w\",@nobits"); asm(".previous"); #define CAR_GLOBAL __attribute__((section(".car.global_data"))) -#define CAR_CBMEM __attribute__((section(".car.cbmem_console"))) #else #define CAR_GLOBAL -#define CAR_CBMEM #endif #if defined(__PRE_RAM__) diff --git a/src/arch/x86/init/romstage.ld b/src/arch/x86/init/romstage.ld index 5458cfc23d..d6eb5111ef 100644 --- a/src/arch/x86/init/romstage.ld +++ b/src/arch/x86/init/romstage.ld @@ -55,15 +55,15 @@ SECTIONS .car.data . (NOLOAD) : { _car_data_start = .; *(.car.global_data); - /* The cbmem_console section comes last to take advantage of - * a zero-sized array to hold the memconsole contents that - * grows to a bound of CONFIG_CONSOLE_CAR_BUFFER_SIZE. However, - * collisions within the cache-as-ram region cannot be + _car_data_end = .; + /* The preram cbmem console area comes last to take advantage + * of a zero-sized array to hold the memconsole contents that + * grows to a bound of CONFIG_CONSOLE_PRERAM_BUFFER_SIZE. + * However, collisions within the cache-as-ram region cannot be * statically checked because the cache-as-ram region usage is * cpu/chipset dependent. */ - *(.car.cbmem_console); - _car_data_end = .; + preram_cbmem_console = .; } - _bogus = ASSERT((SIZEOF(.car.data) <= CONFIG_DCACHE_RAM_SIZE), "Cache as RAM area is too full"); + _bogus = ASSERT((SIZEOF(.car.data) + CONFIG_CONSOLE_PRERAM_BUFFER_SIZE <= CONFIG_DCACHE_RAM_SIZE), "Cache as RAM area is too full"); } |