nvramtool: Move code so it has access to the right data structures

Signed-off-by: Mathias Krause <mathias.krause@secunet.com>
Acked-by: Peter Stuge <peter@stuge.se>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@6440 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

diff --git a/util/nvramtool/accessors/layout-bin.c b/util/nvramtool/accessors/layout-bin.c
index 53f0530c4075c15341976ddd8ec8e8fe535d9d6b..cf79646453fb99795d1b2c4dee8aab6bb99a02bc 100644 (file)
--- a/util/nvramtool/accessors/layout-bin.c
+++ b/util/nvramtool/accessors/layout-bin.c
@@ -83,6 +83,20 @@ void get_layout_from_cbfs_file(void)
        process_layout();
 }
 
+/****************************************************************************
+ * 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
  *

diff --git a/util/nvramtool/lbtable.c b/util/nvramtool/lbtable.c
index 2ce43c50f9f759699058480f6a37d1963c0ef074..71c32447a9229bea83a1ed618959c7508f9cf1ec 100644 (file)
--- 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, "            ", " | ", " ", " | ", '.' };
 
@@ -302,21 +296,6 @@ void get_lbtable(void)
        exit(1);
 }
 
-/****************************************************************************
- * 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
  *
@@ -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 319557e24ad226b54bf4209c3de20a9fc94c8397..9873ecb3269ce0a875544f062eddb1ec1b0b59be 100644 (file)
--- 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 */