Various smaller fixes in superiotool:
- Also dump the extra registers (e.g. EC regs) in --list-supported.
- Small fix in the code to allow for building with -pedantic (yes,
the fix is a bit silly, but it's simple and allows us to use the
-pedantic flag to keep the code even cleaner and nicer).
- Install the binary in /usr/sbin, as it's meant to be run as root.
- Small typo in README.
Signed-off-by: Uwe Hermann <uwe@hermann-uwe.de>
Acked-by: Stefan Reinauer <stepan@coresystems.de>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@3163 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
diff --git a/util/superiotool/Makefile b/util/superiotool/Makefile
index 87faecb..d8ac62c 100644
--- a/util/superiotool/Makefile
+++ b/util/superiotool/Makefile
@@ -29,9 +29,8 @@
SVNDEF := -D'SUPERIOTOOL_VERSION="$(shell svnversion -cn . \
| sed -e "s/.*://" -e "s/\([0-9]*\).*/\1/")"'
-# TODO: -pedantic
CFLAGS = -O2 -Wall -Werror -Wstrict-prototypes -Wundef -Wstrict-aliasing \
- -Werror-implicit-function-declaration -ansi $(SVNDEF)
+ -Werror-implicit-function-declaration -ansi -pedantic $(SVNDEF)
OBJS = superiotool.o ali.o fintek.o ite.o nsc.o smsc.o winbond.o
@@ -43,7 +42,7 @@
$(CC) $(CFLAGS) -o $(PROGRAM) $(OBJS)
install: $(PROGRAM)
- $(INSTALL) $(PROGRAM) $(PREFIX)/bin
+ $(INSTALL) $(PROGRAM) $(PREFIX)/sbin
mkdir -p $(PREFIX)/share/man/man8
$(INSTALL) $(PROGRAM).8 $(PREFIX)/share/man/man8
diff --git a/util/superiotool/README b/util/superiotool/README
index 0b4505c..178df83 100644
--- a/util/superiotool/README
+++ b/util/superiotool/README
@@ -30,7 +30,7 @@
Usage
-----
-Please read the superiotool(1) manpage or type 'superiotool --help'.
+Please read the superiotool(8) manpage or type 'superiotool --help'.
Per default (no options) superiotool will just probe for a Super I/O
and print its vendor, name, ID, revision, and config port.
diff --git a/util/superiotool/ite.c b/util/superiotool/ite.c
index 784c4ef..44ec64c 100644
--- a/util/superiotool/ite.c
+++ b/util/superiotool/ite.c
@@ -428,4 +428,5 @@
void print_ite_chips(void)
{
print_vendor_chips("ITE", reg_table);
+ print_vendor_chips("ITE EC", ec_table);
}
diff --git a/util/superiotool/superiotool.c b/util/superiotool/superiotool.c
index 637c0b0..c70aff9 100644
--- a/util/superiotool/superiotool.c
+++ b/util/superiotool/superiotool.c
@@ -237,6 +237,7 @@
break;
case 'h':
printf(USAGE);
+ printf(USAGE_INFO);
exit(0);
break;
default:
diff --git a/util/superiotool/superiotool.h b/util/superiotool/superiotool.h
index 6961325..2685148 100644
--- a/util/superiotool/superiotool.h
+++ b/util/superiotool/superiotool.h
@@ -36,7 +36,9 @@
-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\
- -h | --help Show a short help text\n\n\
+ -h | --help Show a short help text\n\n"
+
+#define USAGE_INFO "\
Per default (no options) superiotool will just probe for a Super I/O\n\
and print its vendor, name, ID, revision, and config port.\n"
@@ -123,7 +125,6 @@
{probe_idregs_winbond, {0x2e, 0x4e, 0x3f0, 0x370, 0x250, EOT}},
};
-
/** Table of functions to print out supported Super I/O chips. */
static const struct {
void (*print_list) (void);