Makefile 27.1 KB
Newer Older
wdenk's avatar
wdenk committed
1
#
2
# (C) Copyright 2000-2012
wdenk's avatar
wdenk committed
3 4 5 6 7 8 9
# Wolfgang Denk, DENX Software Engineering, wd@denx.de.
#
# See file CREDITS for list of people who contributed to this
# project.
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License as
10
# published by the Free Software Foundatio; either version 2 of
wdenk's avatar
wdenk committed
11 12 13 14
# the License, or (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
15
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	See the
wdenk's avatar
wdenk committed
16 17 18 19 20 21 22 23
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston,
# MA 02111-1307 USA
#

Wolfgang Denk's avatar
Wolfgang Denk committed
24
VERSION = 2012
Tom Rini's avatar
Tom Rini committed
25
PATCHLEVEL = 10
Wolfgang Denk's avatar
Wolfgang Denk committed
26
SUBLEVEL =
Tom Rini's avatar
Tom Rini committed
27
EXTRAVERSION =
28
ifneq "$(SUBLEVEL)" ""
29
U_BOOT_VERSION = $(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)
30 31 32
else
U_BOOT_VERSION = $(VERSION).$(PATCHLEVEL)$(EXTRAVERSION)
endif
33 34
TIMESTAMP_FILE = $(obj)include/generated/timestamp_autogenerated.h
VERSION_FILE = $(obj)include/generated/version_autogenerated.h
35

wdenk's avatar
wdenk committed
36
HOSTARCH := $(shell uname -m | \
Graeme Russ's avatar
Graeme Russ committed
37
	sed -e s/i.86/x86/ \
wdenk's avatar
wdenk committed
38 39 40
	    -e s/sun4u/sparc64/ \
	    -e s/arm.*/arm/ \
	    -e s/sa110/arm/ \
Kumar Gala's avatar
Kumar Gala committed
41 42
	    -e s/ppc64/powerpc/ \
	    -e s/ppc/powerpc/ \
43 44
	    -e s/macppc/powerpc/\
	    -e s/sh.*/sh/)
wdenk's avatar
wdenk committed
45

46
HOSTOS := $(shell uname -s | tr '[:upper:]' '[:lower:]' | \
wdenk's avatar
wdenk committed
47 48
	    sed -e 's/\(cygwin\).*/cygwin/')

49 50 51 52 53 54
# Set shell to bash if possible, otherwise fall back to sh
SHELL := $(shell if [ -x "$$BASH" ]; then echo $$BASH; \
	else if [ -x /bin/bash ]; then echo /bin/bash; \
	else echo sh; fi; fi)

export	HOSTARCH HOSTOS SHELL
wdenk's avatar
wdenk committed
55 56 57 58

# Deal with colliding definitions from tcsh etc.
VENDOR=

59 60 61 62 63 64 65 66
#########################################################################
# Allow for silent builds
ifeq (,$(findstring s,$(MAKEFLAGS)))
XECHO = echo
else
XECHO = :
endif

wdenk's avatar
wdenk committed
67
#########################################################################
68 69 70
#
# U-boot build supports producing a object files to the separate external
# directory. Two use cases are supported:
71
#
72 73 74 75 76 77 78 79 80 81
# 1) Add O= to the make command line
# 'make O=/tmp/build all'
#
# 2) Set environement variable BUILD_DIR to point to the desired location
# 'export BUILD_DIR=/tmp/build'
# 'make'
#
# The second approach can also be used with a MAKEALL script
# 'export BUILD_DIR=/tmp/build'
# './MAKEALL'
82
#
83
# Command line 'O=' setting overrides BUILD_DIR environent variable.
84
#
85 86
# When none of the above methods is used the local build is performed and
# the object files are placed in the source directory.
87
#
88 89 90 91 92 93 94 95 96

ifdef O
ifeq ("$(origin O)", "command line")
BUILD_DIR := $(O)
endif
endif

ifneq ($(BUILD_DIR),)
saved-output := $(BUILD_DIR)
97 98 99 100

# Attempt to create a output directory.
$(shell [ -d ${BUILD_DIR} ] || mkdir -p ${BUILD_DIR})

Stefan Roese's avatar
Stefan Roese committed
101
# Verify if it was successful.
102 103 104 105 106
BUILD_DIR := $(shell cd $(BUILD_DIR) && /bin/pwd)
$(if $(BUILD_DIR),,$(error output directory "$(saved-output)" does not exist))
endif # ifneq ($(BUILD_DIR),)

OBJTREE		:= $(if $(BUILD_DIR),$(BUILD_DIR),$(CURDIR))
107
SPLTREE		:= $(OBJTREE)/spl
108 109 110
SRCTREE		:= $(CURDIR)
TOPDIR		:= $(SRCTREE)
LNDIR		:= $(OBJTREE)
111
export	TOPDIR SRCTREE OBJTREE SPLTREE
112 113 114

MKCONFIG	:= $(SRCTREE)/mkconfig
export MKCONFIG
wdenk's avatar
wdenk committed
115

116
ifneq ($(OBJTREE),$(SRCTREE))
Wolfgang Denk's avatar
Wolfgang Denk committed
117
REMOTE_BUILD	:= 1
118 119 120 121 122 123 124 125 126 127 128 129
export REMOTE_BUILD
endif

# $(obj) and (src) are defined in config.mk but here in main Makefile
# we also need them before config.mk is included which is the case for
# some targets like unconfig, clean, clobber, distclean, etc.
ifneq ($(OBJTREE),$(SRCTREE))
obj := $(OBJTREE)/
src := $(SRCTREE)/
else
obj :=
src :=
130
endif
131 132
export obj src

133 134 135
# Make sure CDPATH settings don't interfere
unexport CDPATH

wdenk's avatar
wdenk committed
136 137
#########################################################################

138 139
# The "tools" are needed early, so put this first
# Don't include stuff already done in $(LIBS)
140 141 142 143 144
# The "examples" conditionally depend on U-Boot (say, when USE_PRIVATE_LIBGCC
# is "yes"), so compile examples after U-Boot is compiled.
SUBDIR_TOOLS = tools
SUBDIR_EXAMPLES = examples/standalone examples/api
SUBDIRS = $(SUBDIR_TOOLS)
145

146
.PHONY : $(SUBDIRS) $(VERSION_FILE) $(TIMESTAMP_FILE)
147

148
ifeq ($(obj)include/config.mk,$(wildcard $(obj)include/config.mk))
wdenk's avatar
wdenk committed
149

150 151 152 153 154 155 156
# Include autoconf.mk before config.mk so that the config options are available
# to all top level build files.  We need the dummy all: target to prevent the
# dependency target in autoconf.mk.dep from being the default.
all:
sinclude $(obj)include/autoconf.mk.dep
sinclude $(obj)include/autoconf.mk

157 158 159 160
ifndef CONFIG_SANDBOX
SUBDIRS += $(SUBDIR_EXAMPLES)
endif

wdenk's avatar
wdenk committed
161
# load ARCH, BOARD, and CPU configuration
162
include $(obj)include/config.mk
wdenk's avatar
wdenk committed
163
export	ARCH CPU BOARD VENDOR SOC
164

165
# set default to nothing for native builds
Wolfgang Denk's avatar
Wolfgang Denk committed
166
ifeq ($(HOSTARCH),$(ARCH))
167
CROSS_COMPILE ?=
wdenk's avatar
wdenk committed
168
endif
wdenk's avatar
wdenk committed
169

170 171 172
# load other configuration
include $(TOPDIR)/config.mk

173 174 175 176
# If board code explicitly specified LDSCRIPT or CONFIG_SYS_LDSCRIPT, use
# that (or fail if absent).  Otherwise, search for a linker script in a
# standard location.

177 178
LDSCRIPT_MAKEFILE_DIR = $(dir $(LDSCRIPT))

179 180 181 182 183 184 185 186
ifndef LDSCRIPT
	#LDSCRIPT := $(TOPDIR)/board/$(BOARDDIR)/u-boot.lds.debug
	ifdef CONFIG_SYS_LDSCRIPT
		# need to strip off double quotes
		LDSCRIPT := $(subst ",,$(CONFIG_SYS_LDSCRIPT))
	endif
endif

187
# If there is no specified link script, we look in a number of places for it
188 189 190 191 192 193 194 195 196 197 198 199 200
ifndef LDSCRIPT
	ifeq ($(CONFIG_NAND_U_BOOT),y)
		LDSCRIPT := $(TOPDIR)/board/$(BOARDDIR)/u-boot-nand.lds
		ifeq ($(wildcard $(LDSCRIPT)),)
			LDSCRIPT := $(TOPDIR)/$(CPUDIR)/u-boot-nand.lds
		endif
	endif
	ifeq ($(wildcard $(LDSCRIPT)),)
		LDSCRIPT := $(TOPDIR)/board/$(BOARDDIR)/u-boot.lds
	endif
	ifeq ($(wildcard $(LDSCRIPT)),)
		LDSCRIPT := $(TOPDIR)/$(CPUDIR)/u-boot.lds
	endif
201 202 203 204 205
	ifeq ($(wildcard $(LDSCRIPT)),)
		LDSCRIPT := $(TOPDIR)/arch/$(ARCH)/cpu/u-boot.lds
		# We don't expect a Makefile here
		LDSCRIPT_MAKEFILE_DIR =
	endif
206 207 208 209 210
	ifeq ($(wildcard $(LDSCRIPT)),)
$(error could not find linker script)
	endif
endif

wdenk's avatar
wdenk committed
211 212 213
#########################################################################
# U-Boot objects....order is important (i.e. start must be first)

Peter Tyser's avatar
Peter Tyser committed
214
OBJS  = $(CPUDIR)/start.o
Graeme Russ's avatar
Graeme Russ committed
215
ifeq ($(CPU),x86)
Peter Tyser's avatar
Peter Tyser committed
216 217
OBJS += $(CPUDIR)/start16.o
OBJS += $(CPUDIR)/resetvec.o
218
endif
wdenk's avatar
wdenk committed
219
ifeq ($(CPU),ppc4xx)
Peter Tyser's avatar
Peter Tyser committed
220
OBJS += $(CPUDIR)/resetvec.o
wdenk's avatar
wdenk committed
221
endif
222
ifeq ($(CPU),mpc85xx)
Peter Tyser's avatar
Peter Tyser committed
223
OBJS += $(CPUDIR)/resetvec.o
224
endif
wdenk's avatar
wdenk committed
225

226 227
OBJS := $(addprefix $(obj),$(OBJS))

228
HAVE_VENDOR_COMMON_LIB = $(if $(wildcard board/$(VENDOR)/common/Makefile),y,n)
229

230 231 232 233
LIBS-y += lib/libgeneric.o
LIBS-y += lib/lzma/liblzma.o
LIBS-y += lib/lzo/liblzo.o
LIBS-y += lib/zlib/libz.o
234 235
LIBS-$(CONFIG_TIZEN) += lib/tizen/libtizen.o
LIBS-$(HAVE_VENDOR_COMMON_LIB) += board/$(VENDOR)/common/lib$(VENDOR).o
236
LIBS-y += $(CPUDIR)/lib$(CPU).o
wdenk's avatar
wdenk committed
237
ifdef SOC
238
LIBS-y += $(CPUDIR)/$(SOC)/lib$(SOC).o
wdenk's avatar
wdenk committed
239
endif
240
ifeq ($(CPU),ixp)
241
LIBS-y += drivers/net/npe/libnpe.o
242
endif
243
LIBS-$(CONFIG_OF_EMBED) += dts/libdts.o
244
LIBS-y += arch/$(ARCH)/lib/lib$(ARCH).o
Tom Rini's avatar
Tom Rini committed
245
LIBS-y += fs/cramfs/libcramfs.o \
Uma Shankar's avatar
Uma Shankar committed
246 247 248 249 250 251 252 253
	fs/ext4/libext4fs.o \
	fs/fat/libfat.o \
	fs/fdos/libfdos.o \
	fs/jffs2/libjffs2.o \
	fs/reiserfs/libreiserfs.o \
	fs/ubifs/libubifs.o \
	fs/yaffs2/libyaffs2.o \
	fs/zfs/libzfs.o
254 255 256 257
LIBS-y += net/libnet.o
LIBS-y += disk/libdisk.o
LIBS-y += drivers/bios_emulator/libatibiosemu.o
LIBS-y += drivers/block/libblock.o
258
LIBS-$(CONFIG_BOOTCOUNT_LIMIT) += drivers/bootcount/libbootcount.o
259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277
LIBS-y += drivers/dma/libdma.o
LIBS-y += drivers/fpga/libfpga.o
LIBS-y += drivers/gpio/libgpio.o
LIBS-y += drivers/hwmon/libhwmon.o
LIBS-y += drivers/i2c/libi2c.o
LIBS-y += drivers/input/libinput.o
LIBS-y += drivers/misc/libmisc.o
LIBS-y += drivers/mmc/libmmc.o
LIBS-y += drivers/mtd/libmtd.o
LIBS-y += drivers/mtd/nand/libnand.o
LIBS-y += drivers/mtd/onenand/libonenand.o
LIBS-y += drivers/mtd/ubi/libubi.o
LIBS-y += drivers/mtd/spi/libspi_flash.o
LIBS-y += drivers/net/libnet.o
LIBS-y += drivers/net/phy/libphy.o
LIBS-y += drivers/pci/libpci.o
LIBS-y += drivers/pcmcia/libpcmcia.o
LIBS-y += drivers/power/libpower.o
LIBS-y += drivers/spi/libspi.o
278
LIBS-y += drivers/dfu/libdfu.o
Dave Liu's avatar
Dave Liu committed
279
ifeq ($(CPU),mpc83xx)
280 281 282
LIBS-y += drivers/qe/libqe.o
LIBS-y += arch/powerpc/cpu/mpc8xxx/ddr/libddr.o
LIBS-y += arch/powerpc/cpu/mpc8xxx/lib8xxx.o
Dave Liu's avatar
Dave Liu committed
283
endif
Andy Fleming's avatar
Andy Fleming committed
284
ifeq ($(CPU),mpc85xx)
285 286 287 288
LIBS-y += drivers/qe/libqe.o
LIBS-y += drivers/net/fm/libfm.o
LIBS-y += arch/powerpc/cpu/mpc8xxx/ddr/libddr.o
LIBS-y += arch/powerpc/cpu/mpc8xxx/lib8xxx.o
289 290
endif
ifeq ($(CPU),mpc86xx)
291 292
LIBS-y += arch/powerpc/cpu/mpc8xxx/ddr/libddr.o
LIBS-y += arch/powerpc/cpu/mpc8xxx/lib8xxx.o
Andy Fleming's avatar
Andy Fleming committed
293
endif
294 295
LIBS-y += drivers/rtc/librtc.o
LIBS-y += drivers/serial/libserial.o
296
LIBS-$(CONFIG_GENERIC_LPC_TPM) += drivers/tpm/libtpm.o
297 298 299 300 301 302 303 304 305 306 307 308 309 310
LIBS-y += drivers/twserial/libtws.o
LIBS-y += drivers/usb/eth/libusb_eth.o
LIBS-y += drivers/usb/gadget/libusb_gadget.o
LIBS-y += drivers/usb/host/libusb_host.o
LIBS-y += drivers/usb/musb/libusb_musb.o
LIBS-y += drivers/usb/phy/libusb_phy.o
LIBS-y += drivers/usb/ulpi/libusb_ulpi.o
LIBS-y += drivers/video/libvideo.o
LIBS-y += drivers/watchdog/libwatchdog.o
LIBS-y += common/libcommon.o
LIBS-y += lib/libfdt/libfdt.o
LIBS-y += api/libapi.o
LIBS-y += post/libpost.o
LIBS-y += test/libtest.o
311

312
ifneq ($(CONFIG_AM33XX)$(CONFIG_OMAP34XX)$(CONFIG_OMAP44XX)$(CONFIG_OMAP54XX),)
313
LIBS-y += $(CPUDIR)/omap-common/libomap-common.o
Chandan Nath's avatar
Chandan Nath committed
314
endif
315

316 317
ifneq (,$(filter $(SOC), mx25 mx27 mx5 mx6 mx31 mx35))
LIBS-y += arch/$(ARCH)/imx-common/libimx-common.o
318 319
endif

320
ifeq ($(SOC),s5pc1xx)
321
LIBS-y += $(CPUDIR)/s5p-common/libs5p-common.o
322
endif
323
ifeq ($(SOC),exynos)
324
LIBS-y += $(CPUDIR)/s5p-common/libs5p-common.o
325
endif
326 327 328
ifeq ($(SOC),tegra20)
LIBS-y += arch/$(ARCH)/cpu/$(SOC)-common/lib$(SOC)-common.o
endif
329

330
LIBS := $(addprefix $(obj),$(sort $(LIBS-y)))
331
.PHONY : $(LIBS)
wdenk's avatar
wdenk committed
332

333
LIBBOARD = board/$(BOARDDIR)/lib$(BOARD).o
Wolfgang Denk's avatar
Wolfgang Denk committed
334 335
LIBBOARD := $(addprefix $(obj),$(LIBBOARD))

wdenk's avatar
wdenk committed
336
# Add GCC lib
337 338
ifdef USE_PRIVATE_LIBGCC
ifeq ("$(USE_PRIVATE_LIBGCC)", "yes")
339
PLATFORM_LIBGCC = $(OBJTREE)/arch/$(ARCH)/lib/libgcc.o
340 341 342 343
else
PLATFORM_LIBGCC = -L $(USE_PRIVATE_LIBGCC) -lgcc
endif
else
Wolfgang Denk's avatar
Wolfgang Denk committed
344
PLATFORM_LIBGCC := -L $(shell dirname `$(CC) $(CFLAGS) -print-libgcc-file-name`) -lgcc
345 346 347
endif
PLATFORM_LIBS += $(PLATFORM_LIBGCC)
export PLATFORM_LIBS
348

349 350 351 352 353
# Special flags for CPP when processing the linker script.
# Pass the version down so we can handle backwards compatibility
# on the fly.
LDPPFLAGS += \
	-include $(TOPDIR)/include/u-boot/u-boot.lds.h \
354
	-DCPUDIR=$(CPUDIR) \
355 356 357
	$(shell $(LD) --version | \
	  sed -ne 's/GNU ld version \([0-9][0-9]*\)\.\([0-9][0-9]*\).*/-DLD_MAJOR=\1 -DLD_MINOR=\2/p')

358
__OBJS := $(subst $(obj),,$(OBJS))
Wolfgang Denk's avatar
Wolfgang Denk committed
359
__LIBS := $(subst $(obj),,$(LIBS)) $(subst $(obj),,$(LIBBOARD))
360

361
#########################################################################
wdenk's avatar
wdenk committed
362 363
#########################################################################

364 365 366 367 368 369 370 371 372 373 374 375 376 377 378
ifneq ($(CONFIG_BOARD_SIZE_LIMIT),)
BOARD_SIZE_CHECK = \
	@actual=`wc -c $@ | awk '{print $$1}'`; \
	limit=$(CONFIG_BOARD_SIZE_LIMIT); \
	if test $$actual -gt $$limit; then \
		echo "$@ exceeds file size limit:"; \
		echo "  limit:  $$limit bytes"; \
		echo "  actual: $$actual bytes"; \
		echo "  excess: $$((actual - limit)) bytes"; \
		exit 1; \
	fi
else
BOARD_SIZE_CHECK =
endif

379
# Always append ALL so that arch config.mk's can add custom ones
380
ALL-y += $(obj)u-boot.srec $(obj)u-boot.bin $(obj)System.map
381

382 383
ALL-$(CONFIG_NAND_U_BOOT) += $(obj)u-boot-nand.bin
ALL-$(CONFIG_ONENAND_U_BOOT) += $(obj)u-boot-onenand.bin
384
ALL-$(CONFIG_SPL) += $(obj)spl/u-boot-spl.bin
385
ALL-$(CONFIG_OF_SEPARATE) += $(obj)u-boot.dtb $(obj)u-boot-dtb.bin
386

387 388 389 390 391 392 393 394 395
# enable combined SPL/u-boot/dtb rules for tegra
ifeq ($(SOC),tegra20)
ifeq ($(CONFIG_OF_SEPARATE),y)
ALL-y += $(obj)u-boot-dtb-tegra.bin
else
ALL-y += $(obj)u-boot-nodtb-tegra.bin
endif
endif

396
all:		$(ALL-y) $(SUBDIR_EXAMPLES)
wdenk's avatar
wdenk committed
397

398 399 400 401 402 403 404
$(obj)u-boot.dtb:	$(obj)u-boot
		$(MAKE) -C dts binary
		mv $(obj)dts/dt.dtb $@

$(obj)u-boot-dtb.bin:	$(obj)u-boot.bin $(obj)u-boot.dtb
		cat $^ >$@

405
$(obj)u-boot.hex:	$(obj)u-boot
wdenk's avatar
wdenk committed
406 407
		$(OBJCOPY) ${OBJCFLAGS} -O ihex $< $@

408
$(obj)u-boot.srec:	$(obj)u-boot
409
		$(OBJCOPY) -O srec $< $@
wdenk's avatar
wdenk committed
410

411
$(obj)u-boot.bin:	$(obj)u-boot
wdenk's avatar
wdenk committed
412
		$(OBJCOPY) ${OBJCFLAGS} -O binary $< $@
413
		$(BOARD_SIZE_CHECK)
wdenk's avatar
wdenk committed
414

415
$(obj)u-boot.ldr:	$(obj)u-boot
416
		$(CREATE_LDR_ENV)
417
		$(LDR) -T $(CONFIG_BFIN_CPU) -c $@ $< $(LDR_FLAGS)
418
		$(BOARD_SIZE_CHECK)
419 420 421 422 423 424 425

$(obj)u-boot.ldr.hex:	$(obj)u-boot.ldr
		$(OBJCOPY) ${OBJCFLAGS} -O ihex $< $@ -I binary

$(obj)u-boot.ldr.srec:	$(obj)u-boot.ldr
		$(OBJCOPY) ${OBJCFLAGS} -O srec $< $@ -I binary

426
$(obj)u-boot.img:	$(obj)u-boot.bin
427
		$(obj)tools/mkimage -A $(ARCH) -T firmware -C none \
aneeshv's avatar
aneeshv committed
428
		-O u-boot -a $(CONFIG_SYS_TEXT_BASE) -e 0 \
429
		-n $(shell sed -n -e 's/.*U_BOOT_VERSION//p' $(VERSION_FILE) | \
430 431 432
			sed -e 's/"[	 ]*$$/ for $(BOARD) board"/') \
		-d $< $@

433
$(obj)u-boot.imx:       $(obj)u-boot.bin
434
		$(obj)tools/mkimage -n  $(CONFIG_IMX_CONFIG) -T imximage \
435
		-e $(CONFIG_SYS_TEXT_BASE) -d $< $@
436

437
$(obj)u-boot.kwb:       $(obj)u-boot.bin
438
		$(obj)tools/mkimage -n $(CONFIG_SYS_KWD_CONFIG) -T kwbimage \
439
		-a $(CONFIG_SYS_TEXT_BASE) -e $(CONFIG_SYS_TEXT_BASE) -d $< $@
440

441 442 443 444 445
$(obj)u-boot.pbl:	$(obj)u-boot.bin
		$(obj)tools/mkimage -n $(CONFIG_PBLRCW_CONFIG) \
		-R $(CONFIG_PBLPBI_CONFIG) -T pblimage \
		-d $< $@

446
$(obj)u-boot.sha1:	$(obj)u-boot.bin
447
		$(obj)tools/ubsha1 $(obj)u-boot.bin
448

449
$(obj)u-boot.dis:	$(obj)u-boot
wdenk's avatar
wdenk committed
450 451
		$(OBJDUMP) -d $< > $@

452 453 454
$(obj)u-boot.ubl:       $(obj)spl/u-boot-spl.bin $(obj)u-boot.bin
		$(OBJCOPY) ${OBJCFLAGS} --pad-to=$(PAD_TO) -O binary $(obj)spl/u-boot-spl $(obj)spl/u-boot-spl-pad.bin
		cat $(obj)spl/u-boot-spl-pad.bin $(obj)u-boot.bin > $(obj)u-boot-ubl.bin
455
		$(obj)tools/mkimage -n $(UBL_CONFIG) -T ublimage \
456 457 458
		-e $(CONFIG_SYS_TEXT_BASE) -d $(obj)u-boot-ubl.bin $(obj)u-boot.ubl
		rm $(obj)u-boot-ubl.bin
		rm $(obj)spl/u-boot-spl-pad.bin
459

460
$(obj)u-boot.ais:       $(obj)spl/u-boot-spl.bin $(obj)u-boot.img
461 462
		$(obj)tools/mkimage -s -n $(if $(CONFIG_AIS_CONFIG_FILE),$(CONFIG_AIS_CONFIG_FILE),"/dev/null") \
			-T aisimage \
463 464 465 466 467 468
			-e $(CONFIG_SPL_TEXT_BASE) \
			-d $(obj)spl/u-boot-spl.bin \
			$(obj)spl/u-boot-spl.ais
		$(OBJCOPY) ${OBJCFLAGS} -I binary \
			--pad-to=$(CONFIG_SPL_MAX_SIZE) -O binary \
			$(obj)spl/u-boot-spl.ais $(obj)spl/u-boot-spl-pad.ais
469
		cat $(obj)spl/u-boot-spl-pad.ais $(obj)u-boot.img > \
470 471
			$(obj)u-boot.ais

472 473 474
# Specify the target for use in elftosb call
ELFTOSB_TARGET-$(CONFIG_MX28) = imx28

475
$(obj)u-boot.sb:       $(obj)u-boot.bin $(obj)spl/u-boot-spl.bin
476
		elftosb -zdf $(ELFTOSB_TARGET-y) -c $(TOPDIR)/$(CPUDIR)/$(SOC)/u-boot-$(ELFTOSB_TARGET-y).bd \
477 478
			-o $(obj)u-boot.sb

479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494
# On x600 (SPEAr600) U-Boot is appended to U-Boot SPL.
# Both images are created using mkimage (crc etc), so that the ROM
# bootloader can check its integrity. Padding needs to be done to the
# SPL image (with mkimage header) and not the binary. Otherwise the resulting image
# which is loaded/copied by the ROM bootloader to SRAM doesn't fit.
# The resulting image containing both U-Boot images is called u-boot.spr
$(obj)u-boot.spr:	$(obj)u-boot.img $(obj)spl/u-boot-spl.bin
		$(obj)tools/mkimage -A $(ARCH) -T firmware -C none \
		-a $(CONFIG_SPL_TEXT_BASE) -e $(CONFIG_SPL_TEXT_BASE) -n XLOADER \
		-d $(obj)spl/u-boot-spl.bin $(obj)spl/u-boot-spl.img
		tr "\000" "\377" < /dev/zero | dd ibs=1 count=$(CONFIG_SPL_PAD_TO) \
			of=$(obj)spl/u-boot-spl-pad.img 2>/dev/null
		dd if=$(obj)spl/u-boot-spl.img of=$(obj)spl/u-boot-spl-pad.img \
			conv=notrunc 2>/dev/null
		cat $(obj)spl/u-boot-spl-pad.img $(obj)u-boot.img > $@

495 496 497 498 499 500 501 502 503 504 505 506 507 508
ifeq ($(SOC),tegra20)
ifeq ($(CONFIG_OF_SEPARATE),y)
$(obj)u-boot-dtb-tegra.bin:	$(obj)spl/u-boot-spl.bin $(obj)u-boot.bin $(obj)u-boot.dtb
		$(OBJCOPY) ${OBJCFLAGS} --pad-to=$(CONFIG_SYS_TEXT_BASE) -O binary $(obj)spl/u-boot-spl $(obj)spl/u-boot-spl-pad.bin
		cat $(obj)spl/u-boot-spl-pad.bin $(obj)u-boot.bin $(obj)u-boot.dtb > $@
		rm $(obj)spl/u-boot-spl-pad.bin
else
$(obj)u-boot-nodtb-tegra.bin:	$(obj)spl/u-boot-spl.bin $(obj)u-boot.bin
		$(OBJCOPY) ${OBJCFLAGS} --pad-to=$(CONFIG_SYS_TEXT_BASE) -O binary $(obj)spl/u-boot-spl $(obj)spl/u-boot-spl-pad.bin
		cat $(obj)spl/u-boot-spl-pad.bin $(obj)u-boot.bin > $@
		rm $(obj)spl/u-boot-spl-pad.bin
endif
endif

509 510 511 512 513 514
ifeq ($(CONFIG_SANDBOX),y)
GEN_UBOOT = \
		cd $(LNDIR) && $(CC) $(SYMS) -T $(obj)u-boot.lds \
			-Wl,--start-group $(__LIBS) -Wl,--end-group \
			$(PLATFORM_LIBS) -Wl,-Map -Wl,u-boot.map -o u-boot
else
515
GEN_UBOOT = \
Wolfgang Denk's avatar
Wolfgang Denk committed
516 517
		UNDEF_SYM=`$(OBJDUMP) -x $(LIBBOARD) $(LIBS) | \
		sed  -n -e 's/.*\($(SYM_PREFIX)__u_boot_cmd_.*\)/-u\1/p'|sort|uniq`;\
518
		cd $(LNDIR) && $(LD) $(LDFLAGS) $(LDFLAGS_$(@F)) $$UNDEF_SYM $(__OBJS) \
519
			--start-group $(__LIBS) --end-group $(PLATFORM_LIBS) \
520
			-Map u-boot.map -o u-boot
521 522
endif

523
$(obj)u-boot:	depend \
524
		$(SUBDIR_TOOLS) $(OBJS) $(LIBBOARD) $(LIBS) $(LDSCRIPT) $(obj)u-boot.lds
525 526
		$(GEN_UBOOT)
ifeq ($(CONFIG_KALLSYMS),y)
527
		smap=`$(call SYSTEM_MAP,$(obj)u-boot) | \
528 529 530
			awk '$$2 ~ /[tTwW]/ {printf $$1 $$3 "\\\\000"}'` ; \
		$(CC) $(CFLAGS) -DSYSTEM_MAP="\"$${smap}\"" \
			-c common/system_map.c -o $(obj)common/system_map.o
531 532
		$(GEN_UBOOT) $(obj)common/system_map.o
endif
wdenk's avatar
wdenk committed
533

534
$(OBJS):	depend
Peter Tyser's avatar
Peter Tyser committed
535
		$(MAKE) -C $(CPUDIR) $(if $(REMOTE_BUILD),$@,$(notdir $@))
536

537
$(LIBS):	depend $(SUBDIR_TOOLS)
538
		$(MAKE) -C $(dir $(subst $(obj),,$@))
wdenk's avatar
wdenk committed
539

540
$(LIBBOARD):	depend $(LIBS)
Wolfgang Denk's avatar
Wolfgang Denk committed
541 542
		$(MAKE) -C $(dir $(subst $(obj),,$@))

543
$(SUBDIRS):	depend
wdenk's avatar
wdenk committed
544
		$(MAKE) -C $@ all
wdenk's avatar
wdenk committed
545

546 547
$(SUBDIR_EXAMPLES): $(obj)u-boot

548
$(LDSCRIPT):	depend
549 550
		$(MAKE) -C $(dir $@) $(notdir $@)

551 552 553
$(obj)u-boot.lds: $(LDSCRIPT)
		$(CPP) $(CPPFLAGS) $(LDPPFLAGS) -ansi -D__ASSEMBLY__ -P - <$^ >$@

554
nand_spl:	$(TIMESTAMP_FILE) $(VERSION_FILE) depend
555
		$(MAKE) -C nand_spl/board/$(BOARDDIR) all
556

557
$(obj)u-boot-nand.bin:	nand_spl $(obj)u-boot.bin
558
		cat $(obj)nand_spl/u-boot-spl-16k.bin $(obj)u-boot.bin > $(obj)u-boot-nand.bin
559

560
$(obj)spl/u-boot-spl.bin:	$(SUBDIR_TOOLS) depend
561 562
		$(MAKE) -C spl all

563
updater:
Mike Frysinger's avatar
Mike Frysinger committed
564
		$(MAKE) -C tools/updater all
565

Daniel Hobi's avatar
Daniel Hobi committed
566 567
# Explicitly make _depend in subdirs containing multiple targets to prevent
# parallel sub-makes creating .depend files simultaneously.
568 569
depend dep:	$(TIMESTAMP_FILE) $(VERSION_FILE) \
		$(obj)include/autoconf.mk \
570 571
		$(obj)include/generated/generic-asm-offsets.h \
		$(obj)include/generated/asm-offsets.h
572
		for dir in $(SUBDIRS) $(CPUDIR) $(LDSCRIPT_MAKEFILE_DIR) ; do \
Daniel Hobi's avatar
Daniel Hobi committed
573
			$(MAKE) -C $$dir _depend ; done
wdenk's avatar
wdenk committed
574

Li Yang's avatar
Li Yang committed
575 576
TAG_SUBDIRS = $(SUBDIRS)
TAG_SUBDIRS += $(dir $(__LIBS))
577 578
TAG_SUBDIRS += include

579 580 581
FIND := find
FINDFLAGS := -L

582 583 584 585 586
checkstack:
		$(CROSS_COMPILE)objdump -d $(obj)u-boot \
			`$(FIND) $(obj) -name u-boot-spl -print` | \
			perl $(src)tools/checkstack.pl $(ARCH)

587
tags ctags:
588
		ctags -w -o $(obj)ctags `$(FIND) $(FINDFLAGS) $(TAG_SUBDIRS) \
Li Yang's avatar
Li Yang committed
589
						-name '*.[chS]' -print`
wdenk's avatar
wdenk committed
590 591

etags:
592
		etags -a -o $(obj)etags `$(FIND) $(FINDFLAGS) $(TAG_SUBDIRS) \
Li Yang's avatar
Li Yang committed
593
						-name '*.[chS]' -print`
Li Yang's avatar
Li Yang committed
594
cscope:
595 596
		$(FIND) $(FINDFLAGS) $(TAG_SUBDIRS) -name '*.[chS]' -print > \
						cscope.files
Li Yang's avatar
Li Yang committed
597
		cscope -b -q -k
wdenk's avatar
wdenk committed
598

599 600
SYSTEM_MAP = \
		$(NM) $1 | \
wdenk's avatar
wdenk committed
601
		grep -v '\(compiled\)\|\(\.o$$\)\|\( [aUw] \)\|\(\.\.ng$$\)\|\(LASH[RL]DI\)' | \
602 603 604
		LC_ALL=C sort
$(obj)System.map:	$(obj)u-boot
		@$(call SYSTEM_MAP,$<) > $(obj)System.map
wdenk's avatar
wdenk committed
605

Tom Rini's avatar
Tom Rini committed
606 607 608 609 610 611 612
checkthumb:
	@if test $(call cc-version) -lt 0404; then \
		echo -n '*** Your GCC does not produce working '; \
		echo 'binaries in THUMB mode.'; \
		echo '*** Your board is configured for THUMB mode.'; \
		false; \
	fi
613 614 615 616 617 618
#
# Auto-generate the autoconf.mk file (which is included by all makefiles)
#
# This target actually generates 2 files; autoconf.mk and autoconf.mk.dep.
# the dep file is only include in this top level makefile to determine when
# to regenerate the autoconf.mk file.
619 620
$(obj)include/autoconf.mk.dep: $(obj)include/config.h include/common.h
	@$(XECHO) Generating $@ ; \
621
	set -e ; \
622
	: Generate the dependancies ; \
623
	$(CC) -x c -DDO_DEPS_ONLY -M $(CFLAGS) $(CPPFLAGS) \
624 625 626 627 628
		-MQ $(obj)include/autoconf.mk include/common.h > $@

$(obj)include/autoconf.mk: $(obj)include/config.h
	@$(XECHO) Generating $@ ; \
	set -e ; \
629
	: Extract the config macros ; \
630
	$(CPP) $(CFLAGS) -DDO_DEPS_ONLY -dM include/common.h | \
631 632
		sed -n -f tools/scripts/define2mk.sed > $@.tmp && \
	mv $@.tmp $@
633

634 635 636 637 638 639 640 641 642 643 644 645
$(obj)include/generated/generic-asm-offsets.h:	$(obj)include/autoconf.mk.dep \
	$(obj)lib/asm-offsets.s
	@$(XECHO) Generating $@
	tools/scripts/make-asm-offsets $(obj)lib/asm-offsets.s $@

$(obj)lib/asm-offsets.s:	$(obj)include/autoconf.mk.dep \
	$(src)lib/asm-offsets.c
	@mkdir -p $(obj)lib
	$(CC) -DDO_DEPS_ONLY \
		$(CFLAGS) $(CFLAGS_$(BCURDIR)/$(@F)) $(CFLAGS_$(BCURDIR)) \
		-o $@ $(src)lib/asm-offsets.c -c -S

646 647
$(obj)include/generated/asm-offsets.h:	$(obj)include/autoconf.mk.dep \
	$(obj)$(CPUDIR)/$(SOC)/asm-offsets.s
648
	@$(XECHO) Generating $@
649 650 651 652 653 654 655 656 657 658 659 660
	tools/scripts/make-asm-offsets $(obj)$(CPUDIR)/$(SOC)/asm-offsets.s $@

$(obj)$(CPUDIR)/$(SOC)/asm-offsets.s:	$(obj)include/autoconf.mk.dep
	@mkdir -p $(obj)$(CPUDIR)/$(SOC)
	if [ -f $(src)$(CPUDIR)/$(SOC)/asm-offsets.c ];then \
		$(CC) -DDO_DEPS_ONLY \
		$(CFLAGS) $(CFLAGS_$(BCURDIR)/$(@F)) $(CFLAGS_$(BCURDIR)) \
			-o $@ $(src)$(CPUDIR)/$(SOC)/asm-offsets.c -c -S; \
	else \
		touch $@; \
	fi

wdenk's avatar
wdenk committed
661
#########################################################################
662
else	# !config.mk
663 664
all $(obj)u-boot.hex $(obj)u-boot.srec $(obj)u-boot.bin \
$(obj)u-boot.img $(obj)u-boot.dis $(obj)u-boot \
665
$(filter-out tools,$(SUBDIRS)) \
Mike Frysinger's avatar
Mike Frysinger committed
666
updater depend dep tags ctags etags cscope $(obj)System.map:
wdenk's avatar
wdenk committed
667 668
	@echo "System not configured - see README" >&2
	@ exit 1
669

670
tools: $(VERSION_FILE) $(TIMESTAMP_FILE)
Mike Frysinger's avatar
Mike Frysinger committed
671
	$(MAKE) -C $@ all
672
endif	# config.mk
wdenk's avatar
wdenk committed
673

674
$(VERSION_FILE):
675
		@mkdir -p $(dir $(VERSION_FILE))
676 677 678 679 680 681 682 683 684 685 686 687
		@( localvers='$(shell $(TOPDIR)/tools/setlocalversion $(TOPDIR))' ; \
		   printf '#define PLAIN_VERSION "%s%s"\n' \
			"$(U_BOOT_VERSION)" "$${localvers}" ; \
		   printf '#define U_BOOT_VERSION "U-Boot %s%s"\n' \
			"$(U_BOOT_VERSION)" "$${localvers}" ; \
		) > $@.tmp
		@( printf '#define CC_VERSION_STRING "%s"\n' \
		 '$(shell $(CC) --version | head -n 1)' )>>  $@.tmp
		@( printf '#define LD_VERSION_STRING "%s"\n' \
		 '$(shell $(LD) -v | head -n 1)' )>>  $@.tmp
		@cmp -s $@ $@.tmp && rm -f $@.tmp || mv -f $@.tmp $@

688 689
$(TIMESTAMP_FILE):
		@mkdir -p $(dir $(TIMESTAMP_FILE))
690 691 692
		@LC_ALL=C date +'#define U_BOOT_DATE "%b %d %C%y"' > $@.tmp
		@LC_ALL=C date +'#define U_BOOT_TIME "%T"' >> $@.tmp
		@cmp -s $@ $@.tmp && rm -f $@.tmp || mv -f $@.tmp $@
693

Mike Frysinger's avatar
Mike Frysinger committed
694 695 696 697
easylogo env gdb:
	$(MAKE) -C tools/$@ all MTD_VERSION=${MTD_VERSION}
gdbtools: gdb

698
tools-all: easylogo env gdb $(VERSION_FILE) $(TIMESTAMP_FILE)
Mike Frysinger's avatar
Mike Frysinger committed
699 700
	$(MAKE) -C tools HOST_TOOLS_ALL=y

701 702
.PHONY : CHANGELOG
CHANGELOG:
703 704
	git log --no-merges U-Boot-1_1_5.. | \
	unexpand -a | sed -e 's/\s\s*$$//' > $@
705

706
include/license.h: tools/bin2header COPYING
707
	cat COPYING | gzip -9 -c | ./tools/bin2header license_gzip > include/license.h
wdenk's avatar
wdenk committed
708 709 710
#########################################################################

unconfig:
711
	@rm -f $(obj)include/config.h $(obj)include/config.mk \
712 713
		$(obj)board/*/config.tmp $(obj)board/*/*/config.tmp \
		$(obj)include/autoconf.mk $(obj)include/autoconf.mk.dep
wdenk's avatar
wdenk committed
714

715 716 717
%_config::	unconfig
	@$(MKCONFIG) -A $(@:_config=)

718 719
sinclude $(obj).boards.depend
$(obj).boards.depend:	boards.cfg
720
	@awk '(NF && $$1 !~ /^#/) { print $$1 ": " $$1 "_config; $$(MAKE)" }' $< > $@
721

722 723 724 725 726 727
#
# Functions to generate common board directory names
#
lcname	= $(shell echo $(1) | sed -e 's/\(.*\)_config/\L\1/')
ucname	= $(shell echo $(1) | sed -e 's/\(.*\)_config/\U\1/')

wdenk's avatar
wdenk committed
728 729 730
#========================================================================
# ARM
#========================================================================
731

732 733 734 735 736 737 738 739
SX1_stdout_serial_config \
SX1_config:		unconfig
	@mkdir -p $(obj)include
	@if [ "$(findstring _stdout_serial_, $@)" ] ; then \
		echo "#undef CONFIG_STDOUT_USBTTY" >> $(obj)include/config.h ; \
	else \
		echo "#define CONFIG_STDOUT_USBTTY" >> $(obj)include/config.h ; \
	fi;
740
	@$(MKCONFIG) -n $@ SX1 arm arm925t sx1
wdenk's avatar
wdenk committed
741

742 743 744 745 746 747 748 749
#########################################################################
## ARM1176 Systems
#########################################################################
smdk6400_noUSB_config	\
smdk6400_config	:	unconfig
	@mkdir -p $(obj)include $(obj)board/samsung/smdk6400
	@mkdir -p $(obj)nand_spl/board/samsung/smdk6400
	@echo "#define CONFIG_NAND_U_BOOT" > $(obj)include/config.h
750
	@echo "CONFIG_NAND_U_BOOT = y" >> $(obj)include/config.mk
751 752 753 754 755
	@if [ -z "$(findstring smdk6400_noUSB_config,$@)" ]; then			\
		echo "RAM_TEXT = 0x57e00000" >> $(obj)board/samsung/smdk6400/config.tmp;\
	else										\
		echo "RAM_TEXT = 0xc7e00000" >> $(obj)board/samsung/smdk6400/config.tmp;\
	fi
756
	@$(MKCONFIG) smdk6400 arm arm1176 smdk6400 samsung s3c64xx
757 758
	@echo "CONFIG_NAND_U_BOOT = y" >> $(obj)include/config.mk

wdenk's avatar
wdenk committed
759 760
#########################################################################
#########################################################################
wdenk's avatar
wdenk committed
761 762

clean:
763
	@rm -f $(obj)examples/standalone/82559_eeprom			  \
764
	       $(obj)examples/standalone/atmel_df_pow2			  \
765 766 767 768 769
	       $(obj)examples/standalone/eepro100_eeprom		  \
	       $(obj)examples/standalone/hello_world			  \
	       $(obj)examples/standalone/interrupt			  \
	       $(obj)examples/standalone/mem_to_mem_idma2intr		  \
	       $(obj)examples/standalone/sched				  \
770
	       $(obj)examples/standalone/smc911{11,x}_eeprom		  \
771 772
	       $(obj)examples/standalone/test_burst			  \
	       $(obj)examples/standalone/timer
773
	@rm -f $(obj)examples/api/demo{,.bin}
774 775 776 777 778
	@rm -f $(obj)tools/bmp_logo	   $(obj)tools/easylogo/easylogo  \
	       $(obj)tools/env/{fw_printenv,fw_setenv}			  \
	       $(obj)tools/envcrc					  \
	       $(obj)tools/gdb/{astest,gdbcont,gdbsend}			  \
	       $(obj)tools/gen_eth_addr    $(obj)tools/img2srec		  \
779
	       $(obj)tools/mk{env,}image   $(obj)tools/mpc86x_clk	  \
780
	       $(obj)tools/mk{smdk5250,}spl				  \
781
	       $(obj)tools/mxsboot					  \
782 783
	       $(obj)tools/ncb		   $(obj)tools/ubsha1
	@rm -f $(obj)board/cray/L1/{bootscript.c,bootscript.image}	  \
784
	       $(obj)board/matrix_vision/*/bootscript.img		  \
785
	       $(obj)board/voiceblue/eeprom 				  \
786
	       $(obj)u-boot.lds						  \
787 788
	       $(obj)arch/blackfin/cpu/bootrom-asm-offsets.[chs]	  \
	       $(obj)arch/blackfin/cpu/init.{lds,elf}
789
	@rm -f $(obj)include/bmp_logo.h
790
	@rm -f $(obj)include/bmp_logo_data.h
791
	@rm -f $(obj)lib/asm-offsets.s
792 793
	@rm -f $(obj)include/generated/asm-offsets.h
	@rm -f $(obj)$(CPUDIR)/$(SOC)/asm-offsets.s
794
	@rm -f $(TIMESTAMP_FILE) $(VERSION_FILE)
795
	@find $(OBJTREE) -type f \
796
		\( -name 'core' -o -name '*.bak' -o -name '*~' -o -name '*.su' \
797
		-o -name '*.o'	-o -name '*.a' -o -name '*.exe'	\) -print \
wdenk's avatar
wdenk committed
798 799
		| xargs rm -f

Andy Fleming's avatar
Andy Fleming committed
800 801 802 803 804 805 806 807
# Removes everything not needed for testing u-boot
tidy:	clean
	@find $(OBJTREE) -type f \( -name '*.depend*' \) -print | xargs rm -f

clobber:	tidy
	@find $(OBJTREE) -type f \( -name '*.srec' \
		-o -name '*.bin' -o -name u-boot.img \) \
		-print0 | xargs -0 rm -f
Li Yang's avatar
Li Yang committed
808
	@rm -f $(OBJS) $(obj)*.bak $(obj)ctags $(obj)etags $(obj)TAGS \
809
		$(obj)cscope.* $(obj)*.*~
810
	@rm -f $(obj)u-boot $(obj)u-boot.map $(obj)u-boot.hex $(ALL-y)
811
	@rm -f $(obj)u-boot.kwb
812
	@rm -f $(obj)u-boot.pbl
813
	@rm -f $(obj)u-boot.imx
814
	@rm -f $(obj)u-boot.ubl
815
	@rm -f $(obj)u-boot.ais
816
	@rm -f $(obj)u-boot.dtb
817
	@rm -f $(obj)u-boot.sb
818
	@rm -f $(obj)u-boot.spr
819 820 821
	@rm -f $(obj)nand_spl/{u-boot.lds,u-boot-nand_spl.lds,u-boot-spl,u-boot-spl.map,System.map}
	@rm -f $(obj)spl/{u-boot-spl,u-boot-spl.bin,u-boot-spl.lds,u-boot-spl.map}
	@rm -f $(obj)MLO
822
	@rm -f $(obj)tools/xway-swap-bytes
Stefan Roese's avatar
Stefan Roese committed
823
	@rm -f $(obj)arch/powerpc/cpu/mpc824x/bedbug_603e.c
824
	@rm -f $(obj)arch/powerpc/cpu/mpc83xx/ddr-gen?.c
825
	@rm -fr $(obj)include/asm/proc $(obj)include/asm/arch $(obj)include/asm
826
	@rm -fr $(obj)include/generated
827
	@[ ! -d $(obj)nand_spl ] || find $(obj)nand_spl -name "*" -type l -print | xargs rm -f
828
	@rm -f $(obj)dts/*.tmp
829
	@rm -f $(obj)spl/u-boot-spl{,-pad}.ais
830 831 832

mrproper \
distclean:	clobber unconfig
833
ifneq ($(OBJTREE),$(SRCTREE))
834
	rm -rf $(obj)*
835
endif
wdenk's avatar
wdenk committed
836 837 838

backup:
	F=`basename $(TOPDIR)` ; cd .. ; \
839
	gtar --force-local -zcvf `LC_ALL=C date "+$$F-%Y-%m-%d-%T.tar.gz"` $$F
wdenk's avatar
wdenk committed
840 841

#########################################################################