summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ubi-utils/Makefile11
-rw-r--r--ubi-utils/src/bin2nand.c4
-rw-r--r--ubi-utils/src/mkbootenv.c4
-rw-r--r--ubi-utils/src/nand2bin.c5
-rw-r--r--ubi-utils/src/pddcustomize.c4
-rw-r--r--ubi-utils/src/pfi2bin.c4
-rw-r--r--ubi-utils/src/pfiflash.c4
-rw-r--r--ubi-utils/src/ubicrc32.c4
-rw-r--r--ubi-utils/src/ubigen.c4
-rw-r--r--ubi-utils/src/ubimirror.c4
-rw-r--r--ubi-utils/src/ubimkvol.c5
-rw-r--r--ubi-utils/src/ubirmvol.c5
-rw-r--r--ubi-utils/src/ubiupdatevol.c5
-rw-r--r--ubi-utils/src/unubi.c5
14 files changed, 19 insertions, 49 deletions
diff --git a/ubi-utils/Makefile b/ubi-utils/Makefile
index db984c8..e1b7b84 100644
--- a/ubi-utils/Makefile
+++ b/ubi-utils/Makefile
@@ -2,11 +2,6 @@
# Makefile for ubi-utils
#
-HOST_OS_NAME := $(shell uname -s)
-HOST_VERSION_NAME := $(shell uname -r)
-BUILD_CPU := $(shell uname -m)
-BUILD_OS := $(shell uname -o)
-
OPTFLAGS := -O2 -g -Wall
KERNELHDR := ../include
DESTDIR := /usr/local
@@ -16,11 +11,7 @@ INCLUDEDIR=/usr/include
CC := $(CROSS)gcc
CFLAGS := -I./inc -I./src -I$(KERNELHDR) $(OPTFLAGS) -Werror \
- -Wwrite-strings -W -std=gnu99 \
- -DHOST_OS_NAME=\"$(HOST_OS_NAME)\" \
- -DHOST_VERSION_NAME=\"$(HOST_VERSION_NAME)\" \
- -DBUILD_CPU=\"$(BUILD_CPU)\" -DBUILD_OS=\"$(BUILD_OS)\" \
- -DPACKAGE_VERSION=\"1.0\"
+ -Wwrite-strings -W -std=gnu99 -DPACKAGE_VERSION=\"1.0\"
PERLPROGS = mkpfi ubicrc32.pl
TARGETS = ubiupdatevol ubimkvol ubirmvol pfiflash pddcustomize ubimirror \
diff --git a/ubi-utils/src/bin2nand.c b/ubi-utils/src/bin2nand.c
index cf69191..c7c7ccc 100644
--- a/ubi-utils/src/bin2nand.c
+++ b/ubi-utils/src/bin2nand.c
@@ -67,9 +67,7 @@ typedef enum action_t {
#define PADDING 0 /* 0 means, do not adjust anything */
#define BUFSIZE 4096
-static char doc[] = "\nVersion: " PROGRAM_VERSION "\n\tBuilt on "
- BUILD_CPU" "BUILD_OS" at "__DATE__" "__TIME__"\n"
- "\n"
+static char doc[] = "\nVersion: " PROGRAM_VERSION "\n"
"bin2nand - a tool for adding OOB information to a "
"binary input file.\n";
diff --git a/ubi-utils/src/mkbootenv.c b/ubi-utils/src/mkbootenv.c
index 4a8cc6a..952f651 100644
--- a/ubi-utils/src/mkbootenv.c
+++ b/ubi-utils/src/mkbootenv.c
@@ -37,9 +37,7 @@
#define PROGRAM_VERSION "1.3"
-static char doc[] = "\nVersion: " PROGRAM_VERSION "\n\tBuilt on "
- BUILD_CPU" "BUILD_OS" at "__DATE__" "__TIME__"\n"
- "\n"
+static char doc[] = "\nVersion: " PROGRAM_VERSION "\n"
"mkbootenv - processes bootenv text files and convertes "
"them into a binary format.\n";
diff --git a/ubi-utils/src/nand2bin.c b/ubi-utils/src/nand2bin.c
index b8e4ea3..0773a2b 100644
--- a/ubi-utils/src/nand2bin.c
+++ b/ubi-utils/src/nand2bin.c
@@ -63,9 +63,8 @@ static struct args myargs = {
.options = NULL,
};
-static char doc[] = "\nVersion: " PROGRAM_VERSION "\n\t"
- BUILD_OS" "BUILD_CPU" at "__DATE__" "__TIME__"\n"
- "\nSplit data and OOB.\n";
+static char doc[] = "\nVersion: " PROGRAM_VERSION "\n"
+ "nand2bin - split data and OOB.\n";
static const char *optionsstr =
" -o, --output=<output> Data output file\n"
diff --git a/ubi-utils/src/pddcustomize.c b/ubi-utils/src/pddcustomize.c
index a86e942..956ce8f 100644
--- a/ubi-utils/src/pddcustomize.c
+++ b/ubi-utils/src/pddcustomize.c
@@ -61,9 +61,7 @@ typedef enum action_t {
args->action = ACT_ARGP_ERR; \
} while (0)
-static char doc[] = "\nVersion: " PROGRAM_VERSION "\n\tBuilt on "
- BUILD_CPU" "BUILD_OS" at "__DATE__" "__TIME__"\n"
- "\n"
+static char doc[] = "\nVersion: " PROGRAM_VERSION "\n"
"pddcustomize - customize bootenv and pdd values.\n";
static const char *optionsstr =
diff --git a/ubi-utils/src/pfi2bin.c b/ubi-utils/src/pfi2bin.c
index 6d5b210..35af86c 100644
--- a/ubi-utils/src/pfi2bin.c
+++ b/ubi-utils/src/pfi2bin.c
@@ -69,9 +69,7 @@ typedef enum action_t {
static const char copyright [] __attribute__((unused)) =
"(c) Copyright IBM Corp 2006\n";
-static char doc[] = "\nVersion: " PROGRAM_VERSION "\n\tBuilt on "
- BUILD_CPU" "BUILD_OS" at "__DATE__" "__TIME__"\n"
- "\n"
+static char doc[] = "\nVersion: " PROGRAM_VERSION "\n"
"pfi2bin - a tool to convert PFI files into binary images.\n";
static const char *optionsstr =
diff --git a/ubi-utils/src/pfiflash.c b/ubi-utils/src/pfiflash.c
index bac62e6..a31874e 100644
--- a/ubi-utils/src/pfiflash.c
+++ b/ubi-utils/src/pfiflash.c
@@ -45,9 +45,7 @@
#define PROGRAM_VERSION "1.5"
-static char doc[] = "\nVersion: " PROGRAM_VERSION "\n\tBuilt on "
- BUILD_CPU" "BUILD_OS" at "__DATE__" "__TIME__"\n"
- "\n"
+static char doc[] = "\nVersion: " PROGRAM_VERSION "\n"
"pfiflash - a tool for updating a controller with PFI files.\n";
static const char *optionsstr =
diff --git a/ubi-utils/src/ubicrc32.c b/ubi-utils/src/ubicrc32.c
index fb4ef49..7e3f045 100644
--- a/ubi-utils/src/ubicrc32.c
+++ b/ubi-utils/src/ubicrc32.c
@@ -36,9 +36,7 @@
const char *argp_program_version = PACKAGE_VERSION;
const char *argp_program_bug_address = PACKAGE_BUGREPORT;
-static char doc[] = "\nVersion: " PACKAGE_VERSION "\n\tBuilt on "
- BUILD_CPU" "BUILD_OS" at "__DATE__" "__TIME__"\n"
- "\n"
+static char doc[] = "\nVersion: " PACKAGE_VERSION "\n"
"ubicrc32 - calculates the UBI CRC32 value and prints it to stdout.\n";
static const char copyright [] __attribute__((unused)) =
diff --git a/ubi-utils/src/ubigen.c b/ubi-utils/src/ubigen.c
index d99ba2d..9fcafab 100644
--- a/ubi-utils/src/ubigen.c
+++ b/ubi-utils/src/ubigen.c
@@ -43,9 +43,7 @@ typedef enum action_t {
ACT_BROKEN_UPDATE = 0x00000002,
} action_t;
-static char doc[] = "\nVersion: " PROGRAM_VERSION "\n\tBuilt on "
- BUILD_CPU" "BUILD_OS" at "__DATE__" "__TIME__"\n"
- "\n"
+static char doc[] = "\nVersion: " PROGRAM_VERSION "\n"
"ubigen - a tool for adding UBI information to a binary input file.\n";
static const char *optionsstr =
diff --git a/ubi-utils/src/ubimirror.c b/ubi-utils/src/ubimirror.c
index eeedb3a..c8bdb8a 100644
--- a/ubi-utils/src/ubimirror.c
+++ b/ubi-utils/src/ubimirror.c
@@ -53,9 +53,7 @@ typedef enum action_t {
#define VOL_ARGS_MAX 2
-static char doc[] = "\nVersion: " PROGRAM_VERSION "\n\tBuilt on "
- BUILD_CPU" "BUILD_OS" at "__DATE__" "__TIME__"\n"
- "\n"
+static char doc[] = "\nVersion: " PROGRAM_VERSION "\n"
"ubimirror - mirrors ubi volumes.\n";
static const char *optionsstr =
diff --git a/ubi-utils/src/ubimkvol.c b/ubi-utils/src/ubimkvol.c
index ad58cc9..bff6068 100644
--- a/ubi-utils/src/ubimkvol.c
+++ b/ubi-utils/src/ubimkvol.c
@@ -75,9 +75,8 @@ static struct args myargs = {
static int param_sanity_check(struct args *args, libubi_t libubi);
-static char doc[] = "\nVersion: " PROGRAM_VERSION "\n\t"
- BUILD_OS" "BUILD_CPU" at "__DATE__" "__TIME__"\n"
- "\nMake UBI Volume.\n";
+static char doc[] = "\nVersion: " PROGRAM_VERSION "\n"
+ "ubinkvol - make UBI Volume.\n";
static const char *optionsstr =
" -a, --alignment=<alignment> volume alignment (default is 1)\n"
diff --git a/ubi-utils/src/ubirmvol.c b/ubi-utils/src/ubirmvol.c
index f32cbe0..6dd16ba 100644
--- a/ubi-utils/src/ubirmvol.c
+++ b/ubi-utils/src/ubirmvol.c
@@ -63,9 +63,8 @@ static struct args myargs = {
static int param_sanity_check(struct args *args, libubi_t libubi);
-static char doc[] = "\nVersion: " PROGRAM_VERSION "\n\t"
- BUILD_OS" "BUILD_CPU" at "__DATE__" "__TIME__"\n"
- "\nMake UBI Volume.\n";
+static char doc[] = "\nVersion: " PROGRAM_VERSION "\n"
+ "ubirmvol - make UBI Volume.\n";
static const char *optionsstr =
" -d, --devn=<devn> UBI device\n"
diff --git a/ubi-utils/src/ubiupdatevol.c b/ubi-utils/src/ubiupdatevol.c
index 5401eb1..807b961 100644
--- a/ubi-utils/src/ubiupdatevol.c
+++ b/ubi-utils/src/ubiupdatevol.c
@@ -72,9 +72,8 @@ static struct args myargs = {
static int verbose = 0;
-static char doc[] = "\nVersion: " PROGRAM_VERSION "\n\t"
- BUILD_OS" "BUILD_CPU" at "__DATE__" "__TIME__"\n"
- "\nWrite to UBI Volume.\n";
+static char doc[] = "\nVersion: " PROGRAM_VERSION "\n"
+ "ubiupdatevol - write to UBI Volume.\n";
static const char *optionsstr =
" -B, --broken-update broken update, this is for testing\n"
diff --git a/ubi-utils/src/unubi.c b/ubi-utils/src/unubi.c
index 811a6db..81db5fa 100644
--- a/ubi-utils/src/unubi.c
+++ b/ubi-utils/src/unubi.c
@@ -56,9 +56,8 @@
#define CONTACT "haver@vnet.ibm.com"
#define VERSION "1.3"
-static char doc[] = "\nVersion: " VERSION "\n\t"
- BUILD_OS" "BUILD_CPU" at "__DATE__" "__TIME__"\n"
- "\nAnalyze raw flash containing UBI data.\n";
+static char doc[] = "\nVersion: " VERSION "\n"
+ "unubi - analyze raw flash containing UBI data.\n";
static const char *optionsstr =
" OPTIONS\n"