diff options
| author | Markus Klotzbücher <mk@pollux.(none)> | 2006-02-24 11:34:34 +0100 |
|---|---|---|
| committer | Markus Klotzbücher <mk@pollux.(none)> | 2006-02-24 11:34:34 +0100 |
| commit | 7d4d1ce48c849ec5a7e034fd4bc4d0e624075e7b (patch) | |
| tree | 50c39015f2bbbd9f50e9ee623146100c3a673f99 /Makefile | |
| parent | 599f52253ab38e1b9d3966279ce83e7816f1e5e0 (diff) | |
| parent | 6624b687bc2b747233090e67628df37d1c84ed17 (diff) | |
| download | u-boot-imx-7d4d1ce48c849ec5a7e034fd4bc4d0e624075e7b.zip u-boot-imx-7d4d1ce48c849ec5a7e034fd4bc4d0e624075e7b.tar.gz u-boot-imx-7d4d1ce48c849ec5a7e034fd4bc4d0e624075e7b.tar.bz2 | |
Merge branch 'master' of http://www.denx.de/git/u-boot
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 36 |
1 files changed, 27 insertions, 9 deletions
@@ -1,5 +1,5 @@ # -# (C) Copyright 2000-2005 +# (C) Copyright 2000-2006 # Wolfgang Denk, DENX Software Engineering, wd@denx.de. # # See file CREDITS for list of people who contributed to this @@ -21,6 +21,13 @@ # MA 02111-1307 USA # +VERSION = 1 +PATCHLEVEL = 1 +SUBLEVEL = 4 +EXTRAVERSION = +U_BOOT_VERSION = $(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION) +VERSION_FILE = include/version_autogenerated.h + HOSTARCH := $(shell uname -m | \ sed -e s/i.86/i386/ \ -e s/sun4u/sparc64/ \ @@ -154,14 +161,14 @@ u-boot.bin: u-boot u-boot.img: u-boot.bin ./tools/mkimage -A $(ARCH) -T firmware -C none \ -a $(TEXT_BASE) -e 0 \ - -n $(shell sed -n -e 's/.*U_BOOT_VERSION//p' include/version.h | \ + -n $(shell sed -n -e 's/.*U_BOOT_VERSION//p' $(VERSION_FILE) | \ sed -e 's/"[ ]*$$/ for $(BOARD) board"/') \ -d $< $@ u-boot.dis: u-boot $(OBJDUMP) -d $< > $@ -u-boot: depend $(SUBDIRS) $(OBJS) $(LIBS) $(LDSCRIPT) +u-boot: depend version $(SUBDIRS) $(OBJS) $(LIBS) $(LDSCRIPT) UNDEF_SYM=`$(OBJDUMP) -x $(LIBS) |sed -n -e 's/.*\(__u_boot_cmd_.*\)/-u\1/p'|sort|uniq`;\ $(LD) $(LDFLAGS) $$UNDEF_SYM $(OBJS) \ --start-group $(LIBS) --end-group $(PLATFORM_LIBS) \ @@ -173,6 +180,13 @@ $(LIBS): $(SUBDIRS): $(MAKE) -C $@ all +version: + @echo -n "#define U_BOOT_VERSION \"U-Boot " > $(VERSION_FILE); \ + echo -n "$(U_BOOT_VERSION)" >> $(VERSION_FILE); \ + echo -n $(shell $(CONFIG_SHELL) $(TOPDIR)/tools/setlocalversion \ + $(TOPDIR)) >> $(VERSION_FILE); \ + echo "\"" >> $(VERSION_FILE) + gdbtools: $(MAKE) -C tools/gdb || exit 1 @@ -301,6 +315,14 @@ PM520_ROMBOOT_DDR_config: unconfig } @./mkconfig -a PM520 ppc mpc5xxx pm520 +smmaco4_config: unconfig + @./mkconfig -a smmaco4 ppc mpc5xxx tqm5200 + +spieval_config: unconfig + echo "#define CONFIG_CS_AUTOCONF">>include/config.h + echo "... with automatic CS configuration" + @./mkconfig -a spieval ppc mpc5xxx tqm5200 + MINI5200_config \ EVAL5200_config \ TOP5200_config: unconfig @@ -366,11 +388,6 @@ MiniFAP_config: unconfig } @./mkconfig -a TQM5200 ppc mpc5xxx tqm5200 -spieval_config: unconfig - echo "#define CONFIG_CS_AUTOCONF">>include/config.h - echo "... with automatic CS configuration" - @./mkconfig -a spieval ppc mpc5xxx tqm5200 - ######################################################################### ## MPC8xx Systems ######################################################################### @@ -1845,7 +1862,8 @@ clobber: clean -o -name '*.srec' -o -name '*.bin' -o -name u-boot.img \) \ -print0 \ | xargs -0 rm -f - rm -f $(OBJS) *.bak tags + rm -f $(OBJS) *.bak tags TAGS include/version_autogenerated.h + rm -fr *.*~ rm -f u-boot u-boot.map u-boot.hex $(ALL) rm -f tools/crc32.c tools/environment.c tools/env/crc32.c |