Commit 6a44d80634f7bf78182f5988ed0b93f2349a25ce

Authored by Masahiro Yamada
Committed by Tom Rini
1 parent 6378008a44

kbuild: move asm-offsets.h rules to ./Kbuild

Generate include/generated/generic-asm-offsets.h and
include/generated/asm-offsets.h in ./Kbuild.

This commit also changes the include guard.

Before this commit, __ASM_OFFSETS_H__ was used for both of them.
So we could not include generic-asm-offsets.h and asm-offsets.h
at the same time.

This commit renames the include guard of the former to
__GENERIC_ASM_OFFSETS_H__.

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>

Showing 3 changed files with 89 additions and 61 deletions Inline Diff

File was created 1 #
2 # Kbuild for top-level directory of U-Boot
3 # This file takes care of the following:
4 # 1) Generate generic-asm-offsets.h
5 # 2) Generate asm-offsets.h
6
7 #####
8 # 1) Generate generic-asm-offsets.h
9
10 generic-offsets-file := include/generated/generic-asm-offsets.h
11
12 always := $(generic-offsets-file)
13 targets := $(generic-offsets-file) lib/asm-offsets.s
14
15 quiet_cmd_generic-offsets = GEN $@
16 define cmd_generic-offsets
17 (set -e; \
18 echo "#ifndef __GENERIC_ASM_OFFSETS_H__"; \
19 echo "#define __GENERIC_ASM_OFFSETS_H__"; \
20 echo "/*"; \
21 echo " * DO NOT MODIFY."; \
22 echo " *"; \
23 echo " * This file was generated by Kbuild"; \
24 echo " *"; \
25 echo " */"; \
26 echo ""; \
27 sed -ne $(sed-y) $<; \
28 echo ""; \
29 echo "#endif" ) > $@
30 endef
31
32 # We use internal kbuild rules to avoid the "is up to date" message from make
33 lib/asm-offsets.s: lib/asm-offsets.c FORCE
34 $(Q)mkdir -p $(dir $@)
35 $(call if_changed_dep,cc_s_c)
36
37 $(obj)/$(generic-offsets-file): lib/asm-offsets.s Kbuild
38 $(Q)mkdir -p $(dir $@)
39 $(call cmd,generic-offsets)
40
41 #####
42 # 2) Generate asm-offsets.h
43 #
44
45 ifneq ($(wildcard $(srctree)/$(CPUDIR)/$(SOC)/asm-offsets.c),)
46 offsets-file := include/generated/asm-offsets.h
47 endif
48
49 always += $(offsets-file)
50 targets += $(offsets-file)
51 targets += $(CPUDIR)/$(SOC)/asm-offsets.s
52
53
54 # Default sed regexp - multiline due to syntax constraints
55 define sed-y
56 "/^->/{s:->#\(.*\):/* \1 */:; \
57 s:^->\([^ ]*\) [\$$#]*\([-0-9]*\) \(.*\):#define \1 \2 /* \3 */:; \
58 s:^->\([^ ]*\) [\$$#]*\([^ ]*\) \(.*\):#define \1 \2 /* \3 */:; \
59 s:->::; p;}"
60 endef
61
62 CFLAGS_asm-offsets.o := -DDO_DEPS_ONLY
63
64 quiet_cmd_offsets = GEN $@
65 define cmd_offsets
66 (set -e; \
67 echo "#ifndef __ASM_OFFSETS_H__"; \
68 echo "#define __ASM_OFFSETS_H__"; \
69 echo "/*"; \
70 echo " * DO NOT MODIFY."; \
71 echo " *"; \
72 echo " * This file was generated by Kbuild"; \
73 echo " *"; \
74 echo " */"; \
75 echo ""; \
76 sed -ne $(sed-y) $<; \
77 echo ""; \
78 echo "#endif" ) > $@
79 endef
80
81 # We use internal kbuild rules to avoid the "is up to date" message from make
82 $(CPUDIR)/$(SOC)/asm-offsets.s: $(CPUDIR)/$(SOC)/asm-offsets.c FORCE
83 $(Q)mkdir -p $(dir $@)
84 $(call if_changed_dep,cc_s_c)
85
86 $(obj)/$(offsets-file): $(CPUDIR)/$(SOC)/asm-offsets.s
87 $(call cmd,offsets)
88
1 # 1 #
2 # (C) Copyright 2000-2013 2 # (C) Copyright 2000-2013
3 # Wolfgang Denk, DENX Software Engineering, wd@denx.de. 3 # Wolfgang Denk, DENX Software Engineering, wd@denx.de.
4 # 4 #
5 # SPDX-License-Identifier: GPL-2.0+ 5 # SPDX-License-Identifier: GPL-2.0+
6 # 6 #
7 7
8 VERSION = 2014 8 VERSION = 2014
9 PATCHLEVEL = 04 9 PATCHLEVEL = 04
10 SUBLEVEL = 10 SUBLEVEL =
11 EXTRAVERSION = -rc1 11 EXTRAVERSION = -rc1
12 NAME = 12 NAME =
13 13
14 # *DOCUMENTATION* 14 # *DOCUMENTATION*
15 # To see a list of typical targets execute "make help" 15 # To see a list of typical targets execute "make help"
16 # More info can be located in ./README 16 # More info can be located in ./README
17 # Comments in this file are targeted only to the developer, do not 17 # Comments in this file are targeted only to the developer, do not
18 # expect to learn how to build the kernel reading this file. 18 # expect to learn how to build the kernel reading this file.
19 19
20 # Do not: 20 # Do not:
21 # o use make's built-in rules and variables 21 # o use make's built-in rules and variables
22 # (this increases performance and avoids hard-to-debug behaviour); 22 # (this increases performance and avoids hard-to-debug behaviour);
23 # o print "Entering directory ..."; 23 # o print "Entering directory ...";
24 MAKEFLAGS += -rR --no-print-directory 24 MAKEFLAGS += -rR --no-print-directory
25 25
26 # Avoid funny character set dependencies 26 # Avoid funny character set dependencies
27 unexport LC_ALL 27 unexport LC_ALL
28 LC_COLLATE=C 28 LC_COLLATE=C
29 LC_NUMERIC=C 29 LC_NUMERIC=C
30 export LC_COLLATE LC_NUMERIC 30 export LC_COLLATE LC_NUMERIC
31 31
32 # We are using a recursive build, so we need to do a little thinking 32 # We are using a recursive build, so we need to do a little thinking
33 # to get the ordering right. 33 # to get the ordering right.
34 # 34 #
35 # Most importantly: sub-Makefiles should only ever modify files in 35 # Most importantly: sub-Makefiles should only ever modify files in
36 # their own directory. If in some directory we have a dependency on 36 # their own directory. If in some directory we have a dependency on
37 # a file in another dir (which doesn't happen often, but it's often 37 # a file in another dir (which doesn't happen often, but it's often
38 # unavoidable when linking the built-in.o targets which finally 38 # unavoidable when linking the built-in.o targets which finally
39 # turn into vmlinux), we will call a sub make in that other dir, and 39 # turn into vmlinux), we will call a sub make in that other dir, and
40 # after that we are sure that everything which is in that other dir 40 # after that we are sure that everything which is in that other dir
41 # is now up to date. 41 # is now up to date.
42 # 42 #
43 # The only cases where we need to modify files which have global 43 # The only cases where we need to modify files which have global
44 # effects are thus separated out and done before the recursive 44 # effects are thus separated out and done before the recursive
45 # descending is started. They are now explicitly listed as the 45 # descending is started. They are now explicitly listed as the
46 # prepare rule. 46 # prepare rule.
47 47
48 # To put more focus on warnings, be less verbose as default 48 # To put more focus on warnings, be less verbose as default
49 # Use 'make V=1' to see the full commands 49 # Use 'make V=1' to see the full commands
50 50
51 ifeq ("$(origin V)", "command line") 51 ifeq ("$(origin V)", "command line")
52 KBUILD_VERBOSE = $(V) 52 KBUILD_VERBOSE = $(V)
53 endif 53 endif
54 ifndef KBUILD_VERBOSE 54 ifndef KBUILD_VERBOSE
55 KBUILD_VERBOSE = 0 55 KBUILD_VERBOSE = 0
56 endif 56 endif
57 57
58 # Call a source code checker (by default, "sparse") as part of the 58 # Call a source code checker (by default, "sparse") as part of the
59 # C compilation. 59 # C compilation.
60 # 60 #
61 # Use 'make C=1' to enable checking of only re-compiled files. 61 # Use 'make C=1' to enable checking of only re-compiled files.
62 # Use 'make C=2' to enable checking of *all* source files, regardless 62 # Use 'make C=2' to enable checking of *all* source files, regardless
63 # of whether they are re-compiled or not. 63 # of whether they are re-compiled or not.
64 # 64 #
65 # See the file "Documentation/sparse.txt" for more details, including 65 # See the file "Documentation/sparse.txt" for more details, including
66 # where to get the "sparse" utility. 66 # where to get the "sparse" utility.
67 67
68 ifeq ("$(origin C)", "command line") 68 ifeq ("$(origin C)", "command line")
69 KBUILD_CHECKSRC = $(C) 69 KBUILD_CHECKSRC = $(C)
70 endif 70 endif
71 ifndef KBUILD_CHECKSRC 71 ifndef KBUILD_CHECKSRC
72 KBUILD_CHECKSRC = 0 72 KBUILD_CHECKSRC = 0
73 endif 73 endif
74 74
75 # Use make M=dir to specify directory of external module to build 75 # Use make M=dir to specify directory of external module to build
76 # Old syntax make ... SUBDIRS=$PWD is still supported 76 # Old syntax make ... SUBDIRS=$PWD is still supported
77 # Setting the environment variable KBUILD_EXTMOD take precedence 77 # Setting the environment variable KBUILD_EXTMOD take precedence
78 ifdef SUBDIRS 78 ifdef SUBDIRS
79 KBUILD_EXTMOD ?= $(SUBDIRS) 79 KBUILD_EXTMOD ?= $(SUBDIRS)
80 endif 80 endif
81 81
82 ifeq ("$(origin M)", "command line") 82 ifeq ("$(origin M)", "command line")
83 KBUILD_EXTMOD := $(M) 83 KBUILD_EXTMOD := $(M)
84 endif 84 endif
85 85
86 # kbuild supports saving output files in a separate directory. 86 # kbuild supports saving output files in a separate directory.
87 # To locate output files in a separate directory two syntaxes are supported. 87 # To locate output files in a separate directory two syntaxes are supported.
88 # In both cases the working directory must be the root of the kernel src. 88 # In both cases the working directory must be the root of the kernel src.
89 # 1) O= 89 # 1) O=
90 # Use "make O=dir/to/store/output/files/" 90 # Use "make O=dir/to/store/output/files/"
91 # 91 #
92 # 2) Set KBUILD_OUTPUT 92 # 2) Set KBUILD_OUTPUT
93 # Set the environment variable KBUILD_OUTPUT to point to the directory 93 # Set the environment variable KBUILD_OUTPUT to point to the directory
94 # where the output files shall be placed. 94 # where the output files shall be placed.
95 # export KBUILD_OUTPUT=dir/to/store/output/files/ 95 # export KBUILD_OUTPUT=dir/to/store/output/files/
96 # make 96 # make
97 # 97 #
98 # The O= assignment takes precedence over the KBUILD_OUTPUT environment 98 # The O= assignment takes precedence over the KBUILD_OUTPUT environment
99 # variable. 99 # variable.
100 100
101 101
102 # KBUILD_SRC is set on invocation of make in OBJ directory 102 # KBUILD_SRC is set on invocation of make in OBJ directory
103 # KBUILD_SRC is not intended to be used by the regular user (for now) 103 # KBUILD_SRC is not intended to be used by the regular user (for now)
104 ifeq ($(KBUILD_SRC),) 104 ifeq ($(KBUILD_SRC),)
105 105
106 # OK, Make called in directory where kernel src resides 106 # OK, Make called in directory where kernel src resides
107 # Do we want to locate output files in a separate directory? 107 # Do we want to locate output files in a separate directory?
108 ifeq ("$(origin O)", "command line") 108 ifeq ("$(origin O)", "command line")
109 KBUILD_OUTPUT := $(O) 109 KBUILD_OUTPUT := $(O)
110 endif 110 endif
111 111
112 ifeq ("$(origin W)", "command line") 112 ifeq ("$(origin W)", "command line")
113 export KBUILD_ENABLE_EXTRA_GCC_CHECKS := $(W) 113 export KBUILD_ENABLE_EXTRA_GCC_CHECKS := $(W)
114 endif 114 endif
115 115
116 # That's our default target when none is given on the command line 116 # That's our default target when none is given on the command line
117 PHONY := _all 117 PHONY := _all
118 _all: 118 _all:
119 119
120 # Cancel implicit rules on top Makefile 120 # Cancel implicit rules on top Makefile
121 $(CURDIR)/Makefile Makefile: ; 121 $(CURDIR)/Makefile Makefile: ;
122 122
123 ifneq ($(KBUILD_OUTPUT),) 123 ifneq ($(KBUILD_OUTPUT),)
124 # Invoke a second make in the output directory, passing relevant variables 124 # Invoke a second make in the output directory, passing relevant variables
125 # check that the output directory actually exists 125 # check that the output directory actually exists
126 saved-output := $(KBUILD_OUTPUT) 126 saved-output := $(KBUILD_OUTPUT)
127 KBUILD_OUTPUT := $(shell cd $(KBUILD_OUTPUT) && /bin/pwd) 127 KBUILD_OUTPUT := $(shell cd $(KBUILD_OUTPUT) && /bin/pwd)
128 $(if $(KBUILD_OUTPUT),, \ 128 $(if $(KBUILD_OUTPUT),, \
129 $(error output directory "$(saved-output)" does not exist)) 129 $(error output directory "$(saved-output)" does not exist))
130 130
131 PHONY += $(MAKECMDGOALS) sub-make 131 PHONY += $(MAKECMDGOALS) sub-make
132 132
133 $(filter-out _all sub-make $(CURDIR)/Makefile, $(MAKECMDGOALS)) _all: sub-make 133 $(filter-out _all sub-make $(CURDIR)/Makefile, $(MAKECMDGOALS)) _all: sub-make
134 @: 134 @:
135 135
136 sub-make: FORCE 136 sub-make: FORCE
137 $(if $(KBUILD_VERBOSE:1=),@)$(MAKE) -C $(KBUILD_OUTPUT) \ 137 $(if $(KBUILD_VERBOSE:1=),@)$(MAKE) -C $(KBUILD_OUTPUT) \
138 KBUILD_SRC=$(CURDIR) \ 138 KBUILD_SRC=$(CURDIR) \
139 KBUILD_EXTMOD="$(KBUILD_EXTMOD)" -f $(CURDIR)/Makefile \ 139 KBUILD_EXTMOD="$(KBUILD_EXTMOD)" -f $(CURDIR)/Makefile \
140 $(filter-out _all sub-make,$(MAKECMDGOALS)) 140 $(filter-out _all sub-make,$(MAKECMDGOALS))
141 141
142 # Leave processing to above invocation of make 142 # Leave processing to above invocation of make
143 skip-makefile := 1 143 skip-makefile := 1
144 endif # ifneq ($(KBUILD_OUTPUT),) 144 endif # ifneq ($(KBUILD_OUTPUT),)
145 endif # ifeq ($(KBUILD_SRC),) 145 endif # ifeq ($(KBUILD_SRC),)
146 146
147 # We process the rest of the Makefile if this is the final invocation of make 147 # We process the rest of the Makefile if this is the final invocation of make
148 ifeq ($(skip-makefile),) 148 ifeq ($(skip-makefile),)
149 149
150 # If building an external module we do not care about the all: rule 150 # If building an external module we do not care about the all: rule
151 # but instead _all depend on modules 151 # but instead _all depend on modules
152 PHONY += all 152 PHONY += all
153 ifeq ($(KBUILD_EXTMOD),) 153 ifeq ($(KBUILD_EXTMOD),)
154 _all: all 154 _all: all
155 else 155 else
156 _all: modules 156 _all: modules
157 endif 157 endif
158 158
159 srctree := $(if $(KBUILD_SRC),$(KBUILD_SRC),$(CURDIR)) 159 srctree := $(if $(KBUILD_SRC),$(KBUILD_SRC),$(CURDIR))
160 objtree := $(CURDIR) 160 objtree := $(CURDIR)
161 src := $(srctree) 161 src := $(srctree)
162 obj := $(objtree) 162 obj := $(objtree)
163 163
164 VPATH := $(srctree)$(if $(KBUILD_EXTMOD),:$(KBUILD_EXTMOD)) 164 VPATH := $(srctree)$(if $(KBUILD_EXTMOD),:$(KBUILD_EXTMOD))
165 165
166 export srctree objtree VPATH 166 export srctree objtree VPATH
167 167
168 OBJTREE := $(objtree) 168 OBJTREE := $(objtree)
169 SPLTREE := $(OBJTREE)/spl 169 SPLTREE := $(OBJTREE)/spl
170 TPLTREE := $(OBJTREE)/tpl 170 TPLTREE := $(OBJTREE)/tpl
171 SRCTREE := $(srctree) 171 SRCTREE := $(srctree)
172 TOPDIR := $(SRCTREE) 172 TOPDIR := $(SRCTREE)
173 export TOPDIR SRCTREE OBJTREE SPLTREE TPLTREE 173 export TOPDIR SRCTREE OBJTREE SPLTREE TPLTREE
174 174
175 MKCONFIG := $(SRCTREE)/mkconfig 175 MKCONFIG := $(SRCTREE)/mkconfig
176 export MKCONFIG 176 export MKCONFIG
177 177
178 # Make sure CDPATH settings don't interfere 178 # Make sure CDPATH settings don't interfere
179 unexport CDPATH 179 unexport CDPATH
180 180
181 ######################################################################### 181 #########################################################################
182 182
183 HOSTARCH := $(shell uname -m | \ 183 HOSTARCH := $(shell uname -m | \
184 sed -e s/i.86/x86/ \ 184 sed -e s/i.86/x86/ \
185 -e s/sun4u/sparc64/ \ 185 -e s/sun4u/sparc64/ \
186 -e s/arm.*/arm/ \ 186 -e s/arm.*/arm/ \
187 -e s/sa110/arm/ \ 187 -e s/sa110/arm/ \
188 -e s/ppc64/powerpc/ \ 188 -e s/ppc64/powerpc/ \
189 -e s/ppc/powerpc/ \ 189 -e s/ppc/powerpc/ \
190 -e s/macppc/powerpc/\ 190 -e s/macppc/powerpc/\
191 -e s/sh.*/sh/) 191 -e s/sh.*/sh/)
192 192
193 HOSTOS := $(shell uname -s | tr '[:upper:]' '[:lower:]' | \ 193 HOSTOS := $(shell uname -s | tr '[:upper:]' '[:lower:]' | \
194 sed -e 's/\(cygwin\).*/cygwin/') 194 sed -e 's/\(cygwin\).*/cygwin/')
195 195
196 export HOSTARCH HOSTOS 196 export HOSTARCH HOSTOS
197 197
198 # Deal with colliding definitions from tcsh etc. 198 # Deal with colliding definitions from tcsh etc.
199 VENDOR= 199 VENDOR=
200 200
201 ######################################################################### 201 #########################################################################
202 202
203 # set default to nothing for native builds 203 # set default to nothing for native builds
204 ifeq ($(HOSTARCH),$(ARCH)) 204 ifeq ($(HOSTARCH),$(ARCH))
205 CROSS_COMPILE ?= 205 CROSS_COMPILE ?=
206 endif 206 endif
207 207
208 # SHELL used by kbuild 208 # SHELL used by kbuild
209 CONFIG_SHELL := $(shell if [ -x "$$BASH" ]; then echo $$BASH; \ 209 CONFIG_SHELL := $(shell if [ -x "$$BASH" ]; then echo $$BASH; \
210 else if [ -x /bin/bash ]; then echo /bin/bash; \ 210 else if [ -x /bin/bash ]; then echo /bin/bash; \
211 else echo sh; fi ; fi) 211 else echo sh; fi ; fi)
212 212
213 HOSTCC = gcc 213 HOSTCC = gcc
214 HOSTCFLAGS = -Wall -Wstrict-prototypes -O2 -fomit-frame-pointer 214 HOSTCFLAGS = -Wall -Wstrict-prototypes -O2 -fomit-frame-pointer
215 215
216 ifeq ($(HOSTOS),cygwin) 216 ifeq ($(HOSTOS),cygwin)
217 HOSTCFLAGS += -ansi 217 HOSTCFLAGS += -ansi
218 endif 218 endif
219 219
220 # Mac OS X / Darwin's C preprocessor is Apple specific. It 220 # Mac OS X / Darwin's C preprocessor is Apple specific. It
221 # generates numerous errors and warnings. We want to bypass it 221 # generates numerous errors and warnings. We want to bypass it
222 # and use GNU C's cpp. To do this we pass the -traditional-cpp 222 # and use GNU C's cpp. To do this we pass the -traditional-cpp
223 # option to the compiler. Note that the -traditional-cpp flag 223 # option to the compiler. Note that the -traditional-cpp flag
224 # DOES NOT have the same semantics as GNU C's flag, all it does 224 # DOES NOT have the same semantics as GNU C's flag, all it does
225 # is invoke the GNU preprocessor in stock ANSI/ISO C fashion. 225 # is invoke the GNU preprocessor in stock ANSI/ISO C fashion.
226 # 226 #
227 # Apple's linker is similar, thanks to the new 2 stage linking 227 # Apple's linker is similar, thanks to the new 2 stage linking
228 # multiple symbol definitions are treated as errors, hence the 228 # multiple symbol definitions are treated as errors, hence the
229 # -multiply_defined suppress option to turn off this error. 229 # -multiply_defined suppress option to turn off this error.
230 # 230 #
231 ifeq ($(HOSTOS),darwin) 231 ifeq ($(HOSTOS),darwin)
232 # get major and minor product version (e.g. '10' and '6' for Snow Leopard) 232 # get major and minor product version (e.g. '10' and '6' for Snow Leopard)
233 DARWIN_MAJOR_VERSION = $(shell sw_vers -productVersion | cut -f 1 -d '.') 233 DARWIN_MAJOR_VERSION = $(shell sw_vers -productVersion | cut -f 1 -d '.')
234 DARWIN_MINOR_VERSION = $(shell sw_vers -productVersion | cut -f 2 -d '.') 234 DARWIN_MINOR_VERSION = $(shell sw_vers -productVersion | cut -f 2 -d '.')
235 235
236 os_x_before = $(shell if [ $(DARWIN_MAJOR_VERSION) -le $(1) -a \ 236 os_x_before = $(shell if [ $(DARWIN_MAJOR_VERSION) -le $(1) -a \
237 $(DARWIN_MINOR_VERSION) -le $(2) ] ; then echo "$(3)"; else echo "$(4)"; fi ;) 237 $(DARWIN_MINOR_VERSION) -le $(2) ] ; then echo "$(3)"; else echo "$(4)"; fi ;)
238 238
239 # Snow Leopards build environment has no longer restrictions as described above 239 # Snow Leopards build environment has no longer restrictions as described above
240 HOSTCC = $(call os_x_before, 10, 5, "cc", "gcc") 240 HOSTCC = $(call os_x_before, 10, 5, "cc", "gcc")
241 HOSTCFLAGS += $(call os_x_before, 10, 4, "-traditional-cpp") 241 HOSTCFLAGS += $(call os_x_before, 10, 4, "-traditional-cpp")
242 HOSTLDFLAGS += $(call os_x_before, 10, 5, "-multiply_defined suppress") 242 HOSTLDFLAGS += $(call os_x_before, 10, 5, "-multiply_defined suppress")
243 endif 243 endif
244 244
245 # Decide whether to build built-in, modular, or both. 245 # Decide whether to build built-in, modular, or both.
246 # Normally, just do built-in. 246 # Normally, just do built-in.
247 247
248 KBUILD_MODULES := 248 KBUILD_MODULES :=
249 KBUILD_BUILTIN := 1 249 KBUILD_BUILTIN := 1
250 250
251 # If we have only "make modules", don't compile built-in objects. 251 # If we have only "make modules", don't compile built-in objects.
252 # When we're building modules with modversions, we need to consider 252 # When we're building modules with modversions, we need to consider
253 # the built-in objects during the descend as well, in order to 253 # the built-in objects during the descend as well, in order to
254 # make sure the checksums are up to date before we record them. 254 # make sure the checksums are up to date before we record them.
255 255
256 ifeq ($(MAKECMDGOALS),modules) 256 ifeq ($(MAKECMDGOALS),modules)
257 KBUILD_BUILTIN := $(if $(CONFIG_MODVERSIONS),1) 257 KBUILD_BUILTIN := $(if $(CONFIG_MODVERSIONS),1)
258 endif 258 endif
259 259
260 # If we have "make <whatever> modules", compile modules 260 # If we have "make <whatever> modules", compile modules
261 # in addition to whatever we do anyway. 261 # in addition to whatever we do anyway.
262 # Just "make" or "make all" shall build modules as well 262 # Just "make" or "make all" shall build modules as well
263 263
264 # U-Boot does not need modules 264 # U-Boot does not need modules
265 #ifneq ($(filter all _all modules,$(MAKECMDGOALS)),) 265 #ifneq ($(filter all _all modules,$(MAKECMDGOALS)),)
266 # KBUILD_MODULES := 1 266 # KBUILD_MODULES := 1
267 #endif 267 #endif
268 268
269 #ifeq ($(MAKECMDGOALS),) 269 #ifeq ($(MAKECMDGOALS),)
270 # KBUILD_MODULES := 1 270 # KBUILD_MODULES := 1
271 #endif 271 #endif
272 272
273 export KBUILD_MODULES KBUILD_BUILTIN 273 export KBUILD_MODULES KBUILD_BUILTIN
274 export KBUILD_CHECKSRC KBUILD_SRC KBUILD_EXTMOD 274 export KBUILD_CHECKSRC KBUILD_SRC KBUILD_EXTMOD
275 275
276 # Beautify output 276 # Beautify output
277 # --------------------------------------------------------------------------- 277 # ---------------------------------------------------------------------------
278 # 278 #
279 # Normally, we echo the whole command before executing it. By making 279 # Normally, we echo the whole command before executing it. By making
280 # that echo $($(quiet)$(cmd)), we now have the possibility to set 280 # that echo $($(quiet)$(cmd)), we now have the possibility to set
281 # $(quiet) to choose other forms of output instead, e.g. 281 # $(quiet) to choose other forms of output instead, e.g.
282 # 282 #
283 # quiet_cmd_cc_o_c = Compiling $(RELDIR)/$@ 283 # quiet_cmd_cc_o_c = Compiling $(RELDIR)/$@
284 # cmd_cc_o_c = $(CC) $(c_flags) -c -o $@ $< 284 # cmd_cc_o_c = $(CC) $(c_flags) -c -o $@ $<
285 # 285 #
286 # If $(quiet) is empty, the whole command will be printed. 286 # If $(quiet) is empty, the whole command will be printed.
287 # If it is set to "quiet_", only the short version will be printed. 287 # If it is set to "quiet_", only the short version will be printed.
288 # If it is set to "silent_", nothing will be printed at all, since 288 # If it is set to "silent_", nothing will be printed at all, since
289 # the variable $(silent_cmd_cc_o_c) doesn't exist. 289 # the variable $(silent_cmd_cc_o_c) doesn't exist.
290 # 290 #
291 # A simple variant is to prefix commands with $(Q) - that's useful 291 # A simple variant is to prefix commands with $(Q) - that's useful
292 # for commands that shall be hidden in non-verbose mode. 292 # for commands that shall be hidden in non-verbose mode.
293 # 293 #
294 # $(Q)ln $@ :< 294 # $(Q)ln $@ :<
295 # 295 #
296 # If KBUILD_VERBOSE equals 0 then the above command will be hidden. 296 # If KBUILD_VERBOSE equals 0 then the above command will be hidden.
297 # If KBUILD_VERBOSE equals 1 then the above command is displayed. 297 # If KBUILD_VERBOSE equals 1 then the above command is displayed.
298 298
299 ifeq ($(KBUILD_VERBOSE),1) 299 ifeq ($(KBUILD_VERBOSE),1)
300 quiet = 300 quiet =
301 Q = 301 Q =
302 else 302 else
303 quiet=quiet_ 303 quiet=quiet_
304 Q = @ 304 Q = @
305 endif 305 endif
306 306
307 # If the user is running make -s (silent mode), suppress echoing of 307 # If the user is running make -s (silent mode), suppress echoing of
308 # commands 308 # commands
309 309
310 ifneq ($(filter s% -s%,$(MAKEFLAGS)),) 310 ifneq ($(filter s% -s%,$(MAKEFLAGS)),)
311 quiet=silent_ 311 quiet=silent_
312 endif 312 endif
313 313
314 export quiet Q KBUILD_VERBOSE 314 export quiet Q KBUILD_VERBOSE
315 315
316 316
317 # Look for make include files relative to root of kernel src 317 # Look for make include files relative to root of kernel src
318 MAKEFLAGS += --include-dir=$(srctree) 318 MAKEFLAGS += --include-dir=$(srctree)
319 319
320 # We need some generic definitions (do not try to remake the file). 320 # We need some generic definitions (do not try to remake the file).
321 $(srctree)/scripts/Kbuild.include: ; 321 $(srctree)/scripts/Kbuild.include: ;
322 include $(srctree)/scripts/Kbuild.include 322 include $(srctree)/scripts/Kbuild.include
323 323
324 # Make variables (CC, etc...) 324 # Make variables (CC, etc...)
325 325
326 AS = $(CROSS_COMPILE)as 326 AS = $(CROSS_COMPILE)as
327 # Always use GNU ld 327 # Always use GNU ld
328 ifneq ($(shell $(CROSS_COMPILE)ld.bfd -v 2> /dev/null),) 328 ifneq ($(shell $(CROSS_COMPILE)ld.bfd -v 2> /dev/null),)
329 LD = $(CROSS_COMPILE)ld.bfd 329 LD = $(CROSS_COMPILE)ld.bfd
330 else 330 else
331 LD = $(CROSS_COMPILE)ld 331 LD = $(CROSS_COMPILE)ld
332 endif 332 endif
333 CC = $(CROSS_COMPILE)gcc 333 CC = $(CROSS_COMPILE)gcc
334 CPP = $(CC) -E 334 CPP = $(CC) -E
335 AR = $(CROSS_COMPILE)ar 335 AR = $(CROSS_COMPILE)ar
336 NM = $(CROSS_COMPILE)nm 336 NM = $(CROSS_COMPILE)nm
337 LDR = $(CROSS_COMPILE)ldr 337 LDR = $(CROSS_COMPILE)ldr
338 STRIP = $(CROSS_COMPILE)strip 338 STRIP = $(CROSS_COMPILE)strip
339 OBJCOPY = $(CROSS_COMPILE)objcopy 339 OBJCOPY = $(CROSS_COMPILE)objcopy
340 OBJDUMP = $(CROSS_COMPILE)objdump 340 OBJDUMP = $(CROSS_COMPILE)objdump
341 AWK = awk 341 AWK = awk
342 RANLIB = $(CROSS_COMPILE)RANLIB 342 RANLIB = $(CROSS_COMPILE)RANLIB
343 DTC = dtc 343 DTC = dtc
344 CHECK = sparse 344 CHECK = sparse
345 345
346 CHECKFLAGS := -D__linux__ -Dlinux -D__STDC__ -Dunix -D__unix__ \ 346 CHECKFLAGS := -D__linux__ -Dlinux -D__STDC__ -Dunix -D__unix__ \
347 -Wbitwise -Wno-return-void -D__CHECK_ENDIAN__ $(CF) 347 -Wbitwise -Wno-return-void -D__CHECK_ENDIAN__ $(CF)
348 348
349 KBUILD_CPPFLAGS := -D__KERNEL__ 349 KBUILD_CPPFLAGS := -D__KERNEL__
350 350
351 KBUILD_CFLAGS := -Wall -Wstrict-prototypes \ 351 KBUILD_CFLAGS := -Wall -Wstrict-prototypes \
352 -Wno-format-security \ 352 -Wno-format-security \
353 -fno-builtin -ffreestanding 353 -fno-builtin -ffreestanding
354 KBUILD_AFLAGS := -D__ASSEMBLY__ 354 KBUILD_AFLAGS := -D__ASSEMBLY__
355 355
356 # Read UBOOTRELEASE from include/config/uboot.release (if it exists) 356 # Read UBOOTRELEASE from include/config/uboot.release (if it exists)
357 UBOOTRELEASE = $(shell cat include/config/uboot.release 2> /dev/null) 357 UBOOTRELEASE = $(shell cat include/config/uboot.release 2> /dev/null)
358 UBOOTVERSION = $(VERSION)$(if $(PATCHLEVEL),.$(PATCHLEVEL)$(if $(SUBLEVEL),.$(SUBLEVEL)))$(EXTRAVERSION) 358 UBOOTVERSION = $(VERSION)$(if $(PATCHLEVEL),.$(PATCHLEVEL)$(if $(SUBLEVEL),.$(SUBLEVEL)))$(EXTRAVERSION)
359 359
360 export VERSION PATCHLEVEL SUBLEVEL UBOOTRELEASE UBOOTVERSION 360 export VERSION PATCHLEVEL SUBLEVEL UBOOTRELEASE UBOOTVERSION
361 export ARCH CPU BOARD VENDOR SOC 361 export ARCH CPU BOARD VENDOR SOC
362 export CONFIG_SHELL HOSTCC HOSTCFLAGS HOSTLDFLAGS CROSS_COMPILE AS LD CC 362 export CONFIG_SHELL HOSTCC HOSTCFLAGS HOSTLDFLAGS CROSS_COMPILE AS LD CC
363 export CPP AR NM LDR STRIP OBJCOPY OBJDUMP 363 export CPP AR NM LDR STRIP OBJCOPY OBJDUMP
364 export MAKE AWK 364 export MAKE AWK
365 export DTC CHECK CHECKFLAGS 365 export DTC CHECK CHECKFLAGS
366 366
367 export KBUILD_CPPFLAGS NOSTDINC_FLAGS UBOOTINCLUDE 367 export KBUILD_CPPFLAGS NOSTDINC_FLAGS UBOOTINCLUDE
368 export KBUILD_CFLAGS KBUILD_AFLAGS 368 export KBUILD_CFLAGS KBUILD_AFLAGS
369 369
370 # When compiling out-of-tree modules, put MODVERDIR in the module 370 # When compiling out-of-tree modules, put MODVERDIR in the module
371 # tree rather than in the kernel tree. The kernel tree might 371 # tree rather than in the kernel tree. The kernel tree might
372 # even be read-only. 372 # even be read-only.
373 export MODVERDIR := $(if $(KBUILD_EXTMOD),$(firstword $(KBUILD_EXTMOD))/).tmp_versions 373 export MODVERDIR := $(if $(KBUILD_EXTMOD),$(firstword $(KBUILD_EXTMOD))/).tmp_versions
374 374
375 # Files to ignore in find ... statements 375 # Files to ignore in find ... statements
376 376
377 RCS_FIND_IGNORE := \( -name SCCS -o -name BitKeeper -o -name .svn -o -name CVS \ 377 RCS_FIND_IGNORE := \( -name SCCS -o -name BitKeeper -o -name .svn -o -name CVS \
378 -o -name .pc -o -name .hg -o -name .git \) -prune -o 378 -o -name .pc -o -name .hg -o -name .git \) -prune -o
379 export RCS_TAR_IGNORE := --exclude SCCS --exclude BitKeeper --exclude .svn \ 379 export RCS_TAR_IGNORE := --exclude SCCS --exclude BitKeeper --exclude .svn \
380 --exclude CVS --exclude .pc --exclude .hg --exclude .git 380 --exclude CVS --exclude .pc --exclude .hg --exclude .git
381 381
382 # =========================================================================== 382 # ===========================================================================
383 # Rules shared between *config targets and build targets 383 # Rules shared between *config targets and build targets
384 384
385 # Basic helpers built in scripts/ 385 # Basic helpers built in scripts/
386 PHONY += scripts_basic 386 PHONY += scripts_basic
387 scripts_basic: 387 scripts_basic:
388 $(Q)$(MAKE) $(build)=scripts/basic 388 $(Q)$(MAKE) $(build)=scripts/basic
389 $(Q)rm -f .tmp_quiet_recordmcount 389 $(Q)rm -f .tmp_quiet_recordmcount
390 390
391 # To avoid any implicit rule to kick in, define an empty command. 391 # To avoid any implicit rule to kick in, define an empty command.
392 scripts/basic/%: scripts_basic ; 392 scripts/basic/%: scripts_basic ;
393 393
394 PHONY += outputmakefile 394 PHONY += outputmakefile
395 # outputmakefile generates a Makefile in the output directory, if using a 395 # outputmakefile generates a Makefile in the output directory, if using a
396 # separate output directory. This allows convenient use of make in the 396 # separate output directory. This allows convenient use of make in the
397 # output directory. 397 # output directory.
398 outputmakefile: 398 outputmakefile:
399 ifneq ($(KBUILD_SRC),) 399 ifneq ($(KBUILD_SRC),)
400 $(Q)ln -fsn $(srctree) source 400 $(Q)ln -fsn $(srctree) source
401 $(Q)$(CONFIG_SHELL) $(srctree)/scripts/mkmakefile \ 401 $(Q)$(CONFIG_SHELL) $(srctree)/scripts/mkmakefile \
402 $(srctree) $(objtree) $(VERSION) $(PATCHLEVEL) 402 $(srctree) $(objtree) $(VERSION) $(PATCHLEVEL)
403 endif 403 endif
404 404
405 # To make sure we do not include .config for any of the *config targets 405 # To make sure we do not include .config for any of the *config targets
406 # catch them early, and hand them over to scripts/kconfig/Makefile 406 # catch them early, and hand them over to scripts/kconfig/Makefile
407 # It is allowed to specify more targets when calling make, including 407 # It is allowed to specify more targets when calling make, including
408 # mixing *config targets and build targets. 408 # mixing *config targets and build targets.
409 # For example 'make oldconfig all'. 409 # For example 'make oldconfig all'.
410 # Detect when mixed targets is specified, and make a second invocation 410 # Detect when mixed targets is specified, and make a second invocation
411 # of make so .config is not included in this case either (for *config). 411 # of make so .config is not included in this case either (for *config).
412 412
413 version_h := include/generated/version_autogenerated.h 413 version_h := include/generated/version_autogenerated.h
414 timestamp_h := include/generated/timestamp_autogenerated.h 414 timestamp_h := include/generated/timestamp_autogenerated.h
415 415
416 no-dot-config-targets := clean clobber mrproper distclean \ 416 no-dot-config-targets := clean clobber mrproper distclean \
417 help %docs check% coccicheck \ 417 help %docs check% coccicheck \
418 backup 418 backup
419 419
420 config-targets := 0 420 config-targets := 0
421 mixed-targets := 0 421 mixed-targets := 0
422 dot-config := 1 422 dot-config := 1
423 423
424 ifneq ($(filter $(no-dot-config-targets), $(MAKECMDGOALS)),) 424 ifneq ($(filter $(no-dot-config-targets), $(MAKECMDGOALS)),)
425 ifeq ($(filter-out $(no-dot-config-targets), $(MAKECMDGOALS)),) 425 ifeq ($(filter-out $(no-dot-config-targets), $(MAKECMDGOALS)),)
426 dot-config := 0 426 dot-config := 0
427 endif 427 endif
428 endif 428 endif
429 429
430 ifeq ($(KBUILD_EXTMOD),) 430 ifeq ($(KBUILD_EXTMOD),)
431 ifneq ($(filter config %config,$(MAKECMDGOALS)),) 431 ifneq ($(filter config %config,$(MAKECMDGOALS)),)
432 config-targets := 1 432 config-targets := 1
433 ifneq ($(filter-out config %config,$(MAKECMDGOALS)),) 433 ifneq ($(filter-out config %config,$(MAKECMDGOALS)),)
434 mixed-targets := 1 434 mixed-targets := 1
435 endif 435 endif
436 endif 436 endif
437 endif 437 endif
438 438
439 ifeq ($(mixed-targets),1) 439 ifeq ($(mixed-targets),1)
440 # =========================================================================== 440 # ===========================================================================
441 # We're called with mixed targets (*config and build targets). 441 # We're called with mixed targets (*config and build targets).
442 # Handle them one by one. 442 # Handle them one by one.
443 443
444 PHONY += $(MAKECMDGOALS) build-one-by-one 444 PHONY += $(MAKECMDGOALS) build-one-by-one
445 445
446 $(MAKECMDGOALS): build-one-by-one 446 $(MAKECMDGOALS): build-one-by-one
447 @: 447 @:
448 448
449 build-one-by-one: 449 build-one-by-one:
450 $(Q)set -e; \ 450 $(Q)set -e; \
451 for i in $(MAKECMDGOALS); do \ 451 for i in $(MAKECMDGOALS); do \
452 $(MAKE) -f $(srctree)/Makefile $$i; \ 452 $(MAKE) -f $(srctree)/Makefile $$i; \
453 done 453 done
454 454
455 else 455 else
456 ifeq ($(config-targets),1) 456 ifeq ($(config-targets),1)
457 # =========================================================================== 457 # ===========================================================================
458 # *config targets only - make sure prerequisites are updated, and descend 458 # *config targets only - make sure prerequisites are updated, and descend
459 # in scripts/kconfig to make the *config target 459 # in scripts/kconfig to make the *config target
460 460
461 # Read arch specific Makefile to set KBUILD_DEFCONFIG as needed. 461 # Read arch specific Makefile to set KBUILD_DEFCONFIG as needed.
462 # KBUILD_DEFCONFIG may point out an alternative default configuration 462 # KBUILD_DEFCONFIG may point out an alternative default configuration
463 # used for 'make defconfig' 463 # used for 'make defconfig'
464 464
465 %_config:: outputmakefile 465 %_config:: outputmakefile
466 @$(MKCONFIG) -A $(@:_config=) 466 @$(MKCONFIG) -A $(@:_config=)
467 467
468 else 468 else
469 # =========================================================================== 469 # ===========================================================================
470 # Build targets only - this includes vmlinux, arch specific targets, clean 470 # Build targets only - this includes vmlinux, arch specific targets, clean
471 # targets and others. In general all targets except *config targets. 471 # targets and others. In general all targets except *config targets.
472 472
473 # load ARCH, BOARD, and CPU configuration 473 # load ARCH, BOARD, and CPU configuration
474 -include include/config.mk 474 -include include/config.mk
475 475
476 ifeq ($(dot-config),1) 476 ifeq ($(dot-config),1)
477 # Read in config 477 # Read in config
478 -include include/autoconf.mk 478 -include include/autoconf.mk
479 -include include/autoconf.mk.dep 479 -include include/autoconf.mk.dep
480 480
481 # load other configuration 481 # load other configuration
482 include $(srctree)/config.mk 482 include $(srctree)/config.mk
483 483
484 ifeq ($(wildcard include/config.mk),) 484 ifeq ($(wildcard include/config.mk),)
485 $(error "System not configured - see README") 485 $(error "System not configured - see README")
486 endif 486 endif
487 487
488 ifeq ($(__HAVE_ARCH_GENERIC_BOARD),) 488 ifeq ($(__HAVE_ARCH_GENERIC_BOARD),)
489 ifneq ($(CONFIG_SYS_GENERIC_BOARD),) 489 ifneq ($(CONFIG_SYS_GENERIC_BOARD),)
490 $(error Your architecture does not support generic board. \ 490 $(error Your architecture does not support generic board. \
491 Please undefined CONFIG_SYS_GENERIC_BOARD in your board config file) 491 Please undefined CONFIG_SYS_GENERIC_BOARD in your board config file)
492 endif 492 endif
493 endif 493 endif
494 494
495 # If board code explicitly specified LDSCRIPT or CONFIG_SYS_LDSCRIPT, use 495 # If board code explicitly specified LDSCRIPT or CONFIG_SYS_LDSCRIPT, use
496 # that (or fail if absent). Otherwise, search for a linker script in a 496 # that (or fail if absent). Otherwise, search for a linker script in a
497 # standard location. 497 # standard location.
498 498
499 LDSCRIPT_MAKEFILE_DIR = $(dir $(LDSCRIPT)) 499 LDSCRIPT_MAKEFILE_DIR = $(dir $(LDSCRIPT))
500 500
501 ifndef LDSCRIPT 501 ifndef LDSCRIPT
502 #LDSCRIPT := $(TOPDIR)/board/$(BOARDDIR)/u-boot.lds.debug 502 #LDSCRIPT := $(TOPDIR)/board/$(BOARDDIR)/u-boot.lds.debug
503 ifdef CONFIG_SYS_LDSCRIPT 503 ifdef CONFIG_SYS_LDSCRIPT
504 # need to strip off double quotes 504 # need to strip off double quotes
505 LDSCRIPT := $(CONFIG_SYS_LDSCRIPT:"%"=%) 505 LDSCRIPT := $(CONFIG_SYS_LDSCRIPT:"%"=%)
506 endif 506 endif
507 endif 507 endif
508 508
509 # If there is no specified link script, we look in a number of places for it 509 # If there is no specified link script, we look in a number of places for it
510 ifndef LDSCRIPT 510 ifndef LDSCRIPT
511 ifeq ($(CONFIG_NAND_U_BOOT),y) 511 ifeq ($(CONFIG_NAND_U_BOOT),y)
512 LDSCRIPT := $(TOPDIR)/board/$(BOARDDIR)/u-boot-nand.lds 512 LDSCRIPT := $(TOPDIR)/board/$(BOARDDIR)/u-boot-nand.lds
513 ifeq ($(wildcard $(LDSCRIPT)),) 513 ifeq ($(wildcard $(LDSCRIPT)),)
514 LDSCRIPT := $(TOPDIR)/$(CPUDIR)/u-boot-nand.lds 514 LDSCRIPT := $(TOPDIR)/$(CPUDIR)/u-boot-nand.lds
515 endif 515 endif
516 endif 516 endif
517 ifeq ($(wildcard $(LDSCRIPT)),) 517 ifeq ($(wildcard $(LDSCRIPT)),)
518 LDSCRIPT := $(TOPDIR)/board/$(BOARDDIR)/u-boot.lds 518 LDSCRIPT := $(TOPDIR)/board/$(BOARDDIR)/u-boot.lds
519 endif 519 endif
520 ifeq ($(wildcard $(LDSCRIPT)),) 520 ifeq ($(wildcard $(LDSCRIPT)),)
521 LDSCRIPT := $(TOPDIR)/$(CPUDIR)/u-boot.lds 521 LDSCRIPT := $(TOPDIR)/$(CPUDIR)/u-boot.lds
522 endif 522 endif
523 ifeq ($(wildcard $(LDSCRIPT)),) 523 ifeq ($(wildcard $(LDSCRIPT)),)
524 LDSCRIPT := $(TOPDIR)/arch/$(ARCH)/cpu/u-boot.lds 524 LDSCRIPT := $(TOPDIR)/arch/$(ARCH)/cpu/u-boot.lds
525 # We don't expect a Makefile here 525 # We don't expect a Makefile here
526 LDSCRIPT_MAKEFILE_DIR = 526 LDSCRIPT_MAKEFILE_DIR =
527 endif 527 endif
528 ifeq ($(wildcard $(LDSCRIPT)),) 528 ifeq ($(wildcard $(LDSCRIPT)),)
529 $(error could not find linker script) 529 $(error could not find linker script)
530 endif 530 endif
531 endif 531 endif
532 532
533 else 533 else
534 534
535 535
536 endif # $(dot-config) 536 endif # $(dot-config)
537 537
538 KBUILD_CFLAGS += -Os #-fomit-frame-pointer 538 KBUILD_CFLAGS += -Os #-fomit-frame-pointer
539 539
540 ifdef BUILD_TAG 540 ifdef BUILD_TAG
541 KBUILD_CFLAGS += -DBUILD_TAG='"$(BUILD_TAG)"' 541 KBUILD_CFLAGS += -DBUILD_TAG='"$(BUILD_TAG)"'
542 endif 542 endif
543 543
544 KBUILD_CFLAGS += $(call cc-option,-fno-stack-protector) 544 KBUILD_CFLAGS += $(call cc-option,-fno-stack-protector)
545 545
546 KBUILD_CFLAGS += -g 546 KBUILD_CFLAGS += -g
547 # $(KBUILD_AFLAGS) sets -g, which causes gcc to pass a suitable -g<format> 547 # $(KBUILD_AFLAGS) sets -g, which causes gcc to pass a suitable -g<format>
548 # option to the assembler. 548 # option to the assembler.
549 KBUILD_AFLAGS += -g 549 KBUILD_AFLAGS += -g
550 550
551 # Report stack usage if supported 551 # Report stack usage if supported
552 ifeq ($(shell $(CONFIG_SHELL) $(srctree)/scripts/gcc-stack-usage.sh $(CC)),y) 552 ifeq ($(shell $(CONFIG_SHELL) $(srctree)/scripts/gcc-stack-usage.sh $(CC)),y)
553 KBUILD_CFLAGS += -fstack-usage 553 KBUILD_CFLAGS += -fstack-usage
554 endif 554 endif
555 555
556 KBUILD_CFLAGS += $(call cc-option,-Wno-format-nonliteral) 556 KBUILD_CFLAGS += $(call cc-option,-Wno-format-nonliteral)
557 557
558 # turn jbsr into jsr for m68k 558 # turn jbsr into jsr for m68k
559 ifeq ($(ARCH),m68k) 559 ifeq ($(ARCH),m68k)
560 ifeq ($(findstring 3.4,$(shell $(CC) --version)),3.4) 560 ifeq ($(findstring 3.4,$(shell $(CC) --version)),3.4)
561 KBUILD_AFLAGS += -Wa,-gstabs,-S 561 KBUILD_AFLAGS += -Wa,-gstabs,-S
562 endif 562 endif
563 endif 563 endif
564 564
565 ifneq ($(CONFIG_SYS_TEXT_BASE),) 565 ifneq ($(CONFIG_SYS_TEXT_BASE),)
566 KBUILD_CPPFLAGS += -DCONFIG_SYS_TEXT_BASE=$(CONFIG_SYS_TEXT_BASE) 566 KBUILD_CPPFLAGS += -DCONFIG_SYS_TEXT_BASE=$(CONFIG_SYS_TEXT_BASE)
567 endif 567 endif
568 568
569 export CONFIG_SYS_TEXT_BASE 569 export CONFIG_SYS_TEXT_BASE
570 570
571 # Use UBOOTINCLUDE when you must reference the include/ directory. 571 # Use UBOOTINCLUDE when you must reference the include/ directory.
572 # Needed to be compatible with the O= option 572 # Needed to be compatible with the O= option
573 UBOOTINCLUDE := 573 UBOOTINCLUDE :=
574 ifneq ($(OBJTREE),$(SRCTREE)) 574 ifneq ($(OBJTREE),$(SRCTREE))
575 UBOOTINCLUDE += -I$(OBJTREE)/include 575 UBOOTINCLUDE += -I$(OBJTREE)/include
576 endif 576 endif
577 UBOOTINCLUDE += -I$(srctree)/include \ 577 UBOOTINCLUDE += -I$(srctree)/include \
578 -I$(srctree)/arch/$(ARCH)/include 578 -I$(srctree)/arch/$(ARCH)/include
579 579
580 NOSTDINC_FLAGS += -nostdinc -isystem $(shell $(CC) -print-file-name=include) 580 NOSTDINC_FLAGS += -nostdinc -isystem $(shell $(CC) -print-file-name=include)
581 CHECKFLAGS += $(NOSTDINC_FLAGS) 581 CHECKFLAGS += $(NOSTDINC_FLAGS)
582 582
583 # FIX ME 583 # FIX ME
584 cpp_flags := $(KBUILD_CPPFLAGS) $(CPPFLAGS) $(UBOOTINCLUDE) $(NOSTDINC_FLAGS) 584 cpp_flags := $(KBUILD_CPPFLAGS) $(CPPFLAGS) $(UBOOTINCLUDE) $(NOSTDINC_FLAGS)
585 c_flags := $(KBUILD_CFLAGS) $(cpp_flags) 585 c_flags := $(KBUILD_CFLAGS) $(cpp_flags)
586 586
587 ######################################################################### 587 #########################################################################
588 # U-Boot objects....order is important (i.e. start must be first) 588 # U-Boot objects....order is important (i.e. start must be first)
589 589
590 head-y := $(CPUDIR)/start.o 590 head-y := $(CPUDIR)/start.o
591 head-$(CONFIG_4xx) += arch/powerpc/cpu/ppc4xx/resetvec.o 591 head-$(CONFIG_4xx) += arch/powerpc/cpu/ppc4xx/resetvec.o
592 head-$(CONFIG_MPC85xx) += arch/powerpc/cpu/mpc85xx/resetvec.o 592 head-$(CONFIG_MPC85xx) += arch/powerpc/cpu/mpc85xx/resetvec.o
593 593
594 HAVE_VENDOR_COMMON_LIB = $(if $(wildcard $(srctree)/board/$(VENDOR)/common/Makefile),y,n) 594 HAVE_VENDOR_COMMON_LIB = $(if $(wildcard $(srctree)/board/$(VENDOR)/common/Makefile),y,n)
595 595
596 libs-y += lib/ 596 libs-y += lib/
597 libs-$(HAVE_VENDOR_COMMON_LIB) += board/$(VENDOR)/common/ 597 libs-$(HAVE_VENDOR_COMMON_LIB) += board/$(VENDOR)/common/
598 libs-y += $(CPUDIR)/ 598 libs-y += $(CPUDIR)/
599 ifdef SOC 599 ifdef SOC
600 libs-y += $(CPUDIR)/$(SOC)/ 600 libs-y += $(CPUDIR)/$(SOC)/
601 endif 601 endif
602 libs-$(CONFIG_OF_EMBED) += dts/ 602 libs-$(CONFIG_OF_EMBED) += dts/
603 libs-y += arch/$(ARCH)/lib/ 603 libs-y += arch/$(ARCH)/lib/
604 libs-y += fs/ 604 libs-y += fs/
605 libs-y += net/ 605 libs-y += net/
606 libs-y += disk/ 606 libs-y += disk/
607 libs-y += drivers/ 607 libs-y += drivers/
608 libs-y += drivers/dma/ 608 libs-y += drivers/dma/
609 libs-y += drivers/gpio/ 609 libs-y += drivers/gpio/
610 libs-y += drivers/i2c/ 610 libs-y += drivers/i2c/
611 libs-y += drivers/input/ 611 libs-y += drivers/input/
612 libs-y += drivers/mmc/ 612 libs-y += drivers/mmc/
613 libs-y += drivers/mtd/ 613 libs-y += drivers/mtd/
614 libs-$(CONFIG_CMD_NAND) += drivers/mtd/nand/ 614 libs-$(CONFIG_CMD_NAND) += drivers/mtd/nand/
615 libs-y += drivers/mtd/onenand/ 615 libs-y += drivers/mtd/onenand/
616 libs-$(CONFIG_CMD_UBI) += drivers/mtd/ubi/ 616 libs-$(CONFIG_CMD_UBI) += drivers/mtd/ubi/
617 libs-y += drivers/mtd/spi/ 617 libs-y += drivers/mtd/spi/
618 libs-y += drivers/net/ 618 libs-y += drivers/net/
619 libs-y += drivers/net/phy/ 619 libs-y += drivers/net/phy/
620 libs-y += drivers/pci/ 620 libs-y += drivers/pci/
621 libs-y += drivers/power/ \ 621 libs-y += drivers/power/ \
622 drivers/power/fuel_gauge/ \ 622 drivers/power/fuel_gauge/ \
623 drivers/power/mfd/ \ 623 drivers/power/mfd/ \
624 drivers/power/pmic/ \ 624 drivers/power/pmic/ \
625 drivers/power/battery/ 625 drivers/power/battery/
626 libs-y += drivers/spi/ 626 libs-y += drivers/spi/
627 libs-$(CONFIG_FMAN_ENET) += drivers/net/fm/ 627 libs-$(CONFIG_FMAN_ENET) += drivers/net/fm/
628 libs-$(CONFIG_SYS_FSL_DDR) += drivers/ddr/fsl/ 628 libs-$(CONFIG_SYS_FSL_DDR) += drivers/ddr/fsl/
629 libs-y += drivers/serial/ 629 libs-y += drivers/serial/
630 libs-y += drivers/usb/eth/ 630 libs-y += drivers/usb/eth/
631 libs-y += drivers/usb/gadget/ 631 libs-y += drivers/usb/gadget/
632 libs-y += drivers/usb/host/ 632 libs-y += drivers/usb/host/
633 libs-y += drivers/usb/musb/ 633 libs-y += drivers/usb/musb/
634 libs-y += drivers/usb/musb-new/ 634 libs-y += drivers/usb/musb-new/
635 libs-y += drivers/usb/phy/ 635 libs-y += drivers/usb/phy/
636 libs-y += drivers/usb/ulpi/ 636 libs-y += drivers/usb/ulpi/
637 libs-y += common/ 637 libs-y += common/
638 libs-y += lib/libfdt/ 638 libs-y += lib/libfdt/
639 libs-$(CONFIG_API) += api/ 639 libs-$(CONFIG_API) += api/
640 libs-$(CONFIG_HAS_POST) += post/ 640 libs-$(CONFIG_HAS_POST) += post/
641 libs-y += test/ 641 libs-y += test/
642 642
643 ifneq (,$(filter $(SOC), mx25 mx27 mx5 mx6 mx31 mx35 mxs vf610)) 643 ifneq (,$(filter $(SOC), mx25 mx27 mx5 mx6 mx31 mx35 mxs vf610))
644 libs-y += arch/$(ARCH)/imx-common/ 644 libs-y += arch/$(ARCH)/imx-common/
645 endif 645 endif
646 646
647 libs-$(CONFIG_ARM) += arch/arm/cpu/ 647 libs-$(CONFIG_ARM) += arch/arm/cpu/
648 libs-$(CONFIG_PPC) += arch/powerpc/cpu/ 648 libs-$(CONFIG_PPC) += arch/powerpc/cpu/
649 649
650 libs-y += board/$(BOARDDIR)/ 650 libs-y += board/$(BOARDDIR)/
651 651
652 libs-y := $(sort $(libs-y)) 652 libs-y := $(sort $(libs-y))
653 653
654 u-boot-dirs := $(patsubst %/,%,$(filter %/, $(libs-y))) tools examples 654 u-boot-dirs := $(patsubst %/,%,$(filter %/, $(libs-y))) tools examples
655 655
656 u-boot-alldirs := $(sort $(u-boot-dirs) $(patsubst %/,%,$(filter %/, $(libs-)))) 656 u-boot-alldirs := $(sort $(u-boot-dirs) $(patsubst %/,%,$(filter %/, $(libs-))))
657 657
658 libs-y := $(patsubst %/, %/built-in.o, $(libs-y)) 658 libs-y := $(patsubst %/, %/built-in.o, $(libs-y))
659 659
660 u-boot-init := $(head-y) 660 u-boot-init := $(head-y)
661 u-boot-main := $(libs-y) 661 u-boot-main := $(libs-y)
662 662
663 663
664 # Add GCC lib 664 # Add GCC lib
665 ifdef USE_PRIVATE_LIBGCC 665 ifdef USE_PRIVATE_LIBGCC
666 ifeq ("$(USE_PRIVATE_LIBGCC)", "yes") 666 ifeq ("$(USE_PRIVATE_LIBGCC)", "yes")
667 PLATFORM_LIBGCC = $(OBJTREE)/arch/$(ARCH)/lib/lib.a 667 PLATFORM_LIBGCC = $(OBJTREE)/arch/$(ARCH)/lib/lib.a
668 else 668 else
669 PLATFORM_LIBGCC = -L $(USE_PRIVATE_LIBGCC) -lgcc 669 PLATFORM_LIBGCC = -L $(USE_PRIVATE_LIBGCC) -lgcc
670 endif 670 endif
671 else 671 else
672 PLATFORM_LIBGCC := -L $(shell dirname `$(CC) $(c_flags) -print-libgcc-file-name`) -lgcc 672 PLATFORM_LIBGCC := -L $(shell dirname `$(CC) $(c_flags) -print-libgcc-file-name`) -lgcc
673 endif 673 endif
674 PLATFORM_LIBS += $(PLATFORM_LIBGCC) 674 PLATFORM_LIBS += $(PLATFORM_LIBGCC)
675 export PLATFORM_LIBS 675 export PLATFORM_LIBS
676 676
677 # Special flags for CPP when processing the linker script. 677 # Special flags for CPP when processing the linker script.
678 # Pass the version down so we can handle backwards compatibility 678 # Pass the version down so we can handle backwards compatibility
679 # on the fly. 679 # on the fly.
680 LDPPFLAGS += \ 680 LDPPFLAGS += \
681 -include $(TOPDIR)/include/u-boot/u-boot.lds.h \ 681 -include $(TOPDIR)/include/u-boot/u-boot.lds.h \
682 -DCPUDIR=$(CPUDIR) \ 682 -DCPUDIR=$(CPUDIR) \
683 $(shell $(LD) --version | \ 683 $(shell $(LD) --version | \
684 sed -ne 's/GNU ld version \([0-9][0-9]*\)\.\([0-9][0-9]*\).*/-DLD_MAJOR=\1 -DLD_MINOR=\2/p') 684 sed -ne 's/GNU ld version \([0-9][0-9]*\)\.\([0-9][0-9]*\).*/-DLD_MAJOR=\1 -DLD_MINOR=\2/p')
685 685
686 ######################################################################### 686 #########################################################################
687 ######################################################################### 687 #########################################################################
688 688
689 ifneq ($(CONFIG_BOARD_SIZE_LIMIT),) 689 ifneq ($(CONFIG_BOARD_SIZE_LIMIT),)
690 BOARD_SIZE_CHECK = \ 690 BOARD_SIZE_CHECK = \
691 @actual=`wc -c $@ | awk '{print $$1}'`; \ 691 @actual=`wc -c $@ | awk '{print $$1}'`; \
692 limit=`printf "%d" $(CONFIG_BOARD_SIZE_LIMIT)`; \ 692 limit=`printf "%d" $(CONFIG_BOARD_SIZE_LIMIT)`; \
693 if test $$actual -gt $$limit; then \ 693 if test $$actual -gt $$limit; then \
694 echo "$@ exceeds file size limit:" >&2 ; \ 694 echo "$@ exceeds file size limit:" >&2 ; \
695 echo " limit: $$limit bytes" >&2 ; \ 695 echo " limit: $$limit bytes" >&2 ; \
696 echo " actual: $$actual bytes" >&2 ; \ 696 echo " actual: $$actual bytes" >&2 ; \
697 echo " excess: $$((actual - limit)) bytes" >&2; \ 697 echo " excess: $$((actual - limit)) bytes" >&2; \
698 exit 1; \ 698 exit 1; \
699 fi 699 fi
700 else 700 else
701 BOARD_SIZE_CHECK = 701 BOARD_SIZE_CHECK =
702 endif 702 endif
703 703
704 # Statically apply RELA-style relocations (currently arm64 only) 704 # Statically apply RELA-style relocations (currently arm64 only)
705 ifneq ($(CONFIG_STATIC_RELA),) 705 ifneq ($(CONFIG_STATIC_RELA),)
706 # $(1) is u-boot ELF, $(2) is u-boot bin, $(3) is text base 706 # $(1) is u-boot ELF, $(2) is u-boot bin, $(3) is text base
707 DO_STATIC_RELA = \ 707 DO_STATIC_RELA = \
708 start=$$($(NM) $(1) | grep __rel_dyn_start | cut -f 1 -d ' '); \ 708 start=$$($(NM) $(1) | grep __rel_dyn_start | cut -f 1 -d ' '); \
709 end=$$($(NM) $(1) | grep __rel_dyn_end | cut -f 1 -d ' '); \ 709 end=$$($(NM) $(1) | grep __rel_dyn_end | cut -f 1 -d ' '); \
710 tools/relocate-rela $(2) $(3) $$start $$end 710 tools/relocate-rela $(2) $(3) $$start $$end
711 else 711 else
712 DO_STATIC_RELA = 712 DO_STATIC_RELA =
713 endif 713 endif
714 714
715 # Always append ALL so that arch config.mk's can add custom ones 715 # Always append ALL so that arch config.mk's can add custom ones
716 ALL-y += u-boot.srec u-boot.bin System.map 716 ALL-y += u-boot.srec u-boot.bin System.map
717 717
718 ALL-$(CONFIG_NAND_U_BOOT) += u-boot-nand.bin 718 ALL-$(CONFIG_NAND_U_BOOT) += u-boot-nand.bin
719 ALL-$(CONFIG_ONENAND_U_BOOT) += u-boot-onenand.bin 719 ALL-$(CONFIG_ONENAND_U_BOOT) += u-boot-onenand.bin
720 ALL-$(CONFIG_RAMBOOT_PBL) += u-boot.pbl 720 ALL-$(CONFIG_RAMBOOT_PBL) += u-boot.pbl
721 ALL-$(CONFIG_SPL) += spl/u-boot-spl.bin 721 ALL-$(CONFIG_SPL) += spl/u-boot-spl.bin
722 ALL-$(CONFIG_SPL_FRAMEWORK) += u-boot.img 722 ALL-$(CONFIG_SPL_FRAMEWORK) += u-boot.img
723 ALL-$(CONFIG_TPL) += tpl/u-boot-tpl.bin 723 ALL-$(CONFIG_TPL) += tpl/u-boot-tpl.bin
724 ALL-$(CONFIG_OF_SEPARATE) += u-boot-dtb.bin 724 ALL-$(CONFIG_OF_SEPARATE) += u-boot-dtb.bin
725 ifneq ($(CONFIG_SPL_TARGET),) 725 ifneq ($(CONFIG_SPL_TARGET),)
726 ALL-$(CONFIG_SPL) += $(CONFIG_SPL_TARGET:"%"=%) 726 ALL-$(CONFIG_SPL) += $(CONFIG_SPL_TARGET:"%"=%)
727 endif 727 endif
728 ALL-$(CONFIG_REMAKE_ELF) += u-boot.elf 728 ALL-$(CONFIG_REMAKE_ELF) += u-boot.elf
729 729
730 # enable combined SPL/u-boot/dtb rules for tegra 730 # enable combined SPL/u-boot/dtb rules for tegra
731 ifneq ($(CONFIG_TEGRA),) 731 ifneq ($(CONFIG_TEGRA),)
732 ifeq ($(CONFIG_SPL),y) 732 ifeq ($(CONFIG_SPL),y)
733 ifeq ($(CONFIG_OF_SEPARATE),y) 733 ifeq ($(CONFIG_OF_SEPARATE),y)
734 ALL-y += u-boot-dtb-tegra.bin 734 ALL-y += u-boot-dtb-tegra.bin
735 else 735 else
736 ALL-y += u-boot-nodtb-tegra.bin 736 ALL-y += u-boot-nodtb-tegra.bin
737 endif 737 endif
738 endif 738 endif
739 endif 739 endif
740 740
741 LDFLAGS_u-boot += -T u-boot.lds $(LDFLAGS_FINAL) 741 LDFLAGS_u-boot += -T u-boot.lds $(LDFLAGS_FINAL)
742 ifneq ($(CONFIG_SYS_TEXT_BASE),) 742 ifneq ($(CONFIG_SYS_TEXT_BASE),)
743 LDFLAGS_u-boot += -Ttext $(CONFIG_SYS_TEXT_BASE) 743 LDFLAGS_u-boot += -Ttext $(CONFIG_SYS_TEXT_BASE)
744 endif 744 endif
745 745
746 all: $(ALL-y) 746 all: $(ALL-y)
747 747
748 PHONY += dtbs 748 PHONY += dtbs
749 dtbs dts/dt.dtb: checkdtc u-boot 749 dtbs dts/dt.dtb: checkdtc u-boot
750 $(Q)$(MAKE) $(build)=dts dtbs 750 $(Q)$(MAKE) $(build)=dts dtbs
751 751
752 u-boot-dtb.bin: u-boot.bin dts/dt.dtb 752 u-boot-dtb.bin: u-boot.bin dts/dt.dtb
753 cat $^ >$@ 753 cat $^ >$@
754 754
755 u-boot.hex: u-boot 755 u-boot.hex: u-boot
756 $(OBJCOPY) ${OBJCFLAGS} -O ihex $< $@ 756 $(OBJCOPY) ${OBJCFLAGS} -O ihex $< $@
757 757
758 u-boot.srec: u-boot 758 u-boot.srec: u-boot
759 $(OBJCOPY) ${OBJCFLAGS} -O srec $< $@ 759 $(OBJCOPY) ${OBJCFLAGS} -O srec $< $@
760 760
761 u-boot.bin: u-boot 761 u-boot.bin: u-boot
762 $(OBJCOPY) ${OBJCFLAGS} -O binary $< $@ 762 $(OBJCOPY) ${OBJCFLAGS} -O binary $< $@
763 $(call DO_STATIC_RELA,$<,$@,$(CONFIG_SYS_TEXT_BASE)) 763 $(call DO_STATIC_RELA,$<,$@,$(CONFIG_SYS_TEXT_BASE))
764 $(BOARD_SIZE_CHECK) 764 $(BOARD_SIZE_CHECK)
765 765
766 u-boot.ldr: u-boot 766 u-boot.ldr: u-boot
767 $(CREATE_LDR_ENV) 767 $(CREATE_LDR_ENV)
768 $(LDR) -T $(CONFIG_BFIN_CPU) -c $@ $< $(LDR_FLAGS) 768 $(LDR) -T $(CONFIG_BFIN_CPU) -c $@ $< $(LDR_FLAGS)
769 $(BOARD_SIZE_CHECK) 769 $(BOARD_SIZE_CHECK)
770 770
771 u-boot.ldr.hex: u-boot.ldr 771 u-boot.ldr.hex: u-boot.ldr
772 $(OBJCOPY) ${OBJCFLAGS} -O ihex $< $@ -I binary 772 $(OBJCOPY) ${OBJCFLAGS} -O ihex $< $@ -I binary
773 773
774 u-boot.ldr.srec: u-boot.ldr 774 u-boot.ldr.srec: u-boot.ldr
775 $(OBJCOPY) ${OBJCFLAGS} -O srec $< $@ -I binary 775 $(OBJCOPY) ${OBJCFLAGS} -O srec $< $@ -I binary
776 776
777 # 777 #
778 # U-Boot entry point, needed for booting of full-blown U-Boot 778 # U-Boot entry point, needed for booting of full-blown U-Boot
779 # from the SPL U-Boot version. 779 # from the SPL U-Boot version.
780 # 780 #
781 ifndef CONFIG_SYS_UBOOT_START 781 ifndef CONFIG_SYS_UBOOT_START
782 CONFIG_SYS_UBOOT_START := 0 782 CONFIG_SYS_UBOOT_START := 0
783 endif 783 endif
784 784
785 u-boot.img: u-boot.bin 785 u-boot.img: u-boot.bin
786 tools/mkimage -A $(ARCH) -T firmware -C none \ 786 tools/mkimage -A $(ARCH) -T firmware -C none \
787 -O u-boot -a $(CONFIG_SYS_TEXT_BASE) \ 787 -O u-boot -a $(CONFIG_SYS_TEXT_BASE) \
788 -e $(CONFIG_SYS_UBOOT_START) \ 788 -e $(CONFIG_SYS_UBOOT_START) \
789 -n "U-Boot $(UBOOTRELEASE) for $(BOARD) board" \ 789 -n "U-Boot $(UBOOTRELEASE) for $(BOARD) board" \
790 -d $< $@ 790 -d $< $@
791 791
792 u-boot.imx: u-boot.bin 792 u-boot.imx: u-boot.bin
793 $(MAKE) $(build)=arch/arm/imx-common $(objtree)/u-boot.imx 793 $(MAKE) $(build)=arch/arm/imx-common $(objtree)/u-boot.imx
794 794
795 u-boot.kwb: u-boot.bin 795 u-boot.kwb: u-boot.bin
796 tools/mkimage -n $(CONFIG_SYS_KWD_CONFIG) -T kwbimage \ 796 tools/mkimage -n $(CONFIG_SYS_KWD_CONFIG) -T kwbimage \
797 -a $(CONFIG_SYS_TEXT_BASE) -e $(CONFIG_SYS_TEXT_BASE) -d $< $@ 797 -a $(CONFIG_SYS_TEXT_BASE) -e $(CONFIG_SYS_TEXT_BASE) -d $< $@
798 798
799 u-boot.pbl: u-boot.bin 799 u-boot.pbl: u-boot.bin
800 tools/mkimage -n $(CONFIG_SYS_FSL_PBL_RCW) \ 800 tools/mkimage -n $(CONFIG_SYS_FSL_PBL_RCW) \
801 -R $(CONFIG_SYS_FSL_PBL_PBI) -T pblimage \ 801 -R $(CONFIG_SYS_FSL_PBL_PBI) -T pblimage \
802 -d $< $@ 802 -d $< $@
803 803
804 u-boot.sha1: u-boot.bin 804 u-boot.sha1: u-boot.bin
805 tools/ubsha1 u-boot.bin 805 tools/ubsha1 u-boot.bin
806 806
807 u-boot.dis: u-boot 807 u-boot.dis: u-boot
808 $(OBJDUMP) -d $< > $@ 808 $(OBJDUMP) -d $< > $@
809 809
810 # $@ is output, $(1) and $(2) are inputs, $(3) is padded intermediate, 810 # $@ is output, $(1) and $(2) are inputs, $(3) is padded intermediate,
811 # $(4) is pad-to 811 # $(4) is pad-to
812 SPL_PAD_APPEND = \ 812 SPL_PAD_APPEND = \
813 $(OBJCOPY) ${OBJCFLAGS} --pad-to=$(4) -I binary -O binary \ 813 $(OBJCOPY) ${OBJCFLAGS} --pad-to=$(4) -I binary -O binary \
814 $(1) $(3); \ 814 $(1) $(3); \
815 cat $(3) $(2) > $@; \ 815 cat $(3) $(2) > $@; \
816 rm $(3) 816 rm $(3)
817 817
818 ifdef CONFIG_TPL 818 ifdef CONFIG_TPL
819 SPL_PAYLOAD := tpl/u-boot-with-tpl.bin 819 SPL_PAYLOAD := tpl/u-boot-with-tpl.bin
820 else 820 else
821 SPL_PAYLOAD := u-boot.bin 821 SPL_PAYLOAD := u-boot.bin
822 endif 822 endif
823 823
824 u-boot-with-spl.bin: spl/u-boot-spl.bin $(SPL_PAYLOAD) 824 u-boot-with-spl.bin: spl/u-boot-spl.bin $(SPL_PAYLOAD)
825 $(call SPL_PAD_APPEND,$<,$(SPL_PAYLOAD),spl/u-boot-spl-pad.bin,$(CONFIG_SPL_PAD_TO)) 825 $(call SPL_PAD_APPEND,$<,$(SPL_PAYLOAD),spl/u-boot-spl-pad.bin,$(CONFIG_SPL_PAD_TO))
826 826
827 tpl/u-boot-with-tpl.bin: tpl/u-boot-tpl.bin u-boot.bin 827 tpl/u-boot-with-tpl.bin: tpl/u-boot-tpl.bin u-boot.bin
828 $(call SPL_PAD_APPEND,$<,u-boot.bin,tpl/u-boot-tpl-pad.bin,$(CONFIG_TPL_PAD_TO)) 828 $(call SPL_PAD_APPEND,$<,u-boot.bin,tpl/u-boot-tpl-pad.bin,$(CONFIG_TPL_PAD_TO))
829 829
830 u-boot-with-spl.imx: spl/u-boot-spl.bin u-boot.bin 830 u-boot-with-spl.imx: spl/u-boot-spl.bin u-boot.bin
831 $(MAKE) $(build)=arch/arm/imx-common \ 831 $(MAKE) $(build)=arch/arm/imx-common \
832 $(OBJTREE)/u-boot-with-spl.imx 832 $(OBJTREE)/u-boot-with-spl.imx
833 833
834 u-boot-with-nand-spl.imx: spl/u-boot-spl.bin u-boot.bin 834 u-boot-with-nand-spl.imx: spl/u-boot-spl.bin u-boot.bin
835 $(MAKE) $(build)=arch/arm/imx-common \ 835 $(MAKE) $(build)=arch/arm/imx-common \
836 $(OBJTREE)/u-boot-with-nand-spl.imx 836 $(OBJTREE)/u-boot-with-nand-spl.imx
837 837
838 u-boot.ubl: u-boot-with-spl.bin 838 u-boot.ubl: u-boot-with-spl.bin
839 tools/mkimage -n $(UBL_CONFIG) -T ublimage \ 839 tools/mkimage -n $(UBL_CONFIG) -T ublimage \
840 -e $(CONFIG_SYS_TEXT_BASE) -d $< u-boot.ubl 840 -e $(CONFIG_SYS_TEXT_BASE) -d $< u-boot.ubl
841 841
842 u-boot.ais: spl/u-boot-spl.bin u-boot.img 842 u-boot.ais: spl/u-boot-spl.bin u-boot.img
843 tools/mkimage -s -n $(if $(CONFIG_AIS_CONFIG_FILE),$(srctree)/$(CONFIG_AIS_CONFIG_FILE:"%"=%),"/dev/null") \ 843 tools/mkimage -s -n $(if $(CONFIG_AIS_CONFIG_FILE),$(srctree)/$(CONFIG_AIS_CONFIG_FILE:"%"=%),"/dev/null") \
844 -T aisimage \ 844 -T aisimage \
845 -e $(CONFIG_SPL_TEXT_BASE) \ 845 -e $(CONFIG_SPL_TEXT_BASE) \
846 -d spl/u-boot-spl.bin \ 846 -d spl/u-boot-spl.bin \
847 spl/u-boot-spl.ais 847 spl/u-boot-spl.ais
848 $(OBJCOPY) ${OBJCFLAGS} -I binary \ 848 $(OBJCOPY) ${OBJCFLAGS} -I binary \
849 --pad-to=$(CONFIG_SPL_MAX_SIZE) -O binary \ 849 --pad-to=$(CONFIG_SPL_MAX_SIZE) -O binary \
850 spl/u-boot-spl.ais spl/u-boot-spl-pad.ais 850 spl/u-boot-spl.ais spl/u-boot-spl-pad.ais
851 cat spl/u-boot-spl-pad.ais u-boot.img > u-boot.ais 851 cat spl/u-boot-spl-pad.ais u-boot.img > u-boot.ais
852 852
853 853
854 u-boot.sb: u-boot.bin spl/u-boot-spl.bin 854 u-boot.sb: u-boot.bin spl/u-boot-spl.bin
855 $(MAKE) $(build)=$(CPUDIR)/$(SOC)/ $(OBJTREE)/u-boot.sb 855 $(MAKE) $(build)=$(CPUDIR)/$(SOC)/ $(OBJTREE)/u-boot.sb
856 856
857 # On x600 (SPEAr600) U-Boot is appended to U-Boot SPL. 857 # On x600 (SPEAr600) U-Boot is appended to U-Boot SPL.
858 # Both images are created using mkimage (crc etc), so that the ROM 858 # Both images are created using mkimage (crc etc), so that the ROM
859 # bootloader can check its integrity. Padding needs to be done to the 859 # bootloader can check its integrity. Padding needs to be done to the
860 # SPL image (with mkimage header) and not the binary. Otherwise the resulting image 860 # SPL image (with mkimage header) and not the binary. Otherwise the resulting image
861 # which is loaded/copied by the ROM bootloader to SRAM doesn't fit. 861 # which is loaded/copied by the ROM bootloader to SRAM doesn't fit.
862 # The resulting image containing both U-Boot images is called u-boot.spr 862 # The resulting image containing both U-Boot images is called u-boot.spr
863 u-boot.spr: u-boot.img spl/u-boot-spl.bin 863 u-boot.spr: u-boot.img spl/u-boot-spl.bin
864 tools/mkimage -A $(ARCH) -T firmware -C none \ 864 tools/mkimage -A $(ARCH) -T firmware -C none \
865 -a $(CONFIG_SPL_TEXT_BASE) -e $(CONFIG_SPL_TEXT_BASE) -n XLOADER \ 865 -a $(CONFIG_SPL_TEXT_BASE) -e $(CONFIG_SPL_TEXT_BASE) -n XLOADER \
866 -d spl/u-boot-spl.bin $@ 866 -d spl/u-boot-spl.bin $@
867 $(OBJCOPY) -I binary -O binary \ 867 $(OBJCOPY) -I binary -O binary \
868 --pad-to=$(CONFIG_SPL_PAD_TO) --gap-fill=0xff $@ 868 --pad-to=$(CONFIG_SPL_PAD_TO) --gap-fill=0xff $@
869 cat u-boot.img >> $@ 869 cat u-boot.img >> $@
870 870
871 ifneq ($(CONFIG_TEGRA),) 871 ifneq ($(CONFIG_TEGRA),)
872 u-boot-nodtb-tegra.bin: spl/u-boot-spl.bin u-boot.bin 872 u-boot-nodtb-tegra.bin: spl/u-boot-spl.bin u-boot.bin
873 $(OBJCOPY) ${OBJCFLAGS} --pad-to=$(CONFIG_SYS_TEXT_BASE) -O binary spl/u-boot-spl spl/u-boot-spl-pad.bin 873 $(OBJCOPY) ${OBJCFLAGS} --pad-to=$(CONFIG_SYS_TEXT_BASE) -O binary spl/u-boot-spl spl/u-boot-spl-pad.bin
874 cat spl/u-boot-spl-pad.bin u-boot.bin > $@ 874 cat spl/u-boot-spl-pad.bin u-boot.bin > $@
875 rm spl/u-boot-spl-pad.bin 875 rm spl/u-boot-spl-pad.bin
876 876
877 ifeq ($(CONFIG_OF_SEPARATE),y) 877 ifeq ($(CONFIG_OF_SEPARATE),y)
878 u-boot-dtb-tegra.bin: u-boot-nodtb-tegra.bin dts/dt.dtb 878 u-boot-dtb-tegra.bin: u-boot-nodtb-tegra.bin dts/dt.dtb
879 cat $^ > $@ 879 cat $^ > $@
880 endif 880 endif
881 endif 881 endif
882 882
883 u-boot-img.bin: spl/u-boot-spl.bin u-boot.img 883 u-boot-img.bin: spl/u-boot-spl.bin u-boot.img
884 cat spl/u-boot-spl.bin u-boot.img > $@ 884 cat spl/u-boot-spl.bin u-boot.img > $@
885 885
886 # PPC4xx needs the SPL at the end of the image, since the reset vector 886 # PPC4xx needs the SPL at the end of the image, since the reset vector
887 # is located at 0xfffffffc. So we can't use the "u-boot-img.bin" target 887 # is located at 0xfffffffc. So we can't use the "u-boot-img.bin" target
888 # and need to introduce a new build target with the full blown U-Boot 888 # and need to introduce a new build target with the full blown U-Boot
889 # at the start padded up to the start of the SPL image. And then concat 889 # at the start padded up to the start of the SPL image. And then concat
890 # the SPL image to the end. 890 # the SPL image to the end.
891 u-boot-img-spl-at-end.bin: spl/u-boot-spl.bin u-boot.img 891 u-boot-img-spl-at-end.bin: spl/u-boot-spl.bin u-boot.img
892 $(OBJCOPY) -I binary -O binary --pad-to=$(CONFIG_UBOOT_PAD_TO) \ 892 $(OBJCOPY) -I binary -O binary --pad-to=$(CONFIG_UBOOT_PAD_TO) \
893 --gap-fill=0xff u-boot.img $@ 893 --gap-fill=0xff u-boot.img $@
894 cat spl/u-boot-spl.bin >> $@ 894 cat spl/u-boot-spl.bin >> $@
895 895
896 # Create a new ELF from a raw binary file. This is useful for arm64 896 # Create a new ELF from a raw binary file. This is useful for arm64
897 # where static relocation needs to be performed on the raw binary, 897 # where static relocation needs to be performed on the raw binary,
898 # but certain simulators only accept an ELF file (but don't do the 898 # but certain simulators only accept an ELF file (but don't do the
899 # relocation). 899 # relocation).
900 # FIXME refactor dts/Makefile to share target/arch detection 900 # FIXME refactor dts/Makefile to share target/arch detection
901 u-boot.elf: u-boot.bin 901 u-boot.elf: u-boot.bin
902 @$(OBJCOPY) -B aarch64 -I binary -O elf64-littleaarch64 \ 902 @$(OBJCOPY) -B aarch64 -I binary -O elf64-littleaarch64 \
903 $< u-boot-elf.o 903 $< u-boot-elf.o
904 @$(LD) u-boot-elf.o -o $@ \ 904 @$(LD) u-boot-elf.o -o $@ \
905 --defsym=_start=$(CONFIG_SYS_TEXT_BASE) \ 905 --defsym=_start=$(CONFIG_SYS_TEXT_BASE) \
906 -Ttext=$(CONFIG_SYS_TEXT_BASE) 906 -Ttext=$(CONFIG_SYS_TEXT_BASE)
907 907
908 ifeq ($(CONFIG_SANDBOX),y) 908 ifeq ($(CONFIG_SANDBOX),y)
909 GEN_UBOOT = \ 909 GEN_UBOOT = \
910 $(CC) $(SYMS) -T u-boot.lds \ 910 $(CC) $(SYMS) -T u-boot.lds \
911 -Wl,--start-group $(u-boot-main) -Wl,--end-group \ 911 -Wl,--start-group $(u-boot-main) -Wl,--end-group \
912 $(PLATFORM_LIBS) -Wl,-Map -Wl,u-boot.map -o u-boot 912 $(PLATFORM_LIBS) -Wl,-Map -Wl,u-boot.map -o u-boot
913 else 913 else
914 GEN_UBOOT = \ 914 GEN_UBOOT = \
915 $(LD) $(LDFLAGS) $(LDFLAGS_$(@F)) \ 915 $(LD) $(LDFLAGS) $(LDFLAGS_$(@F)) \
916 $(u-boot-init) \ 916 $(u-boot-init) \
917 --start-group $(u-boot-main) --end-group $(PLATFORM_LIBS) \ 917 --start-group $(u-boot-main) --end-group $(PLATFORM_LIBS) \
918 -Map u-boot.map -o u-boot 918 -Map u-boot.map -o u-boot
919 endif 919 endif
920 920
921 u-boot: $(u-boot-init) $(u-boot-main) u-boot.lds 921 u-boot: $(u-boot-init) $(u-boot-main) u-boot.lds
922 $(GEN_UBOOT) 922 $(GEN_UBOOT)
923 ifeq ($(CONFIG_KALLSYMS),y) 923 ifeq ($(CONFIG_KALLSYMS),y)
924 smap=`$(call SYSTEM_MAP,u-boot) | \ 924 smap=`$(call SYSTEM_MAP,u-boot) | \
925 awk '$$2 ~ /[tTwW]/ {printf $$1 $$3 "\\\\000"}'` ; \ 925 awk '$$2 ~ /[tTwW]/ {printf $$1 $$3 "\\\\000"}'` ; \
926 $(CC) $(c_flags) -DSYSTEM_MAP="\"$${smap}\"" \ 926 $(CC) $(c_flags) -DSYSTEM_MAP="\"$${smap}\"" \
927 -c $(srctree)/common/system_map.c -o common/system_map.o 927 -c $(srctree)/common/system_map.c -o common/system_map.o
928 $(GEN_UBOOT) common/system_map.o 928 $(GEN_UBOOT) common/system_map.o
929 endif 929 endif
930 930
931 # The actual objects are generated when descending, 931 # The actual objects are generated when descending,
932 # make sure no implicit rule kicks in 932 # make sure no implicit rule kicks in
933 $(sort $(u-boot-init) $(u-boot-main)): $(u-boot-dirs) ; 933 $(sort $(u-boot-init) $(u-boot-main)): $(u-boot-dirs) ;
934 934
935 # Handle descending into subdirectories listed in $(vmlinux-dirs) 935 # Handle descending into subdirectories listed in $(vmlinux-dirs)
936 # Preset locale variables to speed up the build process. Limit locale 936 # Preset locale variables to speed up the build process. Limit locale
937 # tweaks to this spot to avoid wrong language settings when running 937 # tweaks to this spot to avoid wrong language settings when running
938 # make menuconfig etc. 938 # make menuconfig etc.
939 # Error messages still appears in the original language 939 # Error messages still appears in the original language
940 940
941 PHONY += $(u-boot-dirs) 941 PHONY += $(u-boot-dirs)
942 $(u-boot-dirs): prepare scripts 942 $(u-boot-dirs): prepare scripts
943 $(Q)$(MAKE) $(build)=$@ 943 $(Q)$(MAKE) $(build)=$@
944 944
945 tools: prepare 945 tools: prepare
946 # The "tools" are needed early 946 # The "tools" are needed early
947 $(filter-out tools, $(u-boot-dirs)): tools 947 $(filter-out tools, $(u-boot-dirs)): tools
948 # The "examples" conditionally depend on U-Boot (say, when USE_PRIVATE_LIBGCC 948 # The "examples" conditionally depend on U-Boot (say, when USE_PRIVATE_LIBGCC
949 # is "yes"), so compile examples after U-Boot is compiled. 949 # is "yes"), so compile examples after U-Boot is compiled.
950 examples: $(filter-out examples, $(u-boot-dirs)) 950 examples: $(filter-out examples, $(u-boot-dirs))
951 951
952 define filechk_uboot.release 952 define filechk_uboot.release
953 echo "$(UBOOTVERSION)$$($(CONFIG_SHELL) $(srctree)/scripts/setlocalversion $(srctree))" 953 echo "$(UBOOTVERSION)$$($(CONFIG_SHELL) $(srctree)/scripts/setlocalversion $(srctree))"
954 endef 954 endef
955 955
956 # Store (new) UBOOTRELEASE string in include/config/uboot.release 956 # Store (new) UBOOTRELEASE string in include/config/uboot.release
957 include/config/uboot.release: Makefile FORCE 957 include/config/uboot.release: Makefile FORCE
958 $(call filechk,uboot.release) 958 $(call filechk,uboot.release)
959 959
960 960
961 # Things we need to do before we recursively start building the kernel 961 # Things we need to do before we recursively start building the kernel
962 # or the modules are listed in "prepare". 962 # or the modules are listed in "prepare".
963 # A multi level approach is used. prepareN is processed before prepareN-1. 963 # A multi level approach is used. prepareN is processed before prepareN-1.
964 # archprepare is used in arch Makefiles and when processed asm symlink, 964 # archprepare is used in arch Makefiles and when processed asm symlink,
965 # version.h and scripts_basic is processed / created. 965 # version.h and scripts_basic is processed / created.
966 966
967 # Listed in dependency order 967 # Listed in dependency order
968 PHONY += prepare archprepare prepare0 prepare1 prepare2 prepare3 968 PHONY += prepare archprepare prepare0 prepare1 prepare2 prepare3
969 969
970 # prepare3 is used to check if we are building in a separate output directory, 970 # prepare3 is used to check if we are building in a separate output directory,
971 # and if so do: 971 # and if so do:
972 # 1) Check that make has not been executed in the kernel src $(srctree) 972 # 1) Check that make has not been executed in the kernel src $(srctree)
973 prepare3: include/config/uboot.release 973 prepare3: include/config/uboot.release
974 ifneq ($(KBUILD_SRC),) 974 ifneq ($(KBUILD_SRC),)
975 @$(kecho) ' Using $(srctree) as source for u-boot' 975 @$(kecho) ' Using $(srctree) as source for u-boot'
976 $(Q)if [ -f $(srctree)/include/config.mk ]; then \ 976 $(Q)if [ -f $(srctree)/include/config.mk ]; then \
977 echo >&2 " $(srctree) is not clean, please run 'make mrproper'"; \ 977 echo >&2 " $(srctree) is not clean, please run 'make mrproper'"; \
978 echo >&2 " in the '$(srctree)' directory.";\ 978 echo >&2 " in the '$(srctree)' directory.";\
979 /bin/false; \ 979 /bin/false; \
980 fi; 980 fi;
981 endif 981 endif
982 982
983 # prepare2 creates a makefile if using a separate output directory 983 # prepare2 creates a makefile if using a separate output directory
984 prepare2: prepare3 outputmakefile 984 prepare2: prepare3 outputmakefile
985 985
986 prepare1: prepare2 $(version_h) $(timestamp_h) 986 prepare1: prepare2 $(version_h) $(timestamp_h)
987 @: 987 @:
988 988
989 archprepare: prepare1 scripts_basic 989 archprepare: prepare1 scripts_basic
990 990
991 prepare0: archprepare FORCE include/generated/generic-asm-offsets.h \ 991 prepare0: archprepare FORCE
992 include/generated/asm-offsets.h 992 $(Q)$(MAKE) $(build)=.
993 @:
994 993
995 # All the preparing.. 994 # All the preparing..
996 prepare: prepare0 995 prepare: prepare0
997 996
998 # Generate some files 997 # Generate some files
999 # --------------------------------------------------------------------------- 998 # ---------------------------------------------------------------------------
1000 999
1001 define filechk_version.h 1000 define filechk_version.h
1002 (echo \#define PLAIN_VERSION \"$(UBOOTRELEASE)\"; \ 1001 (echo \#define PLAIN_VERSION \"$(UBOOTRELEASE)\"; \
1003 echo \#define U_BOOT_VERSION \"U-Boot \" PLAIN_VERSION; \ 1002 echo \#define U_BOOT_VERSION \"U-Boot \" PLAIN_VERSION; \
1004 echo \#define CC_VERSION_STRING \"$$($(CC) --version | head -n 1)\"; \ 1003 echo \#define CC_VERSION_STRING \"$$($(CC) --version | head -n 1)\"; \
1005 echo \#define LD_VERSION_STRING \"$$($(LD) --version | head -n 1)\"; ) 1004 echo \#define LD_VERSION_STRING \"$$($(LD) --version | head -n 1)\"; )
1006 endef 1005 endef
1007 1006
1008 define filechk_timestamp.h 1007 define filechk_timestamp.h
1009 (LC_ALL=C date +'#define U_BOOT_DATE "%b %d %C%y"'; \ 1008 (LC_ALL=C date +'#define U_BOOT_DATE "%b %d %C%y"'; \
1010 LC_ALL=C date +'#define U_BOOT_TIME "%T"') 1009 LC_ALL=C date +'#define U_BOOT_TIME "%T"')
1011 endef 1010 endef
1012 1011
1013 $(version_h): $(srctree)/Makefile FORCE 1012 $(version_h): $(srctree)/Makefile FORCE
1014 $(call filechk,version.h) 1013 $(call filechk,version.h)
1015 1014
1016 $(timestamp_h): $(srctree)/Makefile FORCE 1015 $(timestamp_h): $(srctree)/Makefile FORCE
1017 $(call filechk,timestamp.h) 1016 $(call filechk,timestamp.h)
1018 1017
1019 # 1018 #
1020 # Auto-generate the autoconf.mk file (which is included by all makefiles) 1019 # Auto-generate the autoconf.mk file (which is included by all makefiles)
1021 # 1020 #
1022 # This target actually generates 2 files; autoconf.mk and autoconf.mk.dep. 1021 # This target actually generates 2 files; autoconf.mk and autoconf.mk.dep.
1023 # the dep file is only include in this top level makefile to determine when 1022 # the dep file is only include in this top level makefile to determine when
1024 # to regenerate the autoconf.mk file. 1023 # to regenerate the autoconf.mk file.
1025 1024
1026 quiet_cmd_autoconf_dep = GEN $@ 1025 quiet_cmd_autoconf_dep = GEN $@
1027 cmd_autoconf_dep = $(CC) -x c -DDO_DEPS_ONLY -M $(c_flags) \ 1026 cmd_autoconf_dep = $(CC) -x c -DDO_DEPS_ONLY -M $(c_flags) \
1028 -MQ include/autoconf.mk $(srctree)/include/common.h > $@ || rm $@ 1027 -MQ include/autoconf.mk $(srctree)/include/common.h > $@ || rm $@
1029 1028
1030 include/autoconf.mk.dep: include/config.h include/common.h 1029 include/autoconf.mk.dep: include/config.h include/common.h
1031 $(call cmd,autoconf_dep) 1030 $(call cmd,autoconf_dep)
1032 1031
1033 quiet_cmd_autoconf = GEN $@ 1032 quiet_cmd_autoconf = GEN $@
1034 cmd_autoconf = \ 1033 cmd_autoconf = \
1035 $(CPP) $(c_flags) -DDO_DEPS_ONLY -dM $(srctree)/include/common.h > $@.tmp && \ 1034 $(CPP) $(c_flags) -DDO_DEPS_ONLY -dM $(srctree)/include/common.h > $@.tmp && \
1036 sed -n -f $(srctree)/tools/scripts/define2mk.sed $@.tmp > $@; \ 1035 sed -n -f $(srctree)/tools/scripts/define2mk.sed $@.tmp > $@; \
1037 rm $@.tmp 1036 rm $@.tmp
1038 1037
1039 include/autoconf.mk: include/config.h 1038 include/autoconf.mk: include/config.h
1040 $(call cmd,autoconf) 1039 $(call cmd,autoconf)
1041 1040
1042 # --------------------------------------------------------------------------- 1041 # ---------------------------------------------------------------------------
1043 1042
1044 PHONY += depend dep 1043 PHONY += depend dep
1045 depend dep: 1044 depend dep:
1046 @echo '*** Warning: make $@ is unnecessary now.' 1045 @echo '*** Warning: make $@ is unnecessary now.'
1047 1046
1048 # --------------------------------------------------------------------------- 1047 # ---------------------------------------------------------------------------
1049 1048
1050 u-boot.lds: $(LDSCRIPT) prepare 1049 u-boot.lds: $(LDSCRIPT) prepare
1051 $(CPP) $(cpp_flags) $(LDPPFLAGS) -ansi -D__ASSEMBLY__ -P - <$< >$@ 1050 $(CPP) $(cpp_flags) $(LDPPFLAGS) -ansi -D__ASSEMBLY__ -P - <$< >$@
1052 1051
1053 nand_spl: prepare 1052 nand_spl: prepare
1054 $(MAKE) $(build)=nand_spl/board/$(BOARDDIR) all 1053 $(MAKE) $(build)=nand_spl/board/$(BOARDDIR) all
1055 1054
1056 u-boot-nand.bin: nand_spl u-boot.bin 1055 u-boot-nand.bin: nand_spl u-boot.bin
1057 cat nand_spl/u-boot-spl-16k.bin u-boot.bin > u-boot-nand.bin 1056 cat nand_spl/u-boot-spl-16k.bin u-boot.bin > u-boot-nand.bin
1058 1057
1059 spl/u-boot-spl.bin: tools prepare 1058 spl/u-boot-spl.bin: tools prepare
1060 $(MAKE) obj=spl -f $(srctree)/spl/Makefile all 1059 $(MAKE) obj=spl -f $(srctree)/spl/Makefile all
1061 1060
1062 tpl/u-boot-tpl.bin: tools prepare 1061 tpl/u-boot-tpl.bin: tools prepare
1063 $(MAKE) obj=tpl -f $(srctree)/spl/Makefile all CONFIG_TPL_BUILD=y 1062 $(MAKE) obj=tpl -f $(srctree)/spl/Makefile all CONFIG_TPL_BUILD=y
1064 1063
1065 TAG_SUBDIRS := $(u-boot-dirs) include 1064 TAG_SUBDIRS := $(u-boot-dirs) include
1066 1065
1067 FIND := find 1066 FIND := find
1068 FINDFLAGS := -L 1067 FINDFLAGS := -L
1069 1068
1070 PHONY += checkstack 1069 PHONY += checkstack
1071 1070
1072 checkstack: 1071 checkstack:
1073 $(OBJDUMP) -d u-boot $$(find . -name u-boot-spl) | \ 1072 $(OBJDUMP) -d u-boot $$(find . -name u-boot-spl) | \
1074 $(PERL) $(src)/scripts/checkstack.pl $(ARCH) 1073 $(PERL) $(src)/scripts/checkstack.pl $(ARCH)
1075 1074
1076 tags ctags: 1075 tags ctags:
1077 ctags -w -o ctags `$(FIND) $(FINDFLAGS) $(TAG_SUBDIRS) \ 1076 ctags -w -o ctags `$(FIND) $(FINDFLAGS) $(TAG_SUBDIRS) \
1078 -name '*.[chS]' -print` 1077 -name '*.[chS]' -print`
1079 1078
1080 etags: 1079 etags:
1081 etags -a -o $(obj)etags `$(FIND) $(FINDFLAGS) $(TAG_SUBDIRS) \ 1080 etags -a -o $(obj)etags `$(FIND) $(FINDFLAGS) $(TAG_SUBDIRS) \
1082 -name '*.[chS]' -print` 1081 -name '*.[chS]' -print`
1083 cscope: 1082 cscope:
1084 $(FIND) $(FINDFLAGS) $(TAG_SUBDIRS) -name '*.[chS]' -print > \ 1083 $(FIND) $(FINDFLAGS) $(TAG_SUBDIRS) -name '*.[chS]' -print > \
1085 cscope.files 1084 cscope.files
1086 cscope -b -q -k 1085 cscope -b -q -k
1087 1086
1088 SYSTEM_MAP = \ 1087 SYSTEM_MAP = \
1089 $(NM) $1 | \ 1088 $(NM) $1 | \
1090 grep -v '\(compiled\)\|\(\.o$$\)\|\( [aUw] \)\|\(\.\.ng$$\)\|\(LASH[RL]DI\)' | \ 1089 grep -v '\(compiled\)\|\(\.o$$\)\|\( [aUw] \)\|\(\.\.ng$$\)\|\(LASH[RL]DI\)' | \
1091 LC_ALL=C sort 1090 LC_ALL=C sort
1092 System.map: u-boot 1091 System.map: u-boot
1093 @$(call SYSTEM_MAP,$<) > $@ 1092 @$(call SYSTEM_MAP,$<) > $@
1094 1093
1095 checkthumb: 1094 checkthumb:
1096 @if test $(call cc-version) -lt 0404; then \ 1095 @if test $(call cc-version) -lt 0404; then \
1097 echo -n '*** Your GCC does not produce working '; \ 1096 echo -n '*** Your GCC does not produce working '; \
1098 echo 'binaries in THUMB mode.'; \ 1097 echo 'binaries in THUMB mode.'; \
1099 echo '*** Your board is configured for THUMB mode.'; \ 1098 echo '*** Your board is configured for THUMB mode.'; \
1100 false; \ 1099 false; \
1101 fi 1100 fi
1102 1101
1103 # GCC 3.x is reported to have problems generating the type of relocation 1102 # GCC 3.x is reported to have problems generating the type of relocation
1104 # that U-Boot wants. 1103 # that U-Boot wants.
1105 # See http://lists.denx.de/pipermail/u-boot/2012-September/135156.html 1104 # See http://lists.denx.de/pipermail/u-boot/2012-September/135156.html
1106 checkgcc4: 1105 checkgcc4:
1107 @if test $(call cc-version) -lt 0400; then \ 1106 @if test $(call cc-version) -lt 0400; then \
1108 echo -n '*** Your GCC is too old, please upgrade to GCC 4.x or newer'; \ 1107 echo -n '*** Your GCC is too old, please upgrade to GCC 4.x or newer'; \
1109 false; \ 1108 false; \
1110 fi 1109 fi
1111 1110
1112 checkdtc: 1111 checkdtc:
1113 @if test $(call dtc-version) -lt 0104; then \ 1112 @if test $(call dtc-version) -lt 0104; then \
1114 echo '*** Your dtc is too old, please upgrade to dtc 1.4 or newer'; \ 1113 echo '*** Your dtc is too old, please upgrade to dtc 1.4 or newer'; \
1115 false; \ 1114 false; \
1116 fi 1115 fi
1117
1118 quiet_cmd_offsets = GEN $@
1119 cmd_offsets = $(srctree)/tools/scripts/make-asm-offsets $< $@
1120
1121 include/generated/generic-asm-offsets.h: lib/asm-offsets.s
1122 $(call cmd,offsets)
1123
1124 quiet_cmd_asm-offsets.s = CC $@
1125 cmd_asm-offsets.s = mkdir -p lib; \
1126 $(CC) -DDO_DEPS_ONLY \
1127 $(c_flags) $(CFLAGS_$(BCURDIR)/$(@F)) $(CFLAGS_$(BCURDIR)) \
1128 -o $@ $< -c -S
1129
1130 lib/asm-offsets.s: $(srctree)/lib/asm-offsets.c include/config.h
1131 $(call cmd,asm-offsets.s)
1132
1133 include/generated/asm-offsets.h: $(CPUDIR)/$(SOC)/asm-offsets.s
1134 $(call cmd,offsets)
1135
1136 quiet_cmd_soc_asm-offsets.s = CC $@
1137 cmd_soc_asm-offsets.s = mkdir -p $(CPUDIR)/$(SOC); \
1138 if [ -f $(srctree)/$(CPUDIR)/$(SOC)/asm-offsets.c ];then \
1139 $(CC) -DDO_DEPS_ONLY \
1140 $(c_flags) $(CFLAGS_$(BCURDIR)/$(@F)) $(CFLAGS_$(BCURDIR)) \
1141 -o $@ $(srctree)/$(CPUDIR)/$(SOC)/asm-offsets.c -c -S; \
1142 else \
1143 touch $@; \
1144 fi
1145
1146 $(CPUDIR)/$(SOC)/asm-offsets.s: include/config.h
1147 $(call cmd,soc_asm-offsets.s)
1148 1116
1149 ######################################################################### 1117 #########################################################################
1150 1118
1151 # ARM relocations should all be R_ARM_RELATIVE (32-bit) or 1119 # ARM relocations should all be R_ARM_RELATIVE (32-bit) or
1152 # R_AARCH64_RELATIVE (64-bit). 1120 # R_AARCH64_RELATIVE (64-bit).
1153 checkarmreloc: u-boot 1121 checkarmreloc: u-boot
1154 @RELOC="`$(CROSS_COMPILE)readelf -r -W $< | cut -d ' ' -f 4 | \ 1122 @RELOC="`$(CROSS_COMPILE)readelf -r -W $< | cut -d ' ' -f 4 | \
1155 grep R_A | sort -u`"; \ 1123 grep R_A | sort -u`"; \
1156 if test "$$RELOC" != "R_ARM_RELATIVE" -a \ 1124 if test "$$RELOC" != "R_ARM_RELATIVE" -a \
1157 "$$RELOC" != "R_AARCH64_RELATIVE"; then \ 1125 "$$RELOC" != "R_AARCH64_RELATIVE"; then \
1158 echo "$< contains unexpected relocations: $$RELOC"; \ 1126 echo "$< contains unexpected relocations: $$RELOC"; \
1159 false; \ 1127 false; \
1160 fi 1128 fi
1161 1129
1162 env: scripts_basic 1130 env: scripts_basic
1163 $(Q)$(MAKE) $(build)=tools/$@ 1131 $(Q)$(MAKE) $(build)=tools/$@
1164 1132
1165 tools-all: HOST_TOOLS_ALL=y 1133 tools-all: HOST_TOOLS_ALL=y
1166 tools-all: env tools ; 1134 tools-all: env tools ;
1167 1135
1168 .PHONY : CHANGELOG 1136 .PHONY : CHANGELOG
1169 CHANGELOG: 1137 CHANGELOG:
1170 git log --no-merges U-Boot-1_1_5.. | \ 1138 git log --no-merges U-Boot-1_1_5.. | \
1171 unexpand -a | sed -e 's/\s\s*$$//' > $@ 1139 unexpand -a | sed -e 's/\s\s*$$//' > $@
1172 1140
1173 include/license.h: tools/bin2header COPYING 1141 include/license.h: tools/bin2header COPYING
1174 cat COPYING | gzip -9 -c | ./tools/bin2header license_gzip > include/license.h 1142 cat COPYING | gzip -9 -c | ./tools/bin2header license_gzip > include/license.h
1175 ######################################################################### 1143 #########################################################################
1176 1144
1177 ### 1145 ###
1178 # Cleaning is done on three levels. 1146 # Cleaning is done on three levels.
1179 # make clean Delete most generated files 1147 # make clean Delete most generated files
1180 # Leave enough to build external modules 1148 # Leave enough to build external modules
1181 # make mrproper Delete the current configuration, and all generated files 1149 # make mrproper Delete the current configuration, and all generated files
1182 # make distclean Remove editor backup files, patch leftover files and the like 1150 # make distclean Remove editor backup files, patch leftover files and the like
1183 1151
1184 # Directories & files removed with 'make clean' 1152 # Directories & files removed with 'make clean'
1185 CLEAN_DIRS += $(MODVERDIR) 1153 CLEAN_DIRS += $(MODVERDIR)
1186 CLEAN_FILES += u-boot.lds include/bmp_logo.h include/bmp_logo_data.h \ 1154 CLEAN_FILES += u-boot.lds include/bmp_logo.h include/bmp_logo_data.h \
1187 board/*/config.tmp board/*/*/config.tmp \ 1155 board/*/config.tmp board/*/*/config.tmp \
1188 include/autoconf.mk* include/spl-autoconf.mk \ 1156 include/autoconf.mk* include/spl-autoconf.mk \
1189 include/tpl-autoconf.mk 1157 include/tpl-autoconf.mk
1190 1158
1191 # Directories & files removed with 'make clobber' 1159 # Directories & files removed with 'make clobber'
1192 CLOBBER_DIRS += $(patsubst %,spl/%, $(filter-out Makefile, \ 1160 CLOBBER_DIRS += $(patsubst %,spl/%, $(filter-out Makefile, \
1193 $(shell ls -1 spl 2>/dev/null))) \ 1161 $(shell ls -1 spl 2>/dev/null))) \
1194 tpl 1162 tpl
1195 CLOBBER_FILES += u-boot* MLO* SPL System.map nand_spl/u-boot* 1163 CLOBBER_FILES += u-boot* MLO* SPL System.map nand_spl/u-boot*
1196 1164
1197 # Directories & files removed with 'make mrproper' 1165 # Directories & files removed with 'make mrproper'
1198 MRPROPER_DIRS += include/config include/generated 1166 MRPROPER_DIRS += include/config include/generated
1199 MRPROPER_FILES += .config .config.old \ 1167 MRPROPER_FILES += .config .config.old \
1200 tags TAGS cscope* GPATH GTAGS GRTAGS GSYMS \ 1168 tags TAGS cscope* GPATH GTAGS GRTAGS GSYMS \
1201 include/config.h include/config.mk 1169 include/config.h include/config.mk
1202 1170
1203 # clean - Delete most, but leave enough to build external modules 1171 # clean - Delete most, but leave enough to build external modules
1204 # 1172 #
1205 clean: rm-dirs := $(CLEAN_DIRS) 1173 clean: rm-dirs := $(CLEAN_DIRS)
1206 clean: rm-files := $(CLEAN_FILES) 1174 clean: rm-files := $(CLEAN_FILES)
1207 1175
1208 clean-dirs := $(foreach f,$(u-boot-alldirs),$(if $(wildcard $f/Makefile),$f)) 1176 clean-dirs := $(foreach f,$(u-boot-alldirs),$(if $(wildcard $f/Makefile),$f))
1209 1177
1210 clean-dirs := $(addprefix _clean_, $(clean-dirs) doc/DocBook) 1178 clean-dirs := $(addprefix _clean_, $(clean-dirs) doc/DocBook)
1211 1179
1212 PHONY += $(clean-dirs) clean archclean 1180 PHONY += $(clean-dirs) clean archclean
1213 $(clean-dirs): 1181 $(clean-dirs):
1214 $(Q)$(MAKE) $(clean)=$(patsubst _clean_%,%,$@) 1182 $(Q)$(MAKE) $(clean)=$(patsubst _clean_%,%,$@)
1215 1183
1216 # TODO: Do not use *.cfgtmp 1184 # TODO: Do not use *.cfgtmp
1217 clean: $(clean-dirs) 1185 clean: $(clean-dirs)
1218 $(call cmd,rmdirs) 1186 $(call cmd,rmdirs)
1219 $(call cmd,rmfiles) 1187 $(call cmd,rmfiles)
1220 @find $(if $(KBUILD_EXTMOD), $(KBUILD_EXTMOD), .) $(RCS_FIND_IGNORE) \ 1188 @find $(if $(KBUILD_EXTMOD), $(KBUILD_EXTMOD), .) $(RCS_FIND_IGNORE) \
1221 \( -name '*.[oas]' -o -name '*.ko' -o -name '.*.cmd' \ 1189 \( -name '*.[oas]' -o -name '*.ko' -o -name '.*.cmd' \
1222 -o -name '*.ko.*' -o -name '*.su' -o -name '*.cfgtmp' \ 1190 -o -name '*.ko.*' -o -name '*.su' -o -name '*.cfgtmp' \
1223 -o -name '.*.d' -o -name '.*.tmp' -o -name '*.mod.c' \ 1191 -o -name '.*.d' -o -name '.*.tmp' -o -name '*.mod.c' \
1224 -o -name '*.symtypes' -o -name 'modules.order' \ 1192 -o -name '*.symtypes' -o -name 'modules.order' \
1225 -o -name modules.builtin -o -name '.tmp_*.o.*' \ 1193 -o -name modules.builtin -o -name '.tmp_*.o.*' \
1226 -o -name '*.gcno' \) -type f -print | xargs rm -f 1194 -o -name '*.gcno' \) -type f -print | xargs rm -f
1227 @find $(if $(KBUILD_EXTMOD), $(KBUILD_EXTMOD), .) $(RCS_FIND_IGNORE) \ 1195 @find $(if $(KBUILD_EXTMOD), $(KBUILD_EXTMOD), .) $(RCS_FIND_IGNORE) \
1228 -path './nand_spl/*' -type l -print | xargs rm -f 1196 -path './nand_spl/*' -type l -print | xargs rm -f
1229 1197
1230 # clobber 1198 # clobber
1231 # 1199 #
1232 clobber: rm-dirs := $(CLOBBER_DIRS) 1200 clobber: rm-dirs := $(CLOBBER_DIRS)
1233 clobber: rm-files := $(CLOBBER_FILES) 1201 clobber: rm-files := $(CLOBBER_FILES)
1234 1202
1235 PHONY += clobber 1203 PHONY += clobber
1236 1204
1237 clobber: clean 1205 clobber: clean
1238 $(call cmd,rmdirs) 1206 $(call cmd,rmdirs)
1239 $(call cmd,rmfiles) 1207 $(call cmd,rmfiles)
1240 1208
1241 # mrproper - Delete all generated files, including .config 1209 # mrproper - Delete all generated files, including .config
1242 # 1210 #
1243 mrproper: rm-dirs := $(wildcard $(MRPROPER_DIRS)) 1211 mrproper: rm-dirs := $(wildcard $(MRPROPER_DIRS))
1244 mrproper: rm-files := $(wildcard $(MRPROPER_FILES)) 1212 mrproper: rm-files := $(wildcard $(MRPROPER_FILES))
1245 mrproper-dirs := $(addprefix _mrproper_,scripts) 1213 mrproper-dirs := $(addprefix _mrproper_,scripts)
1246 1214
1247 PHONY += $(mrproper-dirs) mrproper archmrproper 1215 PHONY += $(mrproper-dirs) mrproper archmrproper
1248 $(mrproper-dirs): 1216 $(mrproper-dirs):
1249 $(Q)$(MAKE) $(clean)=$(patsubst _mrproper_%,%,$@) 1217 $(Q)$(MAKE) $(clean)=$(patsubst _mrproper_%,%,$@)
1250 1218
1251 mrproper: clobber $(mrproper-dirs) 1219 mrproper: clobber $(mrproper-dirs)
1252 $(call cmd,rmdirs) 1220 $(call cmd,rmdirs)
1253 $(call cmd,rmfiles) 1221 $(call cmd,rmfiles)
1254 @rm -f arch/*/include/asm/arch arch/*/include/asm/proc 1222 @rm -f arch/*/include/asm/arch arch/*/include/asm/proc
1255 1223
1256 # distclean 1224 # distclean
1257 # 1225 #
1258 PHONY += distclean 1226 PHONY += distclean
1259 1227
1260 distclean: mrproper 1228 distclean: mrproper
1261 @find $(srctree) $(RCS_FIND_IGNORE) \ 1229 @find $(srctree) $(RCS_FIND_IGNORE) \
1262 \( -name '*.orig' -o -name '*.rej' -o -name '*~' \ 1230 \( -name '*.orig' -o -name '*.rej' -o -name '*~' \
1263 -o -name '*.bak' -o -name '#*#' -o -name '.*.orig' \ 1231 -o -name '*.bak' -o -name '#*#' -o -name '.*.orig' \
1264 -o -name '.*.rej' \ 1232 -o -name '.*.rej' \
1265 -o -name '*%' -o -name '.*.cmd' -o -name 'core' \) \ 1233 -o -name '*%' -o -name '.*.cmd' -o -name 'core' \) \
1266 -type f -print | xargs rm -f 1234 -type f -print | xargs rm -f
1267 1235
1268 backup: 1236 backup:
1269 F=`basename $(TOPDIR)` ; cd .. ; \ 1237 F=`basename $(TOPDIR)` ; cd .. ; \
1270 gtar --force-local -zcvf `LC_ALL=C date "+$$F-%Y-%m-%d-%T.tar.gz"` $$F 1238 gtar --force-local -zcvf `LC_ALL=C date "+$$F-%Y-%m-%d-%T.tar.gz"` $$F
1271 1239
1272 1240
1273 # Documentation targets 1241 # Documentation targets
1274 # --------------------------------------------------------------------------- 1242 # ---------------------------------------------------------------------------
1275 %docs: scripts_basic FORCE 1243 %docs: scripts_basic FORCE
1276 $(Q)$(MAKE) $(build)=scripts build_docproc 1244 $(Q)$(MAKE) $(build)=scripts build_docproc
1277 $(Q)$(MAKE) $(build)=doc/DocBook $@ 1245 $(Q)$(MAKE) $(build)=doc/DocBook $@
1278 1246
1279 # Dummies... 1247 # Dummies...
1280 PHONY += prepare scripts 1248 PHONY += prepare scripts
1281 prepare: ; 1249 prepare: ;
1282 scripts: ; 1250 scripts: ;
1283 1251
1284 endif #ifeq ($(config-targets),1) 1252 endif #ifeq ($(config-targets),1)
1285 endif #ifeq ($(mixed-targets),1) 1253 endif #ifeq ($(mixed-targets),1)
1286 1254
1287 quiet_cmd_rmdirs = $(if $(wildcard $(rm-dirs)),CLEAN $(wildcard $(rm-dirs))) 1255 quiet_cmd_rmdirs = $(if $(wildcard $(rm-dirs)),CLEAN $(wildcard $(rm-dirs)))
1288 cmd_rmdirs = rm -rf $(rm-dirs) 1256 cmd_rmdirs = rm -rf $(rm-dirs)
1289 1257
1290 quiet_cmd_rmfiles = $(if $(wildcard $(rm-files)),CLEAN $(wildcard $(rm-files))) 1258 quiet_cmd_rmfiles = $(if $(wildcard $(rm-files)),CLEAN $(wildcard $(rm-files)))
1291 cmd_rmfiles = rm -f $(rm-files) 1259 cmd_rmfiles = rm -f $(rm-files)
1292 1260
1293 # Shorthand for $(Q)$(MAKE) -f scripts/Makefile.clean obj=dir 1261 # Shorthand for $(Q)$(MAKE) -f scripts/Makefile.clean obj=dir
1294 # Usage: 1262 # Usage:
1295 # $(Q)$(MAKE) $(clean)=dir 1263 # $(Q)$(MAKE) $(clean)=dir
1296 clean := -f $(if $(KBUILD_SRC),$(srctree)/)scripts/Makefile.clean obj 1264 clean := -f $(if $(KBUILD_SRC),$(srctree)/)scripts/Makefile.clean obj
1297 1265
1298 endif # skip-makefile 1266 endif # skip-makefile
1299 1267
1300 PHONY += FORCE 1268 PHONY += FORCE
1301 FORCE: 1269 FORCE:
1302 1270
1303 # Declare the contents of the .PHONY variable as phony. We keep that 1271 # Declare the contents of the .PHONY variable as phony. We keep that
1304 # information in a variable so we can use it in if_changed and friends. 1272 # information in a variable so we can use it in if_changed and friends.
1305 .PHONY: $(PHONY) 1273 .PHONY: $(PHONY)
1306 1274
tools/scripts/make-asm-offsets
1 #!/bin/sh File was deleted
2
3 # Adapted from Linux kernel's "Kbuild":
4 # commit 1cdf25d704f7951d02a04064c97db547d6021872
5 # Author: Christoph Lameter <clameter@sgi.com>
6
7 mkdir -p $(dirname $2)
8
9 # Default sed regexp - multiline due to syntax constraints
10 SED_CMD="/^->/{s:->#\(.*\):/* \1 */:; \
11 s:^->\([^ ]*\) [\$#]*\([-0-9]*\) \(.*\):#define \1 (\2) /* \3 */:; \
12 s:^->\([^ ]*\) [\$#]*\([^ ]*\) \(.*\):#define \1 \2 /* \3 */:; \
13 s:->::; p;}"
14
15 (set -e
16 echo "#ifndef __ASM_OFFSETS_H__"
17 echo "#define __ASM_OFFSETS_H__"
18 echo "/*"
19 echo " * DO NOT MODIFY."
20 echo " *"
21 echo " * This file was generated by $(basename $0)"
22 echo " *"
23 echo " */"
24 echo ""
25 sed -ne "${SED_CMD}" $1
26 echo ""
27 echo "#endif" ) > $2
28 1 #!/bin/sh