Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit a54535551d7f37054c73c79b6f0417e7e244db89

Authored by Otavio Salvador
Committed by Albert ARIBAUD
1 parent 09bc3d04d9
Exists in master and in 54 other branches 8qm-imx_v2020.04_5.4.70_2.3.0, emb_lf_v2022.04, imx_v2015.04_4.1.15_1.0.0_ga, pitx_8mp_lf_v2020.04, smarc-8m-android-10.0.0_2.6.0, smarc-8m-android-11.0.0_2.0.0, smarc-8mp-android-11.0.0_2.0.0, smarc-emmc-imx_v2014.04_3.10.53_1.1.0_ga, smarc-emmc-imx_v2014.04_3.14.28_1.0.0_ga, smarc-imx-l5.0.0_1.0.0-ga, smarc-imx6_v2018.03_4.14.98_2.0.0_ga, smarc-imx7_v2017.03_4.9.11_1.0.0_ga, smarc-imx7_v2018.03_4.14.98_2.0.0_ga, smarc-imx_v2014.04_3.14.28_1.0.0_ga, smarc-imx_v2015.04_4.1.15_1.0.0_ga, smarc-imx_v2017.03_4.9.11_1.0.0_ga, smarc-imx_v2017.03_4.9.88_2.0.0_ga, smarc-imx_v2017.03_o8.1.0_1.3.0_8m, smarc-imx_v2018.03_4.14.78_1.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_2.0.0_ga, smarc_8m-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8m-imx_v2019.04_4.19.35_1.1.0, smarc_8m_00d0-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2019.04_4.19.35_1.1.0, smarc_8mm-imx_v2020.04_5.4.24_2.1.0, smarc_8mp_lf_v2020.04, smarc_8mq-imx_v2020.04_5.4.24_2.1.0, smarc_8mq_lf_v2020.04, ti-u-boot-2015.07, u-boot-2013.01.y, v2013.10, v2013.10-smarct33, v2013.10-smartmen, v2014.01, v2014.04, v2014.04-smarct33, v2014.04-smarct33-emmc, v2014.04-smartmen, v2014.07, v2014.07-smarct33, v2014.07-smartmen, v2015.07-smarct33, v2015.07-smarct33-emmc, v2015.07-smarct4x, v2016.05-dlt, v2016.05-smarct3x, v2016.05-smarct3x-emmc, v2016.05-smarct4x, v2017.01-smarct3x, v2017.01-smarct3x-emmc, v2017.01-smarct4x

MX28: config: Allow different target generation in elftosb call 

The elftosb call needs to use a target param specific for i.MX28. This
patch allow for later addition of i.MX233.

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Acked-by: Marek Vasut <marex@denx.de>

Showing 3 changed files with 18 additions and 15 deletions Inline Diff

1 # 1 #
2 # (C) Copyright 2000-2012 2 # (C) Copyright 2000-2012
3 # Wolfgang Denk, DENX Software Engineering, wd@denx.de. 3 # Wolfgang Denk, DENX Software Engineering, wd@denx.de.
4 # 4 #
5 # See file CREDITS for list of people who contributed to this 5 # See file CREDITS for list of people who contributed to this
6 # project. 6 # project.
7 # 7 #
8 # This program is free software; you can redistribute it and/or 8 # This program is free software; you can redistribute it and/or
9 # modify it under the terms of the GNU General Public License as 9 # modify it under the terms of the GNU General Public License as
10 # published by the Free Software Foundatio; either version 2 of 10 # published by the Free Software Foundatio; either version 2 of
11 # the License, or (at your option) any later version. 11 # the License, or (at your option) any later version.
12 # 12 #
13 # This program is distributed in the hope that it will be useful, 13 # This program is distributed in the hope that it will be useful,
14 # but WITHOUT ANY WARRANTY; without even the implied warranty of 14 # but WITHOUT ANY WARRANTY; without even the implied warranty of
15 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 # GNU General Public License for more details. 16 # GNU General Public License for more details.
17 # 17 #
18 # You should have received a copy of the GNU General Public License 18 # You should have received a copy of the GNU General Public License
19 # along with this program; if not, write to the Free Software 19 # along with this program; if not, write to the Free Software
20 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, 20 # Foundation, Inc., 59 Temple Place, Suite 330, Boston,
21 # MA 02111-1307 USA 21 # MA 02111-1307 USA
22 # 22 #
23 23
24 VERSION = 2012 24 VERSION = 2012
25 PATCHLEVEL = 07 25 PATCHLEVEL = 07
26 SUBLEVEL = 26 SUBLEVEL =
27 EXTRAVERSION = 27 EXTRAVERSION =
28 ifneq "$(SUBLEVEL)" "" 28 ifneq "$(SUBLEVEL)" ""
29 U_BOOT_VERSION = $(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION) 29 U_BOOT_VERSION = $(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)
30 else 30 else
31 U_BOOT_VERSION = $(VERSION).$(PATCHLEVEL)$(EXTRAVERSION) 31 U_BOOT_VERSION = $(VERSION).$(PATCHLEVEL)$(EXTRAVERSION)
32 endif 32 endif
33 TIMESTAMP_FILE = $(obj)include/generated/timestamp_autogenerated.h 33 TIMESTAMP_FILE = $(obj)include/generated/timestamp_autogenerated.h
34 VERSION_FILE = $(obj)include/generated/version_autogenerated.h 34 VERSION_FILE = $(obj)include/generated/version_autogenerated.h
35 35
36 HOSTARCH := $(shell uname -m | \ 36 HOSTARCH := $(shell uname -m | \
37 sed -e s/i.86/x86/ \ 37 sed -e s/i.86/x86/ \
38 -e s/sun4u/sparc64/ \ 38 -e s/sun4u/sparc64/ \
39 -e s/arm.*/arm/ \ 39 -e s/arm.*/arm/ \
40 -e s/sa110/arm/ \ 40 -e s/sa110/arm/ \
41 -e s/ppc64/powerpc/ \ 41 -e s/ppc64/powerpc/ \
42 -e s/ppc/powerpc/ \ 42 -e s/ppc/powerpc/ \
43 -e s/macppc/powerpc/\ 43 -e s/macppc/powerpc/\
44 -e s/sh.*/sh/) 44 -e s/sh.*/sh/)
45 45
46 HOSTOS := $(shell uname -s | tr '[:upper:]' '[:lower:]' | \ 46 HOSTOS := $(shell uname -s | tr '[:upper:]' '[:lower:]' | \
47 sed -e 's/\(cygwin\).*/cygwin/') 47 sed -e 's/\(cygwin\).*/cygwin/')
48 48
49 # Set shell to bash if possible, otherwise fall back to sh 49 # Set shell to bash if possible, otherwise fall back to sh
50 SHELL := $(shell if [ -x "$$BASH" ]; then echo $$BASH; \ 50 SHELL := $(shell if [ -x "$$BASH" ]; then echo $$BASH; \
51 else if [ -x /bin/bash ]; then echo /bin/bash; \ 51 else if [ -x /bin/bash ]; then echo /bin/bash; \
52 else echo sh; fi; fi) 52 else echo sh; fi; fi)
53 53
54 export HOSTARCH HOSTOS SHELL 54 export HOSTARCH HOSTOS SHELL
55 55
56 # Deal with colliding definitions from tcsh etc. 56 # Deal with colliding definitions from tcsh etc.
57 VENDOR= 57 VENDOR=
58 58
59 ######################################################################### 59 #########################################################################
60 # Allow for silent builds 60 # Allow for silent builds
61 ifeq (,$(findstring s,$(MAKEFLAGS))) 61 ifeq (,$(findstring s,$(MAKEFLAGS)))
62 XECHO = echo 62 XECHO = echo
63 else 63 else
64 XECHO = : 64 XECHO = :
65 endif 65 endif
66 66
67 ######################################################################### 67 #########################################################################
68 # 68 #
69 # U-boot build supports producing a object files to the separate external 69 # U-boot build supports producing a object files to the separate external
70 # directory. Two use cases are supported: 70 # directory. Two use cases are supported:
71 # 71 #
72 # 1) Add O= to the make command line 72 # 1) Add O= to the make command line
73 # 'make O=/tmp/build all' 73 # 'make O=/tmp/build all'
74 # 74 #
75 # 2) Set environement variable BUILD_DIR to point to the desired location 75 # 2) Set environement variable BUILD_DIR to point to the desired location
76 # 'export BUILD_DIR=/tmp/build' 76 # 'export BUILD_DIR=/tmp/build'
77 # 'make' 77 # 'make'
78 # 78 #
79 # The second approach can also be used with a MAKEALL script 79 # The second approach can also be used with a MAKEALL script
80 # 'export BUILD_DIR=/tmp/build' 80 # 'export BUILD_DIR=/tmp/build'
81 # './MAKEALL' 81 # './MAKEALL'
82 # 82 #
83 # Command line 'O=' setting overrides BUILD_DIR environent variable. 83 # Command line 'O=' setting overrides BUILD_DIR environent variable.
84 # 84 #
85 # When none of the above methods is used the local build is performed and 85 # When none of the above methods is used the local build is performed and
86 # the object files are placed in the source directory. 86 # the object files are placed in the source directory.
87 # 87 #
88 88
89 ifdef O 89 ifdef O
90 ifeq ("$(origin O)", "command line") 90 ifeq ("$(origin O)", "command line")
91 BUILD_DIR := $(O) 91 BUILD_DIR := $(O)
92 endif 92 endif
93 endif 93 endif
94 94
95 ifneq ($(BUILD_DIR),) 95 ifneq ($(BUILD_DIR),)
96 saved-output := $(BUILD_DIR) 96 saved-output := $(BUILD_DIR)
97 97
98 # Attempt to create a output directory. 98 # Attempt to create a output directory.
99 $(shell [ -d ${BUILD_DIR} ] || mkdir -p ${BUILD_DIR}) 99 $(shell [ -d ${BUILD_DIR} ] || mkdir -p ${BUILD_DIR})
100 100
101 # Verify if it was successful. 101 # Verify if it was successful.
102 BUILD_DIR := $(shell cd $(BUILD_DIR) && /bin/pwd) 102 BUILD_DIR := $(shell cd $(BUILD_DIR) && /bin/pwd)
103 $(if $(BUILD_DIR),,$(error output directory "$(saved-output)" does not exist)) 103 $(if $(BUILD_DIR),,$(error output directory "$(saved-output)" does not exist))
104 endif # ifneq ($(BUILD_DIR),) 104 endif # ifneq ($(BUILD_DIR),)
105 105
106 OBJTREE := $(if $(BUILD_DIR),$(BUILD_DIR),$(CURDIR)) 106 OBJTREE := $(if $(BUILD_DIR),$(BUILD_DIR),$(CURDIR))
107 SPLTREE := $(OBJTREE)/spl 107 SPLTREE := $(OBJTREE)/spl
108 SRCTREE := $(CURDIR) 108 SRCTREE := $(CURDIR)
109 TOPDIR := $(SRCTREE) 109 TOPDIR := $(SRCTREE)
110 LNDIR := $(OBJTREE) 110 LNDIR := $(OBJTREE)
111 export TOPDIR SRCTREE OBJTREE SPLTREE 111 export TOPDIR SRCTREE OBJTREE SPLTREE
112 112
113 MKCONFIG := $(SRCTREE)/mkconfig 113 MKCONFIG := $(SRCTREE)/mkconfig
114 export MKCONFIG 114 export MKCONFIG
115 115
116 ifneq ($(OBJTREE),$(SRCTREE)) 116 ifneq ($(OBJTREE),$(SRCTREE))
117 REMOTE_BUILD := 1 117 REMOTE_BUILD := 1
118 export REMOTE_BUILD 118 export REMOTE_BUILD
119 endif 119 endif
120 120
121 # $(obj) and (src) are defined in config.mk but here in main Makefile 121 # $(obj) and (src) are defined in config.mk but here in main Makefile
122 # we also need them before config.mk is included which is the case for 122 # we also need them before config.mk is included which is the case for
123 # some targets like unconfig, clean, clobber, distclean, etc. 123 # some targets like unconfig, clean, clobber, distclean, etc.
124 ifneq ($(OBJTREE),$(SRCTREE)) 124 ifneq ($(OBJTREE),$(SRCTREE))
125 obj := $(OBJTREE)/ 125 obj := $(OBJTREE)/
126 src := $(SRCTREE)/ 126 src := $(SRCTREE)/
127 else 127 else
128 obj := 128 obj :=
129 src := 129 src :=
130 endif 130 endif
131 export obj src 131 export obj src
132 132
133 # Make sure CDPATH settings don't interfere 133 # Make sure CDPATH settings don't interfere
134 unexport CDPATH 134 unexport CDPATH
135 135
136 ######################################################################### 136 #########################################################################
137 137
138 # The "tools" are needed early, so put this first 138 # The "tools" are needed early, so put this first
139 # Don't include stuff already done in $(LIBS) 139 # Don't include stuff already done in $(LIBS)
140 # The "examples" conditionally depend on U-Boot (say, when USE_PRIVATE_LIBGCC 140 # The "examples" conditionally depend on U-Boot (say, when USE_PRIVATE_LIBGCC
141 # is "yes"), so compile examples after U-Boot is compiled. 141 # is "yes"), so compile examples after U-Boot is compiled.
142 SUBDIR_TOOLS = tools 142 SUBDIR_TOOLS = tools
143 SUBDIR_EXAMPLES = examples/standalone examples/api 143 SUBDIR_EXAMPLES = examples/standalone examples/api
144 SUBDIRS = $(SUBDIR_TOOLS) 144 SUBDIRS = $(SUBDIR_TOOLS)
145 145
146 .PHONY : $(SUBDIRS) $(VERSION_FILE) $(TIMESTAMP_FILE) 146 .PHONY : $(SUBDIRS) $(VERSION_FILE) $(TIMESTAMP_FILE)
147 147
148 ifeq ($(obj)include/config.mk,$(wildcard $(obj)include/config.mk)) 148 ifeq ($(obj)include/config.mk,$(wildcard $(obj)include/config.mk))
149 149
150 # Include autoconf.mk before config.mk so that the config options are available 150 # Include autoconf.mk before config.mk so that the config options are available
151 # to all top level build files. We need the dummy all: target to prevent the 151 # to all top level build files. We need the dummy all: target to prevent the
152 # dependency target in autoconf.mk.dep from being the default. 152 # dependency target in autoconf.mk.dep from being the default.
153 all: 153 all:
154 sinclude $(obj)include/autoconf.mk.dep 154 sinclude $(obj)include/autoconf.mk.dep
155 sinclude $(obj)include/autoconf.mk 155 sinclude $(obj)include/autoconf.mk
156 156
157 ifndef CONFIG_SANDBOX 157 ifndef CONFIG_SANDBOX
158 SUBDIRS += $(SUBDIR_EXAMPLES) 158 SUBDIRS += $(SUBDIR_EXAMPLES)
159 endif 159 endif
160 160
161 # load ARCH, BOARD, and CPU configuration 161 # load ARCH, BOARD, and CPU configuration
162 include $(obj)include/config.mk 162 include $(obj)include/config.mk
163 export ARCH CPU BOARD VENDOR SOC 163 export ARCH CPU BOARD VENDOR SOC
164 164
165 # set default to nothing for native builds 165 # set default to nothing for native builds
166 ifeq ($(HOSTARCH),$(ARCH)) 166 ifeq ($(HOSTARCH),$(ARCH))
167 CROSS_COMPILE ?= 167 CROSS_COMPILE ?=
168 endif 168 endif
169 169
170 # load other configuration 170 # load other configuration
171 include $(TOPDIR)/config.mk 171 include $(TOPDIR)/config.mk
172 172
173 # If board code explicitly specified LDSCRIPT or CONFIG_SYS_LDSCRIPT, use 173 # If board code explicitly specified LDSCRIPT or CONFIG_SYS_LDSCRIPT, use
174 # that (or fail if absent). Otherwise, search for a linker script in a 174 # that (or fail if absent). Otherwise, search for a linker script in a
175 # standard location. 175 # standard location.
176 176
177 LDSCRIPT_MAKEFILE_DIR = $(dir $(LDSCRIPT)) 177 LDSCRIPT_MAKEFILE_DIR = $(dir $(LDSCRIPT))
178 178
179 ifndef LDSCRIPT 179 ifndef LDSCRIPT
180 #LDSCRIPT := $(TOPDIR)/board/$(BOARDDIR)/u-boot.lds.debug 180 #LDSCRIPT := $(TOPDIR)/board/$(BOARDDIR)/u-boot.lds.debug
181 ifdef CONFIG_SYS_LDSCRIPT 181 ifdef CONFIG_SYS_LDSCRIPT
182 # need to strip off double quotes 182 # need to strip off double quotes
183 LDSCRIPT := $(subst ",,$(CONFIG_SYS_LDSCRIPT)) 183 LDSCRIPT := $(subst ",,$(CONFIG_SYS_LDSCRIPT))
184 endif 184 endif
185 endif 185 endif
186 186
187 # If there is no specified link script, we look in a number of places for it 187 # If there is no specified link script, we look in a number of places for it
188 ifndef LDSCRIPT 188 ifndef LDSCRIPT
189 ifeq ($(CONFIG_NAND_U_BOOT),y) 189 ifeq ($(CONFIG_NAND_U_BOOT),y)
190 LDSCRIPT := $(TOPDIR)/board/$(BOARDDIR)/u-boot-nand.lds 190 LDSCRIPT := $(TOPDIR)/board/$(BOARDDIR)/u-boot-nand.lds
191 ifeq ($(wildcard $(LDSCRIPT)),) 191 ifeq ($(wildcard $(LDSCRIPT)),)
192 LDSCRIPT := $(TOPDIR)/$(CPUDIR)/u-boot-nand.lds 192 LDSCRIPT := $(TOPDIR)/$(CPUDIR)/u-boot-nand.lds
193 endif 193 endif
194 endif 194 endif
195 ifeq ($(wildcard $(LDSCRIPT)),) 195 ifeq ($(wildcard $(LDSCRIPT)),)
196 LDSCRIPT := $(TOPDIR)/board/$(BOARDDIR)/u-boot.lds 196 LDSCRIPT := $(TOPDIR)/board/$(BOARDDIR)/u-boot.lds
197 endif 197 endif
198 ifeq ($(wildcard $(LDSCRIPT)),) 198 ifeq ($(wildcard $(LDSCRIPT)),)
199 LDSCRIPT := $(TOPDIR)/$(CPUDIR)/u-boot.lds 199 LDSCRIPT := $(TOPDIR)/$(CPUDIR)/u-boot.lds
200 endif 200 endif
201 ifeq ($(wildcard $(LDSCRIPT)),) 201 ifeq ($(wildcard $(LDSCRIPT)),)
202 LDSCRIPT := $(TOPDIR)/arch/$(ARCH)/cpu/u-boot.lds 202 LDSCRIPT := $(TOPDIR)/arch/$(ARCH)/cpu/u-boot.lds
203 # We don't expect a Makefile here 203 # We don't expect a Makefile here
204 LDSCRIPT_MAKEFILE_DIR = 204 LDSCRIPT_MAKEFILE_DIR =
205 endif 205 endif
206 ifeq ($(wildcard $(LDSCRIPT)),) 206 ifeq ($(wildcard $(LDSCRIPT)),)
207 $(error could not find linker script) 207 $(error could not find linker script)
208 endif 208 endif
209 endif 209 endif
210 210
211 ######################################################################### 211 #########################################################################
212 # U-Boot objects....order is important (i.e. start must be first) 212 # U-Boot objects....order is important (i.e. start must be first)
213 213
214 OBJS = $(CPUDIR)/start.o 214 OBJS = $(CPUDIR)/start.o
215 ifeq ($(CPU),x86) 215 ifeq ($(CPU),x86)
216 OBJS += $(CPUDIR)/start16.o 216 OBJS += $(CPUDIR)/start16.o
217 OBJS += $(CPUDIR)/resetvec.o 217 OBJS += $(CPUDIR)/resetvec.o
218 endif 218 endif
219 ifeq ($(CPU),ppc4xx) 219 ifeq ($(CPU),ppc4xx)
220 OBJS += $(CPUDIR)/resetvec.o 220 OBJS += $(CPUDIR)/resetvec.o
221 endif 221 endif
222 ifeq ($(CPU),mpc85xx) 222 ifeq ($(CPU),mpc85xx)
223 OBJS += $(CPUDIR)/resetvec.o 223 OBJS += $(CPUDIR)/resetvec.o
224 endif 224 endif
225 225
226 OBJS := $(addprefix $(obj),$(OBJS)) 226 OBJS := $(addprefix $(obj),$(OBJS))
227 227
228 HAVE_VENDOR_COMMON_LIB = $(if $(wildcard board/$(VENDOR)/common/Makefile),y,n) 228 HAVE_VENDOR_COMMON_LIB = $(if $(wildcard board/$(VENDOR)/common/Makefile),y,n)
229 229
230 LIBS-y += lib/libgeneric.o 230 LIBS-y += lib/libgeneric.o
231 LIBS-y += lib/lzma/liblzma.o 231 LIBS-y += lib/lzma/liblzma.o
232 LIBS-y += lib/lzo/liblzo.o 232 LIBS-y += lib/lzo/liblzo.o
233 LIBS-y += lib/zlib/libz.o 233 LIBS-y += lib/zlib/libz.o
234 LIBS-$(CONFIG_TIZEN) += lib/tizen/libtizen.o 234 LIBS-$(CONFIG_TIZEN) += lib/tizen/libtizen.o
235 LIBS-$(HAVE_VENDOR_COMMON_LIB) += board/$(VENDOR)/common/lib$(VENDOR).o 235 LIBS-$(HAVE_VENDOR_COMMON_LIB) += board/$(VENDOR)/common/lib$(VENDOR).o
236 LIBS-y += $(CPUDIR)/lib$(CPU).o 236 LIBS-y += $(CPUDIR)/lib$(CPU).o
237 ifdef SOC 237 ifdef SOC
238 LIBS-y += $(CPUDIR)/$(SOC)/lib$(SOC).o 238 LIBS-y += $(CPUDIR)/$(SOC)/lib$(SOC).o
239 endif 239 endif
240 ifeq ($(CPU),ixp) 240 ifeq ($(CPU),ixp)
241 LIBS-y += arch/arm/cpu/ixp/npe/libnpe.o 241 LIBS-y += arch/arm/cpu/ixp/npe/libnpe.o
242 endif 242 endif
243 LIBS-$(CONFIG_OF_EMBED) += dts/libdts.o 243 LIBS-$(CONFIG_OF_EMBED) += dts/libdts.o
244 LIBS-y += arch/$(ARCH)/lib/lib$(ARCH).o 244 LIBS-y += arch/$(ARCH)/lib/lib$(ARCH).o
245 LIBS-y += fs/cramfs/libcramfs.o fs/fat/libfat.o fs/fdos/libfdos.o fs/jffs2/libjffs2.o \ 245 LIBS-y += fs/cramfs/libcramfs.o fs/fat/libfat.o fs/fdos/libfdos.o fs/jffs2/libjffs2.o \
246 fs/reiserfs/libreiserfs.o fs/ext2/libext2fs.o fs/yaffs2/libyaffs2.o \ 246 fs/reiserfs/libreiserfs.o fs/ext2/libext2fs.o fs/yaffs2/libyaffs2.o \
247 fs/ubifs/libubifs.o fs/zfs/libzfs.o 247 fs/ubifs/libubifs.o fs/zfs/libzfs.o
248 LIBS-y += net/libnet.o 248 LIBS-y += net/libnet.o
249 LIBS-y += disk/libdisk.o 249 LIBS-y += disk/libdisk.o
250 LIBS-y += drivers/bios_emulator/libatibiosemu.o 250 LIBS-y += drivers/bios_emulator/libatibiosemu.o
251 LIBS-y += drivers/block/libblock.o 251 LIBS-y += drivers/block/libblock.o
252 LIBS-$(CONFIG_BOOTCOUNT_LIMIT) += drivers/bootcount/libbootcount.o 252 LIBS-$(CONFIG_BOOTCOUNT_LIMIT) += drivers/bootcount/libbootcount.o
253 LIBS-y += drivers/dma/libdma.o 253 LIBS-y += drivers/dma/libdma.o
254 LIBS-y += drivers/fpga/libfpga.o 254 LIBS-y += drivers/fpga/libfpga.o
255 LIBS-y += drivers/gpio/libgpio.o 255 LIBS-y += drivers/gpio/libgpio.o
256 LIBS-y += drivers/hwmon/libhwmon.o 256 LIBS-y += drivers/hwmon/libhwmon.o
257 LIBS-y += drivers/i2c/libi2c.o 257 LIBS-y += drivers/i2c/libi2c.o
258 LIBS-y += drivers/input/libinput.o 258 LIBS-y += drivers/input/libinput.o
259 LIBS-y += drivers/misc/libmisc.o 259 LIBS-y += drivers/misc/libmisc.o
260 LIBS-y += drivers/mmc/libmmc.o 260 LIBS-y += drivers/mmc/libmmc.o
261 LIBS-y += drivers/mtd/libmtd.o 261 LIBS-y += drivers/mtd/libmtd.o
262 LIBS-y += drivers/mtd/nand/libnand.o 262 LIBS-y += drivers/mtd/nand/libnand.o
263 LIBS-y += drivers/mtd/onenand/libonenand.o 263 LIBS-y += drivers/mtd/onenand/libonenand.o
264 LIBS-y += drivers/mtd/ubi/libubi.o 264 LIBS-y += drivers/mtd/ubi/libubi.o
265 LIBS-y += drivers/mtd/spi/libspi_flash.o 265 LIBS-y += drivers/mtd/spi/libspi_flash.o
266 LIBS-y += drivers/net/libnet.o 266 LIBS-y += drivers/net/libnet.o
267 LIBS-y += drivers/net/phy/libphy.o 267 LIBS-y += drivers/net/phy/libphy.o
268 LIBS-y += drivers/pci/libpci.o 268 LIBS-y += drivers/pci/libpci.o
269 LIBS-y += drivers/pcmcia/libpcmcia.o 269 LIBS-y += drivers/pcmcia/libpcmcia.o
270 LIBS-y += drivers/power/libpower.o 270 LIBS-y += drivers/power/libpower.o
271 LIBS-y += drivers/spi/libspi.o 271 LIBS-y += drivers/spi/libspi.o
272 ifeq ($(CPU),mpc83xx) 272 ifeq ($(CPU),mpc83xx)
273 LIBS-y += drivers/qe/libqe.o 273 LIBS-y += drivers/qe/libqe.o
274 LIBS-y += arch/powerpc/cpu/mpc8xxx/ddr/libddr.o 274 LIBS-y += arch/powerpc/cpu/mpc8xxx/ddr/libddr.o
275 LIBS-y += arch/powerpc/cpu/mpc8xxx/lib8xxx.o 275 LIBS-y += arch/powerpc/cpu/mpc8xxx/lib8xxx.o
276 endif 276 endif
277 ifeq ($(CPU),mpc85xx) 277 ifeq ($(CPU),mpc85xx)
278 LIBS-y += drivers/qe/libqe.o 278 LIBS-y += drivers/qe/libqe.o
279 LIBS-y += drivers/net/fm/libfm.o 279 LIBS-y += drivers/net/fm/libfm.o
280 LIBS-y += arch/powerpc/cpu/mpc8xxx/ddr/libddr.o 280 LIBS-y += arch/powerpc/cpu/mpc8xxx/ddr/libddr.o
281 LIBS-y += arch/powerpc/cpu/mpc8xxx/lib8xxx.o 281 LIBS-y += arch/powerpc/cpu/mpc8xxx/lib8xxx.o
282 endif 282 endif
283 ifeq ($(CPU),mpc86xx) 283 ifeq ($(CPU),mpc86xx)
284 LIBS-y += arch/powerpc/cpu/mpc8xxx/ddr/libddr.o 284 LIBS-y += arch/powerpc/cpu/mpc8xxx/ddr/libddr.o
285 LIBS-y += arch/powerpc/cpu/mpc8xxx/lib8xxx.o 285 LIBS-y += arch/powerpc/cpu/mpc8xxx/lib8xxx.o
286 endif 286 endif
287 LIBS-y += drivers/rtc/librtc.o 287 LIBS-y += drivers/rtc/librtc.o
288 LIBS-y += drivers/serial/libserial.o 288 LIBS-y += drivers/serial/libserial.o
289 LIBS-$(CONFIG_GENERIC_LPC_TPM) += drivers/tpm/libtpm.o 289 LIBS-$(CONFIG_GENERIC_LPC_TPM) += drivers/tpm/libtpm.o
290 LIBS-y += drivers/twserial/libtws.o 290 LIBS-y += drivers/twserial/libtws.o
291 LIBS-y += drivers/usb/eth/libusb_eth.o 291 LIBS-y += drivers/usb/eth/libusb_eth.o
292 LIBS-y += drivers/usb/gadget/libusb_gadget.o 292 LIBS-y += drivers/usb/gadget/libusb_gadget.o
293 LIBS-y += drivers/usb/host/libusb_host.o 293 LIBS-y += drivers/usb/host/libusb_host.o
294 LIBS-y += drivers/usb/musb/libusb_musb.o 294 LIBS-y += drivers/usb/musb/libusb_musb.o
295 LIBS-y += drivers/usb/phy/libusb_phy.o 295 LIBS-y += drivers/usb/phy/libusb_phy.o
296 LIBS-y += drivers/usb/ulpi/libusb_ulpi.o 296 LIBS-y += drivers/usb/ulpi/libusb_ulpi.o
297 LIBS-y += drivers/video/libvideo.o 297 LIBS-y += drivers/video/libvideo.o
298 LIBS-y += drivers/watchdog/libwatchdog.o 298 LIBS-y += drivers/watchdog/libwatchdog.o
299 LIBS-y += common/libcommon.o 299 LIBS-y += common/libcommon.o
300 LIBS-y += lib/libfdt/libfdt.o 300 LIBS-y += lib/libfdt/libfdt.o
301 LIBS-y += api/libapi.o 301 LIBS-y += api/libapi.o
302 LIBS-y += post/libpost.o 302 LIBS-y += post/libpost.o
303 LIBS-y += test/libtest.o 303 LIBS-y += test/libtest.o
304 304
305 ifneq ($(CONFIG_AM33XX)$(CONFIG_OMAP34XX)$(CONFIG_OMAP44XX)$(CONFIG_OMAP54XX),) 305 ifneq ($(CONFIG_AM33XX)$(CONFIG_OMAP34XX)$(CONFIG_OMAP44XX)$(CONFIG_OMAP54XX),)
306 LIBS-y += $(CPUDIR)/omap-common/libomap-common.o 306 LIBS-y += $(CPUDIR)/omap-common/libomap-common.o
307 endif 307 endif
308 308
309 ifeq ($(SOC),mx5) 309 ifeq ($(SOC),mx5)
310 LIBS-y += $(CPUDIR)/imx-common/libimx-common.o 310 LIBS-y += $(CPUDIR)/imx-common/libimx-common.o
311 endif 311 endif
312 ifeq ($(SOC),mx6) 312 ifeq ($(SOC),mx6)
313 LIBS-y += $(CPUDIR)/imx-common/libimx-common.o 313 LIBS-y += $(CPUDIR)/imx-common/libimx-common.o
314 endif 314 endif
315 315
316 ifeq ($(SOC),s5pc1xx) 316 ifeq ($(SOC),s5pc1xx)
317 LIBS-y += $(CPUDIR)/s5p-common/libs5p-common.o 317 LIBS-y += $(CPUDIR)/s5p-common/libs5p-common.o
318 endif 318 endif
319 ifeq ($(SOC),exynos) 319 ifeq ($(SOC),exynos)
320 LIBS-y += $(CPUDIR)/s5p-common/libs5p-common.o 320 LIBS-y += $(CPUDIR)/s5p-common/libs5p-common.o
321 endif 321 endif
322 ifeq ($(SOC),tegra20) 322 ifeq ($(SOC),tegra20)
323 LIBS-y += arch/$(ARCH)/cpu/$(SOC)-common/lib$(SOC)-common.o 323 LIBS-y += arch/$(ARCH)/cpu/$(SOC)-common/lib$(SOC)-common.o
324 endif 324 endif
325 325
326 LIBS := $(addprefix $(obj),$(sort $(LIBS-y))) 326 LIBS := $(addprefix $(obj),$(sort $(LIBS-y)))
327 .PHONY : $(LIBS) 327 .PHONY : $(LIBS)
328 328
329 LIBBOARD = board/$(BOARDDIR)/lib$(BOARD).o 329 LIBBOARD = board/$(BOARDDIR)/lib$(BOARD).o
330 LIBBOARD := $(addprefix $(obj),$(LIBBOARD)) 330 LIBBOARD := $(addprefix $(obj),$(LIBBOARD))
331 331
332 # Add GCC lib 332 # Add GCC lib
333 ifdef USE_PRIVATE_LIBGCC 333 ifdef USE_PRIVATE_LIBGCC
334 ifeq ("$(USE_PRIVATE_LIBGCC)", "yes") 334 ifeq ("$(USE_PRIVATE_LIBGCC)", "yes")
335 PLATFORM_LIBGCC = $(OBJTREE)/arch/$(ARCH)/lib/libgcc.o 335 PLATFORM_LIBGCC = $(OBJTREE)/arch/$(ARCH)/lib/libgcc.o
336 else 336 else
337 PLATFORM_LIBGCC = -L $(USE_PRIVATE_LIBGCC) -lgcc 337 PLATFORM_LIBGCC = -L $(USE_PRIVATE_LIBGCC) -lgcc
338 endif 338 endif
339 else 339 else
340 PLATFORM_LIBGCC := -L $(shell dirname `$(CC) $(CFLAGS) -print-libgcc-file-name`) -lgcc 340 PLATFORM_LIBGCC := -L $(shell dirname `$(CC) $(CFLAGS) -print-libgcc-file-name`) -lgcc
341 endif 341 endif
342 PLATFORM_LIBS += $(PLATFORM_LIBGCC) 342 PLATFORM_LIBS += $(PLATFORM_LIBGCC)
343 export PLATFORM_LIBS 343 export PLATFORM_LIBS
344 344
345 # Special flags for CPP when processing the linker script. 345 # Special flags for CPP when processing the linker script.
346 # Pass the version down so we can handle backwards compatibility 346 # Pass the version down so we can handle backwards compatibility
347 # on the fly. 347 # on the fly.
348 LDPPFLAGS += \ 348 LDPPFLAGS += \
349 -include $(TOPDIR)/include/u-boot/u-boot.lds.h \ 349 -include $(TOPDIR)/include/u-boot/u-boot.lds.h \
350 -DCPUDIR=$(CPUDIR) \ 350 -DCPUDIR=$(CPUDIR) \
351 $(shell $(LD) --version | \ 351 $(shell $(LD) --version | \
352 sed -ne 's/GNU ld version \([0-9][0-9]*\)\.\([0-9][0-9]*\).*/-DLD_MAJOR=\1 -DLD_MINOR=\2/p') 352 sed -ne 's/GNU ld version \([0-9][0-9]*\)\.\([0-9][0-9]*\).*/-DLD_MAJOR=\1 -DLD_MINOR=\2/p')
353 353
354 __OBJS := $(subst $(obj),,$(OBJS)) 354 __OBJS := $(subst $(obj),,$(OBJS))
355 __LIBS := $(subst $(obj),,$(LIBS)) $(subst $(obj),,$(LIBBOARD)) 355 __LIBS := $(subst $(obj),,$(LIBS)) $(subst $(obj),,$(LIBBOARD))
356 356
357 ######################################################################### 357 #########################################################################
358 ######################################################################### 358 #########################################################################
359 359
360 ifneq ($(CONFIG_BOARD_SIZE_LIMIT),) 360 ifneq ($(CONFIG_BOARD_SIZE_LIMIT),)
361 BOARD_SIZE_CHECK = \ 361 BOARD_SIZE_CHECK = \
362 @actual=`wc -c $@ | awk '{print $$1}'`; \ 362 @actual=`wc -c $@ | awk '{print $$1}'`; \
363 limit=$(CONFIG_BOARD_SIZE_LIMIT); \ 363 limit=$(CONFIG_BOARD_SIZE_LIMIT); \
364 if test $$actual -gt $$limit; then \ 364 if test $$actual -gt $$limit; then \
365 echo "$@ exceeds file size limit:"; \ 365 echo "$@ exceeds file size limit:"; \
366 echo " limit: $$limit bytes"; \ 366 echo " limit: $$limit bytes"; \
367 echo " actual: $$actual bytes"; \ 367 echo " actual: $$actual bytes"; \
368 echo " excess: $$((actual - limit)) bytes"; \ 368 echo " excess: $$((actual - limit)) bytes"; \
369 exit 1; \ 369 exit 1; \
370 fi 370 fi
371 else 371 else
372 BOARD_SIZE_CHECK = 372 BOARD_SIZE_CHECK =
373 endif 373 endif
374 374
375 # Always append ALL so that arch config.mk's can add custom ones 375 # Always append ALL so that arch config.mk's can add custom ones
376 ALL-y += $(obj)u-boot.srec $(obj)u-boot.bin $(obj)System.map 376 ALL-y += $(obj)u-boot.srec $(obj)u-boot.bin $(obj)System.map
377 377
378 ALL-$(CONFIG_NAND_U_BOOT) += $(obj)u-boot-nand.bin 378 ALL-$(CONFIG_NAND_U_BOOT) += $(obj)u-boot-nand.bin
379 ALL-$(CONFIG_ONENAND_U_BOOT) += $(obj)u-boot-onenand.bin 379 ALL-$(CONFIG_ONENAND_U_BOOT) += $(obj)u-boot-onenand.bin
380 ONENAND_BIN ?= $(obj)onenand_ipl/onenand-ipl-2k.bin 380 ONENAND_BIN ?= $(obj)onenand_ipl/onenand-ipl-2k.bin
381 ALL-$(CONFIG_SPL) += $(obj)spl/u-boot-spl.bin 381 ALL-$(CONFIG_SPL) += $(obj)spl/u-boot-spl.bin
382 ALL-$(CONFIG_OF_SEPARATE) += $(obj)u-boot.dtb $(obj)u-boot-dtb.bin 382 ALL-$(CONFIG_OF_SEPARATE) += $(obj)u-boot.dtb $(obj)u-boot-dtb.bin
383 383
384 # enable combined SPL/u-boot/dtb rules for tegra 384 # enable combined SPL/u-boot/dtb rules for tegra
385 ifeq ($(SOC),tegra20) 385 ifeq ($(SOC),tegra20)
386 ifeq ($(CONFIG_OF_SEPARATE),y) 386 ifeq ($(CONFIG_OF_SEPARATE),y)
387 ALL-y += $(obj)u-boot-dtb-tegra.bin 387 ALL-y += $(obj)u-boot-dtb-tegra.bin
388 else 388 else
389 ALL-y += $(obj)u-boot-nodtb-tegra.bin 389 ALL-y += $(obj)u-boot-nodtb-tegra.bin
390 endif 390 endif
391 endif 391 endif
392 392
393 all: $(ALL-y) $(SUBDIR_EXAMPLES) 393 all: $(ALL-y) $(SUBDIR_EXAMPLES)
394 394
395 $(obj)u-boot.dtb: $(obj)u-boot 395 $(obj)u-boot.dtb: $(obj)u-boot
396 $(MAKE) -C dts binary 396 $(MAKE) -C dts binary
397 mv $(obj)dts/dt.dtb $@ 397 mv $(obj)dts/dt.dtb $@
398 398
399 $(obj)u-boot-dtb.bin: $(obj)u-boot.bin $(obj)u-boot.dtb 399 $(obj)u-boot-dtb.bin: $(obj)u-boot.bin $(obj)u-boot.dtb
400 cat $^ >$@ 400 cat $^ >$@
401 401
402 $(obj)u-boot.hex: $(obj)u-boot 402 $(obj)u-boot.hex: $(obj)u-boot
403 $(OBJCOPY) ${OBJCFLAGS} -O ihex $< $@ 403 $(OBJCOPY) ${OBJCFLAGS} -O ihex $< $@
404 404
405 $(obj)u-boot.srec: $(obj)u-boot 405 $(obj)u-boot.srec: $(obj)u-boot
406 $(OBJCOPY) -O srec $< $@ 406 $(OBJCOPY) -O srec $< $@
407 407
408 $(obj)u-boot.bin: $(obj)u-boot 408 $(obj)u-boot.bin: $(obj)u-boot
409 $(OBJCOPY) ${OBJCFLAGS} -O binary $< $@ 409 $(OBJCOPY) ${OBJCFLAGS} -O binary $< $@
410 $(BOARD_SIZE_CHECK) 410 $(BOARD_SIZE_CHECK)
411 411
412 $(obj)u-boot.ldr: $(obj)u-boot 412 $(obj)u-boot.ldr: $(obj)u-boot
413 $(CREATE_LDR_ENV) 413 $(CREATE_LDR_ENV)
414 $(LDR) -T $(CONFIG_BFIN_CPU) -c $@ $< $(LDR_FLAGS) 414 $(LDR) -T $(CONFIG_BFIN_CPU) -c $@ $< $(LDR_FLAGS)
415 $(BOARD_SIZE_CHECK) 415 $(BOARD_SIZE_CHECK)
416 416
417 $(obj)u-boot.ldr.hex: $(obj)u-boot.ldr 417 $(obj)u-boot.ldr.hex: $(obj)u-boot.ldr
418 $(OBJCOPY) ${OBJCFLAGS} -O ihex $< $@ -I binary 418 $(OBJCOPY) ${OBJCFLAGS} -O ihex $< $@ -I binary
419 419
420 $(obj)u-boot.ldr.srec: $(obj)u-boot.ldr 420 $(obj)u-boot.ldr.srec: $(obj)u-boot.ldr
421 $(OBJCOPY) ${OBJCFLAGS} -O srec $< $@ -I binary 421 $(OBJCOPY) ${OBJCFLAGS} -O srec $< $@ -I binary
422 422
423 $(obj)u-boot.img: $(obj)u-boot.bin 423 $(obj)u-boot.img: $(obj)u-boot.bin
424 $(obj)tools/mkimage -A $(ARCH) -T firmware -C none \ 424 $(obj)tools/mkimage -A $(ARCH) -T firmware -C none \
425 -O u-boot -a $(CONFIG_SYS_TEXT_BASE) -e 0 \ 425 -O u-boot -a $(CONFIG_SYS_TEXT_BASE) -e 0 \
426 -n $(shell sed -n -e 's/.*U_BOOT_VERSION//p' $(VERSION_FILE) | \ 426 -n $(shell sed -n -e 's/.*U_BOOT_VERSION//p' $(VERSION_FILE) | \
427 sed -e 's/"[ ]*$$/ for $(BOARD) board"/') \ 427 sed -e 's/"[ ]*$$/ for $(BOARD) board"/') \
428 -d $< $@ 428 -d $< $@
429 429
430 $(obj)u-boot.imx: $(obj)u-boot.bin 430 $(obj)u-boot.imx: $(obj)u-boot.bin
431 $(obj)tools/mkimage -n $(CONFIG_IMX_CONFIG) -T imximage \ 431 $(obj)tools/mkimage -n $(CONFIG_IMX_CONFIG) -T imximage \
432 -e $(CONFIG_SYS_TEXT_BASE) -d $< $@ 432 -e $(CONFIG_SYS_TEXT_BASE) -d $< $@
433 433
434 $(obj)u-boot.kwb: $(obj)u-boot.bin 434 $(obj)u-boot.kwb: $(obj)u-boot.bin
435 $(obj)tools/mkimage -n $(CONFIG_SYS_KWD_CONFIG) -T kwbimage \ 435 $(obj)tools/mkimage -n $(CONFIG_SYS_KWD_CONFIG) -T kwbimage \
436 -a $(CONFIG_SYS_TEXT_BASE) -e $(CONFIG_SYS_TEXT_BASE) -d $< $@ 436 -a $(CONFIG_SYS_TEXT_BASE) -e $(CONFIG_SYS_TEXT_BASE) -d $< $@
437 437
438 $(obj)u-boot.sha1: $(obj)u-boot.bin 438 $(obj)u-boot.sha1: $(obj)u-boot.bin
439 $(obj)tools/ubsha1 $(obj)u-boot.bin 439 $(obj)tools/ubsha1 $(obj)u-boot.bin
440 440
441 $(obj)u-boot.dis: $(obj)u-boot 441 $(obj)u-boot.dis: $(obj)u-boot
442 $(OBJDUMP) -d $< > $@ 442 $(OBJDUMP) -d $< > $@
443 443
444 $(obj)u-boot.ubl: $(obj)spl/u-boot-spl.bin $(obj)u-boot.bin 444 $(obj)u-boot.ubl: $(obj)spl/u-boot-spl.bin $(obj)u-boot.bin
445 $(OBJCOPY) ${OBJCFLAGS} --pad-to=$(PAD_TO) -O binary $(obj)spl/u-boot-spl $(obj)spl/u-boot-spl-pad.bin 445 $(OBJCOPY) ${OBJCFLAGS} --pad-to=$(PAD_TO) -O binary $(obj)spl/u-boot-spl $(obj)spl/u-boot-spl-pad.bin
446 cat $(obj)spl/u-boot-spl-pad.bin $(obj)u-boot.bin > $(obj)u-boot-ubl.bin 446 cat $(obj)spl/u-boot-spl-pad.bin $(obj)u-boot.bin > $(obj)u-boot-ubl.bin
447 $(obj)tools/mkimage -n $(UBL_CONFIG) -T ublimage \ 447 $(obj)tools/mkimage -n $(UBL_CONFIG) -T ublimage \
448 -e $(CONFIG_SYS_TEXT_BASE) -d $(obj)u-boot-ubl.bin $(obj)u-boot.ubl 448 -e $(CONFIG_SYS_TEXT_BASE) -d $(obj)u-boot-ubl.bin $(obj)u-boot.ubl
449 rm $(obj)u-boot-ubl.bin 449 rm $(obj)u-boot-ubl.bin
450 rm $(obj)spl/u-boot-spl-pad.bin 450 rm $(obj)spl/u-boot-spl-pad.bin
451 451
452 $(obj)u-boot.ais: $(obj)spl/u-boot-spl.bin $(obj)u-boot.bin 452 $(obj)u-boot.ais: $(obj)spl/u-boot-spl.bin $(obj)u-boot.bin
453 $(obj)tools/mkimage -s -n $(if $(CONFIG_AIS_CONFIG_FILE),$(CONFIG_AIS_CONFIG_FILE),"/dev/null") \ 453 $(obj)tools/mkimage -s -n $(if $(CONFIG_AIS_CONFIG_FILE),$(CONFIG_AIS_CONFIG_FILE),"/dev/null") \
454 -T aisimage \ 454 -T aisimage \
455 -e $(CONFIG_SPL_TEXT_BASE) \ 455 -e $(CONFIG_SPL_TEXT_BASE) \
456 -d $(obj)spl/u-boot-spl.bin \ 456 -d $(obj)spl/u-boot-spl.bin \
457 $(obj)spl/u-boot-spl.ais 457 $(obj)spl/u-boot-spl.ais
458 $(OBJCOPY) ${OBJCFLAGS} -I binary \ 458 $(OBJCOPY) ${OBJCFLAGS} -I binary \
459 --pad-to=$(CONFIG_SPL_MAX_SIZE) -O binary \ 459 --pad-to=$(CONFIG_SPL_MAX_SIZE) -O binary \
460 $(obj)spl/u-boot-spl.ais $(obj)spl/u-boot-spl-pad.ais 460 $(obj)spl/u-boot-spl.ais $(obj)spl/u-boot-spl-pad.ais
461 cat $(obj)spl/u-boot-spl-pad.ais $(obj)u-boot.bin > \ 461 cat $(obj)spl/u-boot-spl-pad.ais $(obj)u-boot.bin > \
462 $(obj)u-boot.ais 462 $(obj)u-boot.ais
463 463
464 # Specify the target for use in elftosb call
465 ELFTOSB_TARGET-$(CONFIG_MX28) = imx28
466
464 $(obj)u-boot.sb: $(obj)u-boot.bin $(obj)spl/u-boot-spl.bin 467 $(obj)u-boot.sb: $(obj)u-boot.bin $(obj)spl/u-boot-spl.bin
465 elftosb -zdf imx28 -c $(TOPDIR)/$(CPUDIR)/$(SOC)/u-boot.bd \ 468 elftosb -zdf $(ELFTOSB_TARGET-y) -c $(TOPDIR)/$(CPUDIR)/$(SOC)/u-boot-$(ELFTOSB_TARGET-y).bd \
466 -o $(obj)u-boot.sb 469 -o $(obj)u-boot.sb
467 470
468 # On x600 (SPEAr600) U-Boot is appended to U-Boot SPL. 471 # On x600 (SPEAr600) U-Boot is appended to U-Boot SPL.
469 # Both images are created using mkimage (crc etc), so that the ROM 472 # Both images are created using mkimage (crc etc), so that the ROM
470 # bootloader can check its integrity. Padding needs to be done to the 473 # bootloader can check its integrity. Padding needs to be done to the
471 # SPL image (with mkimage header) and not the binary. Otherwise the resulting image 474 # SPL image (with mkimage header) and not the binary. Otherwise the resulting image
472 # which is loaded/copied by the ROM bootloader to SRAM doesn't fit. 475 # which is loaded/copied by the ROM bootloader to SRAM doesn't fit.
473 # The resulting image containing both U-Boot images is called u-boot.spr 476 # The resulting image containing both U-Boot images is called u-boot.spr
474 $(obj)u-boot.spr: $(obj)u-boot.img $(obj)spl/u-boot-spl.bin 477 $(obj)u-boot.spr: $(obj)u-boot.img $(obj)spl/u-boot-spl.bin
475 $(obj)tools/mkimage -A $(ARCH) -T firmware -C none \ 478 $(obj)tools/mkimage -A $(ARCH) -T firmware -C none \
476 -a $(CONFIG_SPL_TEXT_BASE) -e $(CONFIG_SPL_TEXT_BASE) -n XLOADER \ 479 -a $(CONFIG_SPL_TEXT_BASE) -e $(CONFIG_SPL_TEXT_BASE) -n XLOADER \
477 -d $(obj)spl/u-boot-spl.bin $(obj)spl/u-boot-spl.img 480 -d $(obj)spl/u-boot-spl.bin $(obj)spl/u-boot-spl.img
478 tr "\000" "\377" < /dev/zero | dd ibs=1 count=$(CONFIG_SPL_PAD_TO) \ 481 tr "\000" "\377" < /dev/zero | dd ibs=1 count=$(CONFIG_SPL_PAD_TO) \
479 of=$(obj)spl/u-boot-spl-pad.img 2>/dev/null 482 of=$(obj)spl/u-boot-spl-pad.img 2>/dev/null
480 dd if=$(obj)spl/u-boot-spl.img of=$(obj)spl/u-boot-spl-pad.img \ 483 dd if=$(obj)spl/u-boot-spl.img of=$(obj)spl/u-boot-spl-pad.img \
481 conv=notrunc 2>/dev/null 484 conv=notrunc 2>/dev/null
482 cat $(obj)spl/u-boot-spl-pad.img $(obj)u-boot.img > $@ 485 cat $(obj)spl/u-boot-spl-pad.img $(obj)u-boot.img > $@
483 486
484 ifeq ($(SOC),tegra20) 487 ifeq ($(SOC),tegra20)
485 ifeq ($(CONFIG_OF_SEPARATE),y) 488 ifeq ($(CONFIG_OF_SEPARATE),y)
486 $(obj)u-boot-dtb-tegra.bin: $(obj)spl/u-boot-spl.bin $(obj)u-boot.bin $(obj)u-boot.dtb 489 $(obj)u-boot-dtb-tegra.bin: $(obj)spl/u-boot-spl.bin $(obj)u-boot.bin $(obj)u-boot.dtb
487 $(OBJCOPY) ${OBJCFLAGS} --pad-to=$(CONFIG_SYS_TEXT_BASE) -O binary $(obj)spl/u-boot-spl $(obj)spl/u-boot-spl-pad.bin 490 $(OBJCOPY) ${OBJCFLAGS} --pad-to=$(CONFIG_SYS_TEXT_BASE) -O binary $(obj)spl/u-boot-spl $(obj)spl/u-boot-spl-pad.bin
488 cat $(obj)spl/u-boot-spl-pad.bin $(obj)u-boot.bin $(obj)u-boot.dtb > $@ 491 cat $(obj)spl/u-boot-spl-pad.bin $(obj)u-boot.bin $(obj)u-boot.dtb > $@
489 rm $(obj)spl/u-boot-spl-pad.bin 492 rm $(obj)spl/u-boot-spl-pad.bin
490 else 493 else
491 $(obj)u-boot-nodtb-tegra.bin: $(obj)spl/u-boot-spl.bin $(obj)u-boot.bin 494 $(obj)u-boot-nodtb-tegra.bin: $(obj)spl/u-boot-spl.bin $(obj)u-boot.bin
492 $(OBJCOPY) ${OBJCFLAGS} --pad-to=$(CONFIG_SYS_TEXT_BASE) -O binary $(obj)spl/u-boot-spl $(obj)spl/u-boot-spl-pad.bin 495 $(OBJCOPY) ${OBJCFLAGS} --pad-to=$(CONFIG_SYS_TEXT_BASE) -O binary $(obj)spl/u-boot-spl $(obj)spl/u-boot-spl-pad.bin
493 cat $(obj)spl/u-boot-spl-pad.bin $(obj)u-boot.bin > $@ 496 cat $(obj)spl/u-boot-spl-pad.bin $(obj)u-boot.bin > $@
494 rm $(obj)spl/u-boot-spl-pad.bin 497 rm $(obj)spl/u-boot-spl-pad.bin
495 endif 498 endif
496 endif 499 endif
497 500
498 ifeq ($(CONFIG_SANDBOX),y) 501 ifeq ($(CONFIG_SANDBOX),y)
499 GEN_UBOOT = \ 502 GEN_UBOOT = \
500 cd $(LNDIR) && $(CC) $(SYMS) -T $(obj)u-boot.lds \ 503 cd $(LNDIR) && $(CC) $(SYMS) -T $(obj)u-boot.lds \
501 -Wl,--start-group $(__LIBS) -Wl,--end-group \ 504 -Wl,--start-group $(__LIBS) -Wl,--end-group \
502 $(PLATFORM_LIBS) -Wl,-Map -Wl,u-boot.map -o u-boot 505 $(PLATFORM_LIBS) -Wl,-Map -Wl,u-boot.map -o u-boot
503 else 506 else
504 GEN_UBOOT = \ 507 GEN_UBOOT = \
505 UNDEF_SYM=`$(OBJDUMP) -x $(LIBBOARD) $(LIBS) | \ 508 UNDEF_SYM=`$(OBJDUMP) -x $(LIBBOARD) $(LIBS) | \
506 sed -n -e 's/.*\($(SYM_PREFIX)__u_boot_cmd_.*\)/-u\1/p'|sort|uniq`;\ 509 sed -n -e 's/.*\($(SYM_PREFIX)__u_boot_cmd_.*\)/-u\1/p'|sort|uniq`;\
507 cd $(LNDIR) && $(LD) $(LDFLAGS) $(LDFLAGS_$(@F)) $$UNDEF_SYM $(__OBJS) \ 510 cd $(LNDIR) && $(LD) $(LDFLAGS) $(LDFLAGS_$(@F)) $$UNDEF_SYM $(__OBJS) \
508 --start-group $(__LIBS) --end-group $(PLATFORM_LIBS) \ 511 --start-group $(__LIBS) --end-group $(PLATFORM_LIBS) \
509 -Map u-boot.map -o u-boot 512 -Map u-boot.map -o u-boot
510 endif 513 endif
511 514
512 $(obj)u-boot: depend \ 515 $(obj)u-boot: depend \
513 $(SUBDIR_TOOLS) $(OBJS) $(LIBBOARD) $(LIBS) $(LDSCRIPT) $(obj)u-boot.lds 516 $(SUBDIR_TOOLS) $(OBJS) $(LIBBOARD) $(LIBS) $(LDSCRIPT) $(obj)u-boot.lds
514 $(GEN_UBOOT) 517 $(GEN_UBOOT)
515 ifeq ($(CONFIG_KALLSYMS),y) 518 ifeq ($(CONFIG_KALLSYMS),y)
516 smap=`$(call SYSTEM_MAP,u-boot) | \ 519 smap=`$(call SYSTEM_MAP,u-boot) | \
517 awk '$$2 ~ /[tTwW]/ {printf $$1 $$3 "\\\\000"}'` ; \ 520 awk '$$2 ~ /[tTwW]/ {printf $$1 $$3 "\\\\000"}'` ; \
518 $(CC) $(CFLAGS) -DSYSTEM_MAP="\"$${smap}\"" \ 521 $(CC) $(CFLAGS) -DSYSTEM_MAP="\"$${smap}\"" \
519 -c common/system_map.c -o $(obj)common/system_map.o 522 -c common/system_map.c -o $(obj)common/system_map.o
520 $(GEN_UBOOT) $(obj)common/system_map.o 523 $(GEN_UBOOT) $(obj)common/system_map.o
521 endif 524 endif
522 525
523 $(OBJS): depend 526 $(OBJS): depend
524 $(MAKE) -C $(CPUDIR) $(if $(REMOTE_BUILD),$@,$(notdir $@)) 527 $(MAKE) -C $(CPUDIR) $(if $(REMOTE_BUILD),$@,$(notdir $@))
525 528
526 $(LIBS): depend $(SUBDIR_TOOLS) 529 $(LIBS): depend $(SUBDIR_TOOLS)
527 $(MAKE) -C $(dir $(subst $(obj),,$@)) 530 $(MAKE) -C $(dir $(subst $(obj),,$@))
528 531
529 $(LIBBOARD): depend $(LIBS) 532 $(LIBBOARD): depend $(LIBS)
530 $(MAKE) -C $(dir $(subst $(obj),,$@)) 533 $(MAKE) -C $(dir $(subst $(obj),,$@))
531 534
532 $(SUBDIRS): depend 535 $(SUBDIRS): depend
533 $(MAKE) -C $@ all 536 $(MAKE) -C $@ all
534 537
535 $(SUBDIR_EXAMPLES): $(obj)u-boot 538 $(SUBDIR_EXAMPLES): $(obj)u-boot
536 539
537 $(LDSCRIPT): depend 540 $(LDSCRIPT): depend
538 $(MAKE) -C $(dir $@) $(notdir $@) 541 $(MAKE) -C $(dir $@) $(notdir $@)
539 542
540 $(obj)u-boot.lds: $(LDSCRIPT) 543 $(obj)u-boot.lds: $(LDSCRIPT)
541 $(CPP) $(CPPFLAGS) $(LDPPFLAGS) -ansi -D__ASSEMBLY__ -P - <$^ >$@ 544 $(CPP) $(CPPFLAGS) $(LDPPFLAGS) -ansi -D__ASSEMBLY__ -P - <$^ >$@
542 545
543 nand_spl: $(TIMESTAMP_FILE) $(VERSION_FILE) depend 546 nand_spl: $(TIMESTAMP_FILE) $(VERSION_FILE) depend
544 $(MAKE) -C nand_spl/board/$(BOARDDIR) all 547 $(MAKE) -C nand_spl/board/$(BOARDDIR) all
545 548
546 $(obj)u-boot-nand.bin: nand_spl $(obj)u-boot.bin 549 $(obj)u-boot-nand.bin: nand_spl $(obj)u-boot.bin
547 cat $(obj)nand_spl/u-boot-spl-16k.bin $(obj)u-boot.bin > $(obj)u-boot-nand.bin 550 cat $(obj)nand_spl/u-boot-spl-16k.bin $(obj)u-boot.bin > $(obj)u-boot-nand.bin
548 551
549 onenand_ipl: $(TIMESTAMP_FILE) $(VERSION_FILE) $(obj)include/autoconf.mk 552 onenand_ipl: $(TIMESTAMP_FILE) $(VERSION_FILE) $(obj)include/autoconf.mk
550 $(MAKE) -C onenand_ipl/board/$(BOARDDIR) all 553 $(MAKE) -C onenand_ipl/board/$(BOARDDIR) all
551 554
552 $(obj)u-boot-onenand.bin: onenand_ipl $(obj)u-boot.bin 555 $(obj)u-boot-onenand.bin: onenand_ipl $(obj)u-boot.bin
553 cat $(ONENAND_BIN) $(obj)u-boot.bin > $(obj)u-boot-onenand.bin 556 cat $(ONENAND_BIN) $(obj)u-boot.bin > $(obj)u-boot-onenand.bin
554 557
555 $(obj)spl/u-boot-spl.bin: $(SUBDIR_TOOLS) depend 558 $(obj)spl/u-boot-spl.bin: $(SUBDIR_TOOLS) depend
556 $(MAKE) -C spl all 559 $(MAKE) -C spl all
557 560
558 updater: 561 updater:
559 $(MAKE) -C tools/updater all 562 $(MAKE) -C tools/updater all
560 563
561 # Explicitly make _depend in subdirs containing multiple targets to prevent 564 # Explicitly make _depend in subdirs containing multiple targets to prevent
562 # parallel sub-makes creating .depend files simultaneously. 565 # parallel sub-makes creating .depend files simultaneously.
563 depend dep: $(TIMESTAMP_FILE) $(VERSION_FILE) \ 566 depend dep: $(TIMESTAMP_FILE) $(VERSION_FILE) \
564 $(obj)include/autoconf.mk \ 567 $(obj)include/autoconf.mk \
565 $(obj)include/generated/generic-asm-offsets.h \ 568 $(obj)include/generated/generic-asm-offsets.h \
566 $(obj)include/generated/asm-offsets.h 569 $(obj)include/generated/asm-offsets.h
567 for dir in $(SUBDIRS) $(CPUDIR) $(LDSCRIPT_MAKEFILE_DIR) ; do \ 570 for dir in $(SUBDIRS) $(CPUDIR) $(LDSCRIPT_MAKEFILE_DIR) ; do \
568 $(MAKE) -C $$dir _depend ; done 571 $(MAKE) -C $$dir _depend ; done
569 572
570 TAG_SUBDIRS = $(SUBDIRS) 573 TAG_SUBDIRS = $(SUBDIRS)
571 TAG_SUBDIRS += $(dir $(__LIBS)) 574 TAG_SUBDIRS += $(dir $(__LIBS))
572 TAG_SUBDIRS += include 575 TAG_SUBDIRS += include
573 576
574 FIND := find 577 FIND := find
575 FINDFLAGS := -L 578 FINDFLAGS := -L
576 579
577 checkstack: 580 checkstack:
578 $(CROSS_COMPILE)objdump -d $(obj)u-boot \ 581 $(CROSS_COMPILE)objdump -d $(obj)u-boot \
579 `$(FIND) $(obj) -name u-boot-spl -print` | \ 582 `$(FIND) $(obj) -name u-boot-spl -print` | \
580 perl $(src)tools/checkstack.pl $(ARCH) 583 perl $(src)tools/checkstack.pl $(ARCH)
581 584
582 tags ctags: 585 tags ctags:
583 ctags -w -o $(obj)ctags `$(FIND) $(FINDFLAGS) $(TAG_SUBDIRS) \ 586 ctags -w -o $(obj)ctags `$(FIND) $(FINDFLAGS) $(TAG_SUBDIRS) \
584 -name '*.[chS]' -print` 587 -name '*.[chS]' -print`
585 588
586 etags: 589 etags:
587 etags -a -o $(obj)etags `$(FIND) $(FINDFLAGS) $(TAG_SUBDIRS) \ 590 etags -a -o $(obj)etags `$(FIND) $(FINDFLAGS) $(TAG_SUBDIRS) \
588 -name '*.[chS]' -print` 591 -name '*.[chS]' -print`
589 cscope: 592 cscope:
590 $(FIND) $(FINDFLAGS) $(TAG_SUBDIRS) -name '*.[chS]' -print > \ 593 $(FIND) $(FINDFLAGS) $(TAG_SUBDIRS) -name '*.[chS]' -print > \
591 cscope.files 594 cscope.files
592 cscope -b -q -k 595 cscope -b -q -k
593 596
594 SYSTEM_MAP = \ 597 SYSTEM_MAP = \
595 $(NM) $1 | \ 598 $(NM) $1 | \
596 grep -v '\(compiled\)\|\(\.o$$\)\|\( [aUw] \)\|\(\.\.ng$$\)\|\(LASH[RL]DI\)' | \ 599 grep -v '\(compiled\)\|\(\.o$$\)\|\( [aUw] \)\|\(\.\.ng$$\)\|\(LASH[RL]DI\)' | \
597 LC_ALL=C sort 600 LC_ALL=C sort
598 $(obj)System.map: $(obj)u-boot 601 $(obj)System.map: $(obj)u-boot
599 @$(call SYSTEM_MAP,$<) > $(obj)System.map 602 @$(call SYSTEM_MAP,$<) > $(obj)System.map
600 603
601 checkthumb: 604 checkthumb:
602 @if test $(call cc-version) -lt 0404; then \ 605 @if test $(call cc-version) -lt 0404; then \
603 echo -n '*** Your GCC does not produce working '; \ 606 echo -n '*** Your GCC does not produce working '; \
604 echo 'binaries in THUMB mode.'; \ 607 echo 'binaries in THUMB mode.'; \
605 echo '*** Your board is configured for THUMB mode.'; \ 608 echo '*** Your board is configured for THUMB mode.'; \
606 false; \ 609 false; \
607 fi 610 fi
608 # 611 #
609 # Auto-generate the autoconf.mk file (which is included by all makefiles) 612 # Auto-generate the autoconf.mk file (which is included by all makefiles)
610 # 613 #
611 # This target actually generates 2 files; autoconf.mk and autoconf.mk.dep. 614 # This target actually generates 2 files; autoconf.mk and autoconf.mk.dep.
612 # the dep file is only include in this top level makefile to determine when 615 # the dep file is only include in this top level makefile to determine when
613 # to regenerate the autoconf.mk file. 616 # to regenerate the autoconf.mk file.
614 $(obj)include/autoconf.mk.dep: $(obj)include/config.h include/common.h 617 $(obj)include/autoconf.mk.dep: $(obj)include/config.h include/common.h
615 @$(XECHO) Generating $@ ; \ 618 @$(XECHO) Generating $@ ; \
616 set -e ; \ 619 set -e ; \
617 : Generate the dependancies ; \ 620 : Generate the dependancies ; \
618 $(CC) -x c -DDO_DEPS_ONLY -M $(CFLAGS) $(CPPFLAGS) \ 621 $(CC) -x c -DDO_DEPS_ONLY -M $(CFLAGS) $(CPPFLAGS) \
619 -MQ $(obj)include/autoconf.mk include/common.h > $@ 622 -MQ $(obj)include/autoconf.mk include/common.h > $@
620 623
621 $(obj)include/autoconf.mk: $(obj)include/config.h 624 $(obj)include/autoconf.mk: $(obj)include/config.h
622 @$(XECHO) Generating $@ ; \ 625 @$(XECHO) Generating $@ ; \
623 set -e ; \ 626 set -e ; \
624 : Extract the config macros ; \ 627 : Extract the config macros ; \
625 $(CPP) $(CFLAGS) -DDO_DEPS_ONLY -dM include/common.h | \ 628 $(CPP) $(CFLAGS) -DDO_DEPS_ONLY -dM include/common.h | \
626 sed -n -f tools/scripts/define2mk.sed > $@.tmp && \ 629 sed -n -f tools/scripts/define2mk.sed > $@.tmp && \
627 mv $@.tmp $@ 630 mv $@.tmp $@
628 631
629 $(obj)include/generated/generic-asm-offsets.h: $(obj)include/autoconf.mk.dep \ 632 $(obj)include/generated/generic-asm-offsets.h: $(obj)include/autoconf.mk.dep \
630 $(obj)lib/asm-offsets.s 633 $(obj)lib/asm-offsets.s
631 @$(XECHO) Generating $@ 634 @$(XECHO) Generating $@
632 tools/scripts/make-asm-offsets $(obj)lib/asm-offsets.s $@ 635 tools/scripts/make-asm-offsets $(obj)lib/asm-offsets.s $@
633 636
634 $(obj)lib/asm-offsets.s: $(obj)include/autoconf.mk.dep \ 637 $(obj)lib/asm-offsets.s: $(obj)include/autoconf.mk.dep \
635 $(src)lib/asm-offsets.c 638 $(src)lib/asm-offsets.c
636 @mkdir -p $(obj)lib 639 @mkdir -p $(obj)lib
637 $(CC) -DDO_DEPS_ONLY \ 640 $(CC) -DDO_DEPS_ONLY \
638 $(CFLAGS) $(CFLAGS_$(BCURDIR)/$(@F)) $(CFLAGS_$(BCURDIR)) \ 641 $(CFLAGS) $(CFLAGS_$(BCURDIR)/$(@F)) $(CFLAGS_$(BCURDIR)) \
639 -o $@ $(src)lib/asm-offsets.c -c -S 642 -o $@ $(src)lib/asm-offsets.c -c -S
640 643
641 $(obj)include/generated/asm-offsets.h: $(obj)include/autoconf.mk.dep \ 644 $(obj)include/generated/asm-offsets.h: $(obj)include/autoconf.mk.dep \
642 $(obj)$(CPUDIR)/$(SOC)/asm-offsets.s 645 $(obj)$(CPUDIR)/$(SOC)/asm-offsets.s
643 @$(XECHO) Generating $@ 646 @$(XECHO) Generating $@
644 tools/scripts/make-asm-offsets $(obj)$(CPUDIR)/$(SOC)/asm-offsets.s $@ 647 tools/scripts/make-asm-offsets $(obj)$(CPUDIR)/$(SOC)/asm-offsets.s $@
645 648
646 $(obj)$(CPUDIR)/$(SOC)/asm-offsets.s: $(obj)include/autoconf.mk.dep 649 $(obj)$(CPUDIR)/$(SOC)/asm-offsets.s: $(obj)include/autoconf.mk.dep
647 @mkdir -p $(obj)$(CPUDIR)/$(SOC) 650 @mkdir -p $(obj)$(CPUDIR)/$(SOC)
648 if [ -f $(src)$(CPUDIR)/$(SOC)/asm-offsets.c ];then \ 651 if [ -f $(src)$(CPUDIR)/$(SOC)/asm-offsets.c ];then \
649 $(CC) -DDO_DEPS_ONLY \ 652 $(CC) -DDO_DEPS_ONLY \
650 $(CFLAGS) $(CFLAGS_$(BCURDIR)/$(@F)) $(CFLAGS_$(BCURDIR)) \ 653 $(CFLAGS) $(CFLAGS_$(BCURDIR)/$(@F)) $(CFLAGS_$(BCURDIR)) \
651 -o $@ $(src)$(CPUDIR)/$(SOC)/asm-offsets.c -c -S; \ 654 -o $@ $(src)$(CPUDIR)/$(SOC)/asm-offsets.c -c -S; \
652 else \ 655 else \
653 touch $@; \ 656 touch $@; \
654 fi 657 fi
655 658
656 ######################################################################### 659 #########################################################################
657 else # !config.mk 660 else # !config.mk
658 all $(obj)u-boot.hex $(obj)u-boot.srec $(obj)u-boot.bin \ 661 all $(obj)u-boot.hex $(obj)u-boot.srec $(obj)u-boot.bin \
659 $(obj)u-boot.img $(obj)u-boot.dis $(obj)u-boot \ 662 $(obj)u-boot.img $(obj)u-boot.dis $(obj)u-boot \
660 $(filter-out tools,$(SUBDIRS)) \ 663 $(filter-out tools,$(SUBDIRS)) \
661 updater depend dep tags ctags etags cscope $(obj)System.map: 664 updater depend dep tags ctags etags cscope $(obj)System.map:
662 @echo "System not configured - see README" >&2 665 @echo "System not configured - see README" >&2
663 @ exit 1 666 @ exit 1
664 667
665 tools: $(VERSION_FILE) $(TIMESTAMP_FILE) 668 tools: $(VERSION_FILE) $(TIMESTAMP_FILE)
666 $(MAKE) -C $@ all 669 $(MAKE) -C $@ all
667 endif # config.mk 670 endif # config.mk
668 671
669 $(VERSION_FILE): 672 $(VERSION_FILE):
670 @mkdir -p $(dir $(VERSION_FILE)) 673 @mkdir -p $(dir $(VERSION_FILE))
671 @( localvers='$(shell $(TOPDIR)/tools/setlocalversion $(TOPDIR))' ; \ 674 @( localvers='$(shell $(TOPDIR)/tools/setlocalversion $(TOPDIR))' ; \
672 printf '#define PLAIN_VERSION "%s%s"\n' \ 675 printf '#define PLAIN_VERSION "%s%s"\n' \
673 "$(U_BOOT_VERSION)" "$${localvers}" ; \ 676 "$(U_BOOT_VERSION)" "$${localvers}" ; \
674 printf '#define U_BOOT_VERSION "U-Boot %s%s"\n' \ 677 printf '#define U_BOOT_VERSION "U-Boot %s%s"\n' \
675 "$(U_BOOT_VERSION)" "$${localvers}" ; \ 678 "$(U_BOOT_VERSION)" "$${localvers}" ; \
676 ) > $@.tmp 679 ) > $@.tmp
677 @( printf '#define CC_VERSION_STRING "%s"\n' \ 680 @( printf '#define CC_VERSION_STRING "%s"\n' \
678 '$(shell $(CC) --version | head -n 1)' )>> $@.tmp 681 '$(shell $(CC) --version | head -n 1)' )>> $@.tmp
679 @( printf '#define LD_VERSION_STRING "%s"\n' \ 682 @( printf '#define LD_VERSION_STRING "%s"\n' \
680 '$(shell $(LD) -v | head -n 1)' )>> $@.tmp 683 '$(shell $(LD) -v | head -n 1)' )>> $@.tmp
681 @cmp -s $@ $@.tmp && rm -f $@.tmp || mv -f $@.tmp $@ 684 @cmp -s $@ $@.tmp && rm -f $@.tmp || mv -f $@.tmp $@
682 685
683 $(TIMESTAMP_FILE): 686 $(TIMESTAMP_FILE):
684 @mkdir -p $(dir $(TIMESTAMP_FILE)) 687 @mkdir -p $(dir $(TIMESTAMP_FILE))
685 @LC_ALL=C date +'#define U_BOOT_DATE "%b %d %C%y"' > $@.tmp 688 @LC_ALL=C date +'#define U_BOOT_DATE "%b %d %C%y"' > $@.tmp
686 @LC_ALL=C date +'#define U_BOOT_TIME "%T"' >> $@.tmp 689 @LC_ALL=C date +'#define U_BOOT_TIME "%T"' >> $@.tmp
687 @cmp -s $@ $@.tmp && rm -f $@.tmp || mv -f $@.tmp $@ 690 @cmp -s $@ $@.tmp && rm -f $@.tmp || mv -f $@.tmp $@
688 691
689 easylogo env gdb: 692 easylogo env gdb:
690 $(MAKE) -C tools/$@ all MTD_VERSION=${MTD_VERSION} 693 $(MAKE) -C tools/$@ all MTD_VERSION=${MTD_VERSION}
691 gdbtools: gdb 694 gdbtools: gdb
692 695
693 tools-all: easylogo env gdb $(VERSION_FILE) $(TIMESTAMP_FILE) 696 tools-all: easylogo env gdb $(VERSION_FILE) $(TIMESTAMP_FILE)
694 $(MAKE) -C tools HOST_TOOLS_ALL=y 697 $(MAKE) -C tools HOST_TOOLS_ALL=y
695 698
696 .PHONY : CHANGELOG 699 .PHONY : CHANGELOG
697 CHANGELOG: 700 CHANGELOG:
698 git log --no-merges U-Boot-1_1_5.. | \ 701 git log --no-merges U-Boot-1_1_5.. | \
699 unexpand -a | sed -e 's/\s\s*$$//' > $@ 702 unexpand -a | sed -e 's/\s\s*$$//' > $@
700 703
701 include/license.h: tools/bin2header COPYING 704 include/license.h: tools/bin2header COPYING
702 cat COPYING | gzip -9 -c | ./tools/bin2header license_gzip > include/license.h 705 cat COPYING | gzip -9 -c | ./tools/bin2header license_gzip > include/license.h
703 ######################################################################### 706 #########################################################################
704 707
705 unconfig: 708 unconfig:
706 @rm -f $(obj)include/config.h $(obj)include/config.mk \ 709 @rm -f $(obj)include/config.h $(obj)include/config.mk \
707 $(obj)board/*/config.tmp $(obj)board/*/*/config.tmp \ 710 $(obj)board/*/config.tmp $(obj)board/*/*/config.tmp \
708 $(obj)include/autoconf.mk $(obj)include/autoconf.mk.dep 711 $(obj)include/autoconf.mk $(obj)include/autoconf.mk.dep
709 712
710 %_config:: unconfig 713 %_config:: unconfig
711 @$(MKCONFIG) -A $(@:_config=) 714 @$(MKCONFIG) -A $(@:_config=)
712 715
713 sinclude $(obj).boards.depend 716 sinclude $(obj).boards.depend
714 $(obj).boards.depend: boards.cfg 717 $(obj).boards.depend: boards.cfg
715 @awk '(NF && $$1 !~ /^#/) { print $$1 ": " $$1 "_config; $$(MAKE)" }' $< > $@ 718 @awk '(NF && $$1 !~ /^#/) { print $$1 ": " $$1 "_config; $$(MAKE)" }' $< > $@
716 719
717 # 720 #
718 # Functions to generate common board directory names 721 # Functions to generate common board directory names
719 # 722 #
720 lcname = $(shell echo $(1) | sed -e 's/\(.*\)_config/\L\1/') 723 lcname = $(shell echo $(1) | sed -e 's/\(.*\)_config/\L\1/')
721 ucname = $(shell echo $(1) | sed -e 's/\(.*\)_config/\U\1/') 724 ucname = $(shell echo $(1) | sed -e 's/\(.*\)_config/\U\1/')
722 725
723 #======================================================================== 726 #========================================================================
724 # ARM 727 # ARM
725 #======================================================================== 728 #========================================================================
726 729
727 SX1_stdout_serial_config \ 730 SX1_stdout_serial_config \
728 SX1_config: unconfig 731 SX1_config: unconfig
729 @mkdir -p $(obj)include 732 @mkdir -p $(obj)include
730 @if [ "$(findstring _stdout_serial_, $@)" ] ; then \ 733 @if [ "$(findstring _stdout_serial_, $@)" ] ; then \
731 echo "#undef CONFIG_STDOUT_USBTTY" >> $(obj)include/config.h ; \ 734 echo "#undef CONFIG_STDOUT_USBTTY" >> $(obj)include/config.h ; \
732 else \ 735 else \
733 echo "#define CONFIG_STDOUT_USBTTY" >> $(obj)include/config.h ; \ 736 echo "#define CONFIG_STDOUT_USBTTY" >> $(obj)include/config.h ; \
734 fi; 737 fi;
735 @$(MKCONFIG) -n $@ SX1 arm arm925t sx1 738 @$(MKCONFIG) -n $@ SX1 arm arm925t sx1
736 739
737 ######################################################################### 740 #########################################################################
738 ## ARM1176 Systems 741 ## ARM1176 Systems
739 ######################################################################### 742 #########################################################################
740 smdk6400_noUSB_config \ 743 smdk6400_noUSB_config \
741 smdk6400_config : unconfig 744 smdk6400_config : unconfig
742 @mkdir -p $(obj)include $(obj)board/samsung/smdk6400 745 @mkdir -p $(obj)include $(obj)board/samsung/smdk6400
743 @mkdir -p $(obj)nand_spl/board/samsung/smdk6400 746 @mkdir -p $(obj)nand_spl/board/samsung/smdk6400
744 @echo "#define CONFIG_NAND_U_BOOT" > $(obj)include/config.h 747 @echo "#define CONFIG_NAND_U_BOOT" > $(obj)include/config.h
745 @echo "CONFIG_NAND_U_BOOT = y" >> $(obj)include/config.mk 748 @echo "CONFIG_NAND_U_BOOT = y" >> $(obj)include/config.mk
746 @if [ -z "$(findstring smdk6400_noUSB_config,$@)" ]; then \ 749 @if [ -z "$(findstring smdk6400_noUSB_config,$@)" ]; then \
747 echo "RAM_TEXT = 0x57e00000" >> $(obj)board/samsung/smdk6400/config.tmp;\ 750 echo "RAM_TEXT = 0x57e00000" >> $(obj)board/samsung/smdk6400/config.tmp;\
748 else \ 751 else \
749 echo "RAM_TEXT = 0xc7e00000" >> $(obj)board/samsung/smdk6400/config.tmp;\ 752 echo "RAM_TEXT = 0xc7e00000" >> $(obj)board/samsung/smdk6400/config.tmp;\
750 fi 753 fi
751 @$(MKCONFIG) smdk6400 arm arm1176 smdk6400 samsung s3c64xx 754 @$(MKCONFIG) smdk6400 arm arm1176 smdk6400 samsung s3c64xx
752 @echo "CONFIG_NAND_U_BOOT = y" >> $(obj)include/config.mk 755 @echo "CONFIG_NAND_U_BOOT = y" >> $(obj)include/config.mk
753 756
754 ######################################################################### 757 #########################################################################
755 ######################################################################### 758 #########################################################################
756 759
757 clean: 760 clean:
758 @rm -f $(obj)examples/standalone/82559_eeprom \ 761 @rm -f $(obj)examples/standalone/82559_eeprom \
759 $(obj)examples/standalone/atmel_df_pow2 \ 762 $(obj)examples/standalone/atmel_df_pow2 \
760 $(obj)examples/standalone/eepro100_eeprom \ 763 $(obj)examples/standalone/eepro100_eeprom \
761 $(obj)examples/standalone/hello_world \ 764 $(obj)examples/standalone/hello_world \
762 $(obj)examples/standalone/interrupt \ 765 $(obj)examples/standalone/interrupt \
763 $(obj)examples/standalone/mem_to_mem_idma2intr \ 766 $(obj)examples/standalone/mem_to_mem_idma2intr \
764 $(obj)examples/standalone/sched \ 767 $(obj)examples/standalone/sched \
765 $(obj)examples/standalone/smc911{11,x}_eeprom \ 768 $(obj)examples/standalone/smc911{11,x}_eeprom \
766 $(obj)examples/standalone/test_burst \ 769 $(obj)examples/standalone/test_burst \
767 $(obj)examples/standalone/timer 770 $(obj)examples/standalone/timer
768 @rm -f $(obj)examples/api/demo{,.bin} 771 @rm -f $(obj)examples/api/demo{,.bin}
769 @rm -f $(obj)tools/bmp_logo $(obj)tools/easylogo/easylogo \ 772 @rm -f $(obj)tools/bmp_logo $(obj)tools/easylogo/easylogo \
770 $(obj)tools/env/{fw_printenv,fw_setenv} \ 773 $(obj)tools/env/{fw_printenv,fw_setenv} \
771 $(obj)tools/envcrc \ 774 $(obj)tools/envcrc \
772 $(obj)tools/gdb/{astest,gdbcont,gdbsend} \ 775 $(obj)tools/gdb/{astest,gdbcont,gdbsend} \
773 $(obj)tools/gen_eth_addr $(obj)tools/img2srec \ 776 $(obj)tools/gen_eth_addr $(obj)tools/img2srec \
774 $(obj)tools/mk{env,}image $(obj)tools/mpc86x_clk \ 777 $(obj)tools/mk{env,}image $(obj)tools/mpc86x_clk \
775 $(obj)tools/mk{smdk5250,}spl \ 778 $(obj)tools/mk{smdk5250,}spl \
776 $(obj)tools/ncb $(obj)tools/ubsha1 779 $(obj)tools/ncb $(obj)tools/ubsha1
777 @rm -f $(obj)board/cray/L1/{bootscript.c,bootscript.image} \ 780 @rm -f $(obj)board/cray/L1/{bootscript.c,bootscript.image} \
778 $(obj)board/matrix_vision/*/bootscript.img \ 781 $(obj)board/matrix_vision/*/bootscript.img \
779 $(obj)board/voiceblue/eeprom \ 782 $(obj)board/voiceblue/eeprom \
780 $(obj)u-boot.lds \ 783 $(obj)u-boot.lds \
781 $(obj)arch/blackfin/cpu/bootrom-asm-offsets.[chs] \ 784 $(obj)arch/blackfin/cpu/bootrom-asm-offsets.[chs] \
782 $(obj)arch/blackfin/cpu/init.{lds,elf} 785 $(obj)arch/blackfin/cpu/init.{lds,elf}
783 @rm -f $(obj)include/bmp_logo.h 786 @rm -f $(obj)include/bmp_logo.h
784 @rm -f $(obj)include/bmp_logo_data.h 787 @rm -f $(obj)include/bmp_logo_data.h
785 @rm -f $(obj)lib/asm-offsets.s 788 @rm -f $(obj)lib/asm-offsets.s
786 @rm -f $(obj)include/generated/asm-offsets.h 789 @rm -f $(obj)include/generated/asm-offsets.h
787 @rm -f $(obj)$(CPUDIR)/$(SOC)/asm-offsets.s 790 @rm -f $(obj)$(CPUDIR)/$(SOC)/asm-offsets.s
788 @rm -f $(obj)nand_spl/{u-boot.lds,u-boot-nand_spl.lds,u-boot-spl,u-boot-spl.map,System.map} 791 @rm -f $(obj)nand_spl/{u-boot.lds,u-boot-nand_spl.lds,u-boot-spl,u-boot-spl.map,System.map}
789 @rm -f $(obj)onenand_ipl/onenand-{ipl,ipl.bin,ipl.map} 792 @rm -f $(obj)onenand_ipl/onenand-{ipl,ipl.bin,ipl.map}
790 @rm -f $(ONENAND_BIN) 793 @rm -f $(ONENAND_BIN)
791 @rm -f $(obj)onenand_ipl/u-boot.lds 794 @rm -f $(obj)onenand_ipl/u-boot.lds
792 @rm -f $(obj)spl/{u-boot-spl,u-boot-spl.bin,u-boot-spl.lds,u-boot-spl.map} 795 @rm -f $(obj)spl/{u-boot-spl,u-boot-spl.bin,u-boot-spl.lds,u-boot-spl.map}
793 @rm -f $(obj)MLO 796 @rm -f $(obj)MLO
794 @rm -f $(TIMESTAMP_FILE) $(VERSION_FILE) 797 @rm -f $(TIMESTAMP_FILE) $(VERSION_FILE)
795 @find $(OBJTREE) -type f \ 798 @find $(OBJTREE) -type f \
796 \( -name 'core' -o -name '*.bak' -o -name '*~' -o -name '*.su' \ 799 \( -name 'core' -o -name '*.bak' -o -name '*~' -o -name '*.su' \
797 -o -name '*.o' -o -name '*.a' -o -name '*.exe' \) -print \ 800 -o -name '*.o' -o -name '*.a' -o -name '*.exe' \) -print \
798 | xargs rm -f 801 | xargs rm -f
799 802
800 # Removes everything not needed for testing u-boot 803 # Removes everything not needed for testing u-boot
801 tidy: clean 804 tidy: clean
802 @find $(OBJTREE) -type f \( -name '*.depend*' \) -print | xargs rm -f 805 @find $(OBJTREE) -type f \( -name '*.depend*' \) -print | xargs rm -f
803 806
804 clobber: tidy 807 clobber: tidy
805 @find $(OBJTREE) -type f \( -name '*.srec' \ 808 @find $(OBJTREE) -type f \( -name '*.srec' \
806 -o -name '*.bin' -o -name u-boot.img \) \ 809 -o -name '*.bin' -o -name u-boot.img \) \
807 -print0 | xargs -0 rm -f 810 -print0 | xargs -0 rm -f
808 @rm -f $(OBJS) $(obj)*.bak $(obj)ctags $(obj)etags $(obj)TAGS \ 811 @rm -f $(OBJS) $(obj)*.bak $(obj)ctags $(obj)etags $(obj)TAGS \
809 $(obj)cscope.* $(obj)*.*~ 812 $(obj)cscope.* $(obj)*.*~
810 @rm -f $(obj)u-boot $(obj)u-boot.map $(obj)u-boot.hex $(ALL-y) 813 @rm -f $(obj)u-boot $(obj)u-boot.map $(obj)u-boot.hex $(ALL-y)
811 @rm -f $(obj)u-boot.kwb 814 @rm -f $(obj)u-boot.kwb
812 @rm -f $(obj)u-boot.imx 815 @rm -f $(obj)u-boot.imx
813 @rm -f $(obj)u-boot.ubl 816 @rm -f $(obj)u-boot.ubl
814 @rm -f $(obj)u-boot.ais 817 @rm -f $(obj)u-boot.ais
815 @rm -f $(obj)u-boot.dtb 818 @rm -f $(obj)u-boot.dtb
816 @rm -f $(obj)u-boot.sb 819 @rm -f $(obj)u-boot.sb
817 @rm -f $(obj)u-boot.spr 820 @rm -f $(obj)u-boot.spr
818 @rm -f $(obj)tools/xway-swap-bytes 821 @rm -f $(obj)tools/xway-swap-bytes
819 @rm -f $(obj)arch/powerpc/cpu/mpc824x/bedbug_603e.c 822 @rm -f $(obj)arch/powerpc/cpu/mpc824x/bedbug_603e.c
820 @rm -f $(obj)arch/powerpc/cpu/mpc83xx/ddr-gen?.c 823 @rm -f $(obj)arch/powerpc/cpu/mpc83xx/ddr-gen?.c
821 @rm -fr $(obj)include/asm/proc $(obj)include/asm/arch $(obj)include/asm 824 @rm -fr $(obj)include/asm/proc $(obj)include/asm/arch $(obj)include/asm
822 @rm -fr $(obj)include/generated 825 @rm -fr $(obj)include/generated
823 @[ ! -d $(obj)nand_spl ] || find $(obj)nand_spl -name "*" -type l -print | xargs rm -f 826 @[ ! -d $(obj)nand_spl ] || find $(obj)nand_spl -name "*" -type l -print | xargs rm -f
824 @[ ! -d $(obj)onenand_ipl ] || find $(obj)onenand_ipl -name "*" -type l -print | xargs rm -f 827 @[ ! -d $(obj)onenand_ipl ] || find $(obj)onenand_ipl -name "*" -type l -print | xargs rm -f
825 @rm -f $(obj)dts/*.tmp 828 @rm -f $(obj)dts/*.tmp
826 @rm -f $(obj)spl/u-boot-spl{,-pad}.ais 829 @rm -f $(obj)spl/u-boot-spl{,-pad}.ais
827 830
828 mrproper \ 831 mrproper \
829 distclean: clobber unconfig 832 distclean: clobber unconfig
830 ifneq ($(OBJTREE),$(SRCTREE)) 833 ifneq ($(OBJTREE),$(SRCTREE))
831 rm -rf $(obj)* 834 rm -rf $(obj)*
832 endif 835 endif
833 836
834 backup: 837 backup:
835 F=`basename $(TOPDIR)` ; cd .. ; \ 838 F=`basename $(TOPDIR)` ; cd .. ; \
836 gtar --force-local -zcvf `LC_ALL=C date "+$$F-%Y-%m-%d-%T.tar.gz"` $$F 839 gtar --force-local -zcvf `LC_ALL=C date "+$$F-%Y-%m-%d-%T.tar.gz"` $$F
837 840
838 ######################################################################### 841 #########################################################################
839 842
arch/arm/cpu/arm926ejs/mxs/u-boot-imx28.bd
Diff comments   View file @ a545355
File was created 1 sources {
2 u_boot_spl="spl/u-boot-spl.bin";
3 u_boot="u-boot.bin";
4 }
5
6 section (0) {
7 load u_boot_spl > 0x0000;
8 load ivt (entry = 0x0014) > 0x8000;
9 hab call 0x8000;
10
11 load u_boot > 0x40000100;
12 load ivt (entry = 0x40000100) > 0x8000;
13 hab call 0x8000;
14 }
15
arch/arm/cpu/arm926ejs/mxs/u-boot.bd
View file @ a545355
1 sources { File was deleted
2 u_boot_spl="spl/u-boot-spl.bin";
3 u_boot="u-boot.bin";
4 }
5
6 section (0) {
7 load u_boot_spl > 0x0000;
8 load ivt (entry = 0x0014) > 0x8000;
9 hab call 0x8000;
10
11 load u_boot > 0x40000100;
12 load ivt (entry = 0x40000100) > 0x8000;
13 hab call 0x8000;
14 }
15 1 sources {