diff options
| author | Kyösti Mälkki <kyosti.malkki@gmail.com> | 2013-10-12 00:22:57 +0300 |
|---|---|---|
| committer | Kyösti Mälkki <kyosti.malkki@gmail.com> | 2013-10-15 13:14:57 +0200 |
| commit | 082c19ea89a24216aafd4ef728f9983b93f6b486 (patch) | |
| tree | f020160e510bc81cee8bdeb4da2318165f9c2616 /src | |
| parent | 1a279046cd5b347c4c9d5b7bb4227417acdb2950 (diff) | |
CBMEM: Fail builds on missing get_top_of_ram()
Dummy get_top_of_ram() is removed from romstage to fail already at
build-time for cases where cbmem_initialize() would not complete.
The mechanisms behind CAR_GLOBAL migration only work correctly when
romstage can succesfully make the cbmem_initialize() call.
Change-Id: I359820fb196ef187b9aa2e8a3e8f658a0550f237
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: http://review.coreboot.org/3969
Tested-by: build bot (Jenkins)
Reviewed-by: Aaron Durbin <adurbin@google.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/arch/x86/boot/cbmem.c | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/src/arch/x86/boot/cbmem.c b/src/arch/x86/boot/cbmem.c index 58ccbca961..6a1226368e 100644 --- a/src/arch/x86/boot/cbmem.c +++ b/src/arch/x86/boot/cbmem.c @@ -18,12 +18,6 @@ #include <console/console.h> #include <cbmem.h> -unsigned long __attribute__((weak)) get_top_of_ram(void) -{ - printk(BIOS_WARNING, "WARNING: you need to define get_top_of_ram() for your chipset\n"); - return 0; -} - #if !CONFIG_DYNAMIC_CBMEM void get_cbmem_table(uint64_t *base, uint64_t *size) { @@ -37,9 +31,8 @@ void get_cbmem_table(uint64_t *base, uint64_t *size) *size = 0; } } -#endif -#if !CONFIG_DYNAMIC_CBMEM && !defined(__PRE_RAM__) +#if !defined(__PRE_RAM__) void __attribute__((weak)) backup_top_of_ram(uint64_t ramtop) { /* Do nothing. Chipset may have implementation to save ramtop in NVRAM. */ @@ -54,4 +47,12 @@ void set_top_of_ram(uint64_t ramtop) backup_top_of_ram(ramtop); cbmem_late_set_table(ramtop - HIGH_MEMORY_SIZE, HIGH_MEMORY_SIZE); } + +unsigned long __attribute__((weak)) get_top_of_ram(void) +{ + printk(BIOS_WARNING, "WARNING: you need to define get_top_of_ram() for your chipset\n"); + return 0; +} +#endif /* !__PRE_RAM__ */ + #endif |