From c2300581997be3e52e1fdab49fc0a9c322c4f27c Mon Sep 17 00:00:00 2001 From: Patrick Georgi Date: Tue, 12 Jul 2011 11:40:29 +0200 Subject: [PATCH] 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 Reviewed-on: http://review.coreboot.org/213 Tested-by: build bot (Jenkins) Reviewed-by: Marc Jones --- payloads/libpayload/drivers/options.c | 9 +++++++-- payloads/libpayload/include/libpayload.h | 1 + 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/payloads/libpayload/drivers/options.c b/payloads/libpayload/drivers/options.c index 1c692f46e..fdb4be34b 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 6ce7548b3..80eaaa40b 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); /** -- 2.25.1