cfi_flash: fix flash on BE machines with CFG_WRITE_SWAPPED_DATA

[karo-tx-uboot.git] / Makefile

diff --git a/Makefile b/Makefile
index 050972d0adb2d8cf0e2341d55dbe6913f055668d..369bbd744ef0eca73b05139a51a98d59071705bf 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -23,8 +23,8 @@
 
 VERSION = 1
 PATCHLEVEL = 3
-SUBLEVEL = 2
-EXTRAVERSION =
+SUBLEVEL = 4
+EXTRAVERSION = -rc1
 U_BOOT_VERSION = $(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)
 VERSION_FILE = $(obj)include/version_autogenerated.h
 
@@ -123,6 +123,10 @@ unexport CDPATH
 
 #########################################################################
 
+ifeq ($(ARCH),powerpc)
+ARCH = ppc
+endif
+
 ifeq ($(obj)include/config.mk,$(wildcard $(obj)include/config.mk))
 
 # load ARCH, BOARD, and CPU configuration
@@ -197,7 +201,6 @@ OBJS := $(addprefix $(obj),$(OBJS))
 LIBS  = lib_generic/libgeneric.a
 LIBS += $(shell if [ -f board/$(VENDOR)/common/Makefile ]; then echo \
        "board/$(VENDOR)/common/lib$(VENDOR).a"; fi)
-LIBS += board/$(BOARDDIR)/lib$(BOARD).a
 LIBS += cpu/$(CPU)/lib$(CPU).a
 ifdef SOC
 LIBS += cpu/$(CPU)/$(SOC)/lib$(SOC).a
@@ -217,10 +220,12 @@ LIBS += drivers/hwmon/libhwmon.a
 LIBS += drivers/i2c/libi2c.a
 LIBS += drivers/input/libinput.a
 LIBS += drivers/misc/libmisc.a
+LIBS += drivers/mmc/libmmc.a
 LIBS += drivers/mtd/libmtd.a
 LIBS += drivers/mtd/nand/libnand.a
 LIBS += drivers/mtd/nand_legacy/libnand_legacy.a
 LIBS += drivers/mtd/onenand/libonenand.a
+LIBS += drivers/mtd/spi/libspi_flash.a
 LIBS += drivers/net/libnet.a
 LIBS += drivers/net/sk98lin/libsk98lin.a
 LIBS += drivers/pci/libpci.a
@@ -236,22 +241,17 @@ LIBS += drivers/rtc/librtc.a
 LIBS += drivers/serial/libserial.a
 LIBS += drivers/usb/libusb.a
 LIBS += drivers/video/libvideo.a
-LIBS += post/libpost.a post/drivers/libpostdrivers.a
-LIBS += $(shell if [ -d post/lib_$(ARCH) ]; then echo \
-       "post/lib_$(ARCH)/libpost$(ARCH).a"; fi)
-LIBS += $(shell if [ -d post/lib_$(ARCH)/fpu ]; then echo \
-       "post/lib_$(ARCH)/fpu/libpost$(ARCH)fpu.a"; fi)
-LIBS += $(shell if [ -d post/cpu/$(CPU) ]; then echo \
-       "post/cpu/$(CPU)/libpost$(CPU).a"; fi)
-LIBS += $(shell if [ -d post/board/$(BOARDDIR) ]; then echo \
-       "post/board/$(BOARDDIR)/libpost$(BOARD).a"; fi)
 LIBS += common/libcommon.a
 LIBS += libfdt/libfdt.a
 LIBS += api/libapi.a
+LIBS += post/libpost.a
 
 LIBS := $(addprefix $(obj),$(LIBS))
 .PHONY : $(LIBS) $(VERSION_FILE)
 
+LIBBOARD = board/$(BOARDDIR)/lib$(BOARD).a
+LIBBOARD := $(addprefix $(obj),$(LIBBOARD))
+
 # Add GCC lib
 PLATFORM_LIBS += -L $(shell dirname `$(CC) $(CFLAGS) -print-libgcc-file-name`) -lgcc
 
@@ -274,7 +274,7 @@ U_BOOT_ONENAND = $(obj)u-boot-onenand.bin
 endif
 
 __OBJS := $(subst $(obj),,$(OBJS))
-__LIBS := $(subst $(obj),,$(LIBS))
+__LIBS := $(subst $(obj),,$(LIBS)) $(subst $(obj),,$(LIBBOARD))
 
 #########################################################################
 #########################################################################
@@ -317,8 +317,9 @@ $(obj)u-boot.sha1:  $(obj)u-boot.bin
 $(obj)u-boot.dis:      $(obj)u-boot
                $(OBJDUMP) -d $< > $@
 
-$(obj)u-boot:          depend $(SUBDIRS) $(OBJS) $(LIBS) $(LDSCRIPT)
-               UNDEF_SYM=`$(OBJDUMP) -x $(LIBS) |sed  -n -e 's/.*\($(SYM_PREFIX)__u_boot_cmd_.*\)/-u\1/p'|sort|uniq`;\
+$(obj)u-boot:          depend $(SUBDIRS) $(OBJS) $(LIBBOARD) $(LIBS) $(LDSCRIPT)
+               UNDEF_SYM=`$(OBJDUMP) -x $(LIBBOARD) $(LIBS) | \
+               sed  -n -e 's/.*\($(SYM_PREFIX)__u_boot_cmd_.*\)/-u\1/p'|sort|uniq`;\
                cd $(LNDIR) && $(LD) $(LDFLAGS) $$UNDEF_SYM $(__OBJS) \
                        --start-group $(__LIBS) --end-group $(PLATFORM_LIBS) \
                        -Map u-boot.map -o u-boot
@@ -329,6 +330,9 @@ $(OBJS):    depend $(obj)include/autoconf.mk
 $(LIBS):       depend $(obj)include/autoconf.mk
                $(MAKE) -C $(dir $(subst $(obj),,$@))
 
+$(LIBBOARD):   depend $(LIBS) $(obj)include/autoconf.mk
+               $(MAKE) -C $(dir $(subst $(obj),,$@))
+
 $(SUBDIRS):    depend $(obj)include/autoconf.mk
                $(MAKE) -C $@ all
 
@@ -350,11 +354,9 @@ $(U_BOOT_ONENAND): $(ONENAND_IPL) $(obj)u-boot.bin $(obj)include/autoconf.mk
                cat $(obj)onenand_ipl/onenand-ipl-4k.bin $(obj)u-boot.bin > $(obj)u-boot-flexonenand.bin
 
 $(VERSION_FILE):
-               @( echo -n "#define U_BOOT_VERSION \"U-Boot " ; \
-               echo -n "$(U_BOOT_VERSION)" ; \
-               echo -n $(shell $(CONFIG_SHELL) $(TOPDIR)/tools/setlocalversion \
-                        $(TOPDIR)) ; \
-               echo "\"" ) > $@.tmp
+               @( printf '#define U_BOOT_VERSION "U-Boot %s%s"\n' "$(U_BOOT_VERSION)" \
+                '$(shell $(CONFIG_SHELL) $(TOPDIR)/tools/setlocalversion $(TOPDIR))' \
+                ) > $@.tmp
                @cmp -s $@ $@.tmp && rm -f $@.tmp || mv -f $@.tmp $@
 
 gdbtools:
@@ -386,10 +388,12 @@ TAG_SUBDIRS += drivers/hwmon
 TAG_SUBDIRS += drivers/i2c
 TAG_SUBDIRS += drivers/input
 TAG_SUBDIRS += drivers/misc
+TAG_SUBDIRS += drivers/mmc
 TAG_SUBDIRS += drivers/mtd
 TAG_SUBDIRS += drivers/mtd/nand
 TAG_SUBDIRS += drivers/mtd/nand_legacy
 TAG_SUBDIRS += drivers/mtd/onenand
+TAG_SUBDIRS += drivers/mtd/spi
 TAG_SUBDIRS += drivers/net
 TAG_SUBDIRS += drivers/net/sk98lin
 TAG_SUBDIRS += drivers/pci
@@ -424,13 +428,19 @@ $(obj)System.map: $(obj)u-boot
 # 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.
-$(obj)include/autoconf.mk: $(obj)include/config.h $(VERSION_FILE)
-       @$(XECHO) Generating include/autoconf.mk ; \
+$(obj)include/autoconf.mk.dep: $(obj)include/config.h include/common.h
+       @$(XECHO) Generating $@ ; \
        set -e ; \
        : Generate the dependancies ; \
-       $(CC) -M $(HOST_CFLAGS) $(CPPFLAGS) -MQ $@ include/common.h > $@.dep ; \
+       $(CC) -x c -DDO_DEPS_ONLY -M $(HOST_CFLAGS) $(CPPFLAGS) \
+               -MQ $(obj)include/autoconf.mk include/common.h > $@
+
+$(obj)include/autoconf.mk: $(obj)include/config.h
+       @$(XECHO) Generating $@ ; \
+       set -e ; \
        : Extract the config macros ; \
-       $(CPP) $(CFLAGS) -dM include/common.h | sed -n -f tools/scripts/define2mk.sed > $@
+       $(CPP) $(CFLAGS) -DDO_DEPS_ONLY -dM include/common.h | \
+               sed -n -f tools/scripts/define2mk.sed > $@
 
 sinclude $(obj)include/autoconf.mk.dep
 
@@ -478,11 +488,14 @@ PATI_config:              unconfig
 #########################################################################
 
 aev_config: unconfig
-       @$(MKCONFIG) -a aev ppc mpc5xxx tqm5200
+       @$(MKCONFIG) -a aev ppc mpc5xxx tqm5200 tqc
 
 BC3450_config: unconfig
        @$(MKCONFIG) -a BC3450 ppc mpc5xxx bc3450
 
+cm5200_config: unconfig
+       @$(MKCONFIG) -a cm5200 ppc mpc5xxx cm5200
+
 cpci5200_config:  unconfig
        @$(MKCONFIG) -a cpci5200  ppc mpc5xxx cpci5200 esd
 
@@ -530,9 +543,6 @@ icecube_5100_config:                        unconfig
 jupiter_config:        unconfig
        @$(MKCONFIG) jupiter ppc mpc5xxx jupiter
 
-v38b_config: unconfig
-       @$(MKCONFIG) -a v38b ppc mpc5xxx v38b
-
 inka4x0_config:        unconfig
        @$(MKCONFIG) inka4x0 ppc mpc5xxx inka4x0
 
@@ -607,9 +617,20 @@ prs200_highboot_DDR_config:        unconfig
 mecp5200_config:  unconfig
        @$(MKCONFIG) mecp5200  ppc mpc5xxx mecp5200 esd
 
+motionpro_config:      unconfig
+       @$(MKCONFIG) motionpro ppc mpc5xxx motionpro
+
 munices_config:        unconfig
        @$(MKCONFIG) munices ppc mpc5xxx munices
 
+MVBC_P_config: unconfig
+       @mkdir -p $(obj)include
+       @mkdir -p $(obj)board/mvbc_p
+       @ >$(obj)include/config.h
+       @[ -z "$(findstring MVBC_P,$@)" ] || \
+       {       echo "#define CONFIG_MVBC_P"    >>$(obj)include/config.h; }
+       @$(MKCONFIG) -n $@ -a MVBC_P ppc mpc5xxx mvbc_p matrix_vision
+
 o2dnt_config:  unconfig
        @$(MKCONFIG) o2dnt ppc mpc5xxx o2dnt
 
@@ -632,13 +653,10 @@ PM520_ROMBOOT_DDR_config: unconfig
        @$(MKCONFIG) -a PM520 ppc mpc5xxx pm520
 
 smmaco4_config: unconfig
-       @$(MKCONFIG) -a smmaco4 ppc mpc5xxx tqm5200
-
-cm5200_config: unconfig
-       @$(MKCONFIG) -a cm5200 ppc mpc5xxx cm5200
+       @$(MKCONFIG) -a smmaco4 ppc mpc5xxx tqm5200 tqc
 
 spieval_config:        unconfig
-       @$(MKCONFIG) -a spieval ppc mpc5xxx tqm5200
+       @$(MKCONFIG) -a spieval ppc mpc5xxx tqm5200 tqc
 
 TB5200_B_config \
 TB5200_config: unconfig
@@ -647,7 +665,7 @@ TB5200_config:      unconfig
                { echo "#define CONFIG_TQM5200_B"       >>$(obj)include/config.h ; \
                  $(XECHO) "... with MPC5200B processor" ; \
                }
-       @$(MKCONFIG) -n $@ -a TB5200 ppc mpc5xxx tqm5200
+       @$(MKCONFIG) -n $@ -a TB5200 ppc mpc5xxx tqm5200 tqc
 
 MINI5200_config        \
 EVAL5200_config        \
@@ -696,7 +714,7 @@ TQM5200_B_HIGHBOOT_config \
 TQM5200_config \
 TQM5200_STK100_config: unconfig
        @mkdir -p $(obj)include
-       @mkdir -p $(obj)board/tqm5200
+       @mkdir -p $(obj)board/tqc/tqm5200
        @[ -z "$(findstring cam5200,$@)" ] || \
                { echo "#define CONFIG_CAM5200" >>$(obj)include/config.h ; \
                  echo "#define CONFIG_TQM5200S"        >>$(obj)include/config.h ; \
@@ -729,23 +747,24 @@ TQM5200_STK100_config:    unconfig
        @[ -z "$(findstring HIGHBOOT,$@)" ] || \
                { echo "TEXT_BASE = 0xFFF00000" >$(obj)board/tqm5200/config.tmp ; \
                }
-       @$(MKCONFIG) -n $@ -a TQM5200 ppc mpc5xxx tqm5200
+       @$(MKCONFIG) -n $@ -a TQM5200 ppc mpc5xxx tqm5200 tqc
+
 uc101_config:          unconfig
        @$(MKCONFIG) uc101 ppc mpc5xxx uc101
-motionpro_config:      unconfig
-       @$(MKCONFIG) motionpro ppc mpc5xxx motionpro
 
+v38b_config: unconfig
+       @$(MKCONFIG) -a v38b ppc mpc5xxx v38b
 
 #########################################################################
 ## MPC512x Systems
 #########################################################################
+
 ads5121_config \
-ads5121_PCI_config \
-       :                unconfig
+ads5121_rev2_config    \
+       : unconfig
        @mkdir -p $(obj)include
-       @if [ "$(findstring _PCI_,$@)" ] ; then \
-               echo "#define CONFIG_PCI"  >>$(obj)include/config.h ; \
-               $(XECHO) "... with PCI enabled" ; \
+       @if [ "$(findstring rev2,$@)" ] ; then \
+               echo "#define CONFIG_ADS5121_REV2 1" > $(obj)include/config.h; \
        fi
        @$(MKCONFIG) -a ads5121 ppc mpc512x ads5121
 
@@ -822,7 +841,7 @@ hermes_config       :       unconfig
        @$(MKCONFIG) $(@:_config=) ppc mpc8xx hermes
 
 HMI10_config   :       unconfig
-       @$(MKCONFIG) $(@:_config=) ppc mpc8xx tqm8xx
+       @$(MKCONFIG) $(@:_config=) ppc mpc8xx tqm8xx tqc
 
 IAD210_config: unconfig
        @$(MKCONFIG) $(@:_config=) ppc mpc8xx IAD210 siemens
@@ -1051,7 +1070,7 @@ RRvision_LCD_config:      unconfig
        @$(MKCONFIG) -a RRvision ppc mpc8xx RRvision
 
 SM850_config   :       unconfig
-       @$(MKCONFIG) $(@:_config=) ppc mpc8xx tqm8xx
+       @$(MKCONFIG) $(@:_config=) ppc mpc8xx tqm8xx tqc
 
 spc1920_config:                unconfig
        @$(MKCONFIG) $(@:_config=) ppc mpc8xx spc1920
@@ -1101,13 +1120,13 @@ virtlab2_config:        unconfig
                  echo "#define CONFIG_NEC_NL6448BC20"  >>$(obj)include/config.h ; \
                  $(XECHO) "... with LCD display" ; \
                }
-       @$(MKCONFIG) -a $(call xtract_8xx,$@) ppc mpc8xx tqm8xx
+       @$(MKCONFIG) -a $(call xtract_8xx,$@) ppc mpc8xx tqm8xx tqc
 
 TTTech_config: unconfig
        @mkdir -p $(obj)include
        @echo "#define CONFIG_LCD" >$(obj)include/config.h
        @echo "#define CONFIG_SHARP_LQ104V7DS01" >>$(obj)include/config.h
-       @$(MKCONFIG) -a TQM823L ppc mpc8xx tqm8xx
+       @$(MKCONFIG) -a TQM823L ppc mpc8xx tqm8xx tqc
 
 uc100_config   :       unconfig
        @$(MKCONFIG) $(@:_config=) ppc mpc8xx uc100
@@ -1122,7 +1141,7 @@ wtk_config:       unconfig
        @mkdir -p $(obj)include
        @echo "#define CONFIG_LCD" >$(obj)include/config.h
        @echo "#define CONFIG_SHARP_LQ065T9DR51U" >>$(obj)include/config.h
-       @$(MKCONFIG) -a TQM823L ppc mpc8xx tqm8xx
+       @$(MKCONFIG) -a TQM823L ppc mpc8xx tqm8xx tqc
 
 #########################################################################
 ## PPC4xx Systems
@@ -1183,10 +1202,13 @@ glacier_config: unconfig
                tr '[:lower:]' '[:upper:]')" >$(obj)include/config.h
        @$(MKCONFIG) -n $@ -a canyonlands ppc ppc4xx canyonlands amcc
 
-canyonlands_nand_config:       unconfig
+canyonlands_nand_config \
+glacier_nand_config:   unconfig
        @mkdir -p $(obj)include $(obj)board/amcc/canyonlands
        @mkdir -p $(obj)nand_spl/board/amcc/canyonlands
        @echo "#define CONFIG_NAND_U_BOOT" > $(obj)include/config.h
+       @echo "#define CONFIG_$$(echo $(subst ,,$(@:_nand_config=)) | \
+               tr '[:lower:]' '[:upper:]')" >> $(obj)include/config.h
        @$(MKCONFIG) -n $@ -a canyonlands ppc ppc4xx canyonlands amcc
        @echo "TEXT_BASE = 0x01000000" > $(obj)board/amcc/canyonlands/config.tmp
        @echo "CONFIG_NAND_U_BOOT = y" >> $(obj)include/config.mk
@@ -1207,6 +1229,9 @@ CATcenter_33_config:      unconfig
                }
        @$(MKCONFIG) -a $(call xtract_4xx,$@) ppc ppc4xx PPChameleonEVB dave
 
+CMS700_config: unconfig
+       @$(MKCONFIG) $(@:_config=) ppc ppc4xx cms700 esd
+
 CPCI2DP_config:        unconfig
        @$(MKCONFIG) $(@:_config=) ppc ppc4xx cpci2dp esd
 
@@ -1382,9 +1407,15 @@ PPChameleonEVB_HI_33_config:     unconfig
                }
        @$(MKCONFIG) -a $(call xtract_4xx,$@) ppc ppc4xx PPChameleonEVB dave
 
+quad100hd_config:      unconfig
+       @$(MKCONFIG) $(@:_config=) ppc ppc4xx quad100hd
+
 sbc405_config: unconfig
        @$(MKCONFIG) $(@:_config=) ppc ppc4xx sbc405
 
+sc3_config:unconfig
+       @$(MKCONFIG) $(@:_config=) ppc ppc4xx sc3
+
 sequoia_config \
 rainier_config: unconfig
        @mkdir -p $(obj)include
@@ -1403,9 +1434,6 @@ rainier_nand_config: unconfig
        @echo "TEXT_BASE = 0x01000000" > $(obj)board/amcc/sequoia/config.tmp
        @echo "CONFIG_NAND_U_BOOT = y" >> $(obj)include/config.mk
 
-sc3_config:unconfig
-       @$(MKCONFIG) $(@:_config=) ppc ppc4xx sc3
-
 taihu_config:  unconfig
        @$(MKCONFIG) $(@:_config=) ppc ppc4xx taihu amcc
 
@@ -1418,9 +1446,6 @@ VOH405_config:    unconfig
 VOM405_config: unconfig
        @$(MKCONFIG) $(@:_config=) ppc ppc4xx vom405 esd
 
-CMS700_config: unconfig
-       @$(MKCONFIG) $(@:_config=) ppc ppc4xx cms700 esd
-
 W7OLMC_config  \
 W7OLMG_config: unconfig
        @$(MKCONFIG) $(@:_config=) ppc ppc4xx w7o
@@ -1502,6 +1527,18 @@ HIDDEN_DRAGON_config: unconfig
 kvme080_config: unconfig
        @$(MKCONFIG) $(@:_config=) ppc mpc824x kvme080 etin
 
+# HDLAN is broken ATM. Should be fixed as soon as hardware is available and as
+# time permits.
+#linkstation_HDLAN_config \
+# Remove this line when HDLAN is fixed
+linkstation_HGLAN_config: unconfig
+       @mkdir -p $(obj)include
+       @case $@ in \
+               *HGLAN*) echo "#define CONFIG_HGLAN 1" >$(obj)include/config.h; ;; \
+               *HDLAN*) echo "#define CONFIG_HLAN 1" >$(obj)include/config.h; ;; \
+       esac
+       @$(MKCONFIG) -n $@ -a linkstation ppc mpc824x linkstation
+
 MOUSSE_config: unconfig
        @$(MKCONFIG) $(@:_config=) ppc mpc824x mousse
 
@@ -1758,10 +1795,10 @@ TQM8265_AA_config:  unconfig
                echo "#undef CONFIG_BUSMODE_60x"  >>$(obj)include/config.h ; \
                $(XECHO) "... without 60x Bus Mode" ; \
        fi
-       @$(MKCONFIG) -a TQM8260 ppc mpc8260 tqm8260
+       @$(MKCONFIG) -a TQM8260 ppc mpc8260 tqm8260 tqc
 
 TQM8272_config: unconfig
-       @$(MKCONFIG) TQM8272 ppc mpc8260 tqm8272
+       @$(MKCONFIG) TQM8272 ppc mpc8260 tqm8272 tqc
 
 VoVPN-GW_66MHz_config  \
 VoVPN-GW_100MHz_config:                unconfig
@@ -1833,9 +1870,6 @@ M5275EVB_config :         unconfig
 M5282EVB_config :              unconfig
        @$(MKCONFIG) $(@:_config=) m68k mcf52x2 m5282evb
 
-TASREG_config :                unconfig
-       @$(MKCONFIG) $(@:_config=) m68k mcf52x2 tasreg esd
-
 M5329AFEE_config \
 M5329BFEE_config :     unconfig
        @case "$@" in \
@@ -1955,6 +1989,9 @@ M5485HFE_config : unconfig
        fi
        @$(MKCONFIG) -a M5485EVB m68k mcf547x_8x m548xevb freescale
 
+TASREG_config :                unconfig
+       @$(MKCONFIG) $(@:_config=) m68k mcf52x2 tasreg esd
+
 #########################################################################
 ## MPC83xx Systems
 #########################################################################
@@ -2081,11 +2118,14 @@ MPC837XEMDS_HOST_config:        unconfig
 MPC837XERDB_config:    unconfig
        @$(MKCONFIG) -a MPC837XERDB ppc mpc83xx mpc837xerdb freescale
 
+MVBLM7_config: unconfig
+       @$(MKCONFIG) $(@:_config=) ppc mpc83xx mvblm7
+
 sbc8349_config:                unconfig
        @$(MKCONFIG) $(@:_config=) ppc mpc83xx sbc8349
 
 TQM834x_config:        unconfig
-       @$(MKCONFIG) $(@:_config=) ppc mpc83xx tqm834x
+       @$(MKCONFIG) $(@:_config=) ppc mpc83xx tqm834x tqc
 
 
 #########################################################################
@@ -2187,6 +2227,9 @@ sbc8560_66_config:        unconfig
        fi
        @$(MKCONFIG) -a sbc8560 ppc mpc85xx sbc8560
 
+socrates_config:       unconfig
+       @$(MKCONFIG) $(@:_config=) ppc mpc85xx socrates
+
 stxgp3_config:         unconfig
        @$(MKCONFIG) $(@:_config=) ppc mpc85xx stxgp3
 
@@ -2201,6 +2244,7 @@ stxssa_4M_config: unconfig
 
 TQM8540_config         \
 TQM8541_config         \
+TQM8548_config         \
 TQM8555_config         \
 TQM8560_config:                unconfig
        @mkdir -p $(obj)include
@@ -2209,9 +2253,8 @@ TQM8560_config:           unconfig
        echo "#define CONFIG_MPC$${CTYPE}">>$(obj)include/config.h; \
        echo "#define CONFIG_TQM$${CTYPE}">>$(obj)include/config.h; \
        echo "#define CONFIG_HOSTNAME tqm$${CTYPE}">>$(obj)include/config.h; \
-       echo "#define CONFIG_BOARDNAME \"TQM$${CTYPE}\"">>$(obj)include/config.h; \
-       echo "#define CFG_BOOTFILE_PATH \"/tftpboot/tqm$${CTYPE}/uImage\"">>$(obj)include/config.h
-       @$(MKCONFIG) -a TQM85xx ppc mpc85xx tqm85xx
+       echo "#define CONFIG_BOARDNAME \"TQM$${CTYPE}\"">>$(obj)include/config.h;
+       @$(MKCONFIG) -a TQM85xx ppc mpc85xx tqm85xx tqc
 
 #########################################################################
 ## MPC86xx Systems
@@ -2272,12 +2315,12 @@ PCIPPC2_config \
 PCIPPC6_config: unconfig
        @$(MKCONFIG) $(@:_config=) ppc 74xx_7xx pcippc2
 
-ZUMA_config:   unconfig
-       @$(MKCONFIG) $(@:_config=) ppc 74xx_7xx evb64260
-
 ppmc7xx_config: unconfig
        @$(MKCONFIG) $(@:_config=) ppc 74xx_7xx ppmc7xx
 
+ZUMA_config:   unconfig
+       @$(MKCONFIG) $(@:_config=) ppc 74xx_7xx evb64260
+
 #========================================================================
 # ARM
 #========================================================================
@@ -2304,20 +2347,21 @@ shannon_config  :       unconfig
 ## ARM92xT Systems
 #########################################################################
 
-xtract_trab = $(subst _bigram,,$(subst _bigflash,,$(subst _old,,$(subst _config,,$1))))
-
-xtract_omap1610xxx = $(subst _cs0boot,,$(subst _cs3boot,,$(subst _cs_autoboot,,$(subst _config,,$1))))
-
-xtract_omap730p2 = $(subst _cs0boot,,$(subst _cs3boot,, $(subst _config,,$1)))
-
-at91cap9adk_config     :       unconfig
-       @$(MKCONFIG) $(@:_config=) arm arm926ejs at91cap9adk atmel at91sam9
+#########################################################################
+## Atmel AT91RM9200 Systems
+#########################################################################
 
 at91rm9200dk_config    :       unconfig
        @$(MKCONFIG) $(@:_config=) arm arm920t at91rm9200dk atmel at91rm9200
 
-at91sam9260ek_config   :       unconfig
-       @$(MKCONFIG) $(@:_config=) arm arm926ejs at91sam9260ek atmel at91sam9
+at91sam9261ek_config   :       unconfig
+       @$(MKCONFIG) $(@:_config=) arm arm926ejs at91sam9261ek atmel at91sam9
+
+at91sam9263ek_config   :       unconfig
+       @$(MKCONFIG) $(@:_config=) arm arm926ejs at91sam9263ek atmel at91sam9
+
+at91sam9rlek_config    :       unconfig
+       @$(MKCONFIG) $(@:_config=) arm arm926ejs at91sam9rlek atmel at91sam9
 
 cmc_pu2_config :       unconfig
        @$(MKCONFIG) $(@:_config=) arm arm920t cmc_pu2 NULL at91rm9200
@@ -2325,12 +2369,25 @@ cmc_pu2_config  :       unconfig
 csb637_config  :       unconfig
        @$(MKCONFIG) $(@:_config=) arm arm920t csb637 NULL at91rm9200
 
-mp2usb_config  :       unconfig
-       @$(MKCONFIG) $(@:_config=) arm arm920t mp2usb NULL at91rm9200
+kb9202_config  :       unconfig
+       @$(MKCONFIG) $(@:_config=) arm arm920t kb9202 NULL at91rm9200
 
 m501sk_config  :       unconfig
        @$(MKCONFIG) $(@:_config=) arm arm920t m501sk NULL at91rm9200
 
+mp2usb_config  :       unconfig
+       @$(MKCONFIG) $(@:_config=) arm arm920t mp2usb NULL at91rm9200
+
+#########################################################################
+## Atmel ARM926EJ-S Systems
+#########################################################################
+
+at91cap9adk_config     :       unconfig
+       @$(MKCONFIG) $(@:_config=) arm arm926ejs at91cap9adk atmel at91sam9
+
+at91sam9260ek_config   :       unconfig
+       @$(MKCONFIG) $(@:_config=) arm arm926ejs at91sam9260ek atmel at91sam9
+
 ########################################################################
 ## ARM Integrator boards - see doc/README-integrator for more info.
 integratorap_config    \
@@ -2357,8 +2414,17 @@ cp922_XA10_config        \
 cp1026_config: unconfig
        @board/integratorcp/split_by_variant.sh $@
 
-kb9202_config  :       unconfig
-       @$(MKCONFIG) $(@:_config=) arm arm920t kb9202 NULL at91rm9200
+davinci_dvevm_config : unconfig
+       @$(MKCONFIG) $(@:_config=) arm arm926ejs dv-evm davinci davinci
+
+davinci_schmoogie_config :     unconfig
+       @$(MKCONFIG) $(@:_config=) arm arm926ejs schmoogie davinci davinci
+
+davinci_sffsdr_config :        unconfig
+       @$(MKCONFIG) $(@:_config=) arm arm926ejs sffsdr davinci davinci
+
+davinci_sonata_config :        unconfig
+       @$(MKCONFIG) $(@:_config=) arm arm926ejs sonata davinci davinci
 
 lpd7a400_config \
 lpd7a404_config:       unconfig
@@ -2376,20 +2442,7 @@ netstar_config:          unconfig
 omap1510inn_config :   unconfig
        @$(MKCONFIG) $(@:_config=) arm arm925t omap1510inn
 
-omap5912osk_config :   unconfig
-       @$(MKCONFIG) $(@:_config=) arm arm926ejs omap5912osk NULL omap
-
-davinci_dvevm_config : unconfig
-       @$(MKCONFIG) $(@:_config=) arm arm926ejs dv-evm davinci davinci
-
-davinci_schmoogie_config :     unconfig
-       @$(MKCONFIG) $(@:_config=) arm arm926ejs schmoogie davinci davinci
-
-davinci_sonata_config :        unconfig
-       @$(MKCONFIG) $(@:_config=) arm arm926ejs sonata davinci davinci
-
-pmdra_config   :       unconfig
-       @$(MKCONFIG) $(@:_config=) arm arm926ejs pmdra prodrive davinci
+xtract_omap1610xxx = $(subst _cs0boot,,$(subst _cs3boot,,$(subst _cs_autoboot,,$(subst _config,,$1))))
 
 omap1610inn_config \
 omap1610inn_cs0boot_config \
@@ -2412,6 +2465,11 @@ omap1610h2_cs_autoboot_config:   unconfig
        fi;
        @$(MKCONFIG) -a $(call xtract_omap1610xxx,$@) arm arm926ejs omap1610inn NULL omap
 
+omap5912osk_config :   unconfig
+       @$(MKCONFIG) $(@:_config=) arm arm926ejs omap5912osk NULL omap
+
+xtract_omap730p2 = $(subst _cs0boot,,$(subst _cs3boot,, $(subst _config,,$1)))
+
 omap730p2_config \
 omap730p2_cs0boot_config \
 omap730p2_cs3boot_config :     unconfig
@@ -2441,6 +2499,8 @@ SX1_config :              unconfig
        @$(MKCONFIG) $(@:_config=) arm arm925t sx1
 
 # TRAB default configuration:  8 MB Flash, 32 MB RAM
+xtract_trab = $(subst _bigram,,$(subst _bigflash,,$(subst _old,,$(subst _config,,$1))))
+
 trab_config \
 trab_bigram_config \
 trab_bigflash_config \
@@ -2469,9 +2529,16 @@ trab_old_config: unconfig
 VCMA9_config   :       unconfig
        @$(MKCONFIG) $(@:_config=) arm arm920t vcma9 mpl s3c24x0
 
-#========================================================================
+#########################################################################
 # ARM supplied Versatile development boards
-#========================================================================
+#########################################################################
+
+cm4008_config  :       unconfig
+       @$(MKCONFIG) $(@:_config=) arm arm920t cm4008 NULL ks8695
+
+cm41xx_config  :       unconfig
+       @$(MKCONFIG) $(@:_config=) arm arm920t cm41xx NULL ks8695
+
 versatile_config       \
 versatileab_config     \
 versatilepb_config :   unconfig
@@ -2480,12 +2547,6 @@ versatilepb_config :     unconfig
 voiceblue_config:      unconfig
        @$(MKCONFIG) $(@:_config=) arm arm925t voiceblue
 
-cm4008_config  :       unconfig
-       @$(MKCONFIG) $(@:_config=) arm arm920t cm4008 NULL ks8695
-
-cm41xx_config  :       unconfig
-       @$(MKCONFIG) $(@:_config=) arm arm920t cm41xx NULL ks8695
-
 #########################################################################
 ## S3C44B0 Systems
 #########################################################################
@@ -2600,8 +2661,6 @@ zylonite_config :
 #########################################################################
 ## ARM1136 Systems
 #########################################################################
-omap2420h4_config      : unconfig
-       @$(MKCONFIG) $(@:_config=) arm arm1136 omap2420h4 NULL omap24xx
 
 apollon_config         : unconfig
        @mkdir -p $(obj)include
@@ -2618,6 +2677,9 @@ imx31_phycore_config      : unconfig
 mx31ads_config         : unconfig
        @$(MKCONFIG) $(@:_config=) arm arm1136 mx31ads NULL mx31
 
+omap2420h4_config      : unconfig
+       @$(MKCONFIG) $(@:_config=) arm arm1136 omap2420h4 NULL omap24xx
+
 #========================================================================
 # i386
 #========================================================================
@@ -2667,6 +2729,7 @@ tb0229_config: unconfig
 #########################################################################
 ## MIPS32 AU1X00
 #########################################################################
+
 dbau1000_config                :       unconfig
        @mkdir -p $(obj)include
        @echo "#define CONFIG_DBAU1000 1" >$(obj)include/config.h
@@ -2692,17 +2755,17 @@ dbau1550_el_config      :       unconfig
        @echo "#define CONFIG_DBAU1550 1" >$(obj)include/config.h
        @$(MKCONFIG) -a dbau1x00 mips mips dbau1x00
 
+gth2_config            :       unconfig
+       @mkdir -p $(obj)include
+       @echo "#define CONFIG_GTH2 1" >$(obj)include/config.h
+       @$(MKCONFIG) -a gth2 mips mips gth2
+
 pb1000_config          :       unconfig
        @mkdir -p $(obj)include
        @echo "#define CONFIG_PB1000 1" >$(obj)include/config.h
        @$(MKCONFIG) -a pb1x00 mips mips pb1x00
 
-gth2_config:   unconfig
-       @mkdir -p $(obj)include
-       @echo "#define CONFIG_GTH2 1" >$(obj)include/config.h
-       @$(MKCONFIG) -a gth2 mips mips gth2
-
-qemu_mips_config: unconfig
+qemu_mips_config       : unconfig
        @mkdir -p $(obj)include
        @echo "#define CONFIG_QEMU_MIPS 1" >$(obj)include/config.h
        @$(MKCONFIG) -a qemu-mips mips mips qemu-mips
@@ -2721,6 +2784,24 @@ purple_config :          unconfig
 ## Nios32
 #########################################################################
 
+ADNPESC1_DNPEVA2_base_32_config        \
+ADNPESC1_base_32_config                \
+ADNPESC1_config: unconfig
+       @mkdir -p $(obj)include
+       @[ -z "$(findstring _DNPEVA2,$@)" ] || \
+               { echo "#define CONFIG_DNPEVA2 1" >>$(obj)include/config.h ; \
+                 $(XECHO) "... DNP/EVA2 configuration" ; \
+               }
+       @[ -z "$(findstring _base_32,$@)" ] || \
+               { echo "#define CONFIG_NIOS_BASE_32 1" >>$(obj)include/config.h ; \
+                 $(XECHO) "... NIOS 'base_32' configuration" ; \
+               }
+       @[ -z "$(findstring ADNPESC1_config,$@)" ] || \
+               { echo "#define CONFIG_NIOS_BASE_32 1" >>$(obj)include/config.h ; \
+                 $(XECHO) "... NIOS 'base_32' configuration (DEFAULT)" ; \
+               }
+       @$(MKCONFIG) -a ADNPESC1 nios nios adnpesc1 ssv
+
 DK1C20_safe_32_config          \
 DK1C20_standard_32_config      \
 DK1C20_config: unconfig
@@ -2762,24 +2843,6 @@ DK1S10_config:   unconfig
                }
        @$(MKCONFIG) -a DK1S10 nios nios dk1s10 altera
 
-ADNPESC1_DNPEVA2_base_32_config        \
-ADNPESC1_base_32_config                \
-ADNPESC1_config: unconfig
-       @mkdir -p $(obj)include
-       @[ -z "$(findstring _DNPEVA2,$@)" ] || \
-               { echo "#define CONFIG_DNPEVA2 1" >>$(obj)include/config.h ; \
-                 $(XECHO) "... DNP/EVA2 configuration" ; \
-               }
-       @[ -z "$(findstring _base_32,$@)" ] || \
-               { echo "#define CONFIG_NIOS_BASE_32 1" >>$(obj)include/config.h ; \
-                 $(XECHO) "... NIOS 'base_32' configuration" ; \
-               }
-       @[ -z "$(findstring ADNPESC1_config,$@)" ] || \
-               { echo "#define CONFIG_NIOS_BASE_32 1" >>$(obj)include/config.h ; \
-                 $(XECHO) "... NIOS 'base_32' configuration (DEFAULT)" ; \
-               }
-       @$(MKCONFIG) -a ADNPESC1 nios nios adnpesc1 ssv
-
 #########################################################################
 ## Nios-II
 #########################################################################
@@ -2800,21 +2863,19 @@ PCI5441_config : unconfig
        @$(MKCONFIG)  PCI5441 nios2 nios2 pci5441 psyent
 
 #========================================================================
-# MicroBlaze
-#========================================================================
-#########################################################################
 ## Microblaze
-#########################################################################
-suzaku_config: unconfig
-       @mkdir -p $(obj)include
-       @echo "#define CONFIG_SUZAKU 1" > $(obj)include/config.h
-       @$(MKCONFIG) -a $(@:_config=) microblaze microblaze suzaku AtmarkTechno
+#========================================================================
 
 ml401_config:  unconfig
        @mkdir -p $(obj)include
        @echo "#define CONFIG_ML401 1" > $(obj)include/config.h
        @$(MKCONFIG) -a $(@:_config=) microblaze microblaze ml401 xilinx
 
+suzaku_config: unconfig
+       @mkdir -p $(obj)include
+       @echo "#define CONFIG_SUZAKU 1" > $(obj)include/config.h
+       @$(MKCONFIG) -a $(@:_config=) microblaze microblaze suzaku AtmarkTechno
+
 xupv2p_config: unconfig
        @mkdir -p $(obj)include
        @echo "#define CONFIG_XUPV2P 1" > $(obj)include/config.h
@@ -2837,9 +2898,9 @@ $(BFIN_BOARDS):
 #========================================================================
 # AVR32
 #========================================================================
-#########################################################################
-## AT32AP7xxx
-#########################################################################
+
+atngw100_config        :       unconfig
+       @$(MKCONFIG) $(@:_config=) avr32 at32ap atngw100 atmel at32ap700x
 
 atstk1002_config       :       unconfig
        @$(MKCONFIG) $(@:_config=) avr32 at32ap atstk1000 atmel at32ap700x
@@ -2850,54 +2911,65 @@ atstk1003_config        :       unconfig
 atstk1004_config       :       unconfig
        @$(MKCONFIG) $(@:_config=) avr32 at32ap atstk1000 atmel at32ap700x
 
-atngw100_config        :       unconfig
-       @$(MKCONFIG) $(@:_config=) avr32 at32ap atngw100 atmel at32ap700x
+atstk1006_config       :       unconfig
+       @$(MKCONFIG) $(@:_config=) avr32 at32ap atstk1000 atmel at32ap700x
 
-#########################################################################
-#########################################################################
-#########################################################################
+#========================================================================
+# SH3 (SuperH)
+#========================================================================
 
 #########################################################################
 ## sh3 (Renesas SuperH)
 #########################################################################
+
 mpr2_config: unconfig
-       @ >include/config.h
-       @echo "#define CONFIG_MPR2 1" >> include/config.h
+       @mkdir -p $(obj)include
+       @echo "#define CONFIG_MPR2 1" > $(obj)include/config.h
        @$(MKCONFIG) -a $(@:_config=) sh sh3 mpr2
 
 ms7720se_config: unconfig
-       @echo "#define CONFIG_MS7720SE 1" > include/config.h
+       @mkdir -p $(obj)include
+       @echo "#define CONFIG_MS7720SE 1" > $(obj)include/config.h
        @$(MKCONFIG) -a $(@:_config=) sh sh3 ms7720se
 
 #########################################################################
 ## sh4 (Renesas SuperH)
 #########################################################################
+
+MigoR_config :       unconfig
+       @mkdir -p $(obj)include
+       @echo "#define CONFIG_MIGO_R 1" > $(obj)include/config.h
+       @./mkconfig -a $(@:_config=) sh sh4 MigoR
+
 ms7750se_config: unconfig
+       @mkdir -p $(obj)include
        @echo "#define CONFIG_MS7750SE 1" > $(obj)include/config.h
        @$(MKCONFIG) -a $(@:_config=) sh sh4 ms7750se
 
 ms7722se_config :      unconfig
+       @mkdir -p $(obj)include
        @echo "#define CONFIG_MS7722SE 1" > $(obj)include/config.h
        @$(MKCONFIG) -a $(@:_config=) sh sh4 ms7722se
 
-MigoR_config :       unconfig
-       @ >include/config.h
-       @echo "#define CONFIG_MIGO_R 1" >> include/config.h
-       @./mkconfig -a $(@:_config=) sh sh4 MigoR
+r2dplus_config  :   unconfig
+       @mkdir -p $(obj)include
+       @echo "#define CONFIG_R2DPLUS 1" > $(obj)include/config.h
+       @./mkconfig -a $(@:_config=) sh sh4 r2dplus
 
 r7780mp_config: unconfig
-       @ >include/config.h
-       @echo "#define CONFIG_R7780MP 1" >> include/config.h
+       @mkdir -p $(obj)include
+       @echo "#define CONFIG_R7780MP 1" > $(obj)include/config.h
        @./mkconfig -a $(@:_config=) sh sh4 r7780mp
 
-r2dplus_config  :   unconfig
-       @ >include/config.h
-       @echo "#define CONFIG_R2DPLUS 1" >> include/config.h
-       @./mkconfig -a $(@:_config=) sh sh4 r2dplus
+sh7763rdp_config  :   unconfig
+       @mkdir -p $(obj)include
+       @echo "#define CONFIG_SH7763RDP 1" > $(obj)include/config.h
+       @./mkconfig -a $(@:_config=) sh sh4 sh7763rdp
 
 #========================================================================
 # SPARC
 #========================================================================
+
 #########################################################################
 ## LEON3
 #########################################################################
@@ -2906,6 +2978,10 @@ r2dplus_config  :   unconfig
 gr_xc3s_1500_config : unconfig
        @$(MKCONFIG) $(@:_config=) sparc leon3 gr_xc3s_1500 gaisler
 
+# Gaisler GR-CPCI-AX2000 board, a General purpose FPGA-AX system
+gr_cpci_ax2000_config : unconfig
+       @$(MKCONFIG) $(@:_config=) sparc leon3 gr_cpci_ax2000 gaisler
+
 # Gaisler GRLIB template design (GPL SPARC/LEON3) for Altera NIOS
 # Development board Stratix II edition, FPGA Device EP2S60.
 gr_ep2s60_config: unconfig
@@ -2919,6 +2995,10 @@ grsim_config : unconfig
 ## LEON2
 #########################################################################
 
+# Gaisler LEON2 GRSIM simulator
+grsim_leon2_config : unconfig
+       @$(MKCONFIG) $(@:_config=) sparc leon2 grsim_leon2 gaisler
+
 #########################################################################
 #########################################################################
 #########################################################################
@@ -2942,7 +3022,8 @@ clean:
               $(obj)board/{integratorap,integratorcp}/u-boot.lds         \
               $(obj)board/{bf533-ezkit,bf533-stamp,bf537-stamp,bf561-ezkit}/u-boot.lds \
               $(obj)cpu/blackfin/bootrom-asm-offsets.[chs]
-       @rm -f $(obj)include/bmp_logo.h $(obj)nand_spl/{u-boot-spl,u-boot-spl.map}
+       @rm -f $(obj)include/bmp_logo.h
+       @rm -f $(obj)nand_spl/{u-boot-spl,u-boot-spl.map,System.map}
        @rm -f $(obj)onenand_ipl/onenand-{ipl,ipl.bin,ipl-2k.bin,ipl-4k.bin,ipl.map}
        @rm -f $(obj)api_examples/demo $(VERSION_FILE)
        @find $(OBJTREE) -type f \
@@ -2959,7 +3040,7 @@ clobber:  clean
                $(obj)cscope.* $(obj)*.*~
        @rm -f $(obj)u-boot $(obj)u-boot.map $(obj)u-boot.hex $(ALL)
        @rm -f $(obj)tools/{crc32.c,environment.c,env/crc32.c,md5.c,sha1.c,inca-swap-bytes}
-       @rm -f $(obj)tools/{image.c,fdt.c,fdt_ro.c,fdt_rw.c,fdt_strerror.c}
+       @rm -f $(obj)tools/{image.c,fdt.c,fdt_ro.c,fdt_rw.c,fdt_strerror.c,zlib.h}
        @rm -f $(obj)tools/{fdt_wip.c,libfdt_internal.h}
        @rm -f $(obj)cpu/mpc824x/bedbug_603e.c
        @rm -f $(obj)include/asm/proc $(obj)include/asm/arch $(obj)include/asm