]> git.ipfire.org Git - people/ms/u-boot.git/blobdiff - Makefile
POST: move CONFIG_POST to Makefiles
[people/ms/u-boot.git] / Makefile
index 3cefb42ead98fb2c2b3be73ec9dee3fb5fdda407..b2b59b23001fbb849856b4f8b98aaf9b218a7c50 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -12,7 +12,7 @@
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
@@ -23,7 +23,7 @@
 
 VERSION = 1
 PATCHLEVEL = 3
-SUBLEVEL = 1
+SUBLEVEL = 2
 EXTRAVERSION =
 U_BOOT_VERSION = $(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)
 VERSION_FILE = $(obj)include/version_autogenerated.h
@@ -118,6 +118,9 @@ src :=
 endif
 export obj src
 
+# Make sure CDPATH settings don't interfere
+unexport CDPATH
+
 #########################################################################
 
 ifeq ($(obj)include/config.mk,$(wildcard $(obj)include/config.mk))
@@ -185,18 +188,6 @@ endif
 ifeq ($(CPU),mpc85xx)
 OBJS += cpu/$(CPU)/resetvec.o
 endif
-ifeq ($(CPU),bf533)
-OBJS += cpu/$(CPU)/start1.o    cpu/$(CPU)/interrupt.o  cpu/$(CPU)/cache.o
-OBJS += cpu/$(CPU)/flush.o     cpu/$(CPU)/init_sdram.o
-endif
-ifeq ($(CPU),bf537)
-OBJS += cpu/$(CPU)/start1.o    cpu/$(CPU)/interrupt.o  cpu/$(CPU)/cache.o
-OBJS += cpu/$(CPU)/flush.o     cpu/$(CPU)/init_sdram.o
-endif
-ifeq ($(CPU),bf561)
-OBJS += cpu/$(CPU)/start1.o    cpu/$(CPU)/interrupt.o  cpu/$(CPU)/cache.o
-OBJS += cpu/$(CPU)/flush.o     cpu/$(CPU)/init_sdram.o
-endif
 
 OBJS := $(addprefix $(obj),$(OBJS))
 
@@ -218,6 +209,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
@@ -241,23 +233,13 @@ 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
-ifeq ($(CONFIG_API),y)
 LIBS += api/libapi.a
-endif
+LIBS += post/libpost.a
 
 LIBS := $(addprefix $(obj),$(LIBS))
-.PHONY : $(LIBS)
+.PHONY : $(LIBS) $(VERSION_FILE)
 
 # Add GCC lib
 PLATFORM_LIBS += -L $(shell dirname `$(CC) $(CFLAGS) -print-libgcc-file-name`) -lgcc
@@ -265,11 +247,8 @@ PLATFORM_LIBS += -L $(shell dirname `$(CC) $(CFLAGS) -print-libgcc-file-name`) -
 # The "tools" are needed early, so put this first
 # Don't include stuff already done in $(LIBS)
 SUBDIRS        = tools \
-         examples
-
-ifeq ($(CONFIG_API),y)
-SUBDIRS += api_examples
-endif
+         examples \
+         api_examples
 
 .PHONY : $(SUBDIRS)
 
@@ -278,13 +257,21 @@ NAND_SPL = nand_spl
 U_BOOT_NAND = $(obj)u-boot-nand.bin
 endif
 
+ifeq ($(CONFIG_ONENAND_U_BOOT),y)
+ONENAND_IPL = onenand_ipl
+U_BOOT_ONENAND = $(obj)u-boot-onenand.bin
+endif
+
 __OBJS := $(subst $(obj),,$(OBJS))
 __LIBS := $(subst $(obj),,$(LIBS))
 
 #########################################################################
 #########################################################################
 
-ALL += $(obj)u-boot.srec $(obj)u-boot.bin $(obj)System.map $(U_BOOT_NAND)
+ALL += $(obj)u-boot.srec $(obj)u-boot.bin $(obj)System.map $(U_BOOT_NAND) $(U_BOOT_ONENAND)
+ifeq ($(ARCH),blackfin)
+ALL += $(obj)u-boot.ldr
+endif
 
 all:           $(ALL)
 
@@ -297,6 +284,15 @@ $(obj)u-boot.srec: $(obj)u-boot
 $(obj)u-boot.bin:      $(obj)u-boot
                $(OBJCOPY) ${OBJCFLAGS} -O binary $< $@
 
+$(obj)u-boot.ldr:      $(obj)u-boot
+               $(LDR) -T $(CONFIG_BFIN_CPU) -f -c $@ $< $(LDR_FLAGS)
+
+$(obj)u-boot.ldr.hex:  $(obj)u-boot.ldr
+               $(OBJCOPY) ${OBJCFLAGS} -O ihex $< $@ -I binary
+
+$(obj)u-boot.ldr.srec: $(obj)u-boot.ldr
+               $(OBJCOPY) ${OBJCFLAGS} -O srec $< $@ -I binary
+
 $(obj)u-boot.img:      $(obj)u-boot.bin
                ./tools/mkimage -A $(ARCH) -T firmware -C none \
                -a $(TEXT_BASE) -e 0 \
@@ -311,32 +307,42 @@ $(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/.*\(__u_boot_cmd_.*\)/-u\1/p'|sort|uniq`;\
+               UNDEF_SYM=`$(OBJDUMP) -x $(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
 
-$(OBJS):       $(obj)include/autoconf.mk
+$(OBJS):       depend $(obj)include/autoconf.mk
                $(MAKE) -C cpu/$(CPU) $(if $(REMOTE_BUILD),$@,$(notdir $@))
 
-$(LIBS):       $(obj)include/autoconf.mk
+$(LIBS):       depend $(obj)include/autoconf.mk
                $(MAKE) -C $(dir $(subst $(obj),,$@))
 
-$(SUBDIRS):    $(obj)include/autoconf.mk
+$(SUBDIRS):    depend $(obj)include/autoconf.mk
                $(MAKE) -C $@ all
 
+$(LDSCRIPT):   depend $(obj)include/autoconf.mk
+               $(MAKE) -C $(dir $@) $(notdir $@)
+
 $(NAND_SPL):   $(VERSION_FILE) $(obj)include/autoconf.mk
                $(MAKE) -C nand_spl/board/$(BOARDDIR) all
 
 $(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
 
+$(ONENAND_IPL):        $(VERSION_FILE) $(obj)include/autoconf.mk
+               $(MAKE) -C onenand_ipl/board/$(BOARDDIR) all
+
+$(U_BOOT_ONENAND):     $(ONENAND_IPL) $(obj)u-boot.bin $(obj)include/autoconf.mk
+               cat $(obj)onenand_ipl/onenand-ipl-2k.bin $(obj)u-boot.bin > $(obj)u-boot-onenand.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 "\"" ) > $(VERSION_FILE)
+               echo "\"" ) > $@.tmp
+               @cmp -s $@ $@.tmp && rm -f $@.tmp || mv -f $@.tmp $@
 
 gdbtools:
                $(MAKE) -C tools/gdb all || exit 1
@@ -389,6 +395,10 @@ tags ctags:
 etags:
                etags -a -o $(obj)etags `find $(SUBDIRS) $(TAG_SUBDIRS) \
                                                -name '*.[ch]' -print`
+cscope:
+               find $(SUBDIRS) $(TAG_SUBDIRS) -name '*.[ch]' -print \
+                                               > cscope.files
+               cscope -b -q -k
 
 $(obj)System.map:      $(obj)u-boot
                @$(NM) $< | \
@@ -403,6 +413,7 @@ $(obj)System.map:   $(obj)u-boot
 # to regenerate the autoconf.mk file.
 $(obj)include/autoconf.mk: $(obj)include/config.h $(VERSION_FILE)
        @$(XECHO) Generating include/autoconf.mk ; \
+       set -e ; \
        : Generate the dependancies ; \
        $(CC) -M $(HOST_CFLAGS) $(CPPFLAGS) -MQ $@ include/common.h > $@.dep ; \
        : Extract the config macros ; \
@@ -415,7 +426,7 @@ 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_FILE) gdbtools updater env depend \
-dep tags ctags etags $(obj)System.map:
+dep tags ctags etags cscope $(obj)System.map:
        @echo "System not configured - see README" >&2
        @ exit 1
 endif  # config.mk
@@ -477,7 +488,6 @@ icecube_5200_DDR_LOWBOOT08_config   \
 icecube_5100_config:                   unconfig
        @mkdir -p $(obj)include
        @mkdir -p $(obj)board/icecube
-       @ >$(obj)include/config.h
        @[ -z "$(findstring LOWBOOT_,$@)" ] || \
                { if [ "$(findstring DDR,$@)" ] ; \
                        then echo "TEXT_BASE = 0xFF800000" >$(obj)board/icecube/config.tmp ; \
@@ -518,7 +528,6 @@ lite5200b_PM_config \
 lite5200b_LOWBOOT_config:      unconfig
        @mkdir -p $(obj)include
        @mkdir -p $(obj)board/icecube
-       @ >$(obj)include/config.h
        @ echo "#define CONFIG_MPC5200_DDR"     >>$(obj)include/config.h
        @ $(XECHO) "... DDR memory revision"
        @ echo "#define CONFIG_MPC5200"         >>$(obj)include/config.h
@@ -548,7 +557,6 @@ prs200_highboot_config      \
 prs200_highboot_DDR_config:    unconfig
        @mkdir -p $(obj)include
        @mkdir -p $(obj)board/mcc200
-       @ >$(obj)include/config.h
        @[ -n "$(findstring highboot,$@)" ] || \
                { $(XECHO) "... with lowboot configuration" ; \
                }
@@ -579,7 +587,7 @@ prs200_highboot_DDR_config: unconfig
                  $(XECHO) "... with console on COM12" ; \
                }
        @[ -z "$(findstring prs200,$@)" ] || \
-               { echo "#define CONFIG_PRS200"  >>$(obj)include/config.h ;\
+               { echo "#define CONFIG_PRS200"  >>$(obj)include/config.h ;\
                }
        @$(MKCONFIG) -n $@ -a mcc200 ppc mpc5xxx mcc200
 
@@ -589,10 +597,10 @@ mecp5200_config:  unconfig
 munices_config:        unconfig
        @$(MKCONFIG) munices ppc mpc5xxx munices
 
-o2dnt_config:
+o2dnt_config:  unconfig
        @$(MKCONFIG) o2dnt ppc mpc5xxx o2dnt
 
-pf5200_config:  unconfig
+pf5200_config: unconfig
        @$(MKCONFIG) pf5200  ppc mpc5xxx pf5200 esd
 
 PM520_config \
@@ -600,7 +608,6 @@ PM520_DDR_config \
 PM520_ROMBOOT_config \
 PM520_ROMBOOT_DDR_config:      unconfig
        @mkdir -p $(obj)include
-       @ >$(obj)include/config.h
        @[ -z "$(findstring DDR,$@)" ] || \
                { echo "#define CONFIG_MPC5200_DDR"     >>$(obj)include/config.h ; \
                  $(XECHO) "... DDR memory revision" ; \
@@ -615,7 +622,7 @@ smmaco4_config: unconfig
        @$(MKCONFIG) -a smmaco4 ppc mpc5xxx tqm5200
 
 cm5200_config: unconfig
-       @./mkconfig -a cm5200 ppc mpc5xxx cm5200
+       @$(MKCONFIG) -a cm5200 ppc mpc5xxx cm5200
 
 spieval_config:        unconfig
        @$(MKCONFIG) -a spieval ppc mpc5xxx tqm5200
@@ -643,7 +650,6 @@ Total5200_Rev2_config               \
 Total5200_Rev2_lowboot_config: unconfig
        @mkdir -p $(obj)include
        @mkdir -p $(obj)board/total5200
-       @ >$(obj)include/config.h
        @[ -z "$(findstring 5100,$@)" ] || \
                { echo "#define CONFIG_MGT5100"         >>$(obj)include/config.h ; \
                  $(XECHO) "... with MGT5100 processor" ; \
@@ -678,7 +684,6 @@ TQM5200_config      \
 TQM5200_STK100_config: unconfig
        @mkdir -p $(obj)include
        @mkdir -p $(obj)board/tqm5200
-       @ >$(obj)include/config.h
        @[ -z "$(findstring cam5200,$@)" ] || \
                { echo "#define CONFIG_CAM5200" >>$(obj)include/config.h ; \
                  echo "#define CONFIG_TQM5200S"        >>$(obj)include/config.h ; \
@@ -721,17 +726,24 @@ motionpro_config: unconfig
 #########################################################################
 ## MPC512x Systems
 #########################################################################
-ads5121_config: unconfig
-       @$(MKCONFIG) ads5121 ppc mpc512x ads5121
+ads5121_config \
+ads5121_PCI_config \
+       :                unconfig
+       @mkdir -p $(obj)include
+       @if [ "$(findstring _PCI_,$@)" ] ; then \
+               echo "#define CONFIG_PCI"  >>$(obj)include/config.h ; \
+               $(XECHO) "... with PCI enabled" ; \
+       fi
+       @$(MKCONFIG) -a ads5121 ppc mpc512x ads5121
 
 
 #########################################################################
 ## MPC8xx Systems
 #########################################################################
 
-Adder_config    \
+Adder_config   \
 Adder87x_config \
-AdderII_config  \
+AdderII_config \
        :               unconfig
        @mkdir -p $(obj)include
        $(if $(findstring AdderII,$@), \
@@ -739,10 +751,10 @@ AdderII_config  \
        @$(MKCONFIG) -a Adder ppc mpc8xx adder
 
 AdderUSB_config:       unconfig
-       @./mkconfig -a AdderUSB ppc mpc8xx adder
+       @$(MKCONFIG) -a AdderUSB ppc mpc8xx adder
 
-ADS860_config     \
-FADS823_config    \
+ADS860_config    \
+FADS823_config   \
 FADS850SAR_config \
 MPC86xADS_config  \
 MPC885ADS_config  \
@@ -781,7 +793,6 @@ xtract_GEN860T = $(subst _SC,,$(subst _config,,$1))
 GEN860T_SC_config      \
 GEN860T_config: unconfig
        @mkdir -p $(obj)include
-       @ >$(obj)include/config.h
        @[ -z "$(findstring _SC,$@)" ] || \
                { echo "#define CONFIG_SC" >>$(obj)include/config.h ; \
                  $(XECHO) "With reduced H/W feature set (SC)..." ; \
@@ -808,7 +819,6 @@ xtract_ICU862 = $(subst _100MHz,,$(subst _config,,$1))
 ICU862_100MHz_config   \
 ICU862_config: unconfig
        @mkdir -p $(obj)include
-       @ >$(obj)include/config.h
        @[ -z "$(findstring _100MHz,$@)" ] || \
                { echo "#define CONFIG_100MHz"  >>$(obj)include/config.h ; \
                  $(XECHO) "... with 100MHz system clock" ; \
@@ -822,7 +832,6 @@ IVML24_256_config \
 IVML24_128_config \
 IVML24_config: unconfig
        @mkdir -p $(obj)include
-       @ >$(obj)include/config.h
        @[ -z "$(findstring IVML24_config,$@)" ] || \
                 { echo "#define CONFIG_IVML24_16M"     >>$(obj)include/config.h ; \
                 }
@@ -838,7 +847,6 @@ IVMS8_256_config \
 IVMS8_128_config \
 IVMS8_config:  unconfig
        @mkdir -p $(obj)include
-       @ >$(obj)include/config.h
        @[ -z "$(findstring IVMS8_config,$@)" ] || \
                 { echo "#define CONFIG_IVMS8_16M"      >>$(obj)include/config.h ; \
                 }
@@ -853,7 +861,7 @@ IVMS8_config:       unconfig
 KUP4K_config   :       unconfig
        @$(MKCONFIG) $(@:_config=) ppc mpc8xx kup4k kup
 
-KUP4X_config    :       unconfig
+KUP4X_config   :       unconfig
        @$(MKCONFIG) $(@:_config=) ppc mpc8xx kup4x kup
 
 LANTEC_config  :       unconfig
@@ -880,7 +888,6 @@ xtract_NETVIA = $(subst _V2,,$(subst _config,,$1))
 NETVIA_V2_config \
 NETVIA_config:         unconfig
        @mkdir -p $(obj)include
-       @ >$(obj)include/config.h
        @[ -z "$(findstring NETVIA_config,$@)" ] || \
                 { echo "#define CONFIG_NETVIA_VERSION 1" >>$(obj)include/config.h ; \
                  $(XECHO) "... Version 1" ; \
@@ -896,7 +903,6 @@ xtract_NETPHONE = $(subst _V2,,$(subst _config,,$1))
 NETPHONE_V2_config \
 NETPHONE_config:       unconfig
        @mkdir -p $(obj)include
-       @ >$(obj)include/config.h
        @[ -z "$(findstring NETPHONE_config,$@)" ] || \
                 { echo "#define CONFIG_NETPHONE_VERSION 1" >>$(obj)include/config.h ; \
                 }
@@ -916,7 +922,6 @@ NETTA_ISDN_config \
 NETTA_6412_config \
 NETTA_config:          unconfig
        @mkdir -p $(obj)include
-       @ >$(obj)include/config.h
        @[ -z "$(findstring ISDN_,$@)" ] || \
                 { echo "#define CONFIG_NETTA_ISDN 1" >>$(obj)include/config.h ; \
                 }
@@ -942,7 +947,6 @@ xtract_NETTA2 = $(subst _V2,,$(subst _config,,$1))
 NETTA2_V2_config \
 NETTA2_config:         unconfig
        @mkdir -p $(obj)include
-       @ >$(obj)include/config.h
        @[ -z "$(findstring NETTA2_config,$@)" ] || \
                 { echo "#define CONFIG_NETTA2_VERSION 1" >>$(obj)include/config.h ; \
                 }
@@ -955,7 +959,6 @@ NC650_Rev1_config \
 NC650_Rev2_config \
 CP850_config:  unconfig
        @mkdir -p $(obj)include
-       @ >$(obj)include/config.h
        @[ -z "$(findstring CP850,$@)" ] || \
                 { echo "#define CONFIG_CP850 1" >>$(obj)include/config.h ; \
                   echo "#define CONFIG_IDS852_REV2 1" >>$(obj)include/config.h ; \
@@ -1002,12 +1005,11 @@ RPXlite_DW_64_config            \
 RPXlite_DW_LCD_config          \
 RPXlite_DW_64_LCD_config       \
 RPXlite_DW_NVRAM_config                \
-RPXlite_DW_NVRAM_64_config      \
+RPXlite_DW_NVRAM_64_config     \
 RPXlite_DW_NVRAM_LCD_config    \
-RPXlite_DW_NVRAM_64_LCD_config  \
+RPXlite_DW_NVRAM_64_LCD_config \
 RPXlite_DW_config:     unconfig
        @mkdir -p $(obj)include
-       @ >$(obj)include/config.h
        @[ -z "$(findstring _64,$@)" ] || \
                { echo "#define RPXlite_64MHz"          >>$(obj)include/config.h ; \
                  $(XECHO) "... with 64MHz system clock ..."; \
@@ -1038,7 +1040,7 @@ RRvision_LCD_config:      unconfig
 SM850_config   :       unconfig
        @$(MKCONFIG) $(@:_config=) ppc mpc8xx tqm8xx
 
-spc1920_config:
+spc1920_config:                unconfig
        @$(MKCONFIG) $(@:_config=) ppc mpc8xx spc1920
 
 SPD823TS_config:       unconfig
@@ -1081,7 +1083,6 @@ 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 ; \
@@ -1161,6 +1162,17 @@ bubinga_config:  unconfig
 CANBT_config:  unconfig
        @$(MKCONFIG) $(@:_config=) ppc ppc4xx canbt esd
 
+canyonlands_config:    unconfig
+       @$(MKCONFIG) $(@:_config=) ppc ppc4xx canyonlands amcc
+
+canyonlands_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
+       @$(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
+
 CATcenter_config       \
 CATcenter_25_config    \
 CATcenter_33_config:   unconfig
@@ -1208,6 +1220,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
 
@@ -1221,9 +1236,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
@@ -1267,6 +1284,10 @@ lwmon5_config:   unconfig
 makalu_config: unconfig
        @$(MKCONFIG) $(@:_config=) ppc ppc4xx makalu amcc
 
+mcu25_config:  unconfig
+       @mkdir -p $(obj)board/netstal/common
+       @$(MKCONFIG) $(@:_config=) ppc ppc4xx mcu25 netstal
+
 METROBOX_config: unconfig
        @$(MKCONFIG) $(@:_config=) ppc ppc4xx metrobox sandburst
 
@@ -1321,7 +1342,6 @@ PPChameleonEVB_BA_33_config       \
 PPChameleonEVB_ME_33_config    \
 PPChameleonEVB_HI_33_config:   unconfig
        @mkdir -p $(obj)include
-       @ >$(obj)include/config.h
        @[ -z "$(findstring EVB_BA,$@)" ] || \
                { echo "#define CONFIG_PPCHAMELEON_MODULE_MODEL 0" >>$(obj)include/config.h ; \
                  $(XECHO) "... BASIC model" ; \
@@ -1643,8 +1663,6 @@ PM828_ROMBOOT_PCI_config: unconfig
        @if [ "$(findstring _PCI_,$@)" ] ; then \
                echo "#define CONFIG_PCI"  >>$(obj)include/config.h ; \
                $(XECHO) "... with PCI enabled" ; \
-       else \
-               >$(obj)include/config.h ; \
        fi
        @if [ "$(findstring _ROMBOOT_,$@)" ] ; then \
                $(XECHO) "... booting from 8-bit flash" ; \
@@ -1703,7 +1721,6 @@ TQM8265_AA_config:  unconfig
        TQM8260_AI_config) CTYPE=MPC8260; CFREQ=300; CACHE=no;  BMODE=60x;;  \
        TQM8265_AA_config) CTYPE=MPC8265; CFREQ=300; CACHE=no;  BMODE=60x;;  \
        esac; \
-       >$(obj)include/config.h ; \
        if [ "$${CTYPE}" != "MPC8260" ] ; then \
                echo "#define CONFIG_$${CTYPE}" >>$(obj)include/config.h ; \
        fi; \
@@ -1726,7 +1743,7 @@ TQM8265_AA_config:  unconfig
        @$(MKCONFIG) -a TQM8260 ppc mpc8260 tqm8260
 
 TQM8272_config: unconfig
-       @$(MKCONFIG) -a TQM8272 ppc mpc8260 tqm8272
+       @$(MKCONFIG) TQM8272 ppc mpc8260 tqm8272
 
 VoVPN-GW_66MHz_config  \
 VoVPN-GW_100MHz_config:                unconfig
@@ -1741,6 +1758,9 @@ ZPC1900_config: unconfig
 ## Coldfire
 #########################################################################
 
+M52277EVB_config:      unconfig
+       @$(MKCONFIG) -a M52277EVB m68k mcf5227x m52277evb freescale
+
 M5235EVB_config \
 M5235EVB_Flash16_config \
 M5235EVB_Flash32_config:       unconfig
@@ -1749,7 +1769,6 @@ M5235EVB_Flash32_config:  unconfig
        M5235EVB_Flash16_config)        FLASH=16;; \
        M5235EVB_Flash32_config)        FLASH=32;; \
        esac; \
-       >$(obj)include/config.h ; \
        if [ "$${FLASH}" != "16" ] ; then \
                echo "#define NORFLASH_PS32BIT  1" >> $(obj)include/config.h ; \
                echo "TEXT_BASE = 0xFFC00000" > $(obj)board/freescale/m5235evb/config.tmp ; \
@@ -1772,14 +1791,12 @@ cobra5272_config :              unconfig
 EB+MCF-EV123_config :          unconfig
        @mkdir -p $(obj)include
        @mkdir -p $(obj)board/BuS/EB+MCF-EV123
-       @ >$(obj)include/config.h
        @echo "TEXT_BASE = 0xFFE00000"|tee $(obj)board/BuS/EB+MCF-EV123/textbase.mk
        @$(MKCONFIG) EB+MCF-EV123 m68k mcf52x2 EB+MCF-EV123 BuS
 
 EB+MCF-EV123_internal_config : unconfig
        @mkdir -p $(obj)include
        @mkdir -p $(obj)board/BuS/EB+MCF-EV123
-       @ >$(obj)include/config.h
        @echo "TEXT_BASE = 0xF0000000"|tee $(obj)board/BuS/EB+MCF-EV123/textbase.mk
        @$(MKCONFIG) EB+MCF-EV123 m68k mcf52x2 EB+MCF-EV123 BuS
 
@@ -1807,12 +1824,20 @@ M5329BFEE_config :      unconfig
        M5329AFEE_config)       NAND=0;; \
        M5329BFEE_config)       NAND=16;; \
        esac; \
-       >$(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; \
+       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 \
@@ -1829,7 +1854,6 @@ M54455EVB_i66_config :    unconfig
        M54455EVB_i33_config)           FLASH=INTEL; FREQ=33333333;; \
        M54455EVB_i66_config)           FLASH=INTEL; FREQ=66666666;; \
        esac; \
-       >$(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 ; \
@@ -1845,6 +1869,74 @@ M54455EVB_i66_config :   unconfig
        $(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; \
+       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=16;VID=1;USB=0;RAM=64;RAM1=0;; \
+       esac; \
+       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
 #########################################################################
@@ -1852,8 +1944,7 @@ M54455EVB_i66_config :    unconfig
 MPC8313ERDB_33_config \
 MPC8313ERDB_66_config: unconfig
        @mkdir -p $(obj)include
-       @echo "" >$(obj)include/config.h ; \
-       if [ "$(findstring _33_,$@)" ] ; then \
+       @if [ "$(findstring _33_,$@)" ] ; then \
                $(XECHO) -n "...33M ..." ; \
                echo "#define CFG_33MHZ" >>$(obj)include/config.h ; \
        fi ; \
@@ -1875,8 +1966,7 @@ MPC832XEMDS_HOST_66_config \
 MPC832XEMDS_SLAVE_config \
 MPC832XEMDS_ATM_config:        unconfig
        @mkdir -p $(obj)include
-       @echo "" >$(obj)include/config.h ; \
-       if [ "$(findstring _HOST_,$@)" ] ; then \
+       @if [ "$(findstring _HOST_,$@)" ] ; then \
                $(XECHO) -n "... PCI HOST " ; \
                echo "#define CONFIG_PCI" >>$(obj)include/config.h ; \
        fi ; \
@@ -1898,7 +1988,7 @@ MPC832XEMDS_ATM_config:   unconfig
        if [ "$(findstring _ATM_,$@)" ] ; then \
                $(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 ; \
+               echo "#define CONFIG_PQ_MDS_PIB_ATM     1" >>$(obj)include/config.h ; \
        fi ;
        @$(MKCONFIG) -a MPC832XEMDS ppc mpc83xx mpc832xemds freescale
 
@@ -1925,8 +2015,7 @@ MPC8360EMDS_HOST_66_config \
 MPC8360EMDS_SLAVE_config \
 MPC8360EMDS_ATM_config: unconfig
        @mkdir -p $(obj)include
-       @echo "" >$(obj)include/config.h ; \
-       if [ "$(findstring _HOST_,$@)" ] ; then \
+       @if [ "$(findstring _HOST_,$@)" ] ; then \
                $(XECHO) -n "... PCI HOST " ; \
                echo "#define CONFIG_PCI" >>$(obj)include/config.h ; \
        fi ; \
@@ -1948,16 +2037,15 @@ MPC8360EMDS_ATM_config: unconfig
        if [ "$(findstring _ATM_,$@)" ] ; then \
                $(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 ; \
+               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:
+MPC8360ERDK_config:    unconfig
        @mkdir -p $(obj)include
-       @echo "" >$(obj)include/config.h ; \
-       if [ "$(findstring _33_,$@)" ] ; then \
+       @if [ "$(findstring _33_,$@)" ] ; then \
                $(XECHO) -n "... CLKIN 33MHz " ; \
                echo "#define CONFIG_CLKIN_33MHZ" >>$(obj)include/config.h ;\
        fi ;
@@ -1966,8 +2054,7 @@ MPC8360ERDK_config:
 MPC837XEMDS_config \
 MPC837XEMDS_HOST_config:       unconfig
        @mkdir -p $(obj)include
-       @echo "" >$(obj)include/config.h ; \
-       if [ "$(findstring _HOST_,$@)" ] ; then \
+       @if [ "$(findstring _HOST_,$@)" ] ; then \
                $(XECHO) -n "... PCI HOST " ; \
                echo "#define CONFIG_PCI" >>$(obj)include/config.h ; \
        fi ;
@@ -1997,10 +2084,9 @@ MPC8540EVAL_config \
 MPC8540EVAL_33_config \
 MPC8540EVAL_66_config \
 MPC8540EVAL_33_slave_config \
-MPC8540EVAL_66_slave_config:      unconfig
+MPC8540EVAL_66_slave_config:     unconfig
        @mkdir -p $(obj)include
-       @echo "" >$(obj)include/config.h ; \
-       if [ "$(findstring _33_,$@)" ] ; then \
+       @if [ "$(findstring _33_,$@)" ] ; then \
                $(XECHO) "... 33 MHz PCI" ; \
        else \
                echo "#define CONFIG_SYSCLK_66M" >>$(obj)include/config.h ; \
@@ -2020,8 +2106,7 @@ MPC8560ADS_config:        unconfig
 MPC8541CDS_legacy_config \
 MPC8541CDS_config:     unconfig
        @mkdir -p $(obj)include
-       @echo "" >$(obj)include/config.h ; \
-       if [ "$(findstring _legacy_,$@)" ] ; then \
+       @if [ "$(findstring _legacy_,$@)" ] ; then \
                echo "#define CONFIG_LEGACY" >>$(obj)include/config.h ; \
                $(XECHO) "... legacy" ; \
        fi
@@ -2033,8 +2118,7 @@ MPC8544DS_config: unconfig
 MPC8548CDS_legacy_config \
 MPC8548CDS_config:     unconfig
        @mkdir -p $(obj)include
-       @echo "" >$(obj)include/config.h ; \
-       if [ "$(findstring _legacy_,$@)" ] ; then \
+       @if [ "$(findstring _legacy_,$@)" ] ; then \
                echo "#define CONFIG_LEGACY" >>$(obj)include/config.h ; \
                $(XECHO) "... legacy" ; \
        fi
@@ -2043,8 +2127,7 @@ MPC8548CDS_config:        unconfig
 MPC8555CDS_legacy_config \
 MPC8555CDS_config:     unconfig
        @mkdir -p $(obj)include
-       @echo "" >$(obj)include/config.h ; \
-       if [ "$(findstring _legacy_,$@)" ] ; then \
+       @if [ "$(findstring _legacy_,$@)" ] ; then \
                echo "#define CONFIG_LEGACY" >>$(obj)include/config.h ; \
                $(XECHO) "... legacy" ; \
        fi
@@ -2067,7 +2150,6 @@ sbc8540_66_config:        unconfig
                echo "#define CONFIG_PCI_66"    >>$(obj)include/config.h ; \
                $(XECHO) "... 66 MHz PCI" ; \
        else \
-               >$(obj)include/config.h ; \
                $(XECHO) "... 33 MHz PCI" ; \
        fi
        @$(MKCONFIG) -a SBC8540 ppc mpc85xx sbc8560
@@ -2077,13 +2159,12 @@ sbc8548_config:         unconfig
 
 sbc8560_config \
 sbc8560_33_config \
-sbc8560_66_config:      unconfig
+sbc8560_66_config:     unconfig
        @mkdir -p $(obj)include
        @if [ "$(findstring _66_,$@)" ] ; then \
                echo "#define CONFIG_PCI_66"    >>$(obj)include/config.h ; \
                $(XECHO) "... 66 MHz PCI" ; \
        else \
-               >$(obj)include/config.h ; \
                $(XECHO) "... 33 MHz PCI" ; \
        fi
        @$(MKCONFIG) -a sbc8560 ppc mpc85xx sbc8560
@@ -2097,8 +2178,6 @@ stxssa_4M_config: unconfig
        @if [ "$(findstring _4M_,$@)" ] ; then \
                echo "#define CONFIG_STXSSA_4M" >>$(obj)include/config.h ; \
                $(XECHO) "... with 4 MiB flash memory" ; \
-       else \
-               >$(obj)include/config.h ; \
        fi
        @$(MKCONFIG) -a stxssa ppc mpc85xx stxssa
 
@@ -2108,7 +2187,6 @@ TQM8555_config            \
 TQM8560_config:                unconfig
        @mkdir -p $(obj)include
        @CTYPE=$(subst TQM,,$(@:_config=)); \
-       >$(obj)include/config.h ; \
        $(XECHO) "... TQM"$${CTYPE}; \
        echo "#define CONFIG_MPC$${CTYPE}">>$(obj)include/config.h; \
        echo "#define CONFIG_TQM$${CTYPE}">>$(obj)include/config.h; \
@@ -2128,7 +2206,7 @@ MPC8641HPCN_config:    unconfig
        @$(MKCONFIG) $(@:_config=) ppc mpc86xx mpc8641hpcn freescale
 
 sbc8641d_config:       unconfig
-       @./mkconfig $(@:_config=) ppc mpc86xx sbc8641d
+       @$(MKCONFIG) $(@:_config=) ppc mpc86xx sbc8641d
 
 #########################################################################
 ## 74xx/7xx Systems
@@ -2214,8 +2292,11 @@ xtract_omap1610xxx = $(subst _cs0boot,,$(subst _cs3boot,,$(subst _cs_autoboot,,$
 
 xtract_omap730p2 = $(subst _cs0boot,,$(subst _cs3boot,, $(subst _config,,$1)))
 
+at91cap9adk_config     :       unconfig
+       @$(MKCONFIG) $(@:_config=) arm arm926ejs at91cap9adk atmel at91cap9
+
 at91rm9200dk_config    :       unconfig
-       @$(MKCONFIG) $(@:_config=) arm arm920t at91rm9200dk NULL at91rm9200
+       @$(MKCONFIG) $(@:_config=) arm arm920t at91rm9200dk atmel at91rm9200
 
 cmc_pu2_config :       unconfig
        @$(MKCONFIG) $(@:_config=) arm arm920t cmc_pu2 NULL at91rm9200
@@ -2226,6 +2307,8 @@ csb637_config     :       unconfig
 mp2usb_config  :       unconfig
        @$(MKCONFIG) $(@:_config=) arm arm920t mp2usb NULL at91rm9200
 
+m501sk_config  :       unconfig
+       @$(MKCONFIG) $(@:_config=) arm arm920t m501sk NULL at91rm9200
 
 ########################################################################
 ## ARM Integrator boards - see doc/README-integrator for more info.
@@ -2266,17 +2349,8 @@ mx1ads_config    :       unconfig
 mx1fs2_config  :       unconfig
        @$(MKCONFIG) $(@:_config=) arm arm920t mx1fs2 NULL imx
 
-netstar_32_config      \
 netstar_config:                unconfig
-       @mkdir -p $(obj)include
-       @if [ "$(findstring _32_,$@)" ] ; then \
-               $(XECHO) "... 32MB SDRAM" ; \
-               echo "#define PHYS_SDRAM_1_SIZE SZ_32M" >>$(obj)include/config.h ; \
-       else \
-               $(XECHO) "... 64MB SDRAM" ; \
-               echo "#define PHYS_SDRAM_1_SIZE SZ_64M" >>$(obj)include/config.h ; \
-       fi
-       @$(MKCONFIG) -a netstar arm arm925t netstar
+       @$(MKCONFIG) $(@:_config=) arm arm925t netstar
 
 omap1510inn_config :   unconfig
        @$(MKCONFIG) $(@:_config=) arm arm925t omap1510inn
@@ -2349,7 +2423,6 @@ trab_bigflash_config \
 trab_old_config:       unconfig
        @mkdir -p $(obj)include
        @mkdir -p $(obj)board/trab
-       @ >$(obj)include/config.h
        @[ -z "$(findstring _bigram,$@)" ] || \
                { echo "#define CONFIG_FLASH_8MB"  >>$(obj)include/config.h ; \
                  echo "#define CONFIG_RAM_32MB"   >>$(obj)include/config.h ; \
@@ -2380,20 +2453,8 @@ versatileab_config       \
 versatilepb_config :   unconfig
        @board/versatile/split_by_variant.sh $@
 
-voiceblue_smallflash_config    \
 voiceblue_config:      unconfig
-       @mkdir -p $(obj)include
-       @mkdir -p $(obj)board/voiceblue
-       @if [ "$(findstring _smallflash_,$@)" ] ; then \
-               $(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 \
-               $(XECHO) "... boot from upper flash bank" ; \
-               >$(obj)include/config.h ; \
-               echo "VOICEBLUE_SMALL_FLASH=n" >$(obj)board/voiceblue/config.tmp ; \
-       fi
-       @$(MKCONFIG) -a voiceblue arm arm925t voiceblue
+       @$(MKCONFIG) $(@:_config=) arm arm925t voiceblue
 
 cm4008_config  :       unconfig
        @$(MKCONFIG) $(@:_config=) arm arm920t cm4008 NULL ks8695
@@ -2403,8 +2464,7 @@ cm41xx_config     :       unconfig
 
 gth2_config            :       unconfig
        @mkdir -p $(obj)include
-       @ >$(obj)include/config.h
-       @echo "#define CONFIG_GTH2 1" >>$(obj)include/config.h
+       @echo "#define CONFIG_GTH2 1" >$(obj)include/config.h
        @$(MKCONFIG) -a gth2 mips mips gth2
 
 #########################################################################
@@ -2443,6 +2503,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
 
@@ -2455,7 +2527,7 @@ cradle_config     :       unconfig
 csb226_config  :       unconfig
        @$(MKCONFIG) $(@:_config=) arm pxa csb226
 
-delta_config :
+delta_config : unconfig
        @$(MKCONFIG) $(@:_config=) arm pxa delta
 
 innokom_config :       unconfig
@@ -2477,13 +2549,11 @@ logodl_config   :       unconfig
        @$(MKCONFIG) $(@:_config=) arm pxa logodl
 
 pdnb3_config \
-scpu_config:    unconfig
+scpu_config:   unconfig
        @mkdir -p $(obj)include
        @if [ "$(findstring scpu_,$@)" ] ; then \
-               echo "#define CONFIG_SCPU"      >>$(obj)include/config.h ; \
+               echo "#define CONFIG_SCPU"      >>$(obj)include/config.h ; \
                $(XECHO) "... on SCPU board variant" ; \
-       else \
-               >$(obj)include/config.h ; \
        fi
        @$(MKCONFIG) -a pdnb3 arm ixp pdnb3 prodrive
 
@@ -2515,7 +2585,10 @@ omap2420h4_config        : unconfig
        @$(MKCONFIG) $(@:_config=) arm arm1136 omap2420h4
 
 apollon_config         : unconfig
+       @mkdir -p $(obj)include
+       @echo "#define CONFIG_ONENAND_U_BOOT" > $(obj)include/config.h
        @$(MKCONFIG) $(@:_config=) arm arm1136 apollon
+       @echo "CONFIG_ONENAND_U_BOOT = y" >> $(obj)include/config.mk
 
 #========================================================================
 # i386
@@ -2546,7 +2619,6 @@ incaip_133MHz_config      \
 incaip_150MHz_config   \
 incaip_config: unconfig
        @mkdir -p $(obj)include
-       @ >$(obj)include/config.h
        @[ -z "$(findstring _100MHz,$@)" ] || \
                { echo "#define CPU_CLOCK_RATE 100000000" >>$(obj)include/config.h ; \
                  $(XECHO) "... with 100MHz system clock" ; \
@@ -2569,40 +2641,39 @@ tb0229_config: unconfig
 #########################################################################
 dbau1000_config                :       unconfig
        @mkdir -p $(obj)include
-       @ >$(obj)include/config.h
-       @echo "#define CONFIG_DBAU1000 1" >>$(obj)include/config.h
+       @echo "#define CONFIG_DBAU1000 1" >$(obj)include/config.h
        @$(MKCONFIG) -a dbau1x00 mips mips dbau1x00
 
 dbau1100_config                :       unconfig
        @mkdir -p $(obj)include
-       @ >$(obj)include/config.h
-       @echo "#define CONFIG_DBAU1100 1" >>$(obj)include/config.h
+       @echo "#define CONFIG_DBAU1100 1" >$(obj)include/config.h
        @$(MKCONFIG) -a dbau1x00 mips mips dbau1x00
 
 dbau1500_config                :       unconfig
        @mkdir -p $(obj)include
-       @ >$(obj)include/config.h
-       @echo "#define CONFIG_DBAU1500 1" >>$(obj)include/config.h
+       @echo "#define CONFIG_DBAU1500 1" >$(obj)include/config.h
        @$(MKCONFIG) -a dbau1x00 mips mips dbau1x00
 
 dbau1550_config                :       unconfig
        @mkdir -p $(obj)include
-       @ >$(obj)include/config.h
-       @echo "#define CONFIG_DBAU1550 1" >>$(obj)include/config.h
+       @echo "#define CONFIG_DBAU1550 1" >$(obj)include/config.h
        @$(MKCONFIG) -a dbau1x00 mips mips dbau1x00
 
 dbau1550_el_config     :       unconfig
        @mkdir -p $(obj)include
-       @ >$(obj)include/config.h
-       @echo "#define CONFIG_DBAU1550 1" >>$(obj)include/config.h
+       @echo "#define CONFIG_DBAU1550 1" >$(obj)include/config.h
        @$(MKCONFIG) -a dbau1x00 mips mips dbau1x00
 
 pb1000_config          :       unconfig
        @mkdir -p $(obj)include
-       @ >$(obj)include/config.h
-       @echo "#define CONFIG_PB1000 1" >>$(obj)include/config.h
+       @echo "#define CONFIG_PB1000 1" >$(obj)include/config.h
        @$(MKCONFIG) -a pb1x00 mips mips pb1x00
 
+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
+
 #########################################################################
 ## MIPS64 5Kc
 #########################################################################
@@ -2621,7 +2692,6 @@ DK1C20_safe_32_config             \
 DK1C20_standard_32_config      \
 DK1C20_config: unconfig
        @mkdir -p $(obj)include
-       @ >$(obj)include/config.h
        @[ -z "$(findstring _safe_32,$@)" ] || \
                { echo "#define CONFIG_NIOS_SAFE_32 1" >>$(obj)include/config.h ; \
                  $(XECHO) "... NIOS 'safe_32' configuration" ; \
@@ -2641,7 +2711,6 @@ DK1S10_standard_32_config \
 DK1S10_mtx_ldk_20_config       \
 DK1S10_config: unconfig
        @mkdir -p $(obj)include
-       @ >$(obj)include/config.h
        @[ -z "$(findstring _safe_32,$@)" ] || \
                { echo "#define CONFIG_NIOS_SAFE_32 1" >>$(obj)include/config.h ; \
                  $(XECHO) "... NIOS 'safe_32' configuration" ; \
@@ -2664,7 +2733,6 @@ ADNPESC1_DNPEVA2_base_32_config   \
 ADNPESC1_base_32_config                \
 ADNPESC1_config: unconfig
        @mkdir -p $(obj)include
-       @ >$(obj)include/config.h
        @[ -z "$(findstring _DNPEVA2,$@)" ] || \
                { echo "#define CONFIG_DNPEVA2 1" >>$(obj)include/config.h ; \
                  $(XECHO) "... DNP/EVA2 configuration" ; \
@@ -2706,36 +2774,32 @@ PCI5441_config : unconfig
 #########################################################################
 suzaku_config: unconfig
        @mkdir -p $(obj)include
-       @ >$(obj)include/config.h
-       @echo "#define CONFIG_SUZAKU 1" >> $(obj)include/config.h
+       @echo "#define CONFIG_SUZAKU 1" > $(obj)include/config.h
        @$(MKCONFIG) -a $(@:_config=) microblaze microblaze suzaku AtmarkTechno
 
 ml401_config:  unconfig
        @mkdir -p $(obj)include
-       @ >$(obj)include/config.h
-       @echo "#define CONFIG_ML401 1" >> $(obj)include/config.h
+       @echo "#define CONFIG_ML401 1" > $(obj)include/config.h
        @$(MKCONFIG) -a $(@:_config=) microblaze microblaze ml401 xilinx
 
 xupv2p_config: unconfig
        @mkdir -p $(obj)include
-       @ >$(obj)include/config.h
-       @echo "#define CONFIG_XUPV2P 1" >> $(obj)include/config.h
+       @echo "#define CONFIG_XUPV2P 1" > $(obj)include/config.h
        @$(MKCONFIG) -a $(@:_config=) microblaze microblaze xupv2p xilinx
 
-#########################################################################
-## Blackfin
-#########################################################################
-bf533-ezkit_config:    unconfig
-       @$(MKCONFIG) $(@:_config=) blackfin bf533 bf533-ezkit
+#========================================================================
+# Blackfin
+#========================================================================
 
-bf533-stamp_config:    unconfig
-       @$(MKCONFIG) $(@:_config=) blackfin bf533 bf533-stamp
+# Analog Devices boards
+BFIN_BOARDS = bf533-ezkit bf533-stamp bf537-stamp bf561-ezkit
 
-bf537-stamp_config:    unconfig
-       @$(MKCONFIG) $(@:_config=) blackfin bf537 bf537-stamp
+$(BFIN_BOARDS:%=%_config)      : unconfig
+       @$(MKCONFIG) $(@:_config=) blackfin $(firstword $(subst -, ,$@)) $(@:_config=)
 
-bf561-ezkit_config:    unconfig
-       @$(MKCONFIG) $(@:_config=) blackfin bf561 bf561-ezkit
+$(BFIN_BOARDS):
+       $(MAKE) $@_config
+       $(MAKE)
 
 #========================================================================
 # AVR32
@@ -2753,6 +2817,9 @@ atstk1003_config  :       unconfig
 atstk1004_config       :       unconfig
        @$(MKCONFIG) $(@:_config=) avr32 at32ap atstk1000 atmel at32ap700x
 
+atngw100_config        :       unconfig
+       @$(MKCONFIG) $(@:_config=) avr32 at32ap atngw100 atmel at32ap700x
+
 #########################################################################
 #########################################################################
 #########################################################################
@@ -2761,66 +2828,63 @@ atstk1004_config        :       unconfig
 ## sh3 (Renesas SuperH)
 #########################################################################
 ms7720se_config: unconfig
-       @ >include/config.h
-       @echo "#define CONFIG_MS7720SE 1" >> include/config.h
-       @./mkconfig -a $(@:_config=) sh sh3 ms7720se
+       @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
+       @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
+ms7722se_config :      unconfig
+       @echo "#define CONFIG_MS7722SE 1" > $(obj)include/config.h
+       @$(MKCONFIG) -a $(@:_config=) sh sh4 ms7722se
 
 #########################################################################
 #########################################################################
 #########################################################################
 
 clean:
+       @rm -f $(obj)examples/82559_eeprom $(obj)examples/eepro100_eeprom \
+              $(obj)examples/hello_world  $(obj)examples/interrupt       \
+              $(obj)examples/mem_to_mem_idma2intr                        \
+              $(obj)examples/sched        $(obj)examples/smc91111_eeprom \
+              $(obj)examples/test_burst   $(obj)examples/timer
+       @rm -f $(obj)tools/bmp_logo        $(obj)tools/easylogo/easylogo  \
+              $(obj)tools/env/{fw_printenv,fw_setenv}                    \
+              $(obj)tools/envcrc                                         \
+              $(obj)tools/gdb/{astest,gdbcont,gdbsend}                   \
+              $(obj)tools/gen_eth_addr    $(obj)tools/img2srec           \
+              $(obj)tools/mkimage         $(obj)tools/mpc86x_clk         \
+              $(obj)tools/ncb             $(obj)tools/ubsha1
+       @rm -f $(obj)board/cray/L1/{bootscript.c,bootscript.image}        \
+              $(obj)board/netstar/{eeprom,crcek,crcit,*.srec,*.bin}      \
+              $(obj)board/trab/trab_fkt   $(obj)board/voiceblue/eeprom   \
+              $(obj)board/{integratorap,integratorcp}/u-boot.lds         \
+              $(obj)board/{bf533-ezkit,bf533-stamp,bf537-stamp,bf561-ezkit}/u-boot.lds
+       @rm -f $(obj)include/bmp_logo.h $(obj)nand_spl/{u-boot-spl,u-boot-spl.map}
+       @rm -f $(obj)onenand_ipl/onenand-{ipl,ipl.bin,ipl-2k.bin,ipl.map}
+       @rm -f $(obj)api_examples/demo $(VERSION_FILE)
        @find $(OBJTREE) -type f \
                \( -name 'core' -o -name '*.bak' -o -name '*~' \
-               -o -name '*.o'  -o -name '*.a'  \) -print \
+               -o -name '*.o'  -o -name '*.a'  \) -print \
                | xargs rm -f
-       @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 \
-               $(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)api_examples/demo $(VERSION_FILE)
 
 clobber:       clean
        @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
-       @rm -fr $(obj)*.*~
+       @rm -f $(OBJS) $(obj)*.bak $(obj)ctags $(obj)etags $(obj)TAGS \
+               $(obj)cscope.* $(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)tools/{crc32.c,environment.c,env/crc32.c,sha1.c,inca-swap-bytes}
+       @rm -f $(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)onenand_ipl ] || find $(obj)onenand_ipl -lname "*" -print | xargs rm -f
        @[ ! -d $(obj)api_examples ] || find $(obj)api_examples -lname "*" -print | xargs rm -f
 
 ifeq ($(OBJTREE),$(SRCTREE))