diff options
| author | Masahiro Yamada <yamada.m@jp.panasonic.com> | 2014-02-24 11:12:09 +0900 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2014-02-25 11:01:28 -0500 |
| commit | 7424145f30c9ce9c40151765bd08029af7550f1d (patch) | |
| tree | 88b661e5a2a94e1f887650c03de83fa1dd70615f /scripts | |
| parent | 5b1f1f4aff912d8c8a98113d1af1fdaa2c9038a4 (diff) | |
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')
| -rwxr-xr-x | scripts/kernel-doc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/kernel-doc b/scripts/kernel-doc index ba2bafd687..c881b8cb3e 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; } |