diff options
| -rw-r--r-- | util/nvramtool/accessors/layout-bin.c | 14 | ||||
| -rw-r--r-- | util/nvramtool/lbtable.c | 23 | ||||
| -rw-r--r-- | util/nvramtool/lbtable.h | 1 |
3 files changed, 16 insertions, 22 deletions
diff --git a/util/nvramtool/accessors/layout-bin.c b/util/nvramtool/accessors/layout-bin.c index 53f0530c4075..cf79646453fb 100644 --- a/util/nvramtool/accessors/layout-bin.c +++ b/util/nvramtool/accessors/layout-bin.c @@ -84,6 +84,20 @@ void get_layout_from_cbfs_file(void) } /**************************************************************************** + * get_layout_from_cmos_table + * + * Find the CMOS table which is stored within the coreboot table and set the + * global variable cmos_table to point to it. + ****************************************************************************/ +void get_layout_from_cmos_table(void) +{ + get_lbtable(); + cmos_table = (const struct cmos_option_table *) + find_lbrec(LB_TAG_CMOS_OPTION_TABLE); + process_layout(); +} + +/**************************************************************************** * process_cmos_table * * Extract layout information from the CMOS option table and store it in our diff --git a/util/nvramtool/lbtable.c b/util/nvramtool/lbtable.c index 2ce43c50f9f7..71c32447a922 100644 --- a/util/nvramtool/lbtable.c +++ b/util/nvramtool/lbtable.c @@ -63,7 +63,6 @@ static const struct lb_header *lbtable_scan(unsigned long start, unsigned long end, int *bad_header_count, int *bad_table_count); -static const struct lb_record *find_lbrec(uint32_t tag); static const char *lbrec_tag_to_str(uint32_t tag); static void memory_print_fn(const struct lb_record *rec); static void mainboard_print_fn(const struct lb_record *rec); @@ -215,11 +214,6 @@ static unsigned long low_phys_base = 0; /* Pointer to coreboot table. */ static const struct lb_header *lbtable = NULL; -/* The CMOS option table is located within the coreboot table. It tells us - * where the CMOS parameters are located in the nonvolatile RAM. - */ -static const struct cmos_option_table *cmos_table = NULL; - static const hexdump_format_t format = { 12, 4, " ", " | ", " ", " | ", '.' }; @@ -303,21 +297,6 @@ void get_lbtable(void) } /**************************************************************************** - * get_layout_from_cmos_table - * - * Find the CMOS table which is stored within the coreboot table and set the - * global variable cmos_table to point to it. - ****************************************************************************/ -void get_layout_from_cmos_table(void) -{ - - get_lbtable(); - cmos_table = (const struct cmos_option_table *) - find_lbrec(LB_TAG_CMOS_OPTION_TABLE); - process_layout(); -} - -/**************************************************************************** * dump_lbtable * * Do a low-level dump of the coreboot table. @@ -538,7 +517,7 @@ static const struct lb_header *lbtable_scan(unsigned long start, * Find the record in the coreboot table that matches 'tag'. Return pointer * to record on success or NULL if record not found. ****************************************************************************/ -static const struct lb_record *find_lbrec(uint32_t tag) +const struct lb_record *find_lbrec(uint32_t tag) { const char *p; uint32_t bytes_processed; diff --git a/util/nvramtool/lbtable.h b/util/nvramtool/lbtable.h index 319557e24ad2..9873ecb3269c 100644 --- a/util/nvramtool/lbtable.h +++ b/util/nvramtool/lbtable.h @@ -39,6 +39,7 @@ void get_layout_from_cbfs_file(void); void dump_lbtable(void); void list_lbtable_choices(void); void list_lbtable_item(const char item[]); +const struct lb_record *find_lbrec(uint32_t tag); void process_layout(void); #endif /* LBTABLE_H */ |