Commit 5f30f3be7394e66a84de501803cab2fe9392ed8b
Committed by
Tom Rini
Tom Rini
1 parent
f2d293d0f8
Exists in
master
and in
49 other branches
kbuild: move some lines to more suitable place
Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
Showing 1 changed file with 33 additions and 33 deletions Side-by-side Diff
Makefile
| ... | ... | @@ -9,40 +9,8 @@ |
| 9 | 9 | PATCHLEVEL = 01 |
| 10 | 10 | SUBLEVEL = |
| 11 | 11 | EXTRAVERSION = |
| 12 | -ifneq "$(SUBLEVEL)" "" | |
| 13 | -U_BOOT_VERSION = $(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION) | |
| 14 | -else | |
| 15 | -U_BOOT_VERSION = $(VERSION).$(PATCHLEVEL)$(EXTRAVERSION) | |
| 16 | -endif | |
| 17 | -TIMESTAMP_FILE = include/generated/timestamp_autogenerated.h | |
| 18 | -VERSION_FILE = include/generated/version_autogenerated.h | |
| 12 | +NAME = | |
| 19 | 13 | |
| 20 | -HOSTARCH := $(shell uname -m | \ | |
| 21 | - sed -e s/i.86/x86/ \ | |
| 22 | - -e s/sun4u/sparc64/ \ | |
| 23 | - -e s/arm.*/arm/ \ | |
| 24 | - -e s/sa110/arm/ \ | |
| 25 | - -e s/ppc64/powerpc/ \ | |
| 26 | - -e s/ppc/powerpc/ \ | |
| 27 | - -e s/macppc/powerpc/\ | |
| 28 | - -e s/sh.*/sh/) | |
| 29 | - | |
| 30 | -HOSTOS := $(shell uname -s | tr '[:upper:]' '[:lower:]' | \ | |
| 31 | - sed -e 's/\(cygwin\).*/cygwin/') | |
| 32 | - | |
| 33 | -export HOSTARCH HOSTOS | |
| 34 | - | |
| 35 | -# Deal with colliding definitions from tcsh etc. | |
| 36 | -VENDOR= | |
| 37 | - | |
| 38 | -######################################################################### | |
| 39 | -# Allow for silent builds | |
| 40 | -ifeq (,$(findstring s,$(MAKEFLAGS))) | |
| 41 | -XECHO = echo | |
| 42 | -else | |
| 43 | -XECHO = : | |
| 44 | -endif | |
| 45 | - | |
| 46 | 14 | # *DOCUMENTATION* |
| 47 | 15 | # To see a list of typical targets execute "make help" |
| 48 | 16 | # More info can be located in ./README |
| ... | ... | @@ -212,6 +180,35 @@ |
| 212 | 180 | |
| 213 | 181 | ######################################################################### |
| 214 | 182 | |
| 183 | +TIMESTAMP_FILE = include/generated/timestamp_autogenerated.h | |
| 184 | +VERSION_FILE = include/generated/version_autogenerated.h | |
| 185 | + | |
| 186 | +HOSTARCH := $(shell uname -m | \ | |
| 187 | + sed -e s/i.86/x86/ \ | |
| 188 | + -e s/sun4u/sparc64/ \ | |
| 189 | + -e s/arm.*/arm/ \ | |
| 190 | + -e s/sa110/arm/ \ | |
| 191 | + -e s/ppc64/powerpc/ \ | |
| 192 | + -e s/ppc/powerpc/ \ | |
| 193 | + -e s/macppc/powerpc/\ | |
| 194 | + -e s/sh.*/sh/) | |
| 195 | + | |
| 196 | +HOSTOS := $(shell uname -s | tr '[:upper:]' '[:lower:]' | \ | |
| 197 | + sed -e 's/\(cygwin\).*/cygwin/') | |
| 198 | + | |
| 199 | +export HOSTARCH HOSTOS | |
| 200 | + | |
| 201 | +# Deal with colliding definitions from tcsh etc. | |
| 202 | +VENDOR= | |
| 203 | + | |
| 204 | +######################################################################### | |
| 205 | +# Allow for silent builds | |
| 206 | +ifeq (,$(findstring s,$(MAKEFLAGS))) | |
| 207 | +XECHO = echo | |
| 208 | +else | |
| 209 | +XECHO = : | |
| 210 | +endif | |
| 211 | + | |
| 215 | 212 | # The "tools" are needed early, so put this first |
| 216 | 213 | # Don't include stuff already done in $(LIBS) |
| 217 | 214 | # The "examples" conditionally depend on U-Boot (say, when USE_PRIVATE_LIBGCC |
| ... | ... | @@ -402,6 +399,9 @@ |
| 402 | 399 | -fno-builtin -ffreestanding |
| 403 | 400 | KBUILD_AFLAGS := -D__ASSEMBLY__ |
| 404 | 401 | |
| 402 | +U_BOOT_VERSION = $(VERSION)$(if $(PATCHLEVEL),.$(PATCHLEVEL)$(if $(SUBLEVEL),.$(SUBLEVEL)))$(EXTRAVERSION) | |
| 403 | + | |
| 404 | +export VERSION PATCHLEVEL SUBLEVEL U_BOOT_VERSION | |
| 405 | 405 | export CONFIG_SHELL HOSTCC HOSTCFLAGS HOSTLDFLAGS CROSS_COMPILE AS LD CC |
| 406 | 406 | export CPP AR NM LDR STRIP OBJCOPY OBJDUMP |
| 407 | 407 | export MAKE AWK |