]> git.kernelconcepts.de Git - karo-tx-uboot.git/blobdiff - Makefile
ppc4xx: HCU4/5. Fix make O=../xx
[karo-tx-uboot.git] / Makefile
index f1f3e4bdd316828da68f083fc1a20467a0e71bee..b3a1d2ff886aca1211c33880526ee6478be75083 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 #
-# (C) Copyright 2000-2007
+# (C) Copyright 2000-2008
 # Wolfgang Denk, DENX Software Engineering, wd@denx.de.
 #
 # See file CREDITS for list of people who contributed to this
@@ -23,7 +23,7 @@
 
 VERSION = 1
 PATCHLEVEL = 3
-SUBLEVEL = 0
+SUBLEVEL = 1
 EXTRAVERSION =
 U_BOOT_VERSION = $(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)
 VERSION_FILE = $(obj)include/version_autogenerated.h
@@ -45,6 +45,14 @@ export       HOSTARCH HOSTOS
 # Deal with colliding definitions from tcsh etc.
 VENDOR=
 
+#########################################################################
+# Allow for silent builds
+ifeq (,$(findstring s,$(MAKEFLAGS)))
+XECHO = echo
+else
+XECHO = :
+endif
+
 #########################################################################
 #
 # U-boot build supports producing a object files to the separate external
@@ -112,10 +120,10 @@ export obj src
 
 #########################################################################
 
-ifeq ($(OBJTREE)/include/config.mk,$(wildcard $(OBJTREE)/include/config.mk))
+ifeq ($(obj)include/config.mk,$(wildcard $(obj)include/config.mk))
 
 # load ARCH, BOARD, and CPU configuration
-include $(OBJTREE)/include/config.mk
+include $(obj)include/config.mk
 export ARCH CPU BOARD VENDOR SOC
 
 ifndef CROSS_COMPILE
@@ -152,8 +160,11 @@ endif
 ifeq ($(ARCH),avr32)
 CROSS_COMPILE = avr32-linux-
 endif
-endif
-endif
+ifeq ($(ARCH),sh)
+CROSS_COMPILE = sh4-linux-
+endif  # sh
+endif  # HOSTARCH,ARCH
+endif  # CROSS_COMPILE
 
 export CROSS_COMPILE
 
@@ -207,6 +218,7 @@ LIBS += net/libnet.a
 LIBS += disk/libdisk.a
 LIBS += drivers/bios_emulator/libatibiosemu.a
 LIBS += drivers/block/libblock.a
+LIBS += drivers/dma/libdma.a
 LIBS += drivers/hwmon/libhwmon.a
 LIBS += drivers/i2c/libi2c.a
 LIBS += drivers/input/libinput.a
@@ -219,6 +231,7 @@ LIBS += drivers/net/libnet.a
 LIBS += drivers/net/sk98lin/libsk98lin.a
 LIBS += drivers/pci/libpci.a
 LIBS += drivers/pcmcia/libpcmcia.a
+LIBS += drivers/spi/libspi.a
 ifeq ($(CPU),mpc83xx)
 LIBS += drivers/qe/qe.a
 endif
@@ -240,6 +253,9 @@ LIBS += $(shell if [ -d post/board/$(BOARDDIR) ]; then echo \
        "post/board/$(BOARDDIR)/libpost$(BOARD).a"; fi)
 LIBS += common/libcommon.a
 LIBS += libfdt/libfdt.a
+ifeq ($(CONFIG_API),y)
+LIBS += api/libapi.a
+endif
 
 LIBS := $(addprefix $(obj),$(LIBS))
 .PHONY : $(LIBS)
@@ -252,6 +268,10 @@ PLATFORM_LIBS += -L $(shell dirname `$(CC) $(CFLAGS) -print-libgcc-file-name`) -
 SUBDIRS        = tools \
          examples
 
+ifeq ($(CONFIG_API),y)
+SUBDIRS += api_examples
+endif
+
 .PHONY : $(SUBDIRS)
 
 ifeq ($(CONFIG_NAND_U_BOOT),y)
@@ -291,33 +311,33 @@ $(obj)u-boot.sha1:        $(obj)u-boot.bin
 $(obj)u-boot.dis:      $(obj)u-boot
                $(OBJDUMP) -d $< > $@
 
-$(obj)u-boot:          depend version $(SUBDIRS) $(OBJS) $(LIBS) $(LDSCRIPT)
+$(obj)u-boot:          depend $(SUBDIRS) $(OBJS) $(LIBS) $(LDSCRIPT)
                UNDEF_SYM=`$(OBJDUMP) -x $(LIBS) |sed  -n -e 's/.*\(__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
 
-$(OBJS):
+$(OBJS):       $(obj)include/autoconf.mk
                $(MAKE) -C cpu/$(CPU) $(if $(REMOTE_BUILD),$@,$(notdir $@))
 
-$(LIBS):
+$(LIBS):       $(obj)include/autoconf.mk
                $(MAKE) -C $(dir $(subst $(obj),,$@))
 
-$(SUBDIRS):
+$(SUBDIRS):    $(obj)include/autoconf.mk
                $(MAKE) -C $@ all
 
-$(NAND_SPL):   version
+$(NAND_SPL):   $(VERSION_FILE) $(obj)include/autoconf.mk
                $(MAKE) -C nand_spl/board/$(BOARDDIR) all
 
-$(U_BOOT_NAND):        $(NAND_SPL) $(obj)u-boot.bin
+$(U_BOOT_NAND):        $(NAND_SPL) $(obj)u-boot.bin $(obj)include/autoconf.mk
                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); \
-               echo -n "$(U_BOOT_VERSION)" >> $(VERSION_FILE); \
+$(VERSION_FILE):
+               @( echo -n "#define U_BOOT_VERSION \"U-Boot " ; \
+               echo -n "$(U_BOOT_VERSION)" ; \
                echo -n $(shell $(CONFIG_SHELL) $(TOPDIR)/tools/setlocalversion \
-                        $(TOPDIR)) >> $(VERSION_FILE); \
-               echo "\"" >> $(VERSION_FILE)
+                        $(TOPDIR)) ; \
+               echo "\"" > $(VERSION_FILE)
 
 gdbtools:
                $(MAKE) -C tools/gdb all || exit 1
@@ -326,36 +346,50 @@ updater:
                $(MAKE) -C tools/updater all || exit 1
 
 env:
-               $(MAKE) -C tools/env all || exit 1
+               $(MAKE) -C tools/env all MTD_VERSION=${MTD_VERSION} || exit 1
 
-depend dep:    version
+depend dep:    $(VERSION_FILE)
                for dir in $(SUBDIRS) ; do $(MAKE) -C $$dir _depend ; done
 
+TAG_SUBDIRS += include
+TAG_SUBDIRS += lib_generic board/$(BOARDDIR)
+TAG_SUBDIRS += cpu/$(CPU)
+TAG_SUBDIRS += lib_$(ARCH)
+TAG_SUBDIRS += fs/cramfs
+TAG_SUBDIRS += fs/fat
+TAG_SUBDIRS += fs/fdos
+TAG_SUBDIRS += fs/jffs2
+TAG_SUBDIRS += net
+TAG_SUBDIRS += disk
+TAG_SUBDIRS += common
+TAG_SUBDIRS += drivers/bios_emulator
+TAG_SUBDIRS += drivers/block
+TAG_SUBDIRS += drivers/hwmon
+TAG_SUBDIRS += drivers/i2c
+TAG_SUBDIRS += drivers/input
+TAG_SUBDIRS += drivers/misc
+TAG_SUBDIRS += drivers/mtd
+TAG_SUBDIRS += drivers/mtd/nand
+TAG_SUBDIRS += drivers/mtd/nand_legacy
+TAG_SUBDIRS += drivers/mtd/onenand
+TAG_SUBDIRS += drivers/net
+TAG_SUBDIRS += drivers/net/sk98lin
+TAG_SUBDIRS += drivers/pci
+TAG_SUBDIRS += drivers/pcmcia
+TAG_SUBDIRS += drivers/qe
+TAG_SUBDIRS += drivers/rtc
+TAG_SUBDIRS += drivers/serial
+TAG_SUBDIRS += drivers/spi
+TAG_SUBDIRS += drivers/usb
+TAG_SUBDIRS += drivers/video
+
 tags ctags:
-               ctags -w -o $(OBJTREE)/ctags `find $(SUBDIRS) include \
-                               lib_generic board/$(BOARDDIR) cpu/$(CPU) lib_$(ARCH) \
-                               fs/cramfs fs/fat fs/fdos fs/jffs2 \
-                               net disk common drivers/bios_emulator \
-                               drivers/block drivers/hwmon drivers/i2c \
-                               drivers/input drivers/misc drivers/mtd \
-                               drivers/mtd/nand drivers/mtd/nand_legacy \
-                               drivers/mtd/onenand drivers/net drivers/net/sk98lin \
-                               drivers/pci drivers/pcmcia drivers/qe drivers/rtc \
-                               drivers/serial drivers/usb drivers/video \
-                       \( -name CVS -prune \) -o \( -name '*.[ch]' -print \)`
+               ctags -w -o $(obj)ctags `find $(SUBDIRS) $(TAG_SUBDIRS) \
+                                               -name '*.[ch]' -print`
 
 etags:
-               etags -a -o $(OBJTREE)/etags `find $(SUBDIRS) include \
-                               lib_generic board/$(BOARDDIR) cpu/$(CPU) lib_$(ARCH) \
-                               fs/cramfs fs/fat fs/fdos fs/jffs2 \
-                               net disk common drivers/bios_emulator \
-                               drivers/block drivers/hwmon drivers/i2c \
-                               drivers/input drivers/misc drivers/mtd \
-                               drivers/mtd/nand drivers/mtd/nand_legacy \
-                               drivers/mtd/onenand drivers/net drivers/net/sk98lin \
-                               drivers/pci drivers/pcmcia drivers/qe drivers/rtc \
-                               drivers/serial drivers/usb drivers/video \
-                       \( -name CVS -prune \) -o \( -name '*.[ch]' -print \)`
+               etags -a -o $(obj)etags `find $(SUBDIRS) $(TAG_SUBDIRS) \
+                                               -name '*.[ch]' -print`
 
 $(obj)System.map:      $(obj)u-boot
                @$(NM) $< | \
@@ -368,24 +402,24 @@ $(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.
-$(OBJTREE)/include/autoconf.mk: $(obj)include/config.h
-       @echo Generating include/autoconf.mk
-       @# Generate the dependancies
-       @$(CC) -M $(HOST_CFLAGS) $(CPPFLAGS) -MQ $@ include/common.h > $@.dep
-       @# Extract the config macros
-       @$(CPP) $(CFLAGS) -dM include/common.h | sed -n -f tools/scripts/define2mk.sed >> $@
+$(obj)include/autoconf.mk: $(obj)include/config.h $(VERSION_FILE)
+       @$(XECHO) Generating include/autoconf.mk ; \
+       : Generate the dependancies ; \
+       $(CC) -M $(HOST_CFLAGS) $(CPPFLAGS) -MQ $@ include/common.h > $@.dep ; \
+       : Extract the config macros ; \
+       $(CPP) $(CFLAGS) -dM include/common.h | sed -n -f tools/scripts/define2mk.sed > $@
 
-sinclude $(OBJTREE)/include/autoconf.mk.dep
+sinclude $(obj)include/autoconf.mk.dep
 
 #########################################################################
-else
+else   # !config.mk
 all $(obj)u-boot.hex $(obj)u-boot.srec $(obj)u-boot.bin \
 $(obj)u-boot.img $(obj)u-boot.dis $(obj)u-boot \
-$(SUBDIRS) version gdbtools updater env depend \
+$(SUBDIRS) $(VERSION_FILE) gdbtools updater env depend \
 dep tags ctags etags $(obj)System.map:
        @echo "System not configured - see README" >&2
        @ exit 1
-endif
+endif  # config.mk
 
 .PHONY : CHANGELOG
 CHANGELOG:
@@ -450,24 +484,24 @@ icecube_5100_config:                      unconfig
                        then echo "TEXT_BASE = 0xFF800000" >$(obj)board/icecube/config.tmp ; \
                        else echo "TEXT_BASE = 0xFF000000" >$(obj)board/icecube/config.tmp ; \
                  fi ; \
-                 echo "... with LOWBOOT configuration" ; \
+                 $(XECHO) "... with LOWBOOT configuration" ; \
                }
        @[ -z "$(findstring LOWBOOT08,$@)" ] || \
                { echo "TEXT_BASE = 0xFF800000" >$(obj)board/icecube/config.tmp ; \
                  echo "... with 8 MB flash only" ; \
-                 echo "... with LOWBOOT configuration" ; \
+                 $(XECHO) "... with LOWBOOT configuration" ; \
                }
        @[ -z "$(findstring DDR,$@)" ] || \
                { echo "#define CONFIG_MPC5200_DDR"     >>$(obj)include/config.h ; \
-                 echo "... DDR memory revision" ; \
+                 $(XECHO) "... DDR memory revision" ; \
                }
        @[ -z "$(findstring 5200,$@)" ] || \
                { echo "#define CONFIG_MPC5200"         >>$(obj)include/config.h ; \
-                 echo "... with MPC5200 processor" ; \
+                 $(XECHO) "... with MPC5200 processor" ; \
                }
        @[ -z "$(findstring 5100,$@)" ] || \
                { echo "#define CONFIG_MGT5100"         >>$(obj)include/config.h ; \
-                 echo "... with MGT5100 processor" ; \
+                 $(XECHO) "... with MGT5100 processor" ; \
                }
        @$(MKCONFIG) -a IceCube ppc mpc5xxx icecube
 
@@ -487,18 +521,18 @@ lite5200b_LOWBOOT_config: unconfig
        @mkdir -p $(obj)board/icecube
        @ >$(obj)include/config.h
        @ echo "#define CONFIG_MPC5200_DDR"     >>$(obj)include/config.h
-       @ echo "... DDR memory revision"
+       @ $(XECHO) "... DDR memory revision"
        @ echo "#define CONFIG_MPC5200"         >>$(obj)include/config.h
        @ echo "#define CONFIG_LITE5200B"       >>$(obj)include/config.h
        @[ -z "$(findstring _PM_,$@)" ] || \
                { echo "#define CONFIG_LITE5200B_PM"    >>$(obj)include/config.h ; \
-                 echo "... with power management (low-power mode) support" ; \
+                 $(XECHO) "... with power management (low-power mode) support" ; \
                }
        @[ -z "$(findstring LOWBOOT_,$@)" ] || \
                { echo "TEXT_BASE = 0xFF000000" >$(obj)board/icecube/config.tmp ; \
-                 echo "... with LOWBOOT configuration" ; \
+                 $(XECHO) "... with LOWBOOT configuration" ; \
                }
-       @ echo "... with MPC5200B processor"
+       @ $(XECHO) "... with MPC5200B processor"
        @$(MKCONFIG) -a IceCube  ppc mpc5xxx icecube
 
 mcc200_config  \
@@ -517,33 +551,33 @@ prs200_highboot_DDR_config:       unconfig
        @mkdir -p $(obj)board/mcc200
        @ >$(obj)include/config.h
        @[ -n "$(findstring highboot,$@)" ] || \
-               { echo "... with lowboot configuration" ; \
+               { $(XECHO) "... with lowboot configuration" ; \
                }
        @[ -z "$(findstring highboot,$@)" ] || \
                { echo "TEXT_BASE = 0xFFF00000" >$(obj)board/mcc200/config.tmp ; \
-                 echo "... with highboot configuration" ; \
+                 $(XECHO) "... with highboot configuration" ; \
                }
        @[ -n "$(findstring _SDRAM,$@)" ] || \
                { if [ -n "$(findstring mcc200,$@)" ]; \
                  then \
-                       echo "... with DDR" ; \
+                       $(XECHO) "... with DDR" ; \
                  else \
                        if [ -n "$(findstring _DDR,$@)" ];\
                        then \
-                               echo "... with DDR" ; \
+                               $(XECHO) "... with DDR" ; \
                        else \
                                echo "#define CONFIG_MCC200_SDRAM" >>$(obj)include/config.h ;\
-                               echo "... with SDRAM" ; \
+                               $(XECHO) "... with SDRAM" ; \
                        fi; \
                  fi; \
                }
        @[ -z "$(findstring _SDRAM,$@)" ] || \
                { echo "#define CONFIG_MCC200_SDRAM"    >>$(obj)include/config.h ; \
-                 echo "... with SDRAM" ; \
+                 $(XECHO) "... with SDRAM" ; \
                }
        @[ -z "$(findstring COM12,$@)" ] || \
                { echo "#define CONFIG_CONSOLE_COM12"   >>$(obj)include/config.h ; \
-                 echo "... with console on COM12" ; \
+                 $(XECHO) "... with console on COM12" ; \
                }
        @[ -z "$(findstring prs200,$@)" ] || \
                { echo "#define CONFIG_PRS200"  >>$(obj)include/config.h ;\
@@ -551,7 +585,10 @@ prs200_highboot_DDR_config:        unconfig
        @$(MKCONFIG) -n $@ -a mcc200 ppc mpc5xxx mcc200
 
 mecp5200_config:  unconfig
-       @$(MKCONFIG) -a mecp5200  ppc mpc5xxx mecp5200 esd
+       @$(MKCONFIG) mecp5200  ppc mpc5xxx mecp5200 esd
+
+munices_config:        unconfig
+       @$(MKCONFIG) munices ppc mpc5xxx munices
 
 o2dnt_config:
        @$(MKCONFIG) o2dnt ppc mpc5xxx o2dnt
@@ -567,11 +604,11 @@ PM520_ROMBOOT_DDR_config: unconfig
        @ >$(obj)include/config.h
        @[ -z "$(findstring DDR,$@)" ] || \
                { echo "#define CONFIG_MPC5200_DDR"     >>$(obj)include/config.h ; \
-                 echo "... DDR memory revision" ; \
+                 $(XECHO) "... DDR memory revision" ; \
                }
        @[ -z "$(findstring ROMBOOT,$@)" ] || \
                { echo "#define CONFIG_BOOT_ROM" >>$(obj)include/config.h ; \
-                 echo "... booting from 8-bit flash" ; \
+                 $(XECHO) "... booting from 8-bit flash" ; \
                }
        @$(MKCONFIG) -a PM520 ppc mpc5xxx pm520
 
@@ -589,7 +626,7 @@ TB5200_config:      unconfig
        @mkdir -p $(obj)include
        @[ -z "$(findstring _B,$@)" ] || \
                { echo "#define CONFIG_TQM5200_B"       >>$(obj)include/config.h ; \
-                 echo "... with MPC5200B processor" ; \
+                 $(XECHO) "... with MPC5200B processor" ; \
                }
        @$(MKCONFIG) -n $@ -a TB5200 ppc mpc5xxx tqm5200
 
@@ -610,23 +647,23 @@ Total5200_Rev2_lowboot_config:    unconfig
        @ >$(obj)include/config.h
        @[ -z "$(findstring 5100,$@)" ] || \
                { echo "#define CONFIG_MGT5100"         >>$(obj)include/config.h ; \
-                 echo "... with MGT5100 processor" ; \
+                 $(XECHO) "... with MGT5100 processor" ; \
                }
        @[ -z "$(findstring 5200,$@)" ] || \
                { echo "#define CONFIG_MPC5200"         >>$(obj)include/config.h ; \
-                 echo "... with MPC5200 processor" ; \
+                 $(XECHO) "... with MPC5200 processor" ; \
                }
        @[ -n "$(findstring Rev,$@)" ] || \
                { echo "#define CONFIG_TOTAL5200_REV 1" >>$(obj)include/config.h ; \
-                 echo "... revision 1 board" ; \
+                 $(XECHO) "... revision 1 board" ; \
                }
        @[ -z "$(findstring Rev2_,$@)" ] || \
                { echo "#define CONFIG_TOTAL5200_REV 2" >>$(obj)include/config.h ; \
-                 echo "... revision 2 board" ; \
+                 $(XECHO) "... revision 2 board" ; \
                }
        @[ -z "$(findstring lowboot_,$@)" ] || \
                { echo "TEXT_BASE = 0xFE000000" >$(obj)board/total5200/config.tmp ; \
-                 echo "... with lowboot configuration" ; \
+                 $(XECHO) "... with lowboot configuration" ; \
                }
        @$(MKCONFIG) -a Total5200 ppc mpc5xxx total5200
 
@@ -647,23 +684,23 @@ TQM5200_STK100_config:    unconfig
                { echo "#define CONFIG_CAM5200" >>$(obj)include/config.h ; \
                  echo "#define CONFIG_TQM5200S"        >>$(obj)include/config.h ; \
                  echo "#define CONFIG_TQM5200_B"       >>$(obj)include/config.h ; \
-                 echo "... TQM5200S on Cam5200" ; \
+                 $(XECHO) "... TQM5200S on Cam5200" ; \
                }
        @[ -z "$(findstring niosflash,$@)" ] || \
                { echo "#define CONFIG_CAM5200_NIOSFLASH"       >>$(obj)include/config.h ; \
-                 echo "... with NIOS flash driver" ; \
+                 $(XECHO) "... with NIOS flash driver" ; \
                }
        @[ -z "$(findstring fo300,$@)" ] || \
                { echo "#define CONFIG_FO300"   >>$(obj)include/config.h ; \
-                 echo "... TQM5200 on FO300" ; \
+                 $(XECHO) "... TQM5200 on FO300" ; \
                }
        @[ -z "$(findstring MiniFAP,$@)" ] || \
                { echo "#define CONFIG_MINIFAP" >>$(obj)include/config.h ; \
-                 echo "... TQM5200_AC on MiniFAP" ; \
+                 $(XECHO) "... TQM5200_AC on MiniFAP" ; \
                }
        @[ -z "$(findstring STK100,$@)" ] || \
                { echo "#define CONFIG_STK52XX_REV100"  >>$(obj)include/config.h ; \
-                 echo "... on a STK52XX.100 base board" ; \
+                 $(XECHO) "... on a STK52XX.100 base board" ; \
                }
        @[ -z "$(findstring TQM5200_B,$@)" ] || \
                { echo "#define CONFIG_TQM5200_B"       >>$(obj)include/config.h ; \
@@ -748,7 +785,7 @@ GEN860T_config: unconfig
        @ >$(obj)include/config.h
        @[ -z "$(findstring _SC,$@)" ] || \
                { echo "#define CONFIG_SC" >>$(obj)include/config.h ; \
-                 echo "With reduced H/W feature set (SC)..." ; \
+                 $(XECHO) "With reduced H/W feature set (SC)..." ; \
                }
        @$(MKCONFIG) -a $(call xtract_GEN860T,$@) ppc mpc8xx gen860t
 
@@ -775,7 +812,7 @@ ICU862_config: unconfig
        @ >$(obj)include/config.h
        @[ -z "$(findstring _100MHz,$@)" ] || \
                { echo "#define CONFIG_100MHz"  >>$(obj)include/config.h ; \
-                 echo "... with 100MHz system clock" ; \
+                 $(XECHO) "... with 100MHz system clock" ; \
                }
        @$(MKCONFIG) -a $(call xtract_ICU862,$@) ppc mpc8xx icu862
 
@@ -830,6 +867,9 @@ MBX_config  \
 MBX860T_config:        unconfig
        @$(MKCONFIG) $(@:_config=) ppc mpc8xx mbx8xx
 
+mgsuvd_config:         unconfig
+       @$(MKCONFIG) $(@:_config=) ppc mpc8xx mgsuvd
+
 MHPC_config:           unconfig
        @$(MKCONFIG) $(@:_config=) ppc mpc8xx mhpc eltec
 
@@ -844,11 +884,11 @@ NETVIA_config:            unconfig
        @ >$(obj)include/config.h
        @[ -z "$(findstring NETVIA_config,$@)" ] || \
                 { echo "#define CONFIG_NETVIA_VERSION 1" >>$(obj)include/config.h ; \
-                 echo "... Version 1" ; \
+                 $(XECHO) "... Version 1" ; \
                 }
        @[ -z "$(findstring NETVIA_V2_config,$@)" ] || \
                 { echo "#define CONFIG_NETVIA_VERSION 2" >>$(obj)include/config.h ; \
-                 echo "... Version 2" ; \
+                 $(XECHO) "... Version 2" ; \
                 }
        @$(MKCONFIG) -a $(call xtract_NETVIA,$@) ppc mpc8xx netvia
 
@@ -971,16 +1011,16 @@ RPXlite_DW_config:       unconfig
        @ >$(obj)include/config.h
        @[ -z "$(findstring _64,$@)" ] || \
                { echo "#define RPXlite_64MHz"          >>$(obj)include/config.h ; \
-                 echo "... with 64MHz system clock ..."; \
+                 $(XECHO) "... with 64MHz system clock ..."; \
                }
        @[ -z "$(findstring _LCD,$@)" ] || \
                { echo "#define CONFIG_LCD"             >>$(obj)include/config.h ; \
                  echo "#define CONFIG_NEC_NL6448BC20"  >>$(obj)include/config.h ; \
-                 echo "... with LCD display ..."; \
+                 $(XECHO) "... with LCD display ..."; \
                }
        @[ -z "$(findstring _NVRAM,$@)" ] || \
                { echo "#define  CFG_ENV_IS_IN_NVRAM"   >>$(obj)include/config.h ; \
-                 echo "... with ENV in NVRAM ..."; \
+                 $(XECHO) "... with ENV in NVRAM ..."; \
                }
        @$(MKCONFIG) -a RPXlite_DW ppc mpc8xx RPXlite_dw
 
@@ -1039,13 +1079,14 @@ TQM860M_config          \
 TQM862M_config         \
 TQM866M_config         \
 TQM885D_config         \
+TK885D_config          \
 virtlab2_config:       unconfig
        @mkdir -p $(obj)include
        @ >$(obj)include/config.h
        @[ -z "$(findstring _LCD,$@)" ] || \
                { echo "#define CONFIG_LCD"             >>$(obj)include/config.h ; \
                  echo "#define CONFIG_NEC_NL6448BC20"  >>$(obj)include/config.h ; \
-                 echo "... with LCD display" ; \
+                 $(XECHO) "... with LCD display" ; \
                }
        @$(MKCONFIG) -a $(call xtract_8xx,$@) ppc mpc8xx tqm8xx
 
@@ -1129,11 +1170,11 @@ CATcenter_33_config:    unconfig
        @ echo "#define CONFIG_PPCHAMELEON_MODULE_MODEL 1" >> $(obj)include/config.h
        @[ -z "$(findstring _25,$@)" ] || \
                { echo "#define CONFIG_PPCHAMELEON_CLK_25" >> $(obj)include/config.h ; \
-                 echo "SysClk = 25MHz" ; \
+                 $(XECHO) "SysClk = 25MHz" ; \
                }
        @[ -z "$(findstring _33,$@)" ] || \
                { echo "#define CONFIG_PPCHAMELEON_CLK_33" >> $(obj)include/config.h ; \
-                 echo "SysClk = 33MHz" ; \
+                 $(XECHO) "SysClk = 33MHz" ; \
                }
        @$(MKCONFIG) -a $(call xtract_4xx,$@) ppc ppc4xx PPChameleonEVB dave
 
@@ -1147,9 +1188,6 @@ CPCI405AB_config: unconfig
        @$(MKCONFIG) $(@:_config=) ppc ppc4xx cpci405 esd
        @echo "BOARD_REVISION = $(@:_config=)"  >> $(obj)include/config.mk
 
-CPCI440_config:        unconfig
-       @$(MKCONFIG) $(@:_config=) ppc ppc4xx cpci440 esd
-
 CPCIISER4_config:      unconfig
        @$(MKCONFIG) $(@:_config=) ppc ppc4xx cpciiser4 esd
 
@@ -1171,6 +1209,9 @@ DP405_config:     unconfig
 DU405_config:  unconfig
        @$(MKCONFIG) $(@:_config=) ppc ppc4xx du405 esd
 
+DU440_config:  unconfig
+       @$(MKCONFIG) $(@:_config=) ppc ppc4xx du440 esd
+
 ebony_config:  unconfig
        @$(MKCONFIG) $(@:_config=) ppc ppc4xx ebony amcc
 
@@ -1184,9 +1225,11 @@ G2000_config:    unconfig
        @$(MKCONFIG) $(@:_config=) ppc ppc4xx g2000
 
 hcu4_config:   unconfig
+       @mkdir -p $(obj)board/netstal/common
        @$(MKCONFIG) $(@:_config=) ppc ppc4xx hcu4 netstal
 
 hcu5_config:   unconfig
+       @mkdir -p $(obj)board/netstal/common
        @$(MKCONFIG) $(@:_config=) ppc ppc4xx hcu5 netstal
 
 HH405_config:  unconfig
@@ -1204,12 +1247,32 @@ KAREF_config: unconfig
 katmai_config: unconfig
        @$(MKCONFIG) $(@:_config=) ppc ppc4xx katmai amcc
 
+# Kilauea & Haleakala images are identical (recognized via PVR)
+kilauea_config \
+haleakala_config: unconfig
+       @$(MKCONFIG) -n $@ -a kilauea ppc ppc4xx kilauea amcc
+
+kilauea_nand_config \
+haleakala_nand_config: unconfig
+       @mkdir -p $(obj)include $(obj)board/amcc/kilauea
+       @mkdir -p $(obj)nand_spl/board/amcc/kilauea
+       @echo "#define CONFIG_NAND_U_BOOT" > $(obj)include/config.h
+       @$(MKCONFIG) -n $@ -a kilauea ppc ppc4xx kilauea amcc
+       @echo "TEXT_BASE = 0x01000000" > $(obj)board/amcc/kilauea/config.tmp
+       @echo "CONFIG_NAND_U_BOOT = y" >> $(obj)include/config.mk
+
+korat_config:  unconfig
+       @$(MKCONFIG) $(@:_config=) ppc ppc4xx korat
+
 luan_config:   unconfig
        @$(MKCONFIG) $(@:_config=) ppc ppc4xx luan amcc
 
 lwmon5_config: unconfig
        @$(MKCONFIG) $(@:_config=) ppc ppc4xx lwmon5
 
+makalu_config: unconfig
+       @$(MKCONFIG) $(@:_config=) ppc ppc4xx makalu amcc
+
 METROBOX_config: unconfig
        @$(MKCONFIG) $(@:_config=) ppc ppc4xx metrobox sandburst
 
@@ -1219,7 +1282,7 @@ MIP405_config:    unconfig
 MIP405T_config:        unconfig
        @mkdir -p $(obj)include
        @echo "#define CONFIG_MIP405T" >$(obj)include/config.h
-       @echo "Enable subset config for MIP405T"
+       @$(XECHO) "Enable subset config for MIP405T"
        @$(MKCONFIG) -a MIP405 ppc ppc4xx mip405 mpl
 
 ML2_config:    unconfig
@@ -1253,6 +1316,9 @@ PLU405_config:    unconfig
 PMC405_config: unconfig
        @$(MKCONFIG) $(@:_config=) ppc ppc4xx pmc405 esd
 
+PMC440_config: unconfig
+       @$(MKCONFIG) $(@:_config=) ppc ppc4xx pmc440 esd
+
 PPChameleonEVB_config          \
 PPChameleonEVB_BA_25_config    \
 PPChameleonEVB_ME_25_config    \
@@ -1264,23 +1330,23 @@ PPChameleonEVB_HI_33_config:    unconfig
        @ >$(obj)include/config.h
        @[ -z "$(findstring EVB_BA,$@)" ] || \
                { echo "#define CONFIG_PPCHAMELEON_MODULE_MODEL 0" >>$(obj)include/config.h ; \
-                 echo "... BASIC model" ; \
+                 $(XECHO) "... BASIC model" ; \
                }
        @[ -z "$(findstring EVB_ME,$@)" ] || \
                { echo "#define CONFIG_PPCHAMELEON_MODULE_MODEL 1" >>$(obj)include/config.h ; \
-                 echo "... MEDIUM model" ; \
+                 $(XECHO) "... MEDIUM model" ; \
                }
        @[ -z "$(findstring EVB_HI,$@)" ] || \
                { echo "#define CONFIG_PPCHAMELEON_MODULE_MODEL 2" >>$(obj)include/config.h ; \
-                 echo "... HIGH-END model" ; \
+                 $(XECHO) "... HIGH-END model" ; \
                }
        @[ -z "$(findstring _25,$@)" ] || \
                { echo "#define CONFIG_PPCHAMELEON_CLK_25" >>$(obj)include/config.h ; \
-                 echo "SysClk = 25MHz" ; \
+                 $(XECHO) "SysClk = 25MHz" ; \
                }
        @[ -z "$(findstring _33,$@)" ] || \
                { echo "#define CONFIG_PPCHAMELEON_CLK_33" >>$(obj)include/config.h ; \
-                 echo "SysClk = 33MHz" ; \
+                 $(XECHO) "SysClk = 33MHz" ; \
                }
        @$(MKCONFIG) -a $(call xtract_4xx,$@) ppc ppc4xx PPChameleonEVB dave
 
@@ -1382,10 +1448,10 @@ CPC45_ROMBOOT_config:   unconfig
        @cd $(obj)include ;                             \
        if [ "$(findstring _ROMBOOT_,$@)" ] ; then \
                echo "CONFIG_BOOT_ROM = y" >> config.mk ; \
-               echo "... booting from 8-bit flash" ; \
+               $(XECHO) "... booting from 8-bit flash" ; \
        else \
                echo "CONFIG_BOOT_ROM = n" >> config.mk ; \
-               echo "... booting from 64-bit flash" ; \
+               $(XECHO) "... booting from 64-bit flash" ; \
        fi; \
        echo "export CONFIG_BOOT_ROM" >> config.mk;
 
@@ -1450,10 +1516,10 @@ CPU86_ROMBOOT_config: unconfig
        @cd $(obj)include ;                             \
        if [ "$(findstring _ROMBOOT_,$@)" ] ; then \
                echo "CONFIG_BOOT_ROM = y" >> config.mk ; \
-               echo "... booting from 8-bit flash" ; \
+               $(XECHO) "... booting from 8-bit flash" ; \
        else \
                echo "CONFIG_BOOT_ROM = n" >> config.mk ; \
-               echo "... booting from 64-bit flash" ; \
+               $(XECHO) "... booting from 64-bit flash" ; \
        fi; \
        echo "export CONFIG_BOOT_ROM" >> config.mk;
 
@@ -1463,10 +1529,10 @@ CPU87_ROMBOOT_config: unconfig
        @cd $(obj)include ;                             \
        if [ "$(findstring _ROMBOOT_,$@)" ] ; then \
                echo "CONFIG_BOOT_ROM = y" >> config.mk ; \
-               echo "... booting from 8-bit flash" ; \
+               $(XECHO) "... booting from 8-bit flash" ; \
        else \
                echo "CONFIG_BOOT_ROM = n" >> config.mk ; \
-               echo "... booting from 64-bit flash" ; \
+               $(XECHO) "... booting from 64-bit flash" ; \
        fi; \
        echo "export CONFIG_BOOT_ROM" >> config.mk;
 
@@ -1500,6 +1566,9 @@ ISPAN_REVB_config:        unconfig
        fi
        @$(MKCONFIG) -a ISPAN ppc mpc8260 ispan
 
+mgcoge_config  :       unconfig
+       @$(MKCONFIG) mgcoge ppc mpc8260 mgcoge
+
 MPC8260ADS_config      \
 MPC8260ADS_lowboot_config      \
 MPC8260ADS_33MHz_config        \
@@ -1528,7 +1597,7 @@ PQ2FADS-ZU_66MHz_lowboot_config   \
        @echo "#define CONFIG_8260_CLKIN 66000000" >> $(obj)include/config.h))
        @[ -z "$(findstring lowboot_,$@)" ] || \
                { echo "TEXT_BASE = 0xFF800000" >$(obj)board/mpc8260ads/config.tmp ; \
-                 echo "... with lowboot configuration" ; \
+                 $(XECHO) "... with lowboot configuration" ; \
                }
        @$(MKCONFIG) -a MPC8260ADS ppc mpc8260 mpc8260ads
 
@@ -1552,17 +1621,17 @@ PM826_ROMBOOT_BIGFLASH_config:  unconfig
                >$(obj)include/config.h ; \
        fi
        @if [ "$(findstring _ROMBOOT_,$@)" ] ; then \
-               echo "... booting from 8-bit flash" ; \
+               $(XECHO) "... booting from 8-bit flash" ; \
                echo "#define CONFIG_BOOT_ROM" >>$(obj)include/config.h ; \
                echo "TEXT_BASE = 0xFF800000" >$(obj)board/pm826/config.tmp ; \
                if [ "$(findstring _BIGFLASH_,$@)" ] ; then \
-                       echo "... with 32 MB Flash" ; \
+                       $(XECHO) "... with 32 MB Flash" ; \
                        echo "#define CONFIG_FLASH_32MB" >>$(obj)include/config.h ; \
                fi; \
        else \
-               echo "... booting from 64-bit flash" ; \
+               $(XECHO) "... booting from 64-bit flash" ; \
                if [ "$(findstring _BIGFLASH_,$@)" ] ; then \
-                       echo "... with 32 MB Flash" ; \
+                       $(XECHO) "... with 32 MB Flash" ; \
                        echo "#define CONFIG_FLASH_32MB" >>$(obj)include/config.h ; \
                        echo "TEXT_BASE = 0x40000000" >$(obj)board/pm826/config.tmp ; \
                else \
@@ -1579,12 +1648,12 @@ PM828_ROMBOOT_PCI_config:       unconfig
        @mkdir -p $(obj)board/pm826
        @if [ "$(findstring _PCI_,$@)" ] ; then \
                echo "#define CONFIG_PCI"  >>$(obj)include/config.h ; \
-               echo "... with PCI enabled" ; \
+               $(XECHO) "... with PCI enabled" ; \
        else \
                >$(obj)include/config.h ; \
        fi
        @if [ "$(findstring _ROMBOOT_,$@)" ] ; then \
-               echo "... booting from 8-bit flash" ; \
+               $(XECHO) "... booting from 8-bit flash" ; \
                echo "#define CONFIG_BOOT_ROM" >>$(obj)include/config.h ; \
                echo "TEXT_BASE = 0xFF800000" >$(obj)board/pm826/config.tmp ; \
        fi
@@ -1646,19 +1715,19 @@ TQM8265_AA_config:  unconfig
        fi; \
        echo "#define CONFIG_$${CFREQ}MHz"      >>$(obj)include/config.h ; \
        echo "... with $${CFREQ}MHz system clock" ; \
-       if [ "$${CACHE}" == "yes" ] ; then \
+       if [ "$${CACHE}" = "yes" ] ; then \
                echo "#define CONFIG_L2_CACHE"  >>$(obj)include/config.h ; \
-               echo "... with L2 Cache support" ; \
+               $(XECHO) "... with L2 Cache support" ; \
        else \
                echo "#undef CONFIG_L2_CACHE"   >>$(obj)include/config.h ; \
-               echo "... without L2 Cache support" ; \
+               $(XECHO) "... without L2 Cache support" ; \
        fi; \
-       if [ "$${BMODE}" == "60x" ] ; then \
+       if [ "$${BMODE}" = "60x" ] ; then \
                echo "#define CONFIG_BUSMODE_60x" >>$(obj)include/config.h ; \
-               echo "... with 60x Bus Mode" ; \
+               $(XECHO) "... with 60x Bus Mode" ; \
        else \
                echo "#undef CONFIG_BUSMODE_60x"  >>$(obj)include/config.h ; \
-               echo "... without 60x Bus Mode" ; \
+               $(XECHO) "... without 60x Bus Mode" ; \
        fi
        @$(MKCONFIG) -a TQM8260 ppc mpc8260 tqm8260
 
@@ -1678,6 +1747,9 @@ ZPC1900_config: unconfig
 ## Coldfire
 #########################################################################
 
+M52277EVB_config:      unconfig
+       @$(MKCONFIG) -a M52277EVB m68k mcf5227x m52277evb freescale
+
 M5235EVB_config \
 M5235EVB_Flash16_config \
 M5235EVB_Flash32_config:       unconfig
@@ -1686,9 +1758,9 @@ M5235EVB_Flash32_config:  unconfig
        M5235EVB_Flash16_config)        FLASH=16;; \
        M5235EVB_Flash32_config)        FLASH=32;; \
        esac; \
-       >include/config.h ; \
+       >$(obj)include/config.h ; \
        if [ "$${FLASH}" != "16" ] ; then \
-               echo "#define NORFLASH_PS32BIT  1" >> include/config.h ; \
+               echo "#define NORFLASH_PS32BIT  1" >> $(obj)include/config.h ; \
                echo "TEXT_BASE = 0xFFC00000" > $(obj)board/freescale/m5235evb/config.tmp ; \
                cp $(obj)board/freescale/m5235evb/u-boot.32 $(obj)board/freescale/m5235evb/u-boot.lds ; \
        else \
@@ -1744,12 +1816,22 @@ M5329BFEE_config :      unconfig
        M5329AFEE_config)       NAND=0;; \
        M5329BFEE_config)       NAND=16;; \
        esac; \
-       >include/config.h ; \
+       >$(obj)include/config.h ; \
        if [ "$${NAND}" != "0" ] ; then \
                echo "#define NANDFLASH_SIZE    $${NAND}" > $(obj)include/config.h ; \
        fi
        @$(MKCONFIG) -a M5329EVB m68k mcf532x m5329evb freescale
 
+M5373EVB_config :      unconfig
+       @case "$@" in \
+       M5373EVB_config)        NAND=16;; \
+       esac; \
+       >include/config.h ; \
+       if [ "$${NAND}" != "0" ] ; then \
+               echo "#define NANDFLASH_SIZE    $${NAND}" > $(obj)include/config.h ; \
+       fi
+       @$(MKCONFIG) -a M5373EVB m68k mcf532x m5373evb freescale
+
 M54455EVB_config \
 M54455EVB_atmel_config \
 M54455EVB_intel_config \
@@ -1766,22 +1848,92 @@ M54455EVB_i66_config :  unconfig
        M54455EVB_i33_config)           FLASH=INTEL; FREQ=33333333;; \
        M54455EVB_i66_config)           FLASH=INTEL; FREQ=66666666;; \
        esac; \
-       >include/config.h ; \
-       if [ "$${FLASH}" == "INTEL" ] ; then \
+       >$(obj)include/config.h ; \
+       if [ "$${FLASH}" = "INTEL" ] ; then \
                echo "#undef CFG_ATMEL_BOOT" >> $(obj)include/config.h ; \
                echo "TEXT_BASE = 0x00000000" > $(obj)board/freescale/m54455evb/config.tmp ; \
                cp $(obj)board/freescale/m54455evb/u-boot.int $(obj)board/freescale/m54455evb/u-boot.lds ; \
-               echo "... with INTEL boot..." ; \
+               $(XECHO) "... with INTEL boot..." ; \
        else \
                echo "#define CFG_ATMEL_BOOT"   >> $(obj)include/config.h ; \
                echo "TEXT_BASE = 0x04000000" > $(obj)board/freescale/m54455evb/config.tmp ; \
                cp $(obj)board/freescale/m54455evb/u-boot.atm $(obj)board/freescale/m54455evb/u-boot.lds ; \
-               echo "... with ATMEL boot..." ; \
+               $(XECHO) "... with ATMEL boot..." ; \
        fi; \
        echo "#define CFG_INPUT_CLKSRC $${FREQ}" >> $(obj)include/config.h ; \
-       echo "... with $${FREQ}Hz input clock"
+       $(XECHO) "... with $${FREQ}Hz input clock"
        @$(MKCONFIG) -a M54455EVB m68k mcf5445x m54455evb freescale
 
+M5475AFE_config \
+M5475BFE_config \
+M5475CFE_config \
+M5475DFE_config \
+M5475EFE_config \
+M5475FFE_config \
+M5475GFE_config :      unconfig
+       @case "$@" in \
+       M5475AFE_config)        BOOT=2;CODE=0;VID=0;USB=0;RAM=64;RAM1=0;; \
+       M5475BFE_config)        BOOT=2;CODE=16;VID=0;USB=0;RAM=64;RAM1=0;; \
+       M5475CFE_config)        BOOT=2;CODE=16;VID=1;USB=1;RAM=64;RAM1=0;; \
+       M5475DFE_config)        BOOT=2;CODE=0;VID=0;USB=1;RAM=64;RAM1=0;; \
+       M5475EFE_config)        BOOT=2;CODE=0;VID=1;USB=1;RAM=64;RAM1=0;; \
+       M5475FFE_config)        BOOT=2;CODE=32;VID=1;USB=1;RAM=64;RAM1=64;; \
+       M5475GFE_config)        BOOT=4;CODE=0;VID=0;USB=0;RAM=64;RAM1=0;; \
+       esac; \
+       >include/config.h ; \
+       echo "#define CFG_BUSCLK        133333333" > $(obj)include/config.h ; \
+       echo "#define CFG_BOOTSZ        $${BOOT}" >> $(obj)include/config.h ; \
+       echo "#define CFG_DRAMSZ        $${RAM}" >> $(obj)include/config.h ; \
+       if [ "$${RAM1}" != "0" ] ; then \
+               echo "#define CFG_DRAMSZ1       $${RAM1}" >> $(obj)include/config.h ; \
+       fi; \
+       if [ "$${CODE}" != "0" ] ; then \
+               echo "#define CFG_NOR1SZ        $${CODE}" >> $(obj)include/config.h ; \
+       fi; \
+       if [ "$${VID}" == "1" ] ; then \
+               echo "#define CFG_VIDEO" >> $(obj)include/config.h ; \
+       fi; \
+       if [ "$${USB}" == "1" ] ; then \
+               echo "#define CFG_USBCTRL" >> $(obj)include/config.h ; \
+       fi
+       @$(MKCONFIG) -a M5475EVB m68k mcf547x_8x m547xevb freescale
+
+M5485AFE_config \
+M5485BFE_config \
+M5485CFE_config \
+M5485DFE_config \
+M5485EFE_config \
+M5485FFE_config \
+M5485GFE_config \
+M5485HFE_config :      unconfig
+       @case "$@" in \
+       M5485AFE_config)        BOOT=2;CODE=0;VID=0;USB=0;RAM=64;RAM1=0;; \
+       M5485BFE_config)        BOOT=2;CODE=16;VID=0;USB=0;RAM=64;RAM1=0;; \
+       M5485CFE_config)        BOOT=2;CODE=16;VID=1;USB=1;RAM=64;RAM1=0;; \
+       M5485DFE_config)        BOOT=2;CODE=0;VID=0;USB=1;RAM=64;RAM1=0;; \
+       M5485EFE_config)        BOOT=2;CODE=0;VID=1;USB=1;RAM=64;RAM1=0;; \
+       M5485FFE_config)        BOOT=2;CODE=32;VID=1;USB=1;RAM=64;RAM1=64;; \
+       M5485GFE_config)        BOOT=4;CODE=0;VID=0;USB=0;RAM=64;RAM1=0;; \
+       M5485HFE_config)        BOOT=2;CODE=;VID=1;USB=0;RAM=64;RAM1=0;; \
+       esac; \
+       >include/config.h ; \
+       echo "#define CFG_BUSCLK        100000000" > $(obj)include/config.h ; \
+       echo "#define CFG_BOOTSZ        $${BOOT}" >> $(obj)include/config.h ; \
+       echo "#define CFG_DRAMSZ        $${RAM}" >> $(obj)include/config.h ; \
+       if [ "$${RAM1}" != "0" ] ; then \
+               echo "#define CFG_DRAMSZ1       $${RAM1}" >> $(obj)include/config.h ; \
+       fi; \
+       if [ "$${CODE}" != "0" ] ; then \
+               echo "#define CFG_NOR1SZ        $${CODE}" >> $(obj)include/config.h ; \
+       fi; \
+       if [ "$${VID}" == "1" ] ; then \
+               echo "#define CFG_VIDEO" >> $(obj)include/config.h ; \
+       fi; \
+       if [ "$${USB}" == "1" ] ; then \
+               echo "#define CFG_USBCTRL" >> $(obj)include/config.h ; \
+       fi
+       @$(MKCONFIG) -a M5485EVB m68k mcf547x_8x m548xevb freescale
+
 #########################################################################
 ## MPC83xx Systems
 #########################################################################
@@ -1791,15 +1943,18 @@ MPC8313ERDB_66_config: unconfig
        @mkdir -p $(obj)include
        @echo "" >$(obj)include/config.h ; \
        if [ "$(findstring _33_,$@)" ] ; then \
-               echo -n "...33M ..." ; \
+               $(XECHO) -n "...33M ..." ; \
                echo "#define CFG_33MHZ" >>$(obj)include/config.h ; \
        fi ; \
        if [ "$(findstring _66_,$@)" ] ; then \
-               echo -n "...66M..." ; \
+               $(XECHO) -n "...66M..." ; \
                echo "#define CFG_66MHZ" >>$(obj)include/config.h ; \
        fi ;
        @$(MKCONFIG) -a MPC8313ERDB ppc mpc83xx mpc8313erdb freescale
 
+MPC8315ERDB_config: unconfig
+       @$(MKCONFIG) -a MPC8315ERDB ppc mpc83xx mpc8315erdb freescale
+
 MPC8323ERDB_config:    unconfig
        @$(MKCONFIG) -a MPC8323ERDB ppc mpc83xx mpc8323erdb freescale
 
@@ -1811,26 +1966,26 @@ MPC832XEMDS_ATM_config: unconfig
        @mkdir -p $(obj)include
        @echo "" >$(obj)include/config.h ; \
        if [ "$(findstring _HOST_,$@)" ] ; then \
-               echo -n "... PCI HOST " ; \
+               $(XECHO) -n "... PCI HOST " ; \
                echo "#define CONFIG_PCI" >>$(obj)include/config.h ; \
        fi ; \
        if [ "$(findstring _SLAVE_,$@)" ] ; then \
-               echo "...PCI SLAVE 66M"  ; \
+               $(XECHO) "...PCI SLAVE 66M"  ; \
                echo "#define CONFIG_PCI" >>$(obj)include/config.h ; \
                echo "#define CONFIG_PCISLAVE" >>$(obj)include/config.h ; \
        fi ; \
        if [ "$(findstring _33_,$@)" ] ; then \
-               echo -n "...33M ..." ; \
+               $(XECHO) -n "...33M ..." ; \
                echo "#define PCI_33M" >>$(obj)include/config.h ; \
                echo "#define CONFIG_PQ_MDS_PIB 1" >>$(obj)include/config.h ; \
        fi ; \
        if [ "$(findstring _66_,$@)" ] ; then \
-               echo -n "...66M..." ; \
+               $(XECHO) -n "...66M..." ; \
                echo "#define PCI_66M" >>$(obj)include/config.h ; \
                echo "#define CONFIG_PQ_MDS_PIB 1" >>$(obj)include/config.h ; \
        fi ; \
        if [ "$(findstring _ATM_,$@)" ] ; then \
-               echo -n "...ATM..." ; \
+               $(XECHO) -n "...ATM..." ; \
                echo "#define CONFIG_PQ_MDS_PIB 1" >>$(obj)include/config.h ; \
                echo "#define CONFIG_PQ_MDS_PIB_ATM     1" >>$(obj)include/config.h ; \
        fi ;
@@ -1861,31 +2016,55 @@ MPC8360EMDS_ATM_config: unconfig
        @mkdir -p $(obj)include
        @echo "" >$(obj)include/config.h ; \
        if [ "$(findstring _HOST_,$@)" ] ; then \
-               echo -n "... PCI HOST " ; \
+               $(XECHO) -n "... PCI HOST " ; \
                echo "#define CONFIG_PCI" >>$(obj)include/config.h ; \
        fi ; \
        if [ "$(findstring _SLAVE_,$@)" ] ; then \
-               echo "...PCI SLAVE 66M"  ; \
+               $(XECHO) "...PCI SLAVE 66M"  ; \
                echo "#define CONFIG_PCI" >>$(obj)include/config.h ; \
                echo "#define CONFIG_PCISLAVE" >>$(obj)include/config.h ; \
        fi ; \
        if [ "$(findstring _33_,$@)" ] ; then \
-               echo -n "...33M ..." ; \
+               $(XECHO) -n "...33M ..." ; \
                echo "#define PCI_33M" >>$(obj)include/config.h ; \
                echo "#define CONFIG_PQ_MDS_PIB 1" >>$(obj)include/config.h ; \
        fi ; \
        if [ "$(findstring _66_,$@)" ] ; then \
-               echo -n "...66M..." ; \
+               $(XECHO) -n "...66M..." ; \
                echo "#define PCI_66M" >>$(obj)include/config.h ; \
                echo "#define CONFIG_PQ_MDS_PIB 1" >>$(obj)include/config.h ; \
        fi ; \
        if [ "$(findstring _ATM_,$@)" ] ; then \
-               echo -n "...ATM..." ; \
+               $(XECHO) -n "...ATM..." ; \
                echo "#define CONFIG_PQ_MDS_PIB 1" >>$(obj)include/config.h ; \
                echo "#define CONFIG_PQ_MDS_PIB_ATM     1" >>$(obj)include/config.h ; \
        fi ;
        @$(MKCONFIG) -a MPC8360EMDS ppc mpc83xx mpc8360emds freescale
 
+MPC8360ERDK_33_config \
+MPC8360ERDK_66_config \
+MPC8360ERDK_config:
+       @mkdir -p $(obj)include
+       @echo "" >$(obj)include/config.h ; \
+       if [ "$(findstring _33_,$@)" ] ; then \
+               $(XECHO) -n "... CLKIN 33MHz " ; \
+               echo "#define CONFIG_CLKIN_33MHZ" >>$(obj)include/config.h ;\
+       fi ;
+       @$(MKCONFIG) -a MPC8360ERDK ppc mpc83xx mpc8360erdk freescale
+
+MPC837XEMDS_config \
+MPC837XEMDS_HOST_config:       unconfig
+       @mkdir -p $(obj)include
+       @echo "" >$(obj)include/config.h ; \
+       if [ "$(findstring _HOST_,$@)" ] ; then \
+               $(XECHO) -n "... PCI HOST " ; \
+               echo "#define CONFIG_PCI" >>$(obj)include/config.h ; \
+       fi ;
+       @$(MKCONFIG) -a MPC837XEMDS ppc mpc83xx mpc837xemds freescale
+
+MPC837XERDB_config:    unconfig
+       @$(MKCONFIG) -a MPC837XERDB ppc mpc83xx mpc837xerdb freescale
+
 sbc8349_config:                unconfig
        @$(MKCONFIG) $(@:_config=) ppc mpc83xx sbc8349
 
@@ -1897,8 +2076,11 @@ TQM834x_config:  unconfig
 ## MPC85xx Systems
 #########################################################################
 
+ATUM8548_config:       unconfig
+       @$(MKCONFIG) $(@:_config=) ppc mpc85xx atum8548
+
 MPC8540ADS_config:     unconfig
-       @$(MKCONFIG) $(@:_config=) ppc mpc85xx mpc8540ads
+       @$(MKCONFIG) $(@:_config=) ppc mpc85xx mpc8540ads freescale
 
 MPC8540EVAL_config \
 MPC8540EVAL_33_config \
@@ -1908,21 +2090,21 @@ MPC8540EVAL_66_slave_config:      unconfig
        @mkdir -p $(obj)include
        @echo "" >$(obj)include/config.h ; \
        if [ "$(findstring _33_,$@)" ] ; then \
-               echo "... 33 MHz PCI" ; \
+               $(XECHO) "... 33 MHz PCI" ; \
        else \
                echo "#define CONFIG_SYSCLK_66M" >>$(obj)include/config.h ; \
-               echo "... 66 MHz PCI" ; \
+               $(XECHO) "... 66 MHz PCI" ; \
        fi ; \
        if [ "$(findstring _slave_,$@)" ] ; then \
                echo "#define CONFIG_PCI_SLAVE" >>$(obj)include/config.h ; \
-               echo " slave" ; \
+               $(XECHO) " slave" ; \
        else \
-               echo " host" ; \
+               $(XECHO) " host" ; \
        fi
        @$(MKCONFIG) -a MPC8540EVAL ppc mpc85xx mpc8540eval
 
 MPC8560ADS_config:     unconfig
-       @$(MKCONFIG) $(@:_config=) ppc mpc85xx mpc8560ads
+       @$(MKCONFIG) $(@:_config=) ppc mpc85xx mpc8560ads freescale
 
 MPC8541CDS_legacy_config \
 MPC8541CDS_config:     unconfig
@@ -1930,9 +2112,9 @@ MPC8541CDS_config:        unconfig
        @echo "" >$(obj)include/config.h ; \
        if [ "$(findstring _legacy_,$@)" ] ; then \
                echo "#define CONFIG_LEGACY" >>$(obj)include/config.h ; \
-               echo "... legacy" ; \
+               $(XECHO) "... legacy" ; \
        fi
-       @$(MKCONFIG) -a MPC8541CDS ppc mpc85xx mpc8541cds cds
+       @$(MKCONFIG) -a MPC8541CDS ppc mpc85xx mpc8541cds freescale
 
 MPC8544DS_config:      unconfig
        @$(MKCONFIG) $(@:_config=) ppc mpc85xx mpc8544ds freescale
@@ -1943,9 +2125,9 @@ MPC8548CDS_config:        unconfig
        @echo "" >$(obj)include/config.h ; \
        if [ "$(findstring _legacy_,$@)" ] ; then \
                echo "#define CONFIG_LEGACY" >>$(obj)include/config.h ; \
-               echo "... legacy" ; \
+               $(XECHO) "... legacy" ; \
        fi
-       @$(MKCONFIG) -a MPC8548CDS ppc mpc85xx mpc8548cds cds
+       @$(MKCONFIG) -a MPC8548CDS ppc mpc85xx mpc8548cds freescale
 
 MPC8555CDS_legacy_config \
 MPC8555CDS_config:     unconfig
@@ -1953,12 +2135,12 @@ MPC8555CDS_config:      unconfig
        @echo "" >$(obj)include/config.h ; \
        if [ "$(findstring _legacy_,$@)" ] ; then \
                echo "#define CONFIG_LEGACY" >>$(obj)include/config.h ; \
-               echo "... legacy" ; \
+               $(XECHO) "... legacy" ; \
        fi
-       @$(MKCONFIG) -a MPC8555CDS ppc mpc85xx mpc8555cds cds
+       @$(MKCONFIG) -a MPC8555CDS ppc mpc85xx mpc8555cds freescale
 
 MPC8568MDS_config:     unconfig
-       @$(MKCONFIG) $(@:_config=) ppc mpc85xx mpc8568mds
+       @$(MKCONFIG) $(@:_config=) ppc mpc85xx mpc8568mds freescale
 
 PM854_config:  unconfig
        @$(MKCONFIG) $(@:_config=) ppc mpc85xx pm854
@@ -1972,23 +2154,26 @@ sbc8540_66_config:      unconfig
        @mkdir -p $(obj)include
        @if [ "$(findstring _66_,$@)" ] ; then \
                echo "#define CONFIG_PCI_66"    >>$(obj)include/config.h ; \
-               echo "... 66 MHz PCI" ; \
+               $(XECHO) "... 66 MHz PCI" ; \
        else \
                >$(obj)include/config.h ; \
-               echo "... 33 MHz PCI" ; \
+               $(XECHO) "... 33 MHz PCI" ; \
        fi
        @$(MKCONFIG) -a SBC8540 ppc mpc85xx sbc8560
 
+sbc8548_config:                unconfig
+       @$(MKCONFIG) $(@:_config=) ppc mpc85xx sbc8548
+
 sbc8560_config \
 sbc8560_33_config \
 sbc8560_66_config:      unconfig
        @mkdir -p $(obj)include
        @if [ "$(findstring _66_,$@)" ] ; then \
                echo "#define CONFIG_PCI_66"    >>$(obj)include/config.h ; \
-               echo "... 66 MHz PCI" ; \
+               $(XECHO) "... 66 MHz PCI" ; \
        else \
                >$(obj)include/config.h ; \
-               echo "... 33 MHz PCI" ; \
+               $(XECHO) "... 33 MHz PCI" ; \
        fi
        @$(MKCONFIG) -a sbc8560 ppc mpc85xx sbc8560
 
@@ -2000,7 +2185,7 @@ stxssa_4M_config: unconfig
        @mkdir -p $(obj)include
        @if [ "$(findstring _4M_,$@)" ] ; then \
                echo "#define CONFIG_STXSSA_4M" >>$(obj)include/config.h ; \
-               echo "... with 4 MiB flash memory" ; \
+               $(XECHO) "... with 4 MiB flash memory" ; \
        else \
                >$(obj)include/config.h ; \
        fi
@@ -2013,7 +2198,7 @@ TQM8560_config:           unconfig
        @mkdir -p $(obj)include
        @CTYPE=$(subst TQM,,$(@:_config=)); \
        >$(obj)include/config.h ; \
-       echo "... TQM"$${CTYPE}; \
+       $(XECHO) "... TQM"$${CTYPE}; \
        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; \
@@ -2025,6 +2210,9 @@ TQM8560_config:           unconfig
 ## MPC86xx Systems
 #########################################################################
 
+MPC8610HPCD_config:    unconfig
+       @$(MKCONFIG) $(@:_config=) ppc mpc86xx mpc8610hpcd freescale
+
 MPC8641HPCN_config:    unconfig
        @$(MKCONFIG) $(@:_config=) ppc mpc86xx mpc8641hpcn freescale
 
@@ -2171,10 +2359,10 @@ netstar_32_config       \
 netstar_config:                unconfig
        @mkdir -p $(obj)include
        @if [ "$(findstring _32_,$@)" ] ; then \
-               echo "... 32MB SDRAM" ; \
+               $(XECHO) "... 32MB SDRAM" ; \
                echo "#define PHYS_SDRAM_1_SIZE SZ_32M" >>$(obj)include/config.h ; \
        else \
-               echo "... 64MB SDRAM" ; \
+               $(XECHO) "... 64MB SDRAM" ; \
                echo "#define PHYS_SDRAM_1_SIZE SZ_64M" >>$(obj)include/config.h ; \
        fi
        @$(MKCONFIG) -a netstar arm arm925t netstar
@@ -2205,13 +2393,13 @@ omap1610h2_cs_autoboot_config:  unconfig
        @mkdir -p $(obj)include
        @if [ "$(findstring _cs0boot_, $@)" ] ; then \
                echo "#define CONFIG_CS0_BOOT" >> .$(obj)include/config.h ; \
-               echo "... configured for CS0 boot"; \
+               $(XECHO) "... configured for CS0 boot"; \
        elif [ "$(findstring _cs_autoboot_, $@)" ] ; then \
                echo "#define CONFIG_CS_AUTOBOOT" >> $(obj)include/config.h ; \
-               echo "... configured for CS_AUTO boot"; \
+               $(XECHO) "... configured for CS_AUTO boot"; \
        else \
                echo "#define CONFIG_CS3_BOOT" >> $(obj)include/config.h ; \
-               echo "... configured for CS3 boot"; \
+               $(XECHO) "... configured for CS3 boot"; \
        fi;
        @$(MKCONFIG) -a $(call xtract_omap1610xxx,$@) arm arm926ejs omap1610inn NULL omap
 
@@ -2221,10 +2409,10 @@ omap730p2_cs3boot_config :      unconfig
        @mkdir -p $(obj)include
        @if [ "$(findstring _cs0boot_, $@)" ] ; then \
                echo "#define CONFIG_CS0_BOOT" >> $(obj)include/config.h ; \
-               echo "... configured for CS0 boot"; \
+               $(XECHO) "... configured for CS0 boot"; \
        else \
                echo "#define CONFIG_CS3_BOOT" >> $(obj)include/config.h ; \
-               echo "... configured for CS3 boot"; \
+               $(XECHO) "... configured for CS3 boot"; \
        fi;
        @$(MKCONFIG) -a $(call xtract_omap730p2,$@) arm arm926ejs omap730p2 NULL omap
 
@@ -2254,18 +2442,18 @@ trab_old_config:        unconfig
        @[ -z "$(findstring _bigram,$@)" ] || \
                { echo "#define CONFIG_FLASH_8MB"  >>$(obj)include/config.h ; \
                  echo "#define CONFIG_RAM_32MB"   >>$(obj)include/config.h ; \
-                 echo "... with 8 MB Flash, 32 MB RAM" ; \
+                 $(XECHO) "... with 8 MB Flash, 32 MB RAM" ; \
                }
        @[ -z "$(findstring _bigflash,$@)" ] || \
                { echo "#define CONFIG_FLASH_16MB" >>$(obj)include/config.h ; \
                  echo "#define CONFIG_RAM_16MB"   >>$(obj)include/config.h ; \
-                 echo "... with 16 MB Flash, 16 MB RAM" ; \
+                 $(XECHO) "... with 16 MB Flash, 16 MB RAM" ; \
                  echo "TEXT_BASE = 0x0CF40000" >$(obj)board/trab/config.tmp ; \
                }
        @[ -z "$(findstring _old,$@)" ] || \
                { echo "#define CONFIG_FLASH_8MB"  >>$(obj)include/config.h ; \
                  echo "#define CONFIG_RAM_16MB"   >>$(obj)include/config.h ; \
-                 echo "... with 8 MB Flash, 16 MB RAM" ; \
+                 $(XECHO) "... with 8 MB Flash, 16 MB RAM" ; \
                  echo "TEXT_BASE = 0x0CF40000" >$(obj)board/trab/config.tmp ; \
                }
        @$(MKCONFIG) -a $(call xtract_trab,$@) arm arm920t trab NULL s3c24x0
@@ -2286,11 +2474,11 @@ voiceblue_config:       unconfig
        @mkdir -p $(obj)include
        @mkdir -p $(obj)board/voiceblue
        @if [ "$(findstring _smallflash_,$@)" ] ; then \
-               echo "... boot from lower flash bank" ; \
+               $(XECHO) "... boot from lower flash bank" ; \
                echo "#define VOICEBLUE_SMALL_FLASH" >>$(obj)include/config.h ; \
                echo "VOICEBLUE_SMALL_FLASH=y" >$(obj)board/voiceblue/config.tmp ; \
        else \
-               echo "... boot from upper flash bank" ; \
+               $(XECHO) "... boot from upper flash bank" ; \
                >$(obj)include/config.h ; \
                echo "VOICEBLUE_SMALL_FLASH=n" >$(obj)board/voiceblue/config.tmp ; \
        fi
@@ -2344,6 +2532,18 @@ SMN42_config     :       unconfig
 ## XScale Systems
 #########################################################################
 
+actux1_config  :       unconfig
+       @$(MKCONFIG) $(@:_config=) arm ixp actux1
+
+actux2_config  :       unconfig
+       @$(MKCONFIG) $(@:_config=) arm ixp actux2
+
+actux3_config  :       unconfig
+       @$(MKCONFIG) $(@:_config=) arm ixp actux3
+
+actux4_config  :       unconfig
+       @$(MKCONFIG) $(@:_config=) arm ixp actux4
+
 adsvix_config  :       unconfig
        @$(MKCONFIG) $(@:_config=) arm pxa adsvix
 
@@ -2382,7 +2582,7 @@ scpu_config:    unconfig
        @mkdir -p $(obj)include
        @if [ "$(findstring scpu_,$@)" ] ; then \
                echo "#define CONFIG_SCPU"      >>$(obj)include/config.h ; \
-               echo "... on SCPU board variant" ; \
+               $(XECHO) "... on SCPU board variant" ; \
        else \
                >$(obj)include/config.h ; \
        fi
@@ -2412,9 +2612,12 @@ zylonite_config :
 #########################################################################
 ## ARM1136 Systems
 #########################################################################
-omap2420h4_config :    unconfig
+omap2420h4_config      : unconfig
        @$(MKCONFIG) $(@:_config=) arm arm1136 omap2420h4
 
+apollon_config         : unconfig
+       @$(MKCONFIG) $(@:_config=) arm arm1136 apollon
+
 #========================================================================
 # i386
 #========================================================================
@@ -2447,15 +2650,15 @@ incaip_config: unconfig
        @ >$(obj)include/config.h
        @[ -z "$(findstring _100MHz,$@)" ] || \
                { echo "#define CPU_CLOCK_RATE 100000000" >>$(obj)include/config.h ; \
-                 echo "... with 100MHz system clock" ; \
+                 $(XECHO) "... with 100MHz system clock" ; \
                }
        @[ -z "$(findstring _133MHz,$@)" ] || \
                { echo "#define CPU_CLOCK_RATE 133000000" >>$(obj)include/config.h ; \
-                 echo "... with 133MHz system clock" ; \
+                 $(XECHO) "... with 133MHz system clock" ; \
                }
        @[ -z "$(findstring _150MHz,$@)" ] || \
                { echo "#define CPU_CLOCK_RATE 150000000" >>$(obj)include/config.h ; \
-                 echo "... with 150MHz system clock" ; \
+                 $(XECHO) "... with 150MHz system clock" ; \
                }
        @$(MKCONFIG) -a $(call xtract_incaip,$@) mips mips incaip
 
@@ -2501,6 +2704,12 @@ pb1000_config            :       unconfig
        @echo "#define CONFIG_PB1000 1" >>$(obj)include/config.h
        @$(MKCONFIG) -a pb1x00 mips mips pb1x00
 
+qemu_mips_config: unconfig
+       @mkdir -p $(obj)include
+       @ >$(obj)include/config.h
+       @echo "#define CONFIG_QEMU_MIPS 1" >>$(obj)include/config.h
+       @$(MKCONFIG) -a qemu-mips mips mips qemu-mips
+
 #########################################################################
 ## MIPS64 5Kc
 #########################################################################
@@ -2522,15 +2731,15 @@ DK1C20_config:  unconfig
        @ >$(obj)include/config.h
        @[ -z "$(findstring _safe_32,$@)" ] || \
                { echo "#define CONFIG_NIOS_SAFE_32 1" >>$(obj)include/config.h ; \
-                 echo "... NIOS 'safe_32' configuration" ; \
+                 $(XECHO) "... NIOS 'safe_32' configuration" ; \
                }
        @[ -z "$(findstring _standard_32,$@)" ] || \
                { echo "#define CONFIG_NIOS_STANDARD_32 1" >>$(obj)include/config.h ; \
-                 echo "... NIOS 'standard_32' configuration" ; \
+                 $(XECHO) "... NIOS 'standard_32' configuration" ; \
                }
        @[ -z "$(findstring DK1C20_config,$@)" ] || \
                { echo "#define CONFIG_NIOS_STANDARD_32 1" >>$(obj)include/config.h ; \
-                 echo "... NIOS 'standard_32' configuration (DEFAULT)" ; \
+                 $(XECHO) "... NIOS 'standard_32' configuration (DEFAULT)" ; \
                }
        @$(MKCONFIG) -a DK1C20 nios nios dk1c20 altera
 
@@ -2542,19 +2751,19 @@ DK1S10_config:  unconfig
        @ >$(obj)include/config.h
        @[ -z "$(findstring _safe_32,$@)" ] || \
                { echo "#define CONFIG_NIOS_SAFE_32 1" >>$(obj)include/config.h ; \
-                 echo "... NIOS 'safe_32' configuration" ; \
+                 $(XECHO) "... NIOS 'safe_32' configuration" ; \
                }
        @[ -z "$(findstring _standard_32,$@)" ] || \
                { echo "#define CONFIG_NIOS_STANDARD_32 1" >>$(obj)include/config.h ; \
-                 echo "... NIOS 'standard_32' configuration" ; \
+                 $(XECHO) "... NIOS 'standard_32' configuration" ; \
                }
        @[ -z "$(findstring _mtx_ldk_20,$@)" ] || \
                { echo "#define CONFIG_NIOS_MTX_LDK_20 1" >>$(obj)include/config.h ; \
-                 echo "... NIOS 'mtx_ldk_20' configuration" ; \
+                 $(XECHO) "... NIOS 'mtx_ldk_20' configuration" ; \
                }
        @[ -z "$(findstring DK1S10_config,$@)" ] || \
                { echo "#define CONFIG_NIOS_STANDARD_32 1" >>$(obj)include/config.h ; \
-                 echo "... NIOS 'standard_32' configuration (DEFAULT)" ; \
+                 $(XECHO) "... NIOS 'standard_32' configuration (DEFAULT)" ; \
                }
        @$(MKCONFIG) -a DK1S10 nios nios dk1s10 altera
 
@@ -2565,15 +2774,15 @@ ADNPESC1_config: unconfig
        @ >$(obj)include/config.h
        @[ -z "$(findstring _DNPEVA2,$@)" ] || \
                { echo "#define CONFIG_DNPEVA2 1" >>$(obj)include/config.h ; \
-                 echo "... DNP/EVA2 configuration" ; \
+                 $(XECHO) "... DNP/EVA2 configuration" ; \
                }
        @[ -z "$(findstring _base_32,$@)" ] || \
                { echo "#define CONFIG_NIOS_BASE_32 1" >>$(obj)include/config.h ; \
-                 echo "... NIOS 'base_32' configuration" ; \
+                 $(XECHO) "... NIOS 'base_32' configuration" ; \
                }
        @[ -z "$(findstring ADNPESC1_config,$@)" ] || \
                { echo "#define CONFIG_NIOS_BASE_32 1" >>$(obj)include/config.h ; \
-                 echo "... NIOS 'base_32' configuration (DEFAULT)" ; \
+                 $(XECHO) "... NIOS 'base_32' configuration (DEFAULT)" ; \
                }
        @$(MKCONFIG) -a ADNPESC1 nios nios adnpesc1 ssv
 
@@ -2643,50 +2852,86 @@ bf561-ezkit_config:     unconfig
 #########################################################################
 
 atstk1002_config       :       unconfig
-       @$(MKCONFIG) $(@:_config=) avr32 at32ap atstk1000 atmel at32ap7000
+       @$(MKCONFIG) $(@:_config=) avr32 at32ap atstk1000 atmel at32ap700x
+
+atstk1003_config       :       unconfig
+       @$(MKCONFIG) $(@:_config=) avr32 at32ap atstk1000 atmel at32ap700x
+
+atstk1004_config       :       unconfig
+       @$(MKCONFIG) $(@:_config=) avr32 at32ap atstk1000 atmel at32ap700x
+
+atngw100_config        :       unconfig
+       @$(MKCONFIG) $(@:_config=) avr32 at32ap atngw100 atmel at32ap700x
+
+#########################################################################
+#########################################################################
+#########################################################################
+
+#########################################################################
+## sh3 (Renesas SuperH)
+#########################################################################
+ms7720se_config: unconfig
+       @ >include/config.h
+       @echo "#define CONFIG_MS7720SE 1" >> include/config.h
+       @./mkconfig -a $(@:_config=) sh sh3 ms7720se
+
+#########################################################################
+## sh4 (Renesas SuperH)
+#########################################################################
+ms7750se_config: unconfig
+       @ >$(obj)include/config.h
+       @echo "#define CONFIG_MS7750SE 1" >> $(obj)include/config.h
+       @./mkconfig -a $(@:_config=) sh sh4 ms7750se
+
+ms7722se_config :       unconfig
+       @ >$(obj)include/config.h
+       @echo "#define CONFIG_MS7722SE 1" >> $(obj)include/config.h
+       @./mkconfig -a $(@:_config=) sh sh4 ms7722se
 
 #########################################################################
 #########################################################################
 #########################################################################
 
 clean:
-       find $(OBJTREE) -type f \
+       @find $(OBJTREE) -type f \
                \( -name 'core' -o -name '*.bak' -o -name '*~' \
                -o -name '*.o'  -o -name '*.a'  \) -print \
                | xargs rm -f
-       rm -f $(obj)examples/hello_world $(obj)examples/timer \
+       @rm -f $(obj)examples/hello_world $(obj)examples/timer \
              $(obj)examples/eepro100_eeprom $(obj)examples/sched \
              $(obj)examples/mem_to_mem_idma2intr $(obj)examples/82559_eeprom \
              $(obj)examples/smc91111_eeprom $(obj)examples/interrupt \
              $(obj)examples/test_burst
-       rm -f $(obj)tools/img2srec $(obj)tools/mkimage $(obj)tools/envcrc \
+       @rm -f $(obj)tools/img2srec $(obj)tools/mkimage $(obj)tools/envcrc \
                $(obj)tools/gen_eth_addr $(obj)tools/ubsha1
-       rm -f $(obj)tools/mpc86x_clk $(obj)tools/ncb
-       rm -f $(obj)tools/easylogo/easylogo $(obj)tools/bmp_logo
-       rm -f $(obj)tools/gdb/astest $(obj)tools/gdb/gdbcont $(obj)tools/gdb/gdbsend
-       rm -f $(obj)tools/env/fw_printenv $(obj)tools/env/fw_setenv
-       rm -f $(obj)board/cray/L1/bootscript.c $(obj)board/cray/L1/bootscript.image
-       rm -f $(obj)board/netstar/eeprom $(obj)board/netstar/crcek $(obj)board/netstar/crcit
-       rm -f $(obj)board/netstar/*.srec $(obj)board/netstar/*.bin
-       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)board/bf533-ezkit/u-boot.lds $(obj)board/bf533-stamp/u-boot.lds
-       rm -f $(obj)board/bf537-stamp/u-boot.lds $(obj)board/bf561-ezkit/u-boot.lds
-       rm -f $(obj)include/bmp_logo.h
-       rm -f $(obj)nand_spl/u-boot-spl $(obj)nand_spl/u-boot-spl.map
+       @rm -f $(obj)tools/mpc86x_clk $(obj)tools/ncb
+       @rm -f $(obj)tools/easylogo/easylogo $(obj)tools/bmp_logo
+       @rm -f $(obj)tools/gdb/astest $(obj)tools/gdb/gdbcont $(obj)tools/gdb/gdbsend
+       @rm -f $(obj)tools/env/fw_printenv $(obj)tools/env/fw_setenv
+       @rm -f $(obj)board/cray/L1/bootscript.c $(obj)board/cray/L1/bootscript.image
+       @rm -f $(obj)board/netstar/eeprom $(obj)board/netstar/crcek $(obj)board/netstar/crcit
+       @rm -f $(obj)board/netstar/*.srec $(obj)board/netstar/*.bin
+       @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)board/bf533-ezkit/u-boot.lds $(obj)board/bf533-stamp/u-boot.lds
+       @rm -f $(obj)board/bf537-stamp/u-boot.lds $(obj)board/bf561-ezkit/u-boot.lds
+       @rm -f $(obj)include/bmp_logo.h
+       @rm -f $(obj)nand_spl/u-boot-spl $(obj)nand_spl/u-boot-spl.map
+       @rm -f $(obj)api_examples/demo $(VERSION_FILE)
 
 clobber:       clean
-       find $(OBJTREE) -type f \( -name .depend \
+       @find $(OBJTREE) -type f \( -name .depend \
                -o -name '*.srec' -o -name '*.bin' -o -name u-boot.img \) \
                -print0 \
                | xargs -0 rm -f
-       rm -f $(OBJS) $(obj)*.bak $(obj)ctags $(obj)etags $(obj)TAGS $(obj)include/version_autogenerated.h
-       rm -fr $(obj)*.*~
-       rm -f $(obj)u-boot $(obj)u-boot.map $(obj)u-boot.hex $(ALL)
-       rm -f $(obj)tools/crc32.c $(obj)tools/environment.c $(obj)tools/env/crc32.c $(obj)tools/sha1.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
+       @rm -f $(OBJS) $(obj)*.bak $(obj)ctags $(obj)etags $(obj)TAGS
+       @rm -fr $(obj)*.*~
+       @rm -f $(obj)u-boot $(obj)u-boot.map $(obj)u-boot.hex $(ALL)
+       @rm -f $(obj)tools/crc32.c $(obj)tools/environment.c $(obj)tools/env/crc32.c $(obj)tools/sha1.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 $(obj)nand_spl ] || find $(obj)nand_spl -lname "*" -print | xargs rm -f
+       @[ ! -d $(obj)api_examples ] || find $(obj)api_examples -lname "*" -print | xargs rm -f
 
 ifeq ($(OBJTREE),$(SRCTREE))
 mrproper \
@@ -2694,7 +2939,7 @@ distclean:        clobber unconfig
 else
 mrproper \
 distclean:     clobber unconfig
-       rm -rf $(OBJTREE)/*
+       rm -rf $(obj)*
 endif
 
 backup: