GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

CBMEM: Rename high_tables variables and make them static 

Old name was too much x86.
All external references have been removed.

Change-Id: I982b9abfcee57a7ea421c245dadb84342949efae
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: http://review.coreboot.org/3906
Tested-by: build bot (Jenkins)
Reviewed-by: Aaron Durbin <adurbin@google.com>
This commit is contained in:
Kyösti Mälkki 2013-06-23 20:03:50 +03:00
parent 625f103ae8
commit 0fbbff48bf
2 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/include/cbmem.h
View File

@ -130,7 +130,6 @@ u64 cbmem_entry_size(const struct cbmem_entry *entry);
#else /* !CONFIG_DYNAMIC_CBMEM */ #else /* !CONFIG_DYNAMIC_CBMEM */
#ifndef __PRE_RAM__ #ifndef __PRE_RAM__
extern uint64_t high_tables_base, high_tables_size;
void set_top_of_ram(uint64_t ramtop); void set_top_of_ram(uint64_t ramtop);
void backup_top_of_ram(uint64_t ramtop); void backup_top_of_ram(uint64_t ramtop);
void cbmem_late_set_table(uint64_t base, uint64_t size); void cbmem_late_set_table(uint64_t base, uint64_t size);

26
src/lib/cbmem.c
View File

@ -43,8 +43,8 @@ struct cbmem_entry {
} __attribute__((packed)); } __attribute__((packed));
#ifndef __PRE_RAM__ #ifndef __PRE_RAM__
uint64_t high_tables_base = 0; static uint64_t cbmem_base = 0;
uint64_t high_tables_size = 0; static uint64_t cbmem_size = 0;
#endif #endif
static void cbmem_trace_location(uint64_t base, uint64_t size, const char *s) static void cbmem_trace_location(uint64_t base, uint64_t size, const char *s)
@ -60,12 +60,12 @@ static void cbmem_locate_table(uint64_t *base, uint64_t *size)
#ifdef __PRE_RAM__ #ifdef __PRE_RAM__
get_cbmem_table(base, size); get_cbmem_table(base, size);
#else #else
if (!(high_tables_base && high_tables_size)) { if (!(cbmem_base && cbmem_size)) {
get_cbmem_table(&high_tables_base, &high_tables_size); get_cbmem_table(&cbmem_base, &cbmem_size);
cbmem_trace_location(high_tables_base, high_tables_size, __FUNCTION__); cbmem_trace_location(cbmem_base, cbmem_size, __FUNCTION__);
} }
*base = high_tables_base; *base = cbmem_base;
*size = high_tables_size; *size = cbmem_size;
#endif #endif
} }
@ -80,8 +80,8 @@ struct cbmem_entry *get_cbmem_toc(void)
void cbmem_late_set_table(uint64_t base, uint64_t size) void cbmem_late_set_table(uint64_t base, uint64_t size)
{ {
cbmem_trace_location(base, size, __FUNCTION__); cbmem_trace_location(base, size, __FUNCTION__);
high_tables_base = base; cbmem_base = base;
high_tables_size = size; cbmem_size = size;
} }
#endif #endif
@ -262,18 +262,18 @@ BOOT_STATE_INIT_ENTRIES(cbmem_bscb) = {
int cbmem_base_check(void) int cbmem_base_check(void)
{ {
if (!high_tables_base) { if (!cbmem_base) {
printk(BIOS_ERR, "ERROR: CBMEM Base is not set.\n"); printk(BIOS_ERR, "ERROR: CBMEM Base is not set.\n");
// Are there any boards without? // Are there any boards without?
// Stepan thinks we should die() here! // Stepan thinks we should die() here!
} }
printk(BIOS_DEBUG, "CBMEM Base is %llx.\n", high_tables_base); printk(BIOS_DEBUG, "CBMEM Base is %llx.\n", cbmem_base);
return !!high_tables_base; return !!cbmem_base;
} }
void cbmem_add_lb_mem(struct lb_memory *mem) void cbmem_add_lb_mem(struct lb_memory *mem)
{ {
lb_add_memory_range(mem, LB_MEM_TABLE, high_tables_base, high_tables_size); lb_add_memory_range(mem, LB_MEM_TABLE, cbmem_base, cbmem_size);
} }
void cbmem_list(void) void cbmem_list(void)