summaryrefslogtreecommitdiff
path: root/scripts/kernel-doc
diff options
context:
space:
mode:
authorMasahiro Yamada <yamada.m@jp.panasonic.com>2014-02-24 11:12:09 +0900
committerTom Rini <trini@ti.com>2014-02-25 11:01:28 -0500
commit7424145f30c9ce9c40151765bd08029af7550f1d (patch)
tree88b661e5a2a94e1f887650c03de83fa1dd70615f /scripts/kernel-doc
parent5b1f1f4aff912d8c8a98113d1af1fdaa2c9038a4 (diff)
downloadu-boot-imx-7424145f30c9ce9c40151765bd08029af7550f1d.zip
u-boot-imx-7424145f30c9ce9c40151765bd08029af7550f1d.tar.gz
u-boot-imx-7424145f30c9ce9c40151765bd08029af7550f1d.tar.bz2
kbuild: consolidate version and timestamp headers generation
- Generate include/generated/{timestamp.h, version.h} more simply by using filechk rule. - Add $(UBOOTRELEASE) variable and re-write u-boot.imx rule more simply. - Rename U_BOOT_VERSION in Makefile to UBOOTVERSION Before this commit, the same variable name, "U_BOOT_VERSION" was used for two different strings. One of them was defined in Makefile. It takes the form like "2014.01-rc1" and used in makefiles and script files. The other is defined in include/generated/version.h It takes the form like "U-Boot 2014.01-rc1-00010-gbe6d426-dirty" and used in C and Aseembler. It is confusing when grepping the source tree. So, this commit renames the former to UBOOTVERSION. Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
Diffstat (limited to 'scripts/kernel-doc')
-rwxr-xr-xscripts/kernel-doc4
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/kernel-doc b/scripts/kernel-doc
index ba2bafd..c881b8c 100755
--- a/scripts/kernel-doc
+++ b/scripts/kernel-doc
@@ -392,8 +392,8 @@ sub usage {
sub get_kernel_version() {
my $version = 'unknown kernel version';
- if (defined($ENV{'U_BOOT_VERSION'})) {
- $version = $ENV{'U_BOOT_VERSION'};
+ if (defined($ENV{'UBOOTVERSION'})) {
+ $version = $ENV{'UBOOTVERSION'};
}
return $version;
}