summaryrefslogtreecommitdiff
path: root/payloads/libpayload
diff options
context:
space:
mode:
authorPatrick Georgi <patrick.georgi@secunet.com>2011-07-12 11:40:29 +0200
committerPatrick Georgi <patrick@georgi-clan.de>2011-09-14 07:42:20 +0200
commitc2300581997be3e52e1fdab49fc0a9c322c4f27c (patch)
tree64ac0f7189bea17d8c5a02ce4bc8a7659300c508 /payloads/libpayload
parente169f82edf661ee922215ffe7fc6f413c7fa9181 (diff)
downloadcoreboot-c2300581997be3e52e1fdab49fc0a9c322c4f27c.tar.xz
libpayload: Add get_option_from()
This function allows reading the nvram configuration table from locations other than the cbtable. Change-Id: I56c9973a9ea45ad7bf0185b70d11c9ce5d0e0e1b Signed-off-by: Patrick Georgi <patrick.georgi@secunet.com> Reviewed-on: http://review.coreboot.org/213 Tested-by: build bot (Jenkins) Reviewed-by: Marc Jones <marcj303@gmail.com>
Diffstat (limited to 'payloads/libpayload')
-rw-r--r--payloads/libpayload/drivers/options.c9
-rw-r--r--payloads/libpayload/include/libpayload.h1
2 files changed, 8 insertions, 2 deletions
diff --git a/payloads/libpayload/drivers/options.c b/payloads/libpayload/drivers/options.c
index 1c692f46e0..fdb4be34bb 100644
--- a/payloads/libpayload/drivers/options.c
+++ b/payloads/libpayload/drivers/options.c
@@ -93,9 +93,8 @@ static int get_cmos_value(u32 bitnum, u32 len, void *valptr)
return 0;
}
-int get_option(void *dest, char *name)
+int get_option_from(struct cb_cmos_option_table *option_table, void *dest, char *name)
{
- struct cb_cmos_option_table *option_table = phys_to_virt(lib_sysinfo.option_table);
struct cb_cmos_entries *cmos_entry;
int len = strnlen(name, CMOS_MAX_NAME_LENGTH);
@@ -118,3 +117,9 @@ int get_option(void *dest, char *name)
printf("ERROR: No such CMOS option (%s)\n", name);
return 1;
}
+
+int get_option(void *dest, char *name)
+{
+ struct cb_cmos_option_table *option_table = phys_to_virt(lib_sysinfo.option_table);
+ return get_option_from(option_table, dest, name);
+}
diff --git a/payloads/libpayload/include/libpayload.h b/payloads/libpayload/include/libpayload.h
index 6ce7548b3d..80eaaa40b7 100644
--- a/payloads/libpayload/include/libpayload.h
+++ b/payloads/libpayload/include/libpayload.h
@@ -194,6 +194,7 @@ void video_console_set_cursor(unsigned int cursorx, unsigned int cursory);
/* drivers/option.c */
void fix_options_checksum(void);
+int get_option_from(struct cb_cmos_option_table *option_table, void *dest, char *name);
int get_option(void *dest, char *name);
/**