coreboot March 2008

coreboot@coreboot.org

75 participants
382 discussions

GENFADT and GENDSDT
by Urbez Santana Roma 01 Mar '08

01 Mar '08

I have not found one tool that can obtain the fadt.c and dsdt.c from the machine trough /proc/acpi/fadt and /proc/acpi/dsdt I have write the two utitilities, if one needs it. Urbez. NOTE: you can compile the tools simply written "make genfadt" and "make gendsdt"

7 28

r3121 build service
by coreboot information 01 Mar '08

01 Mar '08

Dear coreboot readers! This is the automated build check service of coreboot. The developer "uwe" checked in revision 3121 to the coreboot source repository and caused the following changes: Change Log: Small coding style fixes and documentation updates (trivial). Signed-off-by: Uwe Hermann <uwe(a)hermann-uwe.de> Acked-by: Uwe Hermann <uwe(a)hermann-uwe.de> Build Log: Compilation of amd:serengeti_cheetah_fam10 is still broken See the error log at http://qa.coreboot.org/log_buildbrd.php?revision=3121&device=serengeti_chee… If something broke during this checkin please be a pain in uwe's neck until the issue is fixed. If this issue is not fixed within 24h the revision should be backed out. Best regards, coreboot automatic build system

1 0

r3125 - trunk/coreboot-v2/util
by svn＠coreboot.org 01 Mar '08

01 Mar '08

Author: uwe Date: 2008-03-01 20:13:50 +0100 (Sat, 01 Mar 2008) New Revision: 3125 Modified: trunk/coreboot-v2/util/ Log: Adapt v2 svn:externals for lxbios -> nvramtool rename. Signed-off-by: Uwe Hermann <uwe(a)hermann-uwe.de> Acked-by: Uwe Hermann <uwe(a)hermann-uwe.de> Property changes on: trunk/coreboot-v2/util ___________________________________________________________________ Modified: svn:externals - flashrom svn://coreboot.org/repos/trunk/util/flashrom lxbios svn://coreboot.org/repos/trunk/util/lxbios superiotool svn://coreboot.org/repos/trunk/util/superiotool getpir svn://coreboot.org/repos/trunk/util/getpir mptable svn://coreboot.org/repos/trunk/util/mptable + flashrom svn://coreboot.org/repos/trunk/util/flashrom nvramtool svn://coreboot.org/repos/trunk/util/nvramtool superiotool svn://coreboot.org/repos/trunk/util/superiotool getpir svn://coreboot.org/repos/trunk/util/getpir mptable svn://coreboot.org/repos/trunk/util/mptable

1 0

r627 - coreboot-v3/util
by svn＠coreboot.org 01 Mar '08

01 Mar '08

Author: uwe Date: 2008-03-01 20:12:19 +0100 (Sat, 01 Mar 2008) New Revision: 627 Modified: coreboot-v3/util/ Log: Adapt v3 svn:externals to lxbios -> nvramtool rename. Signed-off-by: Uwe Hermann <uwe(a)hermann-uwe.de> Acked-by: Uwe Hermann <uwe(a)hermann-uwe.de> Property changes on: coreboot-v3/util ___________________________________________________________________ Modified: svn:externals - flashrom svn://linuxbios.org/repos/trunk/util/flashrom lxbios svn://linuxbios.org/repos/trunk/util/lxbios superiotool svn://linuxbios.org/repos/trunk/util/superiotool + flashrom svn://linuxbios.org/repos/trunk/util/flashrom nvramtool svn://linuxbios.org/repos/trunk/util/nvramtool superiotool svn://linuxbios.org/repos/trunk/util/superiotool

1 0

r3124 - trunk/util
by svn＠coreboot.org 01 Mar '08

01 Mar '08

Author: uwe Date: 2008-03-01 20:09:01 +0100 (Sat, 01 Mar 2008) New Revision: 3124 Added: trunk/util/nvramtool/ Removed: trunk/util/lxbios/ Log: Rename lxbios to nvramtool, step 3 (rename directory). Signed-off-by: Uwe Hermann <uwe(a)hermann-uwe.de> Acked-by: Stefan Reinauer <stepan(a)coresystems.de>

1 0

r3123 - trunk/util/lxbios
by svn＠coreboot.org 01 Mar '08

01 Mar '08

Author: uwe Date: 2008-03-01 20:07:46 +0100 (Sat, 01 Mar 2008) New Revision: 3123 Added: trunk/util/lxbios/nvramtool.1 trunk/util/lxbios/nvramtool.c trunk/util/lxbios/nvramtool.spec Removed: trunk/util/lxbios/lxbios.1 trunk/util/lxbios/lxbios.c trunk/util/lxbios/lxbios.spec Log: Rename lxbios to nvramtool, step 2 (rename files). Signed-off-by: Uwe Hermann <uwe(a)hermann-uwe.de> Acked-by: Stefan Reinauer <stepan(a)coresystems.de> Deleted: trunk/util/lxbios/lxbios.1 =================================================================== --- trunk/util/lxbios/lxbios.1 2008-03-01 19:06:32 UTC (rev 3122) +++ trunk/util/lxbios/lxbios.1 2008-03-01 19:07:46 UTC (rev 3123) @@ -1,255 +0,0 @@ -.\"***************************************************************************\ -.\" nvramtool.1 -.\" $Id$ -.\"*************************************************************************** -.\" Copyright (C) 2002, 2003 The Regents of the University of California. -.\" Produced at the Lawrence Livermore National Laboratory. -.\" Written by David S. Peterson <dsp(a)llnl.gov> <dave_peterson(a)pobox.com>. -.\" UCRL-CODE-2003-012 -.\" All rights reserved. -.\" -.\" This file is part of nvramtool, a utility for reading/writing coreboot -.\" parameters and displaying information from the coreboot table. -.\" For details, see http://coreboot.org/nvramtool. -.\" -.\" Please also read the file DISCLAIMER which is included in this software -.\" distribution. -.\" -.\" This program is free software; you can redistribute it and/or modify it -.\" under the terms of the GNU General Public License (as published by the -.\" Free Software Foundation) version 2, dated June 1991. -.\" -.\" This program is distributed in the hope that it will be useful, but -.\" WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -.\" conditions of the GNU General Public License for more details. -.\" -.\" You should have received a copy of the GNU General Public License along -.\" with this program; if not, write to the Free Software Foundation, Inc., -.\" 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. -.\"***************************************************************************/ -.TH NVRAMTOOL 1 "January 2008" Linux -.SH NAME -nvramtool \- read/write coreboot-related information -.SH SYNOPSIS -.B "nvramtool [OPTS] [-n] -r NAME" -.br -.B "nvramtool [OPTS] -e NAME" -.br -.B "nvramtool [OPTS] -a" -.br -.B "nvramtool [OPTS] -w NAME=VALUE" -.br -.B "nvramtool [OPTS] -p INPUT_FILE" -.br -.B "nvramtool [OPTS] -i" -.br -.B "nvramtool [OPTS] -c [VALUE]" -.br -.B "nvramtool [OPTS] -l [ARG]" -.br -.B "nvramtool [OPTS] -d" -.br -.B "nvramtool [OPTS] -Y" -.br -.B "nvramtool [OPTS] -b OUTPUT_FILE" -.br -.B "nvramtool [OPTS] -B INPUT_FILE" -.br -.B "nvramtool [OPTS] -x" -.br -.B "nvramtool [OPTS] -X DUMPFILE" -.br -.B "nvramtool [OPTS] -v" -.br -.B "nvramtool [OPTS] -h" -.SH DESCRIPTION -.B "nvramtool" -is a utility for reading/writing coreboot parameters and displaying -information from the coreboot table. - -The coreboot table resides in low physical memory. It is created at boot -time by coreboot, and contains various system information such as the type -of mainboard in use. It specifies locations in the CMOS (nonvolatile RAM) -where the coreboot parameters are stored. - -This program is intended for (x86-based) systems that use coreboot. For -information about coreboot, see -.br -http://www.coreboot.org/. -.SH PARAMETERS -.TP -.B "[-n] -r NAME" -Show the value of the coreboot parameter given by -.B "NAME." -If -.B "-n" -is specified, show only the value. Otherwise show both parameter name and -value. -.TP -.B "-e NAME" -Show all possible values for parameter given by -.B "NAME." -.TP -.B "-a" -Show the names and values for all coreboot parameters. -.TP -.B "-w NAME=VALUE" -Assign -.B "VALUE" -to coreboot parameter given by -.B "NAME." -.TP -.B "-p INPUT_FILE" -Assign values to coreboot parameters according to the contents of -.B "INPUT_FILE." -The format of this file is described below. -.TP -.B "-i" -This is similar to the -.B "-p" -option, except that the contents of the input file are taken from standard -input. -.TP -.B "-c [VALUE]" -If -.B "VALUE" -is present then set the CMOS checksum for the coreboot parameters to -.B "VALUE." -Otherwise, show the checksum value. -.TP -.B "-l [ARG]" -If -.B "ARG" -is present then show information from the coreboot table as specified by -.B "ARG." -Otherwise show all possible values for -.B "ARG." -.TP -.B "-d" -Do a low-level dump of the coreboot table. -.TP -.B "-Y" -Write CMOS layout information to standard output. If redirected to a file, -the layout information may be used as input for the -.B "'-y LAYOUT_FILE'" -option (see below). -.TP -.B "-b OUTPUT_FILE" -Write the contents of CMOS memory to the binary file -.B "OUTPUT_FILE." -The first 14 bytes of -.B "OUTPUT_FILE" -do not contain actual CMOS data, and are always written as zeros. This is -because the first 14 bytes of the CMOS area do not contain CMOS memory. These -bytes are involved with the functioning of the real time clock. -.TP -.B "-B INPUT_FILE" -Read binary data from -.B "INPUT_FILE" -and write the data to CMOS memory. The first 14 bytes of -.B "INPUT_FILE" -are skipped and data is written to CMOS starting at the 15th byte of the CMOS -area. This is because the first 14 bytes of the CMOS area do not contain CMOS -memory. These bytes are involved with the functioning of the real time clock. -.TP -.B "-x" -Show a hex dump of all CMOS data. The first 14 bytes of the dump do not -contain actual CMOS data, and are always shown as zeros. This is because the -first 14 bytes of the CMOS area do not contain CMOS memory. These bytes are -involved with the functioning of the real time clock. -.TP -.B "-X DUMPFILE" -Read binary data from -.B "DUMPFILE" -(presumably a CMOS dumpfile created using the -.B "-b OUTPUT_FILE" -option) and show a hex dump of the data. -.TP -.B "-v" -Show version information for this program. -.TP -.B "-h" -Show a help message for this program. -.SH "OPTIONS" -In all cases above, -.B "[OPTS]" -evaluates to the following: - -.B " [-y LAYOUT_FILE | -t]" - -The -.B "'-y LAYOUT_FILE'" -option tells nvramtool to obtain CMOS layout information from the contents of -.B "LAYOUT_FILE." -Likewise, the -.B "'-t'" -option tells nvramtool to obtain CMOS layout information from the CMOS option -table (contained within the coreboot table). If neither option is -specified, the CMOS option table is used by default. -.B "LAYOUT_FILE" -follows the format of the -.B "cmos.layout" -files provided by coreboot. - -If the coreboot installed on your system was built without specifying -.B "HAVE_OPTION_TABLE," -then the coreboot table will not contain a CMOS option table. In this case, -the -.B "'-y LAYOUT_FILE'" -option must be used. - -These two options are silently ignored when used in combination with other -options (such as -.B "-h," -for instance) for which they are not applicable. -.SH FILE FORMAT -For the -.B "-p" -option, -.B "INPUT_FILE" -must consist of a sequence of lines such that each line is either a blank -line, a comment, or an assignment. A blank line consists only of zero or -more whitespace characters (spaces and tabs). A comment is constructed as -follows: - -.B " [ws]#[text]" - -Here, -.B "[ws]" -indicates optional whitespace characters and -.B "[text]" -indicates optional text. Blank lines and comments are both ignored. An -assignment is constructed as follows: - -.B " [ws]NAME[ws]=[ws]VALUE[ws]" - -Here, -.B "NAME" -is the name of a coreboot parameter and -.B "VALUE" -is the value that will be assigned to -.B "NAME." -.B "VALUE" -is allowed to contain whitespace characters, but it must begin and end with -nonwhitespace characters. Note that each comment must appear on a line by -itself. If you attempt to add a comment to the end of an assignment, then the -comment will be interpreted as part of -.B "VALUE." -It is useful to observe that the output produced by both the -.B "-a" -and the -.B "'[-n] NAME'" -options (without -.B "-n" -specified) adheres to this file format. -.SH BUGS -This program does not implement any type of synchronization to ensure that -different processes don't stomp on each other when trying to access the -nonvolatile RAM simultaneously. Therefore, corruption of the BIOS parameter -values may occur if multiple instances of this program are executed -concurrently. -.SH AUTHORS -David S. Peterson <dsp(a)llnl.gov> <dave_peterson(a)pobox.com> -.br -Stefan Reinauer <stepan(a)openbios.org> Deleted: trunk/util/lxbios/lxbios.c =================================================================== --- trunk/util/lxbios/lxbios.c 2008-03-01 19:06:32 UTC (rev 3122) +++ trunk/util/lxbios/lxbios.c 2008-03-01 19:07:46 UTC (rev 3123) @@ -1,754 +0,0 @@ -/*****************************************************************************\ - * nvramtool.c - * $Id$ - ***************************************************************************** - * Copyright (C) 2002-2005 The Regents of the University of California. - * Produced at the Lawrence Livermore National Laboratory. - * Written by Dave Peterson <dsp(a)llnl.gov> <dave_peterson(a)pobox.com>. - * UCRL-CODE-2003-012 - * All rights reserved. - * - * This file is part of nvramtool, a utility for reading/writing coreboot - * parameters and displaying information from the coreboot table. - * For details, see http://coreboot.org/nvramtool. - * - * Please also read the file DISCLAIMER which is included in this software - * distribution. - * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License (as published by the - * Free Software Foundation) version 2, dated June 1991. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and - * conditions of the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. -\*****************************************************************************/ - -#include "common.h" -#include "opts.h" -#include "lbtable.h" -#include "layout.h" -#include "layout_file.h" -#include "input_file.h" -#include "cmos_ops.h" -#include "cmos_lowlevel.h" -#include "reg_expr.h" -#include "hexdump.h" - -typedef void (*op_fn_t) (void); - -static void op_show_version (void); -static void op_show_usage (void); -static void op_lbtable_show_info (void); -static void op_lbtable_dump (void); -static void op_show_param_values (void); -static void op_cmos_show_one_param (void); -static void op_cmos_show_all_params (void); -static void op_cmos_set_one_param (void); -static void op_cmos_set_params_stdin (void); -static void op_cmos_set_params_file (void); -static void op_cmos_checksum (void); -static void op_show_layout (void); -static void op_write_cmos_dump (void); -static void op_read_cmos_dump (void); -static void op_show_cmos_hex_dump (void); -static void op_show_cmos_dumpfile (void); -static int list_one_param (const char name[], int show_name); -static int list_all_params (void); -static void list_param_enums (const char name[]); -static void set_one_param (const char name[], const char value[]); -static void set_params (FILE *f); -static void parse_assignment (char arg[], const char **name, - const char **value); -static int list_cmos_entry (const cmos_entry_t *e, int show_name); -static uint16_t convert_checksum_value (const char value[]); - -static const op_fn_t op_fns[] = - { op_show_version, - op_show_usage, - op_lbtable_show_info, - op_lbtable_dump, - op_show_param_values, - op_cmos_show_one_param, - op_cmos_show_all_params, - op_cmos_set_one_param, - op_cmos_set_params_stdin, - op_cmos_set_params_file, - op_cmos_checksum, - op_show_layout, - op_write_cmos_dump, - op_read_cmos_dump, - op_show_cmos_hex_dump, - op_show_cmos_dumpfile - }; - -static const hexdump_format_t cmos_dump_format = - { 16, 2, "", " | ", " ", " | ", '.', NULL }; - -/**************************************************************************** - * main - ****************************************************************************/ -int main (int argc, char *argv[]) - { cmos_layout_get_fn_t fn; - - parse_nvramtool_args(argc, argv); - - if (nvramtool_op_modifiers[NVRAMTOOL_MOD_USE_CMOS_LAYOUT_FILE].found) - { set_layout_filename( - nvramtool_op_modifiers[NVRAMTOOL_MOD_USE_CMOS_LAYOUT_FILE].param); - fn = get_layout_from_file; - } - else - fn = get_layout_from_cmos_table; - - register_cmos_layout_get_fn(fn); - op_fns[nvramtool_op.op](); - return 0; - } - -/**************************************************************************** - * op_show_version - * - * -v - * - * Show version information for this program. - ****************************************************************************/ -static void op_show_version (void) - { printf("This is %s version %s.\n", prog_name, prog_version); } - -/**************************************************************************** - * op_show_usage - * - * -h - * - * Show a usage message for this program. - ****************************************************************************/ -static void op_show_usage (void) - { usage(stdout); } - -/**************************************************************************** - * op_lbtable_show_info - * - * -l [ARG] - * - * If ARG is present, show coreboot table information specified by ARG. - * Else show all possible values for ARG. - ****************************************************************************/ -static void op_lbtable_show_info (void) - { if (nvramtool_op.param == NULL) - list_lbtable_choices(); - else - { get_lbtable(); - list_lbtable_item(nvramtool_op.param); - } - } - -/**************************************************************************** - * op_lbtable_dump - * - * -d - * - * Do low-level dump of coreboot table. - ****************************************************************************/ -static void op_lbtable_dump (void) - { get_lbtable(); - dump_lbtable(); - } - -/**************************************************************************** - * op_show_param_values - * - * -e NAME option - * - * Show all possible values for parameter NAME. - ****************************************************************************/ -static void op_show_param_values (void) - { get_cmos_layout(); - list_param_enums(nvramtool_op.param); - } - -/**************************************************************************** - * op_cmos_show_one_param - * - * [-n] -r NAME - * - * Show parameter NAME. If -n is specified, show value only. Else show name - * and value. - ****************************************************************************/ -static void op_cmos_show_one_param (void) - { int result; - - get_cmos_layout(); - result = list_one_param(nvramtool_op.param, - !nvramtool_op_modifiers[NVRAMTOOL_MOD_SHOW_VALUE_ONLY].found); - cmos_checksum_verify(); - - if (result) - exit(1); - } - -/**************************************************************************** - * op_cmos_show_all_params - * - * -a - * - * Show names and values for all parameters. - ****************************************************************************/ -static void op_cmos_show_all_params (void) - { int result; - - get_cmos_layout(); - result = list_all_params(); - cmos_checksum_verify(); - - if (result) - exit(1); - } - -/**************************************************************************** - * op_cmos_set_one_param - * - * -w NAME=VALUE - * - * Set parameter NAME to VALUE. - ****************************************************************************/ -static void op_cmos_set_one_param (void) - { const char *name, *value; - - get_cmos_layout(); - - /* Separate 'NAME=VALUE' syntax into two strings representing NAME and - * VALUE. - */ - parse_assignment(nvramtool_op.param, &name, &value); - - set_one_param(name, value); - } - -/**************************************************************************** - * op_cmos_set_params_stdin - * - * -i - * - * Set parameters according to standard input. - ****************************************************************************/ -static void op_cmos_set_params_stdin (void) - { get_cmos_layout(); - set_params(stdin); - } - -/**************************************************************************** - * op_cmos_set_params_file - * - * -p INPUT_FILE - * - * Set parameters according to INPUT_FILE. - ****************************************************************************/ -static void op_cmos_set_params_file (void) - { FILE *f; - - if ((f = fopen(nvramtool_op.param, "r")) == NULL) - { fprintf(stderr, "%s: Can not open file %s for reading: %s\n", - prog_name, nvramtool_op.param, strerror(errno)); - exit(1); - } - - get_cmos_layout(); - set_params(f); - fclose(f); - } - -/**************************************************************************** - * op_cmos_checksum - * - * -c [VALUE] - * - * If VALUE is present, set coreboot CMOS checksum to VALUE. Else show - * checksum value. - ****************************************************************************/ -static void op_cmos_checksum (void) - { uint16_t checksum; - - get_cmos_layout(); - - if (nvramtool_op.param == NULL) - { set_iopl(3); - checksum = cmos_checksum_read(); - set_iopl(0); - printf("0x%x\n", checksum); - } - else - { checksum = convert_checksum_value(nvramtool_op.param); - set_iopl(3); - cmos_checksum_write(checksum); - set_iopl(0); - } - } - -/**************************************************************************** - * op_show_layout - * - * -Y - * - * Write CMOS layout information to standard output. - ****************************************************************************/ -static void op_show_layout (void) - { get_cmos_layout(); - write_cmos_layout(stdout); - } - -/**************************************************************************** - * op_write_cmos_dump - * - * -b OUTPUT_FILE - * - * Write the contents of CMOS memory to a binary file. - ****************************************************************************/ -static void op_write_cmos_dump (void) - { unsigned char data[CMOS_SIZE]; - FILE *f; - - if ((f = fopen(nvramtool_op.param, "w")) == NULL) - { fprintf(stderr, "%s: Can not open file %s for writing: %s\n", - prog_name, nvramtool_op.param, strerror(errno)); - exit(1); - } - - set_iopl(3); - cmos_read_all(data); - set_iopl(0); - - if (fwrite(data, 1, CMOS_SIZE, f) != CMOS_SIZE) - { fprintf(stderr, "%s: Error writing CMOS data to file %s: %s\n", - prog_name, nvramtool_op.param, strerror(errno)); - exit(1); - } - - fclose(f); - } - -/**************************************************************************** - * op_read_cmos_dump - * - * -B INPUT_FILE - * - * Read binary data from a file and write the data to CMOS memory. - ****************************************************************************/ -static void op_read_cmos_dump (void) - { unsigned char data[CMOS_SIZE]; - size_t nr_bytes; - FILE *f; - - if ((f = fopen(nvramtool_op.param, "r")) == NULL) - { fprintf(stderr, "%s: Can not open file %s for reading: %s\n", - prog_name, nvramtool_op.param, strerror(errno)); - exit(1); - } - - if ((nr_bytes = fread(data, 1, CMOS_SIZE, f)) != CMOS_SIZE) - { fprintf(stderr, "%s: Error: Only able to read %d bytes of CMOS data " - "from file %s. CMOS data is unchanged.\n", prog_name, - (int) nr_bytes, nvramtool_op.param); - exit(1); - } - - fclose(f); - set_iopl(3); - cmos_write_all(data); - set_iopl(0); - } - -/**************************************************************************** - * op_show_cmos_hex_dump - * - * -x - * - * Write a hex dump of CMOS memory to standard output. - ****************************************************************************/ -static void op_show_cmos_hex_dump (void) - { unsigned char data[CMOS_SIZE]; - - set_iopl(3); - cmos_read_all(data); - set_iopl(0); - hexdump(data, CMOS_SIZE, 0, stdout, &cmos_dump_format); - } - -/**************************************************************************** - * op_show_cmos_dumpfile - * - * -X DUMP_FILE - * - * Read binary data from a file (presumably a CMOS dump file) and display a - * hex dump of the CMOS data from the file. - ****************************************************************************/ -static void op_show_cmos_dumpfile (void) - { unsigned char data[CMOS_SIZE]; - size_t nr_bytes; - FILE *f; - - if ((f = fopen(nvramtool_op.param, "r")) == NULL) - { fprintf(stderr, "%s: Can not open file %s for reading: %s\n", - prog_name, nvramtool_op.param, strerror(errno)); - exit(1); - } - - nr_bytes = fread(data, 1, CMOS_SIZE, f); - fclose(f); - hexdump(data, nr_bytes, 0, stdout, &cmos_dump_format); - } - -/**************************************************************************** - * list_one_param - * - * Attempt to list one CMOS parameter given by 'name'. 'show_name' is a - * boolean value indicating whether the parameter name should be displayed - * along with its value. Return 1 if error was encountered. Else return OK. - ****************************************************************************/ -static int list_one_param (const char name[], int show_name) - { const cmos_entry_t *e; - - if (is_checksum_name(name) || ((e = find_cmos_entry(name)) == NULL)) - { fprintf(stderr, "%s: CMOS parameter %s not found.\n", prog_name, name); - exit(1); - } - - if (e->config == CMOS_ENTRY_RESERVED) - { fprintf(stderr, "%s: Parameter %s is reserved.\n", prog_name, name); - exit(1); - } - - return (list_cmos_entry(e, show_name) != 0); - } - -/**************************************************************************** - * list_all_params - * - * Attempt to list all CMOS parameters. Return 1 if error was encountered. - * Else return OK. - ****************************************************************************/ -static int list_all_params (void) - { const cmos_entry_t *e; - int result; - - result = OK; - - for (e = first_cmos_entry(); e != NULL; e = next_cmos_entry(e)) - { if ((e->config == CMOS_ENTRY_RESERVED) || is_checksum_name(e->name)) - continue; - - if (list_cmos_entry(e, TRUE)) - result = 1; - } - - return result; - } - -/**************************************************************************** - * list_param_enums - * - * List all possible values for CMOS parameter given by 'name'. - ****************************************************************************/ -static void list_param_enums (const char name[]) - { const cmos_entry_t *e; - const cmos_enum_t *p; - - if (is_checksum_name(name) || (e = find_cmos_entry(name)) == NULL) - { fprintf(stderr, "%s: CMOS parameter %s not found.\n", prog_name, name); - exit(1); - } - - switch (e->config) - { case CMOS_ENTRY_ENUM: - for (p = first_cmos_enum_id(e->config_id); - p != NULL; - p = next_cmos_enum_id(p)) - printf("%s\n", p->text); - - break; - - case CMOS_ENTRY_HEX: - printf("Parameter %s requires a %u-bit unsigned integer.\n", name, - e->length); - break; - - case CMOS_ENTRY_RESERVED: - printf("Parameter %s is reserved.\n", name); - break; - - default: - BUG(); - } - } - -/**************************************************************************** - * set_one_param - * - * Set the CMOS parameter given by 'name' to 'value'. The 'name' parameter - * is case-sensitive. If we are setting an enum parameter, then 'value' is - * interpreted as a case-sensitive string that must match the option name - * exactly. If we are setting a 'hex' parameter, then 'value' is treated as - * a string representation of an unsigned integer that may be specified in - * decimal, hex, or octal. - ****************************************************************************/ -static void set_one_param (const char name[], const char value[]) - { const cmos_entry_t *e; - unsigned long long n; - - if (is_checksum_name(name) || (e = find_cmos_entry(name)) == NULL) - { fprintf(stderr, "%s: CMOS parameter %s not found.", prog_name, name); - exit(1); - } - - switch (prepare_cmos_write(e, value, &n)) - { case OK: - break; - - case CMOS_OP_BAD_ENUM_VALUE: - fprintf(stderr, "%s: Bad value for parameter %s.", prog_name, name); - goto fail; - - case CMOS_OP_NEGATIVE_INT: - fprintf(stderr, - "%s: This program does not support assignment of negative " - "numbers to coreboot parameters.", prog_name); - goto fail; - - case CMOS_OP_INVALID_INT: - fprintf(stderr, "%s: %s is not a valid integer.", prog_name, value); - goto fail; - - case CMOS_OP_RESERVED: - fprintf(stderr, - "%s: Can not modify reserved coreboot parameter %s.", - prog_name, name); - goto fail; - - case CMOS_OP_VALUE_TOO_WIDE: - fprintf(stderr, - "%s: Can not write value %s to CMOS parameter %s that is " - "only %d bits wide.", prog_name, value, name, e->length); - goto fail; - - case CMOS_OP_NO_MATCHING_ENUM: - fprintf(stderr, - "%s: coreboot parameter %s has no matching enums.", - prog_name, name); - goto fail; - - case CMOS_AREA_OUT_OF_RANGE: - fprintf(stderr, - "%s: The CMOS area specified by the layout info for " - "coreboot parameter %s is out of range.", prog_name, name); - goto fail; - - case CMOS_AREA_OVERLAPS_RTC: - fprintf(stderr, - "%s: The CMOS area specified by the layout info for " - "coreboot parameter %s overlaps the realtime clock area.", - prog_name, name); - goto fail; - - case CMOS_AREA_TOO_WIDE: - fprintf(stderr, - "%s: The CMOS area specified by the layout info for " - "coreboot parameter %s is too wide.", - prog_name, name); - goto fail; - - default: - fprintf(stderr, - "%s: Unknown error encountered while attempting to modify " - "coreboot parameter %s.", prog_name, name); - goto fail; - } - - /* write the value to nonvolatile RAM */ - set_iopl(3); - cmos_write(e->bit, e->length, n); - cmos_checksum_write(cmos_checksum_compute()); - set_iopl(0); - return; - -fail: - fprintf(stderr, " CMOS write not performed.\n"); - exit(1); - } - -/**************************************************************************** - * set_params - * - * Set coreboot parameters according to the contents of file 'f'. - ****************************************************************************/ -static void set_params (FILE *f) - { /* First process the input file. Then perform writes only if there were - * no problems processing the input. Either all values will be written - * successfully or no values will be written. - */ - do_cmos_writes(process_input_file(f)); - } - -/**************************************************************************** - * parse_assignment - * - * Parse the string 'arg' (which supposedly represents an assignment) into a - * NAME and a VALUE. If 'arg' does not conform to the proper assignment - * syntax, exit with a usage message. Otherwise, on return, 'arg' is broken - * into substrings representing NAME and VALUE, and *name and *value are set - * to point to these two substrings. - ****************************************************************************/ -static void parse_assignment (char arg[], const char **name, - const char **value) - { static const size_t N_MATCHES = 4; - regmatch_t match[N_MATCHES]; - regex_t assignment; - - compile_reg_exprs(REG_EXTENDED | REG_NEWLINE, 1, assignment_regex, - &assignment); - - /* Does 'arg' conform to proper assignment syntax? If not, exit with a - * usage message. - */ - if (regexec(&assignment, arg, N_MATCHES, match, 0)) - usage(stderr); - - /* Ok, we found a valid assignment. Break it into two strings - * representing NAME and VALUE. - */ - arg[match[1].rm_eo] = '\0'; - arg[match[2].rm_eo] = '\0'; - *name = &arg[match[1].rm_so]; - *value = &arg[match[2].rm_so]; - - free_reg_exprs(1, &assignment); - } - -/**************************************************************************** - * list_cmos_entry - * - * Attempt to list the CMOS entry represented by 'e'. 'show_name' is a - * boolean value indicating whether the parameter name should be displayed - * along with its value. On success, return OK. On error, print an error - * message and return 1. - ****************************************************************************/ -static int list_cmos_entry (const cmos_entry_t *e, int show_name) - { const cmos_enum_t *p; - unsigned long long value; - - /* sanity check CMOS entry */ - switch (prepare_cmos_read(e)) - { case OK: - break; - - case CMOS_OP_RESERVED: - BUG(); - - case CMOS_AREA_OUT_OF_RANGE: - fprintf(stderr, "%s: Can not read coreboot parameter %s because " - "layout info specifies out of range CMOS area.\n", prog_name, - e->name); - return 1; - - case CMOS_AREA_OVERLAPS_RTC: - fprintf(stderr, "%s: Can not read coreboot parameter %s because " - "layout info specifies CMOS area that overlaps realtime " - "clock area.\n", prog_name, e->name); - return 1; - - case CMOS_AREA_TOO_WIDE: - fprintf(stderr, "%s: Can not read coreboot parameter %s because " - "layout info specifies CMOS area that is too wide.\n", - prog_name, e->name); - return 1; - - default: - fprintf(stderr, "%s: Unknown error encountered while attempting to " - "read coreboot parameter %s\n", prog_name, e->name); - return 1; - } - - /* read the value from CMOS */ - set_iopl(3); - value = cmos_read(e->bit, e->length); - set_iopl(0); - - /* display the value */ - switch (e->config) - { case CMOS_ENTRY_ENUM: - if ((p = find_cmos_enum(e->config_id, value)) == NULL) - { if (show_name) - printf("# Bad value -> %s = 0x%llx\n", e->name, value); - else - printf("Bad value -> 0x%llx\n", value); - } - else - { if (show_name) - printf("%s = %s\n", e->name, p->text); - else - printf("%s\n", p->text); - } - - break; - - case CMOS_ENTRY_HEX: - if (show_name) - printf("%s = 0x%llx\n", e->name, value); - else - printf("0x%llx\n", value); - - break; - - case CMOS_ENTRY_RESERVED: - default: - BUG(); - } - - return OK; - } - -/**************************************************************************** - * convert_checksum_value - * - * 'value' is the string representation of a checksum value that the user - * wishes to set using the -c option. Convert the string to a 16-bit - * unsigned integer and return the result. Exit with an error message if - * 'value' is invalid. - ****************************************************************************/ -static uint16_t convert_checksum_value (const char value[]) - { unsigned long n; - const char *p; - uint16_t result; - int negative; - - for (p = value; isspace(*p); p++); - - negative = (*p == '-'); - n = strtoul(value, (char **) &p, 0); - - if (*p) - { fprintf(stderr, "%s: Checksum value %s is not a valid integer.\n", - prog_name, value); - exit(1); - } - - if (negative) - { fprintf(stderr, - "%s: Checksum must be an unsigned integer.\n", prog_name); - exit(1); - } - - result = (uint16_t) n; - - if (result != n) - { fprintf(stderr, - "%s: Checksum value must fit within 16 bits.\n", prog_name); - exit(1); - } - - return result; - } Deleted: trunk/util/lxbios/lxbios.spec =================================================================== --- trunk/util/lxbios/lxbios.spec 2008-03-01 19:06:32 UTC (rev 3122) +++ trunk/util/lxbios/lxbios.spec 2008-03-01 19:07:46 UTC (rev 3123) @@ -1,50 +0,0 @@ -## -# $Id$ -## - -Name: nvramtool -Version: 2.0.1 -Release: 0 - -Summary: coreboot utility program -Group: System Environment/Base -License: GPL -Provides: nvramtool - -BuildRoot: %{_tmppath}/%{name}-%{version} - -Source0: %{name}-%{version}.tgz - -%description -nvramtool is a utility for reading/writing coreboot parameters and displaying -information from the coreboot table. - -At boot time, coreboot places a table (known as the coreboot table) in low -physical memory. The contents of this table are preserved even after -coreboot transfers control to the kernel and the kernel initializes itself. -The coreboot table contains various system information such as the type of -mainboard in use. It also specifies locations in the CMOS (nonvolatile RAM) -where the coreboot parameters are stored. - -%prep -%setup -n %{name}-%{version} - -%build -make - -%install -rm -rf "$RPM_BUILD_ROOT" -mkdir -p "$RPM_BUILD_ROOT/usr/bin" -mkdir -p "$RPM_BUILD_ROOT/usr/man/man1" -cp nvramtool "$RPM_BUILD_ROOT/usr/bin" -cp nvramtool.1.gz $RPM_BUILD_ROOT/usr/man/man1 - -%clean -rm -rf "$RPM_BUILD_ROOT" - -%files -%defattr(-,root,root,0755) -%doc ChangeLog README -%doc README -/usr/bin/nvramtool -/usr/man/man1/nvramtool.1.gz Copied: trunk/util/lxbios/nvramtool.1 (from rev 3122, trunk/util/lxbios/lxbios.1) =================================================================== --- trunk/util/lxbios/nvramtool.1 (rev 0) +++ trunk/util/lxbios/nvramtool.1 2008-03-01 19:07:46 UTC (rev 3123) @@ -0,0 +1,255 @@ +.\"***************************************************************************\ +.\" nvramtool.1 +.\" $Id$ +.\"*************************************************************************** +.\" Copyright (C) 2002, 2003 The Regents of the University of California. +.\" Produced at the Lawrence Livermore National Laboratory. +.\" Written by David S. Peterson <dsp(a)llnl.gov> <dave_peterson(a)pobox.com>. +.\" UCRL-CODE-2003-012 +.\" All rights reserved. +.\" +.\" This file is part of nvramtool, a utility for reading/writing coreboot +.\" parameters and displaying information from the coreboot table. +.\" For details, see http://coreboot.org/nvramtool. +.\" +.\" Please also read the file DISCLAIMER which is included in this software +.\" distribution. +.\" +.\" This program is free software; you can redistribute it and/or modify it +.\" under the terms of the GNU General Public License (as published by the +.\" Free Software Foundation) version 2, dated June 1991. +.\" +.\" This program is distributed in the hope that it will be useful, but +.\" WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +.\" conditions of the GNU General Public License for more details. +.\" +.\" You should have received a copy of the GNU General Public License along +.\" with this program; if not, write to the Free Software Foundation, Inc., +.\" 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. +.\"***************************************************************************/ +.TH NVRAMTOOL 1 "January 2008" Linux +.SH NAME +nvramtool \- read/write coreboot-related information +.SH SYNOPSIS +.B "nvramtool [OPTS] [-n] -r NAME" +.br +.B "nvramtool [OPTS] -e NAME" +.br +.B "nvramtool [OPTS] -a" +.br +.B "nvramtool [OPTS] -w NAME=VALUE" +.br +.B "nvramtool [OPTS] -p INPUT_FILE" +.br +.B "nvramtool [OPTS] -i" +.br +.B "nvramtool [OPTS] -c [VALUE]" +.br +.B "nvramtool [OPTS] -l [ARG]" +.br +.B "nvramtool [OPTS] -d" +.br +.B "nvramtool [OPTS] -Y" +.br +.B "nvramtool [OPTS] -b OUTPUT_FILE" +.br +.B "nvramtool [OPTS] -B INPUT_FILE" +.br +.B "nvramtool [OPTS] -x" +.br +.B "nvramtool [OPTS] -X DUMPFILE" +.br +.B "nvramtool [OPTS] -v" +.br +.B "nvramtool [OPTS] -h" +.SH DESCRIPTION +.B "nvramtool" +is a utility for reading/writing coreboot parameters and displaying +information from the coreboot table. + +The coreboot table resides in low physical memory. It is created at boot +time by coreboot, and contains various system information such as the type +of mainboard in use. It specifies locations in the CMOS (nonvolatile RAM) +where the coreboot parameters are stored. + +This program is intended for (x86-based) systems that use coreboot. For +information about coreboot, see +.br +http://www.coreboot.org/. +.SH PARAMETERS +.TP +.B "[-n] -r NAME" +Show the value of the coreboot parameter given by +.B "NAME." +If +.B "-n" +is specified, show only the value. Otherwise show both parameter name and +value. +.TP +.B "-e NAME" +Show all possible values for parameter given by +.B "NAME." +.TP +.B "-a" +Show the names and values for all coreboot parameters. +.TP +.B "-w NAME=VALUE" +Assign +.B "VALUE" +to coreboot parameter given by +.B "NAME." +.TP +.B "-p INPUT_FILE" +Assign values to coreboot parameters according to the contents of +.B "INPUT_FILE." +The format of this file is described below. +.TP +.B "-i" +This is similar to the +.B "-p" +option, except that the contents of the input file are taken from standard +input. +.TP +.B "-c [VALUE]" +If +.B "VALUE" +is present then set the CMOS checksum for the coreboot parameters to +.B "VALUE." +Otherwise, show the checksum value. +.TP +.B "-l [ARG]" +If +.B "ARG" +is present then show information from the coreboot table as specified by +.B "ARG." +Otherwise show all possible values for +.B "ARG." +.TP +.B "-d" +Do a low-level dump of the coreboot table. +.TP +.B "-Y" +Write CMOS layout information to standard output. If redirected to a file, +the layout information may be used as input for the +.B "'-y LAYOUT_FILE'" +option (see below). +.TP +.B "-b OUTPUT_FILE" +Write the contents of CMOS memory to the binary file +.B "OUTPUT_FILE." +The first 14 bytes of +.B "OUTPUT_FILE" +do not contain actual CMOS data, and are always written as zeros. This is +because the first 14 bytes of the CMOS area do not contain CMOS memory. These +bytes are involved with the functioning of the real time clock. +.TP +.B "-B INPUT_FILE" +Read binary data from +.B "INPUT_FILE" +and write the data to CMOS memory. The first 14 bytes of +.B "INPUT_FILE" +are skipped and data is written to CMOS starting at the 15th byte of the CMOS +area. This is because the first 14 bytes of the CMOS area do not contain CMOS +memory. These bytes are involved with the functioning of the real time clock. +.TP +.B "-x" +Show a hex dump of all CMOS data. The first 14 bytes of the dump do not +contain actual CMOS data, and are always shown as zeros. This is because the +first 14 bytes of the CMOS area do not contain CMOS memory. These bytes are +involved with the functioning of the real time clock. +.TP +.B "-X DUMPFILE" +Read binary data from +.B "DUMPFILE" +(presumably a CMOS dumpfile created using the +.B "-b OUTPUT_FILE" +option) and show a hex dump of the data. +.TP +.B "-v" +Show version information for this program. +.TP +.B "-h" +Show a help message for this program. +.SH "OPTIONS" +In all cases above, +.B "[OPTS]" +evaluates to the following: + +.B " [-y LAYOUT_FILE | -t]" + +The +.B "'-y LAYOUT_FILE'" +option tells nvramtool to obtain CMOS layout information from the contents of +.B "LAYOUT_FILE." +Likewise, the +.B "'-t'" +option tells nvramtool to obtain CMOS layout information from the CMOS option +table (contained within the coreboot table). If neither option is +specified, the CMOS option table is used by default. +.B "LAYOUT_FILE" +follows the format of the +.B "cmos.layout" +files provided by coreboot. + +If the coreboot installed on your system was built without specifying +.B "HAVE_OPTION_TABLE," +then the coreboot table will not contain a CMOS option table. In this case, +the +.B "'-y LAYOUT_FILE'" +option must be used. + +These two options are silently ignored when used in combination with other +options (such as +.B "-h," +for instance) for which they are not applicable. +.SH FILE FORMAT +For the +.B "-p" +option, +.B "INPUT_FILE" +must consist of a sequence of lines such that each line is either a blank +line, a comment, or an assignment. A blank line consists only of zero or +more whitespace characters (spaces and tabs). A comment is constructed as +follows: + +.B " [ws]#[text]" + +Here, +.B "[ws]" +indicates optional whitespace characters and +.B "[text]" +indicates optional text. Blank lines and comments are both ignored. An +assignment is constructed as follows: + +.B " [ws]NAME[ws]=[ws]VALUE[ws]" + +Here, +.B "NAME" +is the name of a coreboot parameter and +.B "VALUE" +is the value that will be assigned to +.B "NAME." +.B "VALUE" +is allowed to contain whitespace characters, but it must begin and end with +nonwhitespace characters. Note that each comment must appear on a line by +itself. If you attempt to add a comment to the end of an assignment, then the +comment will be interpreted as part of +.B "VALUE." +It is useful to observe that the output produced by both the +.B "-a" +and the +.B "'[-n] NAME'" +options (without +.B "-n" +specified) adheres to this file format. +.SH BUGS +This program does not implement any type of synchronization to ensure that +different processes don't stomp on each other when trying to access the +nonvolatile RAM simultaneously. Therefore, corruption of the BIOS parameter +values may occur if multiple instances of this program are executed +concurrently. +.SH AUTHORS +David S. Peterson <dsp(a)llnl.gov> <dave_peterson(a)pobox.com> +.br +Stefan Reinauer <stepan(a)openbios.org> Copied: trunk/util/lxbios/nvramtool.c (from rev 3122, trunk/util/lxbios/lxbios.c) =================================================================== --- trunk/util/lxbios/nvramtool.c (rev 0) +++ trunk/util/lxbios/nvramtool.c 2008-03-01 19:07:46 UTC (rev 3123) @@ -0,0 +1,754 @@ +/*****************************************************************************\ + * nvramtool.c + * $Id$ + ***************************************************************************** + * Copyright (C) 2002-2005 The Regents of the University of California. + * Produced at the Lawrence Livermore National Laboratory. + * Written by Dave Peterson <dsp(a)llnl.gov> <dave_peterson(a)pobox.com>. + * UCRL-CODE-2003-012 + * All rights reserved. + * + * This file is part of nvramtool, a utility for reading/writing coreboot + * parameters and displaying information from the coreboot table. + * For details, see http://coreboot.org/nvramtool. + * + * Please also read the file DISCLAIMER which is included in this software + * distribution. + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License (as published by the + * Free Software Foundation) version 2, dated June 1991. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and + * conditions of the GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. +\*****************************************************************************/ + +#include "common.h" +#include "opts.h" +#include "lbtable.h" +#include "layout.h" +#include "layout_file.h" +#include "input_file.h" +#include "cmos_ops.h" +#include "cmos_lowlevel.h" +#include "reg_expr.h" +#include "hexdump.h" + +typedef void (*op_fn_t) (void); + +static void op_show_version (void); +static void op_show_usage (void); +static void op_lbtable_show_info (void); +static void op_lbtable_dump (void); +static void op_show_param_values (void); +static void op_cmos_show_one_param (void); +static void op_cmos_show_all_params (void); +static void op_cmos_set_one_param (void); +static void op_cmos_set_params_stdin (void); +static void op_cmos_set_params_file (void); +static void op_cmos_checksum (void); +static void op_show_layout (void); +static void op_write_cmos_dump (void); +static void op_read_cmos_dump (void); +static void op_show_cmos_hex_dump (void); +static void op_show_cmos_dumpfile (void); +static int list_one_param (const char name[], int show_name); +static int list_all_params (void); +static void list_param_enums (const char name[]); +static void set_one_param (const char name[], const char value[]); +static void set_params (FILE *f); +static void parse_assignment (char arg[], const char **name, + const char **value); +static int list_cmos_entry (const cmos_entry_t *e, int show_name); +static uint16_t convert_checksum_value (const char value[]); + +static const op_fn_t op_fns[] = + { op_show_version, + op_show_usage, + op_lbtable_show_info, + op_lbtable_dump, + op_show_param_values, + op_cmos_show_one_param, + op_cmos_show_all_params, + op_cmos_set_one_param, + op_cmos_set_params_stdin, + op_cmos_set_params_file, + op_cmos_checksum, + op_show_layout, + op_write_cmos_dump, + op_read_cmos_dump, + op_show_cmos_hex_dump, + op_show_cmos_dumpfile + }; + +static const hexdump_format_t cmos_dump_format = + { 16, 2, "", " | ", " ", " | ", '.', NULL }; + +/**************************************************************************** + * main + ****************************************************************************/ +int main (int argc, char *argv[]) + { cmos_layout_get_fn_t fn; + + parse_nvramtool_args(argc, argv); + + if (nvramtool_op_modifiers[NVRAMTOOL_MOD_USE_CMOS_LAYOUT_FILE].found) + { set_layout_filename( + nvramtool_op_modifiers[NVRAMTOOL_MOD_USE_CMOS_LAYOUT_FILE].param); + fn = get_layout_from_file; + } + else + fn = get_layout_from_cmos_table; + + register_cmos_layout_get_fn(fn); + op_fns[nvramtool_op.op](); + return 0; + } + +/**************************************************************************** + * op_show_version + * + * -v + * + * Show version information for this program. + ****************************************************************************/ +static void op_show_version (void) + { printf("This is %s version %s.\n", prog_name, prog_version); } + +/**************************************************************************** + * op_show_usage + * + * -h + * + * Show a usage message for this program. + ****************************************************************************/ +static void op_show_usage (void) + { usage(stdout); } + +/**************************************************************************** + * op_lbtable_show_info + * + * -l [ARG] + * + * If ARG is present, show coreboot table information specified by ARG. + * Else show all possible values for ARG. + ****************************************************************************/ +static void op_lbtable_show_info (void) + { if (nvramtool_op.param == NULL) + list_lbtable_choices(); + else + { get_lbtable(); + list_lbtable_item(nvramtool_op.param); + } + } + +/**************************************************************************** + * op_lbtable_dump + * + * -d + * + * Do low-level dump of coreboot table. + ****************************************************************************/ +static void op_lbtable_dump (void) + { get_lbtable(); + dump_lbtable(); + } + +/**************************************************************************** + * op_show_param_values + * + * -e NAME option + * + * Show all possible values for parameter NAME. + ****************************************************************************/ +static void op_show_param_values (void) + { get_cmos_layout(); + list_param_enums(nvramtool_op.param); + } + +/**************************************************************************** + * op_cmos_show_one_param + * + * [-n] -r NAME + * + * Show parameter NAME. If -n is specified, show value only. Else show name + * and value. + ****************************************************************************/ +static void op_cmos_show_one_param (void) + { int result; + + get_cmos_layout(); + result = list_one_param(nvramtool_op.param, + !nvramtool_op_modifiers[NVRAMTOOL_MOD_SHOW_VALUE_ONLY].found); + cmos_checksum_verify(); + + if (result) + exit(1); + } + +/**************************************************************************** + * op_cmos_show_all_params + * + * -a + * + * Show names and values for all parameters. + ****************************************************************************/ +static void op_cmos_show_all_params (void) + { int result; + + get_cmos_layout(); + result = list_all_params(); + cmos_checksum_verify(); + + if (result) + exit(1); + } + +/**************************************************************************** + * op_cmos_set_one_param + * + * -w NAME=VALUE + * + * Set parameter NAME to VALUE. + ****************************************************************************/ +static void op_cmos_set_one_param (void) + { const char *name, *value; + + get_cmos_layout(); + + /* Separate 'NAME=VALUE' syntax into two strings representing NAME and + * VALUE. + */ + parse_assignment(nvramtool_op.param, &name, &value); + + set_one_param(name, value); + } + +/**************************************************************************** + * op_cmos_set_params_stdin + * + * -i + * + * Set parameters according to standard input. + ****************************************************************************/ +static void op_cmos_set_params_stdin (void) + { get_cmos_layout(); + set_params(stdin); + } + +/**************************************************************************** + * op_cmos_set_params_file + * + * -p INPUT_FILE + * + * Set parameters according to INPUT_FILE. + ****************************************************************************/ +static void op_cmos_set_params_file (void) + { FILE *f; + + if ((f = fopen(nvramtool_op.param, "r")) == NULL) + { fprintf(stderr, "%s: Can not open file %s for reading: %s\n", + prog_name, nvramtool_op.param, strerror(errno)); + exit(1); + } + + get_cmos_layout(); + set_params(f); + fclose(f); + } + +/**************************************************************************** + * op_cmos_checksum + * + * -c [VALUE] + * + * If VALUE is present, set coreboot CMOS checksum to VALUE. Else show + * checksum value. + ****************************************************************************/ +static void op_cmos_checksum (void) + { uint16_t checksum; + + get_cmos_layout(); + + if (nvramtool_op.param == NULL) + { set_iopl(3); + checksum = cmos_checksum_read(); + set_iopl(0); + printf("0x%x\n", checksum); + } + else + { checksum = convert_checksum_value(nvramtool_op.param); + set_iopl(3); + cmos_checksum_write(checksum); + set_iopl(0); + } + } + +/**************************************************************************** + * op_show_layout + * + * -Y + * + * Write CMOS layout information to standard output. + ****************************************************************************/ +static void op_show_layout (void) + { get_cmos_layout(); + write_cmos_layout(stdout); + } + +/**************************************************************************** + * op_write_cmos_dump + * + * -b OUTPUT_FILE + * + * Write the contents of CMOS memory to a binary file. + ****************************************************************************/ +static void op_write_cmos_dump (void) + { unsigned char data[CMOS_SIZE]; + FILE *f; + + if ((f = fopen(nvramtool_op.param, "w")) == NULL) + { fprintf(stderr, "%s: Can not open file %s for writing: %s\n", + prog_name, nvramtool_op.param, strerror(errno)); + exit(1); + } + + set_iopl(3); + cmos_read_all(data); + set_iopl(0); + + if (fwrite(data, 1, CMOS_SIZE, f) != CMOS_SIZE) + { fprintf(stderr, "%s: Error writing CMOS data to file %s: %s\n", + prog_name, nvramtool_op.param, strerror(errno)); + exit(1); + } + + fclose(f); + } + +/**************************************************************************** + * op_read_cmos_dump + * + * -B INPUT_FILE + * + * Read binary data from a file and write the data to CMOS memory. + ****************************************************************************/ +static void op_read_cmos_dump (void) + { unsigned char data[CMOS_SIZE]; + size_t nr_bytes; + FILE *f; + + if ((f = fopen(nvramtool_op.param, "r")) == NULL) + { fprintf(stderr, "%s: Can not open file %s for reading: %s\n", + prog_name, nvramtool_op.param, strerror(errno)); + exit(1); + } + + if ((nr_bytes = fread(data, 1, CMOS_SIZE, f)) != CMOS_SIZE) + { fprintf(stderr, "%s: Error: Only able to read %d bytes of CMOS data " + "from file %s. CMOS data is unchanged.\n", prog_name, + (int) nr_bytes, nvramtool_op.param); + exit(1); + } + + fclose(f); + set_iopl(3); + cmos_write_all(data); + set_iopl(0); + } + +/**************************************************************************** + * op_show_cmos_hex_dump + * + * -x + * + * Write a hex dump of CMOS memory to standard output. + ****************************************************************************/ +static void op_show_cmos_hex_dump (void) + { unsigned char data[CMOS_SIZE]; + + set_iopl(3); + cmos_read_all(data); + set_iopl(0); + hexdump(data, CMOS_SIZE, 0, stdout, &cmos_dump_format); + } + +/**************************************************************************** + * op_show_cmos_dumpfile + * + * -X DUMP_FILE + * + * Read binary data from a file (presumably a CMOS dump file) and display a + * hex dump of the CMOS data from the file. + ****************************************************************************/ +static void op_show_cmos_dumpfile (void) + { unsigned char data[CMOS_SIZE]; + size_t nr_bytes; + FILE *f; + + if ((f = fopen(nvramtool_op.param, "r")) == NULL) + { fprintf(stderr, "%s: Can not open file %s for reading: %s\n", + prog_name, nvramtool_op.param, strerror(errno)); + exit(1); + } + + nr_bytes = fread(data, 1, CMOS_SIZE, f); + fclose(f); + hexdump(data, nr_bytes, 0, stdout, &cmos_dump_format); + } + +/**************************************************************************** + * list_one_param + * + * Attempt to list one CMOS parameter given by 'name'. 'show_name' is a + * boolean value indicating whether the parameter name should be displayed + * along with its value. Return 1 if error was encountered. Else return OK. + ****************************************************************************/ +static int list_one_param (const char name[], int show_name) + { const cmos_entry_t *e; + + if (is_checksum_name(name) || ((e = find_cmos_entry(name)) == NULL)) + { fprintf(stderr, "%s: CMOS parameter %s not found.\n", prog_name, name); + exit(1); + } + + if (e->config == CMOS_ENTRY_RESERVED) + { fprintf(stderr, "%s: Parameter %s is reserved.\n", prog_name, name); + exit(1); + } + + return (list_cmos_entry(e, show_name) != 0); + } + +/**************************************************************************** + * list_all_params + * + * Attempt to list all CMOS parameters. Return 1 if error was encountered. + * Else return OK. + ****************************************************************************/ +static int list_all_params (void) + { const cmos_entry_t *e; + int result; + + result = OK; + + for (e = first_cmos_entry(); e != NULL; e = next_cmos_entry(e)) + { if ((e->config == CMOS_ENTRY_RESERVED) || is_checksum_name(e->name)) + continue; + + if (list_cmos_entry(e, TRUE)) + result = 1; + } + + return result; + } + +/**************************************************************************** + * list_param_enums + * + * List all possible values for CMOS parameter given by 'name'. + ****************************************************************************/ +static void list_param_enums (const char name[]) + { const cmos_entry_t *e; + const cmos_enum_t *p; + + if (is_checksum_name(name) || (e = find_cmos_entry(name)) == NULL) + { fprintf(stderr, "%s: CMOS parameter %s not found.\n", prog_name, name); + exit(1); + } + + switch (e->config) + { case CMOS_ENTRY_ENUM: + for (p = first_cmos_enum_id(e->config_id); + p != NULL; + p = next_cmos_enum_id(p)) + printf("%s\n", p->text); + + break; + + case CMOS_ENTRY_HEX: + printf("Parameter %s requires a %u-bit unsigned integer.\n", name, + e->length); + break; + + case CMOS_ENTRY_RESERVED: + printf("Parameter %s is reserved.\n", name); + break; + + default: + BUG(); + } + } + +/**************************************************************************** + * set_one_param + * + * Set the CMOS parameter given by 'name' to 'value'. The 'name' parameter + * is case-sensitive. If we are setting an enum parameter, then 'value' is + * interpreted as a case-sensitive string that must match the option name + * exactly. If we are setting a 'hex' parameter, then 'value' is treated as + * a string representation of an unsigned integer that may be specified in + * decimal, hex, or octal. + ****************************************************************************/ +static void set_one_param (const char name[], const char value[]) + { const cmos_entry_t *e; + unsigned long long n; + + if (is_checksum_name(name) || (e = find_cmos_entry(name)) == NULL) + { fprintf(stderr, "%s: CMOS parameter %s not found.", prog_name, name); + exit(1); + } + + switch (prepare_cmos_write(e, value, &n)) + { case OK: + break; + + case CMOS_OP_BAD_ENUM_VALUE: + fprintf(stderr, "%s: Bad value for parameter %s.", prog_name, name); + goto fail; + + case CMOS_OP_NEGATIVE_INT: + fprintf(stderr, + "%s: This program does not support assignment of negative " + "numbers to coreboot parameters.", prog_name); + goto fail; + + case CMOS_OP_INVALID_INT: + fprintf(stderr, "%s: %s is not a valid integer.", prog_name, value); + goto fail; + + case CMOS_OP_RESERVED: + fprintf(stderr, + "%s: Can not modify reserved coreboot parameter %s.", + prog_name, name); + goto fail; + + case CMOS_OP_VALUE_TOO_WIDE: + fprintf(stderr, + "%s: Can not write value %s to CMOS parameter %s that is " + "only %d bits wide.", prog_name, value, name, e->length); + goto fail; + + case CMOS_OP_NO_MATCHING_ENUM: + fprintf(stderr, + "%s: coreboot parameter %s has no matching enums.", + prog_name, name); + goto fail; + + case CMOS_AREA_OUT_OF_RANGE: + fprintf(stderr, + "%s: The CMOS area specified by the layout info for " + "coreboot parameter %s is out of range.", prog_name, name); + goto fail; + + case CMOS_AREA_OVERLAPS_RTC: + fprintf(stderr, + "%s: The CMOS area specified by the layout info for " + "coreboot parameter %s overlaps the realtime clock area.", + prog_name, name); + goto fail; + + case CMOS_AREA_TOO_WIDE: + fprintf(stderr, + "%s: The CMOS area specified by the layout info for " + "coreboot parameter %s is too wide.", + prog_name, name); + goto fail; + + default: + fprintf(stderr, + "%s: Unknown error encountered while attempting to modify " + "coreboot parameter %s.", prog_name, name); + goto fail; + } + + /* write the value to nonvolatile RAM */ + set_iopl(3); + cmos_write(e->bit, e->length, n); + cmos_checksum_write(cmos_checksum_compute()); + set_iopl(0); + return; + +fail: + fprintf(stderr, " CMOS write not performed.\n"); + exit(1); + } + +/**************************************************************************** + * set_params + * + * Set coreboot parameters according to the contents of file 'f'. + ****************************************************************************/ +static void set_params (FILE *f) + { /* First process the input file. Then perform writes only if there were + * no problems processing the input. Either all values will be written + * successfully or no values will be written. + */ + do_cmos_writes(process_input_file(f)); + } + +/**************************************************************************** + * parse_assignment + * + * Parse the string 'arg' (which supposedly represents an assignment) into a + * NAME and a VALUE. If 'arg' does not conform to the proper assignment + * syntax, exit with a usage message. Otherwise, on return, 'arg' is broken + * into substrings representing NAME and VALUE, and *name and *value are set + * to point to these two substrings. + ****************************************************************************/ +static void parse_assignment (char arg[], const char **name, + const char **value) + { static const size_t N_MATCHES = 4; + regmatch_t match[N_MATCHES]; + regex_t assignment; + + compile_reg_exprs(REG_EXTENDED | REG_NEWLINE, 1, assignment_regex, + &assignment); + + /* Does 'arg' conform to proper assignment syntax? If not, exit with a + * usage message. + */ + if (regexec(&assignment, arg, N_MATCHES, match, 0)) + usage(stderr); + + /* Ok, we found a valid assignment. Break it into two strings + * representing NAME and VALUE. + */ + arg[match[1].rm_eo] = '\0'; + arg[match[2].rm_eo] = '\0'; + *name = &arg[match[1].rm_so]; + *value = &arg[match[2].rm_so]; + + free_reg_exprs(1, &assignment); + } + +/**************************************************************************** + * list_cmos_entry + * + * Attempt to list the CMOS entry represented by 'e'. 'show_name' is a + * boolean value indicating whether the parameter name should be displayed + * along with its value. On success, return OK. On error, print an error + * message and return 1. + ****************************************************************************/ +static int list_cmos_entry (const cmos_entry_t *e, int show_name) + { const cmos_enum_t *p; + unsigned long long value; + + /* sanity check CMOS entry */ + switch (prepare_cmos_read(e)) + { case OK: + break; + + case CMOS_OP_RESERVED: + BUG(); + + case CMOS_AREA_OUT_OF_RANGE: + fprintf(stderr, "%s: Can not read coreboot parameter %s because " + "layout info specifies out of range CMOS area.\n", prog_name, + e->name); + return 1; + + case CMOS_AREA_OVERLAPS_RTC: + fprintf(stderr, "%s: Can not read coreboot parameter %s because " + "layout info specifies CMOS area that overlaps realtime " + "clock area.\n", prog_name, e->name); + return 1; + + case CMOS_AREA_TOO_WIDE: + fprintf(stderr, "%s: Can not read coreboot parameter %s because " + "layout info specifies CMOS area that is too wide.\n", + prog_name, e->name); + return 1; + + default: + fprintf(stderr, "%s: Unknown error encountered while attempting to " + "read coreboot parameter %s\n", prog_name, e->name); + return 1; + } + + /* read the value from CMOS */ + set_iopl(3); + value = cmos_read(e->bit, e->length); + set_iopl(0); + + /* display the value */ + switch (e->config) + { case CMOS_ENTRY_ENUM: + if ((p = find_cmos_enum(e->config_id, value)) == NULL) + { if (show_name) + printf("# Bad value -> %s = 0x%llx\n", e->name, value); + else + printf("Bad value -> 0x%llx\n", value); + } + else + { if (show_name) + printf("%s = %s\n", e->name, p->text); + else + printf("%s\n", p->text); + } + + break; + + case CMOS_ENTRY_HEX: + if (show_name) + printf("%s = 0x%llx\n", e->name, value); + else + printf("0x%llx\n", value); + + break; + + case CMOS_ENTRY_RESERVED: + default: + BUG(); + } + + return OK; + } + +/**************************************************************************** + * convert_checksum_value + * + * 'value' is the string representation of a checksum value that the user + * wishes to set using the -c option. Convert the string to a 16-bit + * unsigned integer and return the result. Exit with an error message if + * 'value' is invalid. + ****************************************************************************/ +static uint16_t convert_checksum_value (const char value[]) + { unsigned long n; + const char *p; + uint16_t result; + int negative; + + for (p = value; isspace(*p); p++); + + negative = (*p == '-'); + n = strtoul(value, (char **) &p, 0); + + if (*p) + { fprintf(stderr, "%s: Checksum value %s is not a valid integer.\n", + prog_name, value); + exit(1); + } + + if (negative) + { fprintf(stderr, + "%s: Checksum must be an unsigned integer.\n", prog_name); + exit(1); + } + + result = (uint16_t) n; + + if (result != n) + { fprintf(stderr, + "%s: Checksum value must fit within 16 bits.\n", prog_name); + exit(1); + } + + return result; + } Copied: trunk/util/lxbios/nvramtool.spec (from rev 3122, trunk/util/lxbios/lxbios.spec) =================================================================== --- trunk/util/lxbios/nvramtool.spec (rev 0) +++ trunk/util/lxbios/nvramtool.spec 2008-03-01 19:07:46 UTC (rev 3123) @@ -0,0 +1,50 @@ +## +# $Id$ +## + +Name: nvramtool +Version: 2.0.1 +Release: 0 + +Summary: coreboot utility program +Group: System Environment/Base +License: GPL +Provides: nvramtool + +BuildRoot: %{_tmppath}/%{name}-%{version} + +Source0: %{name}-%{version}.tgz + +%description +nvramtool is a utility for reading/writing coreboot parameters and displaying +information from the coreboot table. + +At boot time, coreboot places a table (known as the coreboot table) in low +physical memory. The contents of this table are preserved even after +coreboot transfers control to the kernel and the kernel initializes itself. +The coreboot table contains various system information such as the type of +mainboard in use. It also specifies locations in the CMOS (nonvolatile RAM) +where the coreboot parameters are stored. + +%prep +%setup -n %{name}-%{version} + +%build +make + +%install +rm -rf "$RPM_BUILD_ROOT" +mkdir -p "$RPM_BUILD_ROOT/usr/bin" +mkdir -p "$RPM_BUILD_ROOT/usr/man/man1" +cp nvramtool "$RPM_BUILD_ROOT/usr/bin" +cp nvramtool.1.gz $RPM_BUILD_ROOT/usr/man/man1 + +%clean +rm -rf "$RPM_BUILD_ROOT" + +%files +%defattr(-,root,root,0755) +%doc ChangeLog README +%doc README +/usr/bin/nvramtool +/usr/man/man1/nvramtool.1.gz

1 0

r3122 - trunk/util/lxbios
by svn＠coreboot.org 01 Mar '08

01 Mar '08

Author: uwe Date: 2008-03-01 20:06:32 +0100 (Sat, 01 Mar 2008) New Revision: 3122 Modified: trunk/util/lxbios/DISCLAIMER trunk/util/lxbios/Makefile trunk/util/lxbios/README trunk/util/lxbios/cmos_lowlevel.c trunk/util/lxbios/cmos_lowlevel.h trunk/util/lxbios/cmos_ops.c trunk/util/lxbios/cmos_ops.h trunk/util/lxbios/common.c trunk/util/lxbios/common.h trunk/util/lxbios/input_file.c trunk/util/lxbios/input_file.h trunk/util/lxbios/layout.c trunk/util/lxbios/layout.h trunk/util/lxbios/layout_file.c trunk/util/lxbios/layout_file.h trunk/util/lxbios/lbtable.c trunk/util/lxbios/lbtable.h trunk/util/lxbios/lxbios.1 trunk/util/lxbios/lxbios.c trunk/util/lxbios/lxbios.spec trunk/util/lxbios/opts.c trunk/util/lxbios/opts.h trunk/util/lxbios/reg_expr.c trunk/util/lxbios/reg_expr.h Log: Rename lxbios to nvramtool. This is step 1 in a three-step commit: 1. Apply patch, commit. 2. Rename some files: $ svn mv lxbios.c nvramtool.c $ svn mv lxbios.1 nvramtool.c $ svn mv lxbios.spec nvramtool.spec $ svn ci 3. Rename lxbios directory: $ svn mv lxbios/ nvramtool/ $ svn ci Signed-off-by: Uwe Hermann <uwe(a)hermann-uwe.de> Acked-by: Stefan Reinauer <stepan(a)coresystems.de> Modified: trunk/util/lxbios/DISCLAIMER =================================================================== --- trunk/util/lxbios/DISCLAIMER 2008-03-01 18:49:39 UTC (rev 3121) +++ trunk/util/lxbios/DISCLAIMER 2008-03-01 19:06:32 UTC (rev 3122) @@ -8,9 +8,9 @@ UCRL-CODE-2003-012 All rights reserved. -This file is part of lxbios, a utility for reading/writing coreboot +This file is part of nvramtool, a utility for reading/writing coreboot parameters and displaying information from the coreboot table. -For details, see http://coreboot.org/Lxbios. +For details, see http://coreboot.org/nvramtool. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License (as published by the Modified: trunk/util/lxbios/Makefile =================================================================== --- trunk/util/lxbios/Makefile 2008-03-01 18:49:39 UTC (rev 3121) +++ trunk/util/lxbios/Makefile 2008-03-01 19:06:32 UTC (rev 3122) @@ -1,28 +1,28 @@ # $Id$ -PROJECT = lxbios +PROJECT = nvramtool CC = gcc CFLAGS = -O2 -W -Wall LDFLAGS = OBJS = common.o compute_ip_checksum.o hexdump.o cmos_lowlevel.o \ reg_expr.o layout.o layout_file.o lbtable.o cmos_ops.o input_file.o \ - opts.o lxbios.o + opts.o nvramtool.o HEADERS = common.h ip_checksum.h coreboot_tables.h hexdump.h \ cmos_lowlevel.h reg_expr.h layout.h layout_file.h lbtable.h \ cmos_ops.h input_file.h opts.h -all: lxbios man +all: nvramtool man -lxbios: $(OBJS) +nvramtool: $(OBJS) $(CC) $(LDFLAGS) -o $@ $(OBJS) -man: lxbios.1.gz +man: nvramtool.1.gz $(OBJS): $(HEADERS) -lxbios.1.gz: lxbios.1 - gzip -c --best lxbios.1 > lxbios.1.gz +nvramtool.1.gz: nvramtool.1 + gzip -c --best nvramtool.1 > nvramtool.1.gz clean: - rm -f *.o lxbios lxbios.1.gz + rm -f *.o nvramtool nvramtool.1.gz Modified: trunk/util/lxbios/README =================================================================== --- trunk/util/lxbios/README 2008-03-01 18:49:39 UTC (rev 3121) +++ trunk/util/lxbios/README 2008-03-01 19:06:32 UTC (rev 3122) @@ -2,7 +2,7 @@ Summary of Operation -------------------- -lxbios is a utility for reading/writing coreboot parameters and +nvramtool is a utility for reading/writing coreboot parameters and displaying information from the coreboot table. It is intended for x86-based systems (both 32-bit and 64-bit) that use coreboot. Modified: trunk/util/lxbios/cmos_lowlevel.c =================================================================== --- trunk/util/lxbios/cmos_lowlevel.c 2008-03-01 18:49:39 UTC (rev 3121) +++ trunk/util/lxbios/cmos_lowlevel.c 2008-03-01 19:06:32 UTC (rev 3122) @@ -8,9 +8,9 @@ * UCRL-CODE-2003-012 * All rights reserved. * - * This file is part of lxbios, a utility for reading/writing coreboot + * This file is part of nvramtool, a utility for reading/writing coreboot * parameters and displaying information from the coreboot table. - * For details, see http://coreboot.org/Lxbios. + * For details, see http://coreboot.org/nvramtool. * * Please also read the file DISCLAIMER which is included in this software * distribution. Modified: trunk/util/lxbios/cmos_lowlevel.h =================================================================== --- trunk/util/lxbios/cmos_lowlevel.h 2008-03-01 18:49:39 UTC (rev 3121) +++ trunk/util/lxbios/cmos_lowlevel.h 2008-03-01 19:06:32 UTC (rev 3122) @@ -8,9 +8,9 @@ * UCRL-CODE-2003-012 * All rights reserved. * - * This file is part of lxbios, a utility for reading/writing coreboot + * This file is part of nvramtool, a utility for reading/writing coreboot * parameters and displaying information from the coreboot table. - * For details, see http://coreboot.org/Lxbios. + * For details, see http://coreboot.org/nvramtool. * * Please also read the file DISCLAIMER which is included in this software * distribution. @@ -29,8 +29,8 @@ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. \*****************************************************************************/ -#ifndef LXBIOS_CMOS_LOWLEVEL_H -#define LXBIOS_CMOS_LOWLEVEL_H +#ifndef NVRAMTOOL_CMOS_LOWLEVEL_H +#define NVRAMTOOL_CMOS_LOWLEVEL_H #include "common.h" @@ -59,4 +59,4 @@ static inline int verify_cmos_byte_index (unsigned index) { return (index < CMOS_RTC_AREA_SIZE) || (index >= CMOS_SIZE); } -#endif /* LXBIOS_CMOS_LOWLEVEL_H */ +#endif /* NVRAMTOOL_CMOS_LOWLEVEL_H */ Modified: trunk/util/lxbios/cmos_ops.c =================================================================== --- trunk/util/lxbios/cmos_ops.c 2008-03-01 18:49:39 UTC (rev 3121) +++ trunk/util/lxbios/cmos_ops.c 2008-03-01 19:06:32 UTC (rev 3122) @@ -8,9 +8,9 @@ * UCRL-CODE-2003-012 * All rights reserved. * - * This file is part of lxbios, a utility for reading/writing coreboot + * This file is part of nvramtool, a utility for reading/writing coreboot * parameters and displaying information from the coreboot table. - * For details, see http://coreboot.org/Lxbios. + * For details, see http://coreboot.org/nvramtool. * * Please also read the file DISCLAIMER which is included in this software * distribution. Modified: trunk/util/lxbios/cmos_ops.h =================================================================== --- trunk/util/lxbios/cmos_ops.h 2008-03-01 18:49:39 UTC (rev 3121) +++ trunk/util/lxbios/cmos_ops.h 2008-03-01 19:06:32 UTC (rev 3122) @@ -8,9 +8,9 @@ * UCRL-CODE-2003-012 * All rights reserved. * - * This file is part of lxbios, a utility for reading/writing coreboot + * This file is part of nvramtool, a utility for reading/writing coreboot * parameters and displaying information from the coreboot table. - * For details, see http://coreboot.org/Lxbios. + * For details, see http://coreboot.org/nvramtool. * * Please also read the file DISCLAIMER which is included in this software * distribution. @@ -29,8 +29,8 @@ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. \*****************************************************************************/ -#ifndef LXBIOS_CMOS_OPS_H -#define LXBIOS_CMOS_OPS_H +#ifndef CMOS_OPS_H +#define CMOS_OPS_H #include "common.h" #include "layout.h" @@ -50,4 +50,4 @@ uint16_t cmos_checksum_compute (void); void cmos_checksum_verify (void); -#endif /* LXBIOS_CMOS_OPS_H */ +#endif /* CMOS_OPS_H */ Modified: trunk/util/lxbios/common.c =================================================================== --- trunk/util/lxbios/common.c 2008-03-01 18:49:39 UTC (rev 3121) +++ trunk/util/lxbios/common.c 2008-03-01 19:06:32 UTC (rev 3122) @@ -8,9 +8,9 @@ * UCRL-CODE-2003-012 * All rights reserved. * - * This file is part of lxbios, a utility for reading/writing coreboot + * This file is part of nvramtool, a utility for reading/writing coreboot * parameters and displaying information from the coreboot table. - * For details, see http://coreboot.org/Lxbios. + * For details, see http://coreboot.org/nvramtool. * * Please also read the file DISCLAIMER which is included in this software * distribution. @@ -32,7 +32,7 @@ #include "common.h" /* basename of this program, as reported by argv[0] */ -const char prog_name[] = "lxbios"; +const char prog_name[] = "nvramtool"; /* version of this program */ const char prog_version[] = "2.0.1"; Modified: trunk/util/lxbios/common.h =================================================================== --- trunk/util/lxbios/common.h 2008-03-01 18:49:39 UTC (rev 3121) +++ trunk/util/lxbios/common.h 2008-03-01 19:06:32 UTC (rev 3122) @@ -8,9 +8,9 @@ * UCRL-CODE-2003-012 * All rights reserved. * - * This file is part of lxbios, a utility for reading/writing coreboot + * This file is part of nvramtool, a utility for reading/writing coreboot * parameters and displaying information from the coreboot table. - * For details, see http://coreboot.org/Lxbios. + * For details, see http://coreboot.org/nvramtool. * * Please also read the file DISCLAIMER which is included in this software * distribution. @@ -29,8 +29,8 @@ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. \*****************************************************************************/ -#ifndef LXBIOS_COMMON_H -#define LXBIOS_COMMON_H +#ifndef COMMON_H +#define COMMON_H #include <sys/types.h> #include <sys/stat.h> @@ -69,4 +69,4 @@ void out_of_memory (void); void usage (FILE *outfile); -#endif /* LXBIOS_COMMON_H */ +#endif /* COMMON_H */ Modified: trunk/util/lxbios/input_file.c =================================================================== --- trunk/util/lxbios/input_file.c 2008-03-01 18:49:39 UTC (rev 3121) +++ trunk/util/lxbios/input_file.c 2008-03-01 19:06:32 UTC (rev 3122) @@ -8,9 +8,9 @@ * UCRL-CODE-2003-012 * All rights reserved. * - * This file is part of lxbios, a utility for reading/writing coreboot + * This file is part of nvramtool, a utility for reading/writing coreboot * parameters and displaying information from the coreboot table. - * For details, see http://coreboot.org/Lxbios. + * For details, see http://coreboot.org/nvramtool. * * Please also read the file DISCLAIMER which is included in this software * distribution. Modified: trunk/util/lxbios/input_file.h =================================================================== --- trunk/util/lxbios/input_file.h 2008-03-01 18:49:39 UTC (rev 3121) +++ trunk/util/lxbios/input_file.h 2008-03-01 19:06:32 UTC (rev 3122) @@ -8,9 +8,9 @@ * UCRL-CODE-2003-012 * All rights reserved. * - * This file is part of lxbios, a utility for reading/writing coreboot + * This file is part of nvramtool, a utility for reading/writing coreboot * parameters and displaying information from the coreboot table. - * For details, see http://coreboot.org/Lxbios. + * For details, see http://coreboot.org/nvramtool. * * Please also read the file DISCLAIMER which is included in this software * distribution. @@ -29,8 +29,8 @@ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. \*****************************************************************************/ -#ifndef LXBIOS_INPUT_FILE_H -#define LXBIOS_INPUT_FILE_H +#ifndef INPUT_FILE_H +#define INPUT_FILE_H #include "common.h" @@ -53,4 +53,4 @@ extern const char assignment_regex[]; -#endif /* LXBIOS_INPUT_FILE_H */ +#endif /* INPUT_FILE_H */ Modified: trunk/util/lxbios/layout.c =================================================================== --- trunk/util/lxbios/layout.c 2008-03-01 18:49:39 UTC (rev 3121) +++ trunk/util/lxbios/layout.c 2008-03-01 19:06:32 UTC (rev 3122) @@ -8,9 +8,9 @@ * UCRL-CODE-2003-012 * All rights reserved. * - * This file is part of lxbios, a utility for reading/writing coreboot + * This file is part of nvramtool, a utility for reading/writing coreboot * parameters and displaying information from the coreboot table. - * For details, see http://coreboot.org/Lxbios. + * For details, see http://coreboot.org/nvramtool. * * Please also read the file DISCLAIMER which is included in this software * distribution. Modified: trunk/util/lxbios/layout.h =================================================================== --- trunk/util/lxbios/layout.h 2008-03-01 18:49:39 UTC (rev 3121) +++ trunk/util/lxbios/layout.h 2008-03-01 19:06:32 UTC (rev 3122) @@ -8,9 +8,9 @@ * UCRL-CODE-2003-012 * All rights reserved. * - * This file is part of lxbios, a utility for reading/writing coreboot + * This file is part of nvramtool, a utility for reading/writing coreboot * parameters and displaying information from the coreboot table. - * For details, see http://coreboot.org/Lxbios. + * For details, see http://coreboot.org/nvramtool. * * Please also read the file DISCLAIMER which is included in this software * distribution. @@ -29,8 +29,8 @@ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. \*****************************************************************************/ -#ifndef LXBIOS_LAYOUT_H -#define LXBIOS_LAYOUT_H +#ifndef LAYOUT_H +#define LAYOUT_H #include "common.h" #include "coreboot_tables.h" @@ -111,4 +111,4 @@ int checksum_layout_to_bytes (cmos_checksum_layout_t *layout); void checksum_layout_to_bits (cmos_checksum_layout_t *layout); -#endif /* LXBIOS_LAYOUT_H */ +#endif /* LAYOUT_H */ Modified: trunk/util/lxbios/layout_file.c =================================================================== --- trunk/util/lxbios/layout_file.c 2008-03-01 18:49:39 UTC (rev 3121) +++ trunk/util/lxbios/layout_file.c 2008-03-01 19:06:32 UTC (rev 3122) @@ -8,9 +8,9 @@ * UCRL-CODE-2003-012 * All rights reserved. * - * This file is part of lxbios, a utility for reading/writing coreboot + * This file is part of nvramtool, a utility for reading/writing coreboot * parameters and displaying information from the coreboot table. - * For details, see http://coreboot.org/Lxbios. + * For details, see http://coreboot.org/nvramtool. * * Please also read the file DISCLAIMER which is included in this software * distribution. Modified: trunk/util/lxbios/layout_file.h =================================================================== --- trunk/util/lxbios/layout_file.h 2008-03-01 18:49:39 UTC (rev 3121) +++ trunk/util/lxbios/layout_file.h 2008-03-01 19:06:32 UTC (rev 3122) @@ -8,9 +8,9 @@ * UCRL-CODE-2003-012 * All rights reserved. * - * This file is part of lxbios, a utility for reading/writing coreboot + * This file is part of nvramtool, a utility for reading/writing coreboot * parameters and displaying information from the coreboot table. - * For details, see http://coreboot.org/Lxbios. + * For details, see http://coreboot.org/nvramtool. * * Please also read the file DISCLAIMER which is included in this software * distribution. @@ -29,8 +29,8 @@ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. \*****************************************************************************/ -#ifndef LXBIOS_LAYOUT_FILE_H -#define LXBIOS_LAYOUT_FILE_H +#ifndef LAYOUT_FILE_H +#define LAYOUT_FILE_H #include "common.h" #include "coreboot_tables.h" @@ -39,4 +39,4 @@ void get_layout_from_file (void); void write_cmos_layout (FILE *f); -#endif /* LXBIOS_LAYOUT_FILE_H */ +#endif /* LAYOUT_FILE_H */ Modified: trunk/util/lxbios/lbtable.c =================================================================== --- trunk/util/lxbios/lbtable.c 2008-03-01 18:49:39 UTC (rev 3121) +++ trunk/util/lxbios/lbtable.c 2008-03-01 19:06:32 UTC (rev 3122) @@ -9,9 +9,9 @@ * UCRL-CODE-2003-012 * All rights reserved. * - * This file is part of lxbios, a utility for reading/writing coreboot + * This file is part of nvramtool, a utility for reading/writing coreboot * parameters and displaying information from the coreboot table. - * For details, see http://coreboot.org/Lxbios. + * For details, see http://coreboot.org/nvramtool. * * Please also read the file DISCLAIMER which is included in this software * distribution. Modified: trunk/util/lxbios/lbtable.h =================================================================== --- trunk/util/lxbios/lbtable.h 2008-03-01 18:49:39 UTC (rev 3121) +++ trunk/util/lxbios/lbtable.h 2008-03-01 19:06:32 UTC (rev 3122) @@ -8,9 +8,9 @@ * UCRL-CODE-2003-012 * All rights reserved. * - * This file is part of lxbios, a utility for reading/writing coreboot + * This file is part of nvramtool, a utility for reading/writing coreboot * parameters and displaying information from the coreboot table. - * For details, see http://coreboot.org/Lxbios. + * For details, see http://coreboot.org/nvramtool. * * Please also read the file DISCLAIMER which is included in this software * distribution. @@ -29,8 +29,8 @@ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. \*****************************************************************************/ -#ifndef LXBIOS_LBTABLE_H -#define LXBIOS_LBTABLE_H +#ifndef LBTABLE_H +#define LBTABLE_H #include "common.h" @@ -40,4 +40,4 @@ void list_lbtable_choices (void); void list_lbtable_item (const char item[]); -#endif /* LXBIOS_LBTABLE_H */ +#endif /* LBTABLE_H */ Modified: trunk/util/lxbios/lxbios.1 =================================================================== --- trunk/util/lxbios/lxbios.1 2008-03-01 18:49:39 UTC (rev 3121) +++ trunk/util/lxbios/lxbios.1 2008-03-01 19:06:32 UTC (rev 3122) @@ -1,5 +1,5 @@ .\"***************************************************************************\ -.\" lxbios.1 +.\" nvramtool.1 .\" $Id$ .\"*************************************************************************** .\" Copyright (C) 2002, 2003 The Regents of the University of California. @@ -8,9 +8,9 @@ .\" UCRL-CODE-2003-012 .\" All rights reserved. .\" -.\" This file is part of lxbios, a utility for reading/writing coreboot +.\" This file is part of nvramtool, a utility for reading/writing coreboot .\" parameters and displaying information from the coreboot table. -.\" For details, see http://coreboot.org/Lxbios. +.\" For details, see http://coreboot.org/nvramtool. .\" .\" Please also read the file DISCLAIMER which is included in this software .\" distribution. @@ -28,43 +28,43 @@ .\" with this program; if not, write to the Free Software Foundation, Inc., .\" 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. .\"***************************************************************************/ -.TH LXBIOS 1 "January 2008" Linux +.TH NVRAMTOOL 1 "January 2008" Linux .SH NAME -lxbios \- read/write coreboot-related information +nvramtool \- read/write coreboot-related information .SH SYNOPSIS -.B "lxbios [OPTS] [-n] -r NAME" +.B "nvramtool [OPTS] [-n] -r NAME" .br -.B "lxbios [OPTS] -e NAME" +.B "nvramtool [OPTS] -e NAME" .br -.B "lxbios [OPTS] -a" +.B "nvramtool [OPTS] -a" .br -.B "lxbios [OPTS] -w NAME=VALUE" +.B "nvramtool [OPTS] -w NAME=VALUE" .br -.B "lxbios [OPTS] -p INPUT_FILE" +.B "nvramtool [OPTS] -p INPUT_FILE" .br -.B "lxbios [OPTS] -i" +.B "nvramtool [OPTS] -i" .br -.B "lxbios [OPTS] -c [VALUE]" +.B "nvramtool [OPTS] -c [VALUE]" .br -.B "lxbios [OPTS] -l [ARG]" +.B "nvramtool [OPTS] -l [ARG]" .br -.B "lxbios [OPTS] -d" +.B "nvramtool [OPTS] -d" .br -.B "lxbios [OPTS] -Y" +.B "nvramtool [OPTS] -Y" .br -.B "lxbios [OPTS] -b OUTPUT_FILE" +.B "nvramtool [OPTS] -b OUTPUT_FILE" .br -.B "lxbios [OPTS] -B INPUT_FILE" +.B "nvramtool [OPTS] -B INPUT_FILE" .br -.B "lxbios [OPTS] -x" +.B "nvramtool [OPTS] -x" .br -.B "lxbios [OPTS] -X DUMPFILE" +.B "nvramtool [OPTS] -X DUMPFILE" .br -.B "lxbios [OPTS] -v" +.B "nvramtool [OPTS] -v" .br -.B "lxbios [OPTS] -h" +.B "nvramtool [OPTS] -h" .SH DESCRIPTION -.B "lxbios" +.B "nvramtool" is a utility for reading/writing coreboot parameters and displaying information from the coreboot table. @@ -180,11 +180,11 @@ The .B "'-y LAYOUT_FILE'" -option tells lxbios to obtain CMOS layout information from the contents of +option tells nvramtool to obtain CMOS layout information from the contents of .B "LAYOUT_FILE." Likewise, the .B "'-t'" -option tells lxbios to obtain CMOS layout information from the CMOS option +option tells nvramtool to obtain CMOS layout information from the CMOS option table (contained within the coreboot table). If neither option is specified, the CMOS option table is used by default. .B "LAYOUT_FILE" Modified: trunk/util/lxbios/lxbios.c =================================================================== --- trunk/util/lxbios/lxbios.c 2008-03-01 18:49:39 UTC (rev 3121) +++ trunk/util/lxbios/lxbios.c 2008-03-01 19:06:32 UTC (rev 3122) @@ -1,5 +1,5 @@ /*****************************************************************************\ - * lxbios.c + * nvramtool.c * $Id$ ***************************************************************************** * Copyright (C) 2002-2005 The Regents of the University of California. @@ -8,9 +8,9 @@ * UCRL-CODE-2003-012 * All rights reserved. * - * This file is part of lxbios, a utility for reading/writing coreboot + * This file is part of nvramtool, a utility for reading/writing coreboot * parameters and displaying information from the coreboot table. - * For details, see http://coreboot.org/Lxbios. + * For details, see http://coreboot.org/nvramtool. * * Please also read the file DISCLAIMER which is included in this software * distribution. @@ -96,18 +96,18 @@ int main (int argc, char *argv[]) { cmos_layout_get_fn_t fn; - parse_lxbios_args(argc, argv); + parse_nvramtool_args(argc, argv); - if (lxbios_op_modifiers[LXBIOS_MOD_USE_CMOS_LAYOUT_FILE].found) + if (nvramtool_op_modifiers[NVRAMTOOL_MOD_USE_CMOS_LAYOUT_FILE].found) { set_layout_filename( - lxbios_op_modifiers[LXBIOS_MOD_USE_CMOS_LAYOUT_FILE].param); + nvramtool_op_modifiers[NVRAMTOOL_MOD_USE_CMOS_LAYOUT_FILE].param); fn = get_layout_from_file; } else fn = get_layout_from_cmos_table; register_cmos_layout_get_fn(fn); - op_fns[lxbios_op.op](); + op_fns[nvramtool_op.op](); return 0; } @@ -140,11 +140,11 @@ * Else show all possible values for ARG. ****************************************************************************/ static void op_lbtable_show_info (void) - { if (lxbios_op.param == NULL) + { if (nvramtool_op.param == NULL) list_lbtable_choices(); else { get_lbtable(); - list_lbtable_item(lxbios_op.param); + list_lbtable_item(nvramtool_op.param); } } @@ -169,7 +169,7 @@ ****************************************************************************/ static void op_show_param_values (void) { get_cmos_layout(); - list_param_enums(lxbios_op.param); + list_param_enums(nvramtool_op.param); } /**************************************************************************** @@ -184,8 +184,8 @@ { int result; get_cmos_layout(); - result = list_one_param(lxbios_op.param, - !lxbios_op_modifiers[LXBIOS_MOD_SHOW_VALUE_ONLY].found); + result = list_one_param(nvramtool_op.param, + !nvramtool_op_modifiers[NVRAMTOOL_MOD_SHOW_VALUE_ONLY].found); cmos_checksum_verify(); if (result) @@ -225,7 +225,7 @@ /* Separate 'NAME=VALUE' syntax into two strings representing NAME and * VALUE. */ - parse_assignment(lxbios_op.param, &name, &value); + parse_assignment(nvramtool_op.param, &name, &value); set_one_param(name, value); } @@ -252,9 +252,9 @@ static void op_cmos_set_params_file (void) { FILE *f; - if ((f = fopen(lxbios_op.param, "r")) == NULL) + if ((f = fopen(nvramtool_op.param, "r")) == NULL) { fprintf(stderr, "%s: Can not open file %s for reading: %s\n", - prog_name, lxbios_op.param, strerror(errno)); + prog_name, nvramtool_op.param, strerror(errno)); exit(1); } @@ -276,14 +276,14 @@ get_cmos_layout(); - if (lxbios_op.param == NULL) + if (nvramtool_op.param == NULL) { set_iopl(3); checksum = cmos_checksum_read(); set_iopl(0); printf("0x%x\n", checksum); } else - { checksum = convert_checksum_value(lxbios_op.param); + { checksum = convert_checksum_value(nvramtool_op.param); set_iopl(3); cmos_checksum_write(checksum); set_iopl(0); @@ -313,9 +313,9 @@ { unsigned char data[CMOS_SIZE]; FILE *f; - if ((f = fopen(lxbios_op.param, "w")) == NULL) + if ((f = fopen(nvramtool_op.param, "w")) == NULL) { fprintf(stderr, "%s: Can not open file %s for writing: %s\n", - prog_name, lxbios_op.param, strerror(errno)); + prog_name, nvramtool_op.param, strerror(errno)); exit(1); } @@ -325,7 +325,7 @@ if (fwrite(data, 1, CMOS_SIZE, f) != CMOS_SIZE) { fprintf(stderr, "%s: Error writing CMOS data to file %s: %s\n", - prog_name, lxbios_op.param, strerror(errno)); + prog_name, nvramtool_op.param, strerror(errno)); exit(1); } @@ -344,16 +344,16 @@ size_t nr_bytes; FILE *f; - if ((f = fopen(lxbios_op.param, "r")) == NULL) + if ((f = fopen(nvramtool_op.param, "r")) == NULL) { fprintf(stderr, "%s: Can not open file %s for reading: %s\n", - prog_name, lxbios_op.param, strerror(errno)); + prog_name, nvramtool_op.param, strerror(errno)); exit(1); } if ((nr_bytes = fread(data, 1, CMOS_SIZE, f)) != CMOS_SIZE) { fprintf(stderr, "%s: Error: Only able to read %d bytes of CMOS data " "from file %s. CMOS data is unchanged.\n", prog_name, - (int) nr_bytes, lxbios_op.param); + (int) nr_bytes, nvramtool_op.param); exit(1); } @@ -392,9 +392,9 @@ size_t nr_bytes; FILE *f; - if ((f = fopen(lxbios_op.param, "r")) == NULL) + if ((f = fopen(nvramtool_op.param, "r")) == NULL) { fprintf(stderr, "%s: Can not open file %s for reading: %s\n", - prog_name, lxbios_op.param, strerror(errno)); + prog_name, nvramtool_op.param, strerror(errno)); exit(1); } Modified: trunk/util/lxbios/lxbios.spec =================================================================== --- trunk/util/lxbios/lxbios.spec 2008-03-01 18:49:39 UTC (rev 3121) +++ trunk/util/lxbios/lxbios.spec 2008-03-01 19:06:32 UTC (rev 3122) @@ -2,21 +2,21 @@ # $Id$ ## -Name: lxbios +Name: nvramtool Version: 2.0.1 Release: 0 Summary: coreboot utility program Group: System Environment/Base License: GPL -Provides: lxbios +Provides: nvramtool BuildRoot: %{_tmppath}/%{name}-%{version} Source0: %{name}-%{version}.tgz %description -lxbios is a utility for reading/writing coreboot parameters and displaying +nvramtool is a utility for reading/writing coreboot parameters and displaying information from the coreboot table. At boot time, coreboot places a table (known as the coreboot table) in low @@ -36,8 +36,8 @@ rm -rf "$RPM_BUILD_ROOT" mkdir -p "$RPM_BUILD_ROOT/usr/bin" mkdir -p "$RPM_BUILD_ROOT/usr/man/man1" -cp lxbios "$RPM_BUILD_ROOT/usr/bin" -cp lxbios.1.gz $RPM_BUILD_ROOT/usr/man/man1 +cp nvramtool "$RPM_BUILD_ROOT/usr/bin" +cp nvramtool.1.gz $RPM_BUILD_ROOT/usr/man/man1 %clean rm -rf "$RPM_BUILD_ROOT" @@ -46,5 +46,5 @@ %defattr(-,root,root,0755) %doc ChangeLog README %doc README -/usr/bin/lxbios -/usr/man/man1/lxbios.1.gz +/usr/bin/nvramtool +/usr/man/man1/nvramtool.1.gz Modified: trunk/util/lxbios/opts.c =================================================================== --- trunk/util/lxbios/opts.c 2008-03-01 18:49:39 UTC (rev 3121) +++ trunk/util/lxbios/opts.c 2008-03-01 19:06:32 UTC (rev 3122) @@ -8,9 +8,9 @@ * UCRL-CODE-2003-012 * All rights reserved. * - * This file is part of lxbios, a utility for reading/writing coreboot + * This file is part of nvramtool, a utility for reading/writing coreboot * parameters and displaying information from the coreboot table. - * For details, see http://coreboot.org/Lxbios. + * For details, see http://coreboot.org/nvramtool. * * Please also read the file DISCLAIMER which is included in this software * distribution. @@ -32,30 +32,30 @@ #include "common.h" #include "opts.h" -lxbios_op_info_t lxbios_op; +nvramtool_op_info_t nvramtool_op; -lxbios_op_modifier_info_t lxbios_op_modifiers[LXBIOS_NUM_OP_MODIFIERS]; +nvramtool_op_modifier_info_t nvramtool_op_modifiers[NVRAMTOOL_NUM_OP_MODIFIERS]; static char * handle_optional_arg (int argc, char *argv[]); -static void register_op (int *op_found, lxbios_op_t op, char op_param[]); -static void register_op_modifier (lxbios_op_modifier_t mod, char mod_param[]); +static void register_op (int *op_found, nvramtool_op_t op, char op_param[]); +static void register_op_modifier (nvramtool_op_modifier_t mod, char mod_param[]); static void resolve_op_modifiers (void); static void sanity_check_args (void); static const char getopt_string[] = "-ab:B:c::de:hil::np:r:tvw:xX:y:Y"; /**************************************************************************** - * parse_lxbios_args + * parse_nvramtool_args * * Parse command line arguments. ****************************************************************************/ -void parse_lxbios_args (int argc, char *argv[]) - { lxbios_op_modifier_info_t *mod_info; +void parse_nvramtool_args (int argc, char *argv[]) + { nvramtool_op_modifier_info_t *mod_info; int i, op_found; char c; - for (i = 0, mod_info = lxbios_op_modifiers; - i < LXBIOS_NUM_OP_MODIFIERS; + for (i = 0, mod_info = nvramtool_op_modifiers; + i < NVRAMTOOL_NUM_OP_MODIFIERS; i++, mod_info++) { mod_info->found = FALSE; mod_info->found_seq = 0; @@ -68,63 +68,63 @@ do { switch (c = getopt(argc, argv, getopt_string)) { case 'a': - register_op(&op_found, LXBIOS_OP_CMOS_SHOW_ALL_PARAMS, NULL); + register_op(&op_found, NVRAMTOOL_OP_CMOS_SHOW_ALL_PARAMS, NULL); break; case 'b': - register_op(&op_found, LXBIOS_OP_WRITE_CMOS_DUMP, optarg); + register_op(&op_found, NVRAMTOOL_OP_WRITE_CMOS_DUMP, optarg); break; case 'B': - register_op(&op_found, LXBIOS_OP_READ_CMOS_DUMP, optarg); + register_op(&op_found, NVRAMTOOL_OP_READ_CMOS_DUMP, optarg); break; case 'c': - register_op(&op_found, LXBIOS_OP_CMOS_CHECKSUM, + register_op(&op_found, NVRAMTOOL_OP_CMOS_CHECKSUM, handle_optional_arg(argc, argv)); break; case 'd': - register_op(&op_found, LXBIOS_OP_LBTABLE_DUMP, NULL); + register_op(&op_found, NVRAMTOOL_OP_LBTABLE_DUMP, NULL); break; case 'e': - register_op(&op_found, LXBIOS_OP_SHOW_PARAM_VALUES, optarg); + register_op(&op_found, NVRAMTOOL_OP_SHOW_PARAM_VALUES, optarg); break; case 'h': - register_op(&op_found, LXBIOS_OP_SHOW_USAGE, NULL); + register_op(&op_found, NVRAMTOOL_OP_SHOW_USAGE, NULL); break; case 'i': - register_op(&op_found, LXBIOS_OP_CMOS_SET_PARAMS_STDIN, NULL); + register_op(&op_found, NVRAMTOOL_OP_CMOS_SET_PARAMS_STDIN, NULL); break; case 'l': - register_op(&op_found, LXBIOS_OP_LBTABLE_SHOW_INFO, + register_op(&op_found, NVRAMTOOL_OP_LBTABLE_SHOW_INFO, handle_optional_arg(argc, argv)); break; case 'n': - register_op_modifier(LXBIOS_MOD_SHOW_VALUE_ONLY, NULL); + register_op_modifier(NVRAMTOOL_MOD_SHOW_VALUE_ONLY, NULL); break; case 'p': - register_op(&op_found, LXBIOS_OP_CMOS_SET_PARAMS_FILE, optarg); + register_op(&op_found, NVRAMTOOL_OP_CMOS_SET_PARAMS_FILE, optarg); break; case 'r': - register_op(&op_found, LXBIOS_OP_CMOS_SHOW_ONE_PARAM, optarg); + register_op(&op_found, NVRAMTOOL_OP_CMOS_SHOW_ONE_PARAM, optarg); break; case 't': - register_op_modifier(LXBIOS_MOD_USE_CMOS_OPT_TABLE, NULL); + register_op_modifier(NVRAMTOOL_MOD_USE_CMOS_OPT_TABLE, NULL); break; case 'v': - register_op(&op_found, LXBIOS_OP_SHOW_VERSION, NULL); + register_op(&op_found, NVRAMTOOL_OP_SHOW_VERSION, NULL); break; case 'w': - register_op(&op_found, LXBIOS_OP_CMOS_SET_ONE_PARAM, optarg); + register_op(&op_found, NVRAMTOOL_OP_CMOS_SET_ONE_PARAM, optarg); break; case 'x': - register_op(&op_found, LXBIOS_OP_SHOW_CMOS_HEX_DUMP, NULL); + register_op(&op_found, NVRAMTOOL_OP_SHOW_CMOS_HEX_DUMP, NULL); break; case 'X': - register_op(&op_found, LXBIOS_OP_SHOW_CMOS_DUMPFILE, optarg); + register_op(&op_found, NVRAMTOOL_OP_SHOW_CMOS_DUMPFILE, optarg); break; case 'y': - register_op_modifier(LXBIOS_MOD_USE_CMOS_LAYOUT_FILE, optarg); + register_op_modifier(NVRAMTOOL_MOD_USE_CMOS_LAYOUT_FILE, optarg); break; case 'Y': - register_op(&op_found, LXBIOS_OP_SHOW_LAYOUT, NULL); + register_op(&op_found, NVRAMTOOL_OP_SHOW_LAYOUT, NULL); break; case -1: /* no more command line args */ break; @@ -178,13 +178,13 @@ * * Store the user's selection of which operation this program should perform. ****************************************************************************/ -static void register_op (int *op_found, lxbios_op_t op, char op_param[]) - { if (*op_found && (op != lxbios_op.op)) +static void register_op (int *op_found, nvramtool_op_t op, char op_param[]) + { if (*op_found && (op != nvramtool_op.op)) usage(stderr); *op_found = TRUE; - lxbios_op.op = op; - lxbios_op.param = op_param; + nvramtool_op.op = op; + nvramtool_op.param = op_param; } /**************************************************************************** @@ -193,11 +193,11 @@ * Store information regarding an optional argument specified in addition to * the user's selection of which operation this program should perform. ****************************************************************************/ -static void register_op_modifier (lxbios_op_modifier_t mod, char mod_param[]) +static void register_op_modifier (nvramtool_op_modifier_t mod, char mod_param[]) { static int found_seq = 0; - lxbios_op_modifier_info_t *mod_info; + nvramtool_op_modifier_info_t *mod_info; - mod_info = &lxbios_op_modifiers[mod]; + mod_info = &nvramtool_op_modifiers[mod]; mod_info->found = TRUE; mod_info->found_seq = ++found_seq; mod_info->param = mod_param; @@ -210,13 +210,13 @@ * the last specified argument overrides previous conflicting arguments. ****************************************************************************/ static void resolve_op_modifiers (void) - { if (lxbios_op_modifiers[LXBIOS_MOD_USE_CMOS_LAYOUT_FILE].found && - lxbios_op_modifiers[LXBIOS_MOD_USE_CMOS_OPT_TABLE].found) - { if (lxbios_op_modifiers[LXBIOS_MOD_USE_CMOS_LAYOUT_FILE].found_seq > - lxbios_op_modifiers[LXBIOS_MOD_USE_CMOS_OPT_TABLE].found_seq) - lxbios_op_modifiers[LXBIOS_MOD_USE_CMOS_OPT_TABLE].found = FALSE; + { if (nvramtool_op_modifiers[NVRAMTOOL_MOD_USE_CMOS_LAYOUT_FILE].found && + nvramtool_op_modifiers[NVRAMTOOL_MOD_USE_CMOS_OPT_TABLE].found) + { if (nvramtool_op_modifiers[NVRAMTOOL_MOD_USE_CMOS_LAYOUT_FILE].found_seq > + nvramtool_op_modifiers[NVRAMTOOL_MOD_USE_CMOS_OPT_TABLE].found_seq) + nvramtool_op_modifiers[NVRAMTOOL_MOD_USE_CMOS_OPT_TABLE].found = FALSE; else - lxbios_op_modifiers[LXBIOS_MOD_USE_CMOS_LAYOUT_FILE].found = FALSE; + nvramtool_op_modifiers[NVRAMTOOL_MOD_USE_CMOS_LAYOUT_FILE].found = FALSE; } } @@ -226,7 +226,7 @@ * Perform sanity checking on command line arguments. ****************************************************************************/ static void sanity_check_args (void) - { if ((lxbios_op_modifiers[LXBIOS_MOD_SHOW_VALUE_ONLY].found) && - (lxbios_op.op != LXBIOS_OP_CMOS_SHOW_ONE_PARAM)) + { if ((nvramtool_op_modifiers[NVRAMTOOL_MOD_SHOW_VALUE_ONLY].found) && + (nvramtool_op.op != NVRAMTOOL_OP_CMOS_SHOW_ONE_PARAM)) usage(stderr); } Modified: trunk/util/lxbios/opts.h =================================================================== --- trunk/util/lxbios/opts.h 2008-03-01 18:49:39 UTC (rev 3121) +++ trunk/util/lxbios/opts.h 2008-03-01 19:06:32 UTC (rev 3122) @@ -8,9 +8,9 @@ * UCRL-CODE-2003-012 * All rights reserved. * - * This file is part of lxbios, a utility for reading/writing coreboot + * This file is part of nvramtool, a utility for reading/writing coreboot * parameters and displaying information from the coreboot table. - * For details, see http://coreboot.org/Lxbios. + * For details, see http://coreboot.org/nvramtool. * * Please also read the file DISCLAIMER which is included in this software * distribution. @@ -29,56 +29,56 @@ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. \*****************************************************************************/ -#ifndef LXBIOS_OPTS_H -#define LXBIOS_OPTS_H +#ifndef OPTS_H +#define OPTS_H #include "common.h" typedef enum - { LXBIOS_OP_SHOW_VERSION = 0, - LXBIOS_OP_SHOW_USAGE, - LXBIOS_OP_LBTABLE_SHOW_INFO, - LXBIOS_OP_LBTABLE_DUMP, - LXBIOS_OP_SHOW_PARAM_VALUES, - LXBIOS_OP_CMOS_SHOW_ONE_PARAM, - LXBIOS_OP_CMOS_SHOW_ALL_PARAMS, - LXBIOS_OP_CMOS_SET_ONE_PARAM, - LXBIOS_OP_CMOS_SET_PARAMS_STDIN, - LXBIOS_OP_CMOS_SET_PARAMS_FILE, - LXBIOS_OP_CMOS_CHECKSUM, - LXBIOS_OP_SHOW_LAYOUT, - LXBIOS_OP_WRITE_CMOS_DUMP, - LXBIOS_OP_READ_CMOS_DUMP, - LXBIOS_OP_SHOW_CMOS_HEX_DUMP, - LXBIOS_OP_SHOW_CMOS_DUMPFILE + { NVRAMTOOL_OP_SHOW_VERSION = 0, + NVRAMTOOL_OP_SHOW_USAGE, + NVRAMTOOL_OP_LBTABLE_SHOW_INFO, + NVRAMTOOL_OP_LBTABLE_DUMP, + NVRAMTOOL_OP_SHOW_PARAM_VALUES, + NVRAMTOOL_OP_CMOS_SHOW_ONE_PARAM, + NVRAMTOOL_OP_CMOS_SHOW_ALL_PARAMS, + NVRAMTOOL_OP_CMOS_SET_ONE_PARAM, + NVRAMTOOL_OP_CMOS_SET_PARAMS_STDIN, + NVRAMTOOL_OP_CMOS_SET_PARAMS_FILE, + NVRAMTOOL_OP_CMOS_CHECKSUM, + NVRAMTOOL_OP_SHOW_LAYOUT, + NVRAMTOOL_OP_WRITE_CMOS_DUMP, + NVRAMTOOL_OP_READ_CMOS_DUMP, + NVRAMTOOL_OP_SHOW_CMOS_HEX_DUMP, + NVRAMTOOL_OP_SHOW_CMOS_DUMPFILE } -lxbios_op_t; +nvramtool_op_t; typedef struct - { lxbios_op_t op; + { nvramtool_op_t op; char *param; } -lxbios_op_info_t; +nvramtool_op_info_t; typedef enum - { LXBIOS_MOD_SHOW_VALUE_ONLY = 0, - LXBIOS_MOD_USE_CMOS_LAYOUT_FILE, - LXBIOS_MOD_USE_CMOS_OPT_TABLE, - LXBIOS_NUM_OP_MODIFIERS /* must always be last */ + { NVRAMTOOL_MOD_SHOW_VALUE_ONLY = 0, + NVRAMTOOL_MOD_USE_CMOS_LAYOUT_FILE, + NVRAMTOOL_MOD_USE_CMOS_OPT_TABLE, + NVRAMTOOL_NUM_OP_MODIFIERS /* must always be last */ } -lxbios_op_modifier_t; +nvramtool_op_modifier_t; typedef struct { int found; int found_seq; char *param; } -lxbios_op_modifier_info_t; +nvramtool_op_modifier_info_t; -extern lxbios_op_info_t lxbios_op; +extern nvramtool_op_info_t nvramtool_op; -extern lxbios_op_modifier_info_t lxbios_op_modifiers[]; +extern nvramtool_op_modifier_info_t nvramtool_op_modifiers[]; -void parse_lxbios_args (int argc, char *argv[]); +void parse_nvramtool_args (int argc, char *argv[]); -#endif /* LXBIOS_OPTS_H */ +#endif /* OPTS_H */ Modified: trunk/util/lxbios/reg_expr.c =================================================================== --- trunk/util/lxbios/reg_expr.c 2008-03-01 18:49:39 UTC (rev 3121) +++ trunk/util/lxbios/reg_expr.c 2008-03-01 19:06:32 UTC (rev 3122) @@ -8,9 +8,9 @@ * UCRL-CODE-2003-012 * All rights reserved. * - * This file is part of lxbios, a utility for reading/writing coreboot + * This file is part of nvramtool, a utility for reading/writing coreboot * parameters and displaying information from the coreboot table. - * For details, see http://coreboot.org/Lxbios. + * For details, see http://coreboot.org/nvramtool. * * Please also read the file DISCLAIMER which is included in this software * distribution. Modified: trunk/util/lxbios/reg_expr.h =================================================================== --- trunk/util/lxbios/reg_expr.h 2008-03-01 18:49:39 UTC (rev 3121) +++ trunk/util/lxbios/reg_expr.h 2008-03-01 19:06:32 UTC (rev 3122) @@ -8,9 +8,9 @@ * UCRL-CODE-2003-012 * All rights reserved. * - * This file is part of lxbios, a utility for reading/writing coreboot + * This file is part of nvramtool, a utility for reading/writing coreboot * parameters and displaying information from the coreboot table. - * For details, see http://coreboot.org/Lxbios. + * For details, see http://coreboot.org/nvramtool. * * Please also read the file DISCLAIMER which is included in this software * distribution. @@ -29,8 +29,8 @@ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. \*****************************************************************************/ -#ifndef LXBIOS_REG_EXPR_H -#define LXBIOS_REG_EXPR_H +#ifndef REG_EXPR_H +#define REG_EXPR_H #include <regex.h> #include "common.h" @@ -39,4 +39,4 @@ /* const char *expr1, regex_t *reg1, */ ...); void free_reg_exprs (int num_exprs, /* regex_t *reg1, */ ...); -#endif /* LXBIOS_REG_EXPR_H */ +#endif /* REG_EXPR_H */

1 0

r3121 - trunk/util/superiotool
by svn＠coreboot.org 01 Mar '08

01 Mar '08

Author: uwe Date: 2008-03-01 19:49:39 +0100 (Sat, 01 Mar 2008) New Revision: 3121 Modified: trunk/util/superiotool/README trunk/util/superiotool/ite.c trunk/util/superiotool/superiotool.8 trunk/util/superiotool/superiotool.c trunk/util/superiotool/superiotool.h Log: Small coding style fixes and documentation updates (trivial). Signed-off-by: Uwe Hermann <uwe(a)hermann-uwe.de> Acked-by: Uwe Hermann <uwe(a)hermann-uwe.de> Modified: trunk/util/superiotool/README =================================================================== --- trunk/util/superiotool/README 2008-03-01 15:33:03 UTC (rev 3120) +++ trunk/util/superiotool/README 2008-03-01 18:49:39 UTC (rev 3121) @@ -30,10 +30,10 @@ Usage ----- - $ superiotool [-d] [-l] [-V] [-v] [-h] + $ superiotool [-d] [-e] [-l] [-V] [-v] [-h] -d | --dump Dump Super I/O register contents - -e | --extra-dump Dump Secondary registers too (like EC registers etc.) + -e | --extra-dump Dump secondary registers too (e.g. EC registers) -l | --list-supported Show the list of supported Super I/O chips -V | --verbose Verbose mode -v | --version Show the superiotool version Modified: trunk/util/superiotool/ite.c =================================================================== --- trunk/util/superiotool/ite.c 2008-03-01 15:33:03 UTC (rev 3120) +++ trunk/util/superiotool/ite.c 2008-03-01 18:49:39 UTC (rev 3121) @@ -379,7 +379,7 @@ static void probe_idregs_ite_helper(const char *init, uint16_t port) { - uint16_t id, chipver; + uint16_t id, chipver, ecport; probing_for("ITE", init, port); @@ -400,13 +400,16 @@ dump_superio("ITE", reg_table, port, id); if (extra_dump) { - uint16_t ecport; - regwrite(port, 0x07, 0x04); /*EC LDN*/ + regwrite(port, 0x07, 0x04); /* Select LDN 4 (EC). */ + + /* Get EC base address (stored in LDN 4, index 0x60/0x61). */ ecport = regval(port, 0x60) << 8; ecport |= regval(port, 0x61); + + /* EC address register = EC base address + 5. */ ecport += 5; - printf("Environment Controller (0x%04x)\n",ecport); + printf("Environment controller (0x%04x)\n", ecport); dump_superio("ITE-EC", ec_table, ecport, id); } } Modified: trunk/util/superiotool/superiotool.8 =================================================================== --- trunk/util/superiotool/superiotool.8 2008-03-01 15:33:03 UTC (rev 3120) +++ trunk/util/superiotool/superiotool.8 2008-03-01 18:49:39 UTC (rev 3121) @@ -77,8 +77,8 @@ Dump extra secondary register contents too, if available. Only in combination with the .B --dump -option. This option will, for instance, dump the Environmental Controller -configuration registers for the ITE IT8716f chip. The format is similar to +option. This option will, for instance, dump the environmental controller (EC) +configuration registers for the ITE IT8716F chip. The format is similar to the output of the .B --dump option. Modified: trunk/util/superiotool/superiotool.c =================================================================== --- trunk/util/superiotool/superiotool.c 2008-03-01 15:33:03 UTC (rev 3120) +++ trunk/util/superiotool/superiotool.c 2008-03-01 18:49:39 UTC (rev 3121) @@ -158,8 +158,7 @@ return; /* Yes, there's no space between '%s' and 'at'! */ - printf("Probing for %s Super I/O %sat 0x%x...\n", - vendor, info, port); + printf("Probing for %s Super I/O %sat 0x%x...\n", vendor, info, port); } /** Print a list of all supported chips from the given vendor. */ Modified: trunk/util/superiotool/superiotool.h =================================================================== --- trunk/util/superiotool/superiotool.h 2008-03-01 15:33:03 UTC (rev 3120) +++ trunk/util/superiotool/superiotool.h 2008-03-01 18:49:39 UTC (rev 3121) @@ -30,9 +30,9 @@ #include <getopt.h> #include <sys/io.h> -#define USAGE "Usage: superiotool [-d] [-l] [-V] [-v] [-h]\n\n\ +#define USAGE "Usage: superiotool [-d] [-e] [-l] [-V] [-v] [-h]\n\n\ -d | --dump Dump Super I/O register contents\n\ - -e | --extra-dump Dump Secondary registers too (like EC registers etc.)\n\ + -e | --extra-dump Dump secondary registers too (e.g. EC registers)\n\ -l | --list-supported Show the list of supported Super I/O chips\n\ -V | --verbose Verbose mode\n\ -v | --version Show the superiotool version\n\

1 0

IDE cable select question
by joe＠smittys.pointclark.net 01 Mar '08

01 Mar '08

Hello, Trying to figure out if it the payloads (filo) or coreboots resposiblity to detect a 40 or 80 ribbon IDE cable. Reading the ATA specifications it looks like a IDENTIFY_DRIVE command query to the drive is the way it detects this and then the bios sets this in the IDE pci configuration register. Right now, it does not detect this and when the Linux IDE driver takes over it only runs at ATA33 not ATA100. For coreboot to automate this it would have to a IDENTIFY_DRIVE command query to the drive and then set IDE pci configuration register. Would this be possible to do pre payload or is this something that would have to be set manually. If manual could we impliment a global setting?? something like: IDE_CABLE = 40 or 80 Thanks - Joe

4 14

r3120 build service
by coreboot information 01 Mar '08

01 Mar '08

Dear coreboot readers! This is the automated build check service of coreboot. The developer "hailfinger" checked in revision 3120 to the coreboot source repository and caused the following changes: Change Log: Create a genacpi directory below util/ which will hold all acpi related code/data generation utilities. Signed-off-by: Corey Osgood <corey.osgood(a)gmail.com> Acked-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Build Log: Compilation of amd:serengeti_cheetah_fam10 is still broken See the error log at http://qa.coreboot.org/log_buildbrd.php?revision=3120&device=serengeti_chee… If something broke during this checkin please be a pain in hailfinger's neck until the issue is fixed. If this issue is not fixed within 24h the revision should be backed out. Best regards, coreboot automatic build system

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

coreboot March 2008