GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Set the superiotool version number from svn at build time. 

Signed-off-by: Ulf Jordan <jordan@chalmers.se>
Acked-by: Uwe Hermann <uwe@hermann-uwe.de>



git-svn-id: svn://svn.coreboot.org/coreboot/trunk@2852 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
This commit is contained in:
Ulf Jordan 2007-10-13 18:06:12 +00:00 committed by Uwe Hermann
parent 45c1556df9
commit 39a5bf74ef
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
util/superiotool/Makefile
View File

@ -24,14 +24,21 @@ CC = gcc
INSTALL = /usr/bin/install INSTALL = /usr/bin/install
PREFIX = /usr/local PREFIX = /usr/local
# Set the superiotool version string from the highest revision number
# of the checked out superiotool files.
SVNDEF := -D'SUPERIOTOOL_VERSION="$(shell svnversion -cn . \
| sed -e "s/.*://" -e "s/\([0-9]*\).*/\1/")"'
# TODO: -pedantic # TODO: -pedantic
CFLAGS = -O2 -Wall -Werror -Wstrict-prototypes -Wundef -Wstrict-aliasing \ CFLAGS = -O2 -Wall -Werror -Wstrict-prototypes -Wundef -Wstrict-aliasing \
-Werror-implicit-function-declaration -ansi -Werror-implicit-function-declaration -ansi $(SVNDEF)
OBJS = superiotool.o ali.o fintek.o ite.o nsc.o smsc.o winbond.o OBJS = superiotool.o ali.o fintek.o ite.o nsc.o smsc.o winbond.o
all: $(PROGRAM) all: $(PROGRAM)
superiotool.o: *.c superiotool.h
$(PROGRAM): $(OBJS) superiotool.h $(PROGRAM): $(OBJS) superiotool.h
$(CC) $(CFLAGS) -o $(PROGRAM) $(OBJS) $(CC) $(CFLAGS) -o $(PROGRAM) $(OBJS)

7
util/superiotool/superiotool.c
View File

@ -170,12 +170,7 @@ void probing_for(const char *vendor, const char *info, uint16_t port)
static void print_version(void) static void print_version(void)
{ {
char tmp[80]; printf("superiotool r%s\n", SUPERIOTOOL_VERSION);
strncpy((char *)&tmp,
(const char *)&SUPERIOTOOL_VERSION[6],
strlen(SUPERIOTOOL_VERSION) - 8);
printf("superiotool r%s\n", (char *)&tmp);
} }
int main(int argc, char *argv[]) int main(int argc, char *argv[])

2
util/superiotool/superiotool.h
View File

@ -29,8 +29,6 @@
#include <getopt.h> #include <getopt.h>
#include <sys/io.h> #include <sys/io.h>
#define SUPERIOTOOL_VERSION "$Rev$"
#define USAGE "Usage: superiotool [-d] [-D] [-V] [-v] [-h]\n\n\ #define USAGE "Usage: superiotool [-d] [-D] [-V] [-v] [-h]\n\n\
-d | --dump Dump Super I/O registers\n\ -d | --dump Dump Super I/O registers\n\
-D | --dump-readable Dump Super I/O registers in human-readable format\n\ -D | --dump-readable Dump Super I/O registers in human-readable format\n\