Commit 0d41ae8c authored by Nishanth Menon's avatar Nishanth Menon

omapconf: get rid of macro based version information

Macro based revision information does not add value with ability to
pick up latest tag based information from git.

For platforms which copy files, we just use plain old Makefile based
version.
Signed-off-by: default avatarNishanth Menon <nm@ti.com>
parent 0085c142
......@@ -5,6 +5,7 @@
/omapconf
*.pyc
builddate.c
version.c
Module.symvers
Module.markers
modules.order
......
......@@ -42,6 +42,8 @@
# */
VERSION_MAJOR=1
VERSION_MINOR=68
CC = $(CROSS_COMPILE)gcc
......@@ -330,8 +332,8 @@ all: $(EXECUTABLE)
$(EXECUTABLE): $(ALLOBJECTS) builddate.o
$(CC) $(STATIC_BUILD) $(LDFLAGS) $(ALLOBJECTS) builddate.o \
$(EXECUTABLE): $(ALLOBJECTS) builddate.o version.o
$(CC) $(STATIC_BUILD) $(LDFLAGS) $(ALLOBJECTS) builddate.o version.o\
-lrt -o $@
......@@ -346,6 +348,9 @@ $(EXECUTABLE): $(ALLOBJECTS) builddate.o
builddate.c: $(ALLOBJECTS)
echo 'char *builddate="'`date`'";' > builddate.c
version.c: $(ALLOBJECTS)
echo 'char *omapconf_version="'`git describe||echo "$(VERSION_MAJOR).$(VERSION_MINOR)-nogit"`'";' > version.c
......@@ -372,7 +377,7 @@ cscope: $(ALLSOURCES)
clean:
rm -f $(EXECUTABLE) *.o builddate.c
rm -f $(EXECUTABLE) *.o builddate.c version.c
rm -f $(OBJECTS)
rm -f $(LINUXOBJECTS)
rm -f $(OMAPOBJECTS)
......
......@@ -364,8 +364,8 @@ int lib54xx_export(char *file)
"%a %b %d %H:%M:%S %Z %Y", tmp);
fprintf(fp,
"<omapconf_export export_date=\"%s\" omapconf_version=\"%u.%u\" omapconf_builddate=\"%s\">\n",
export_date, OMAPCONF_REV_MAJOR, OMAPCONF_REV_MINOR, builddate);
"<omapconf_export export_date=\"%s\" omapconf_version=\"%s\" omapconf_builddate=\"%s\">\n",
export_date, omapconf_version, builddate);
release_details_get(version, type, date);
if (os_is_android())
fprintf(fp,
......
......@@ -96,8 +96,8 @@ void omapconf_revision_show(FILE *stream)
return;
}
fprintf(stream, "OMAPCONF (rev %d.%d built %s)\n\n",
OMAPCONF_REV_MAJOR, OMAPCONF_REV_MINOR, builddate);
fprintf(stream, "OMAPCONF (rev %s built %s)\n\n",
omapconf_version, builddate);
}
......
......@@ -45,10 +45,7 @@
#ifndef __REVISION_H__
#define __REVISION_H__
#define OMAPCONF_REV_MAJOR 1
#define OMAPCONF_REV_MINOR 68
extern char *omapconf_version;
extern char *builddate;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment