Minor code cleanup. Update CHANGELOG.

[karo-tx-uboot.git] / Makefile

diff --git a/Makefile b/Makefile
index 97271f064e412fd3e38b3c3aba4d037f763ec3bc..5316504be5ee3892963b83c7adb80ae5af018dc5 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -23,7 +23,7 @@
 
 VERSION = 1
 PATCHLEVEL = 1
-SUBLEVEL = 4
+SUBLEVEL = 6
 EXTRAVERSION =
 U_BOOT_VERSION = $(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)
 VERSION_FILE = $(obj)include/version_autogenerated.h
@@ -152,6 +152,9 @@ endif
 ifeq ($(ARCH),blackfin)
 CROSS_COMPILE = bfin-elf-
 endif
+ifeq ($(ARCH),avr32)
+CROSS_COMPILE = avr32-
+endif
 endif
 endif
 
@@ -272,10 +275,10 @@ $(SUBDIRS):
                $(MAKE) -C $@ all
 
 $(NAND_SPL):   version
-               $(MAKE) -C nand_spl all
+               $(MAKE) -C nand_spl/board/$(BOARDDIR) all
 
 $(U_BOOT_NAND):        $(NAND_SPL) $(obj)u-boot.bin
-               cat nand_spl/u-boot-spl-16k.bin $(obj)u-boot.bin > $(obj)u-boot-nand.bin
+               cat $(obj)nand_spl/u-boot-spl-16k.bin $(obj)u-boot.bin > $(obj)u-boot-nand.bin
 
 version:
                @echo -n "#define U_BOOT_VERSION \"U-Boot " > $(VERSION_FILE); \
@@ -325,6 +328,11 @@ dep tags ctags etags $(obj)System.map:
        @ exit 1
 endif
 
+.PHONY : CHANGELOG
+CHANGELOG:
+       git log --no-merges U-Boot-1_1_5.. | \
+       unexpand -a | sed -e 's/\s\s*$$//' > $@
+
 #########################################################################
 
 unconfig:
@@ -403,6 +411,9 @@ icecube_5100_config:                        unconfig
                }
        @$(MKCONFIG) -a IceCube ppc mpc5xxx icecube
 
+v38b_config: unconfig
+       @./mkconfig -a v38b ppc mpc5xxx v38b
+
 inka4x0_config:        unconfig
        @$(MKCONFIG) inka4x0 ppc mpc5xxx inka4x0
 
@@ -1146,19 +1157,22 @@ PPChameleonEVB_HI_33_config:    unconfig
        @$(MKCONFIG) -a $(call xtract_4xx,$@) ppc ppc4xx PPChameleonEVB dave
 
 rainier_config:        unconfig
-       @echo "#define CONFIG_RAINIER" > include/config.h
+       @mkdir -p $(obj)include
+       @echo "#define CONFIG_RAINIER" > $(obj)include/config.h
        @echo "Configuring for rainier board as subset of sequoia..."
        @$(MKCONFIG) -a sequoia ppc ppc4xx sequoia amcc
 
 rainier_nand_config:   unconfig
-       @echo "#define CONFIG_RAINIER" > include/config.h
+       @mkdir -p $(obj)include
+       @mkdir -p $(obj)nand_spl
+       @mkdir -p $(obj)board/amcc/sequoia
+       @echo "#define CONFIG_RAINIER" > $(obj)include/config.h
        @echo "Configuring for rainier board as subset of sequoia..."
-       @ln -s board/amcc/sequoia/Makefile nand_spl/Makefile
-       @echo "#define CONFIG_NAND_U_BOOT" >> include/config.h
+       @echo "#define CONFIG_NAND_U_BOOT" >> $(obj)include/config.h
        @echo "Compile NAND boot image for sequoia"
        @$(MKCONFIG) -a sequoia ppc ppc4xx sequoia amcc
-       @echo "TEXT_BASE = 0x01000000" >board/amcc/sequoia/config.tmp
-       @echo "CONFIG_NAND_U_BOOT = y" >> include/config.mk
+       @echo "TEXT_BASE = 0x01000000" > $(obj)board/amcc/sequoia/config.tmp
+       @echo "CONFIG_NAND_U_BOOT = y" >> $(obj)include/config.mk
 
 sbc405_config: unconfig
        @$(MKCONFIG) $(@:_config=) ppc ppc4xx sbc405
@@ -1167,12 +1181,14 @@ sequoia_config: unconfig
        @$(MKCONFIG) $(@:_config=) ppc ppc4xx sequoia amcc
 
 sequoia_nand_config:   unconfig
-       @ln -s board/amcc/sequoia/Makefile nand_spl/Makefile
-       @echo "#define CONFIG_NAND_U_BOOT" >include/config.h
+       @mkdir -p $(obj)include
+       @mkdir -p $(obj)nand_spl
+       @mkdir -p $(obj)board/amcc/sequoia
+       @echo "#define CONFIG_NAND_U_BOOT" > $(obj)include/config.h
        @echo "Compile NAND boot image for sequoia"
        @$(MKCONFIG) -a sequoia ppc ppc4xx sequoia amcc
-       @echo "TEXT_BASE = 0x01000000" >board/amcc/sequoia/config.tmp
-       @echo "CONFIG_NAND_U_BOOT = y" >> include/config.mk
+       @echo "TEXT_BASE = 0x01000000" > $(obj)board/amcc/sequoia/config.tmp
+       @echo "CONFIG_NAND_U_BOOT = y" >> $(obj)include/config.mk
 
 sycamore_config:       unconfig
        @echo "Configuring for sycamore board as subset of walnut..."
@@ -2226,6 +2242,16 @@ stamp_config     :       unconfig
 dspstamp_config        :       unconfig
        @$(MKCONFIG) $(@:_config=) blackfin bf533 dsp_stamp
 
+#========================================================================
+# AVR32
+#========================================================================
+#########################################################################
+## AT32AP7xxx
+#########################################################################
+
+atstk1002_config       :       unconfig
+       @./mkconfig $(@:_config=) avr32 at32ap atstk1000 atmel at32ap7000
+
 #########################################################################
 #########################################################################
 #########################################################################
@@ -2252,8 +2278,7 @@ clean:
        rm -f $(obj)board/trab/trab_fkt $(obj)board/voiceblue/eeprom
        rm -f $(obj)board/integratorap/u-boot.lds $(obj)board/integratorcp/u-boot.lds
        rm -f $(obj)include/bmp_logo.h
-       find nand_spl -lname "*" -print | xargs rm -f
-       rm -f nand_spl/u-boot-spl nand_spl/u-boot-spl.map
+       rm -f $(obj)nand_spl/u-boot-spl $(obj)nand_spl/u-boot-spl.map
 
 clobber:       clean
        find $(OBJTREE) -type f \( -name .depend \
@@ -2266,6 +2291,7 @@ clobber:  clean
        rm -f $(obj)tools/crc32.c $(obj)tools/environment.c $(obj)tools/env/crc32.c
        rm -f $(obj)tools/inca-swap-bytes $(obj)cpu/mpc824x/bedbug_603e.c
        rm -f $(obj)include/asm/proc $(obj)include/asm/arch $(obj)include/asm
+       [ ! -d $(OBJTREE)/nand_spl ] || find $(obj)nand_spl -lname "*" -print | xargs rm -f
 
 ifeq ($(OBJTREE),$(SRCTREE))
 mrproper \