Build: PXA: Fix Vpac270 build variants
[platform/kernel/u-boot.git] / Makefile
index 42d807b..8078d71 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -22,9 +22,9 @@
 #
 
 VERSION = 2010
-PATCHLEVEL = 06
+PATCHLEVEL = 09
 SUBLEVEL =
-EXTRAVERSION = -rc2
+EXTRAVERSION =
 ifneq "$(SUBLEVEL)" ""
 U_BOOT_VERSION = $(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)
 else
@@ -40,7 +40,8 @@ HOSTARCH := $(shell uname -m | \
            -e s/sa110/arm/ \
            -e s/ppc64/powerpc/ \
            -e s/ppc/powerpc/ \
-           -e s/macppc/powerpc/)
+           -e s/macppc/powerpc/\
+           -e s/sh.*/sh/)
 
 HOSTOS := $(shell uname -s | tr '[:upper:]' '[:lower:]' | \
            sed -e 's/\(cygwin\).*/cygwin/')
@@ -220,6 +221,7 @@ LIBS += drivers/power/libpower.a
 LIBS += drivers/spi/libspi.a
 ifeq ($(CPU),mpc83xx)
 LIBS += drivers/qe/qe.a
+LIBS += arch/powerpc/cpu/mpc8xxx/lib8xxx.a
 endif
 ifeq ($(CPU),mpc85xx)
 LIBS += drivers/qe/qe.a
@@ -244,6 +246,20 @@ LIBS += lib/libfdt/libfdt.a
 LIBS += api/libapi.a
 LIBS += post/libpost.a
 
+ifeq ($(SOC),omap3)
+LIBS += $(CPUDIR)/omap-common/libomap-common.a
+endif
+ifeq ($(SOC),omap4)
+LIBS += $(CPUDIR)/omap-common/libomap-common.a
+endif
+
+ifeq ($(SOC),s5pc1xx)
+LIBS += $(CPUDIR)/s5p-common/libs5p-common.a
+endif
+ifeq ($(SOC),s5pc2xx)
+LIBS += $(CPUDIR)/s5p-common/libs5p-common.a
+endif
+
 LIBS := $(addprefix $(obj),$(LIBS))
 .PHONY : $(LIBS) $(TIMESTAMP_FILE) $(VERSION_FILE)
 
@@ -314,18 +330,18 @@ $(obj)u-boot.ldr.srec:    $(obj)u-boot.ldr
 
 $(obj)u-boot.img:      $(obj)u-boot.bin
                $(obj)tools/mkimage -A $(ARCH) -T firmware -C none \
-               -a $(TEXT_BASE) -e 0 \
+               -a $(CONFIG_SYS_TEXT_BASE) -e 0 \
                -n $(shell sed -n -e 's/.*U_BOOT_VERSION//p' $(VERSION_FILE) | \
                        sed -e 's/"[     ]*$$/ for $(BOARD) board"/') \
                -d $< $@
 
 $(obj)u-boot.imx:       $(obj)u-boot.bin
                $(obj)tools/mkimage -n $(IMX_CONFIG) -T imximage \
-               -e $(TEXT_BASE) -d $< $@
+               -e $(CONFIG_SYS_TEXT_BASE) -d $< $@
 
 $(obj)u-boot.kwb:       $(obj)u-boot.bin
                $(obj)tools/mkimage -n $(KWD_CONFIG) -T kwbimage \
-               -a $(TEXT_BASE) -e $(TEXT_BASE) -d $< $@
+               -a $(CONFIG_SYS_TEXT_BASE) -e $(TEXT_BASE) -d $< $@
 
 $(obj)u-boot.sha1:     $(obj)u-boot.bin
                $(obj)tools/ubsha1 $(obj)u-boot.bin
@@ -385,17 +401,11 @@ $(VERSION_FILE):
                @cmp -s $@ $@.tmp && rm -f $@.tmp || mv -f $@.tmp $@
 
 $(TIMESTAMP_FILE):
-               @date +'#define U_BOOT_DATE "%b %d %C%y"' > $@
-               @date +'#define U_BOOT_TIME "%T"' >> $@
-
-gdbtools:
-               $(MAKE) -C tools/gdb all || exit 1
+               @LC_ALL=C date +'#define U_BOOT_DATE "%b %d %C%y"' > $@
+               @LC_ALL=C date +'#define U_BOOT_TIME "%T"' >> $@
 
 updater:
-               $(MAKE) -C tools/updater all || exit 1
-
-env:
-               $(MAKE) -C tools/env all MTD_VERSION=${MTD_VERSION} || exit 1
+               $(MAKE) -C tools/updater all
 
 # Explicitly make _depend in subdirs containing multiple targets to prevent
 # parallel sub-makes creating .depend files simultaneously.
@@ -450,17 +460,22 @@ $(obj)include/autoconf.mk: $(obj)include/config.h
 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 \
-$(filter-out tools,$(SUBDIRS)) $(TIMESTAMP_FILE) $(VERSION_FILE) gdbtools \
-updater env depend dep tags ctags etags cscope $(obj)System.map:
+$(filter-out tools,$(SUBDIRS)) $(TIMESTAMP_FILE) $(VERSION_FILE) \
+updater depend dep tags ctags etags cscope $(obj)System.map:
        @echo "System not configured - see README" >&2
        @ exit 1
 
 tools:
-       $(MAKE) -C tools
-tools-all:
-       $(MAKE) -C tools HOST_TOOLS_ALL=y
+       $(MAKE) -C $@ all
 endif  # config.mk
 
+easylogo env gdb:
+       $(MAKE) -C tools/$@ all MTD_VERSION=${MTD_VERSION}
+gdbtools: gdb
+
+tools-all: easylogo env gdb
+       $(MAKE) -C tools HOST_TOOLS_ALL=y
+
 .PHONY : CHANGELOG
 CHANGELOG:
        git log --no-merges U-Boot-1_1_5.. | \
@@ -475,8 +490,12 @@ unconfig:
                $(obj)board/*/config.tmp $(obj)board/*/*/config.tmp \
                $(obj)include/autoconf.mk $(obj)include/autoconf.mk.dep
 
-%: %_config
-       $(MAKE)
+%_config::     unconfig
+       @$(MKCONFIG) -A $(@:_config=)
+
+sinclude .boards.depend
+.boards.depend:        boards.cfg
+       awk '(NF && $$1 !~ /^#/) { print $$1 ": " $$1 "_config; $$(MAKE)" }' $< > $@
 
 #
 # Functions to generate common board directory names
@@ -484,1212 +503,10 @@ unconfig:
 lcname = $(shell echo $(1) | sed -e 's/\(.*\)_config/\L\1/')
 ucname = $(shell echo $(1) | sed -e 's/\(.*\)_config/\U\1/')
 
-#========================================================================
-# PowerPC
-#========================================================================
-
-#########################################################################
-## MPC5xx Systems
-#########################################################################
-
-cmi_mpc5xx_config:     unconfig
-       @$(MKCONFIG) $@ powerpc mpc5xx cmi
-
-PATI_config:           unconfig
-       @$(MKCONFIG) $@ powerpc mpc5xx pati mpl
-
-#########################################################################
-## MPC5xxx Systems
-#########################################################################
-
-# generic boards
-################
-BC3450_config  \
-canmb_config   \
-cm5200_config  \
-hmi1001_config \
-jupiter_config \
-inka4x0_config \
-ipek01_config  \
-motionpro_config\
-mucmc52_config \
-munices_config \
-o2dnt_config   \
-uc101_config   \
-v38b_config:   unconfig
-       @$(MKCONFIG) $@ powerpc mpc5xxx $(call lcname,$@)
-
-# vendor specific boards (sorted by vendor)
-###########################################
-cpci5200_config        \
-mecp5200_config        \
-pf5200_config: unconfig
-       @$(MKCONFIG) $@ powerpc mpc5xxx $(call lcname,$@) esd
-
-aev_config     \
-smmaco4_config \
-spieval_config:        unconfig
-       @$(MKCONFIG) $@ powerpc mpc5xxx tqm5200 tqc
-
-# special boards
-################
-digsy_mtc_config \
-digsy_mtc_LOWBOOT_config       \
-digsy_mtc_RAMBOOT_config:      unconfig
-       @mkdir -p $(obj)include
-       @mkdir -p $(obj)board/digsy_mtc
-       @ >$(obj)include/config.h
-       @[ -z "$(findstring LOWBOOT_,$@)" ] || \
-               echo "TEXT_BASE = 0xFF000000" >$(obj)board/digsy_mtc/config.tmp
-       @[ -z "$(findstring RAMBOOT_,$@)" ] || \
-               echo "TEXT_BASE = 0x00100000" >$(obj)board/digsy_mtc/config.tmp
-       @$(MKCONFIG) -n $@ -a digsy_mtc powerpc mpc5xxx digsy_mtc
-
-galaxy5200_LOWBOOT_config \
-galaxy5200_config:     unconfig
-       @mkdir -p $(obj)include
-       @echo "#define CONFIG_$(@:_config=) 1" >$(obj)include/config.h
-       @$(MKCONFIG) -n $@ -a galaxy5200 powerpc mpc5xxx galaxy5200
-
-Lite5200_config                                \
-Lite5200_LOWBOOT_config                        \
-Lite5200_LOWBOOT08_config              \
-icecube_5200_config                    \
-icecube_5200_LOWBOOT_config            \
-icecube_5200_LOWBOOT08_config          \
-icecube_5200_DDR_config                        \
-icecube_5200_DDR_LOWBOOT_config                \
-icecube_5200_DDR_LOWBOOT08_config:     unconfig
-       @mkdir -p $(obj)include
-       @mkdir -p $(obj)board/icecube
-       @[ -z "$(findstring LOWBOOT_,$@)" ] || \
-               if [ "$(findstring DDR,$@)" ] ; \
-                       then echo "TEXT_BASE = 0xFF800000" >$(obj)board/icecube/config.tmp ; \
-                       else echo "TEXT_BASE = 0xFF000000" >$(obj)board/icecube/config.tmp ; \
-               fi
-       @[ -z "$(findstring LOWBOOT08,$@)" ] || \
-               echo "TEXT_BASE = 0xFF800000" >$(obj)board/icecube/config.tmp
-       @[ -z "$(findstring DDR,$@)" ] || \
-               echo "#define CONFIG_MPC5200_DDR" >>$(obj)include/config.h
-       @$(MKCONFIG) -n $@ -a IceCube powerpc mpc5xxx icecube
-
-lite5200b_config       \
-lite5200b_PM_config    \
-lite5200b_LOWBOOT_config:      unconfig
-       @mkdir -p $(obj)include
-       @mkdir -p $(obj)board/icecube
-       @ echo "#define CONFIG_MPC5200_DDR"     >>$(obj)include/config.h
-       @ echo "#define CONFIG_LITE5200B"       >>$(obj)include/config.h
-       @[ -z "$(findstring _PM_,$@)" ] || \
-               echo "#define CONFIG_LITE5200B_PM" >>$(obj)include/config.h
-       @[ -z "$(findstring LOWBOOT_,$@)" ] || \
-               echo "TEXT_BASE = 0xFF000000" >$(obj)board/icecube/config.tmp
-       @$(MKCONFIG) -n $@ -a IceCube  powerpc mpc5xxx icecube
-
-mcc200_config  \
-mcc200_SDRAM_config    \
-mcc200_highboot_config \
-mcc200_COM12_config    \
-mcc200_COM12_SDRAM_config      \
-mcc200_COM12_highboot_config   \
-mcc200_COM12_highboot_SDRAM_config     \
-mcc200_highboot_SDRAM_config   \
-prs200_config  \
-prs200_DDR_config      \
-prs200_highboot_config \
-prs200_highboot_DDR_config:    unconfig
-       @mkdir -p $(obj)include
-       @mkdir -p $(obj)board/mcc200
-       @[ -z "$(findstring highboot,$@)" ] || \
-               echo "TEXT_BASE = 0xFFF00000" >$(obj)board/mcc200/config.tmp
-       @[ -n "$(findstring _SDRAM,$@)" ] || \
-               if [ -n "$(findstring prs200,$@)" ]; \
-               then \
-                       if [ -z "$(findstring _DDR,$@)" ];\
-                       then \
-                               echo "#define CONFIG_MCC200_SDRAM" >>$(obj)include/config.h ;\
-                       fi; \
-               fi
-       @[ -z "$(findstring _SDRAM,$@)" ] || \
-               echo "#define CONFIG_MCC200_SDRAM" >>$(obj)include/config.h
-       @[ -z "$(findstring COM12,$@)" ] || \
-               echo "#define CONFIG_CONSOLE_COM12" >>$(obj)include/config.h
-       @[ -z "$(findstring prs200,$@)" ] || \
-               echo "#define CONFIG_PRS200" >>$(obj)include/config.h
-       @$(MKCONFIG) -n $@ -a mcc200 powerpc mpc5xxx mcc200
-
-MVBC_P_config: unconfig
-       @mkdir -p $(obj)include
-       @mkdir -p $(obj)board/mvbc_p
-       @ >$(obj)include/config.h
-       @[ -z "$(findstring MVBC_P,$@)" ] || \
-               echo "#define CONFIG_MVBC_P" >>$(obj)include/config.h
-       @$(MKCONFIG) -n $@ -a $@ powerpc mpc5xxx mvbc_p matrix_vision
-
-MVSMR_config: unconfig
-       @mkdir -p $(obj)include
-       @mkdir -p $(obj)board/matrix_vision/mvsmr
-       @$(MKCONFIG) $@ powerpc mpc5xxx mvsmr matrix_vision
-
-pcm030_config \
-pcm030_LOWBOOT_config: unconfig
-       @mkdir -p $(obj)include $(obj)board/phytec/pcm030
-       @ >$(obj)include/config.h
-       @[ -z "$(findstring LOWBOOT_,$@)" ] || \
-               echo "TEXT_BASE = 0xFF000000" >$(obj)board/phytec/pcm030/config.tmp
-       @$(MKCONFIG) -n $@ -a pcm030 powerpc mpc5xxx pcm030 phytec
-
-PM520_config \
-PM520_DDR_config \
-PM520_ROMBOOT_config \
-PM520_ROMBOOT_DDR_config:      unconfig
-       @mkdir -p $(obj)include
-       @[ -z "$(findstring DDR,$@)" ] || \
-               echo "#define CONFIG_MPC5200_DDR" >>$(obj)include/config.h
-       @[ -z "$(findstring ROMBOOT,$@)" ] || \
-               echo "#define CONFIG_BOOT_ROM" >>$(obj)include/config.h
-       @$(MKCONFIG) -n $@ -a PM520 powerpc mpc5xxx pm520
-
-TB5200_B_config \
-TB5200_config: unconfig
-       @mkdir -p $(obj)include
-       @[ -z "$(findstring _B,$@)" ] || \
-               echo "#define CONFIG_TQM5200_B" >>$(obj)include/config.h
-       @$(MKCONFIG) -n $@ -a TB5200 powerpc mpc5xxx tqm5200 tqc
-
-MINI5200_config        \
-EVAL5200_config        \
-TOP5200_config:        unconfig
-       @mkdir -p $(obj)include
-       @ echo "#define CONFIG_$(@:_config=) 1" >$(obj)include/config.h
-       @$(MKCONFIG) -n $@ -a TOP5200 powerpc mpc5xxx top5200 emk
-
-Total5200_config               \
-Total5200_lowboot_config       \
-Total5200_Rev2_config          \
-Total5200_Rev2_lowboot_config: unconfig
-       @mkdir -p $(obj)include
-       @mkdir -p $(obj)board/total5200
-       @[ -n "$(findstring Rev,$@)" ] || \
-               echo "#define CONFIG_TOTAL5200_REV 1" >>$(obj)include/config.h
-       @[ -z "$(findstring Rev2_,$@)" ] || \
-               echo "#define CONFIG_TOTAL5200_REV 2" >>$(obj)include/config.h
-       @[ -z "$(findstring lowboot_,$@)" ] || \
-               echo "TEXT_BASE = 0xFE000000" >$(obj)board/total5200/config.tmp
-       @$(MKCONFIG) -n $@ -a Total5200 powerpc mpc5xxx total5200
-
-cam5200_config \
-cam5200_niosflash_config \
-fo300_config \
-MiniFAP_config \
-TQM5200S_config \
-TQM5200S_HIGHBOOT_config \
-TQM5200_B_config \
-TQM5200_B_HIGHBOOT_config \
-TQM5200_config \
-TQM5200_STK100_config: unconfig
-       @mkdir -p $(obj)include
-       @mkdir -p $(obj)board/tqc/tqm5200
-       @[ -z "$(findstring cam5200,$@)" ] || \
-               { echo "#define CONFIG_CAM5200"   >>$(obj)include/config.h ; \
-                 echo "#define CONFIG_TQM5200S"  >>$(obj)include/config.h ; \
-                 echo "#define CONFIG_TQM5200_B" >>$(obj)include/config.h ; \
-               }
-       @[ -z "$(findstring niosflash,$@)" ] || \
-               echo "#define CONFIG_CAM5200_NIOSFLASH" >>$(obj)include/config.h
-       @[ -z "$(findstring fo300,$@)" ] || \
-               echo "#define CONFIG_FO300" >>$(obj)include/config.h
-       @[ -z "$(findstring MiniFAP,$@)" ] || \
-               echo "#define CONFIG_MINIFAP" >>$(obj)include/config.h
-       @[ -z "$(findstring STK100,$@)" ] || \
-               echo "#define CONFIG_STK52XX_REV100" >>$(obj)include/config.h
-       @[ -z "$(findstring TQM5200_B,$@)" ] || \
-               echo "#define CONFIG_TQM5200_B" >>$(obj)include/config.h
-       @[ -z "$(findstring TQM5200S,$@)" ] || \
-               { echo "#define CONFIG_TQM5200S"  >>$(obj)include/config.h ; \
-                 echo "#define CONFIG_TQM5200_B" >>$(obj)include/config.h ; \
-               }
-       @[ -z "$(findstring HIGHBOOT,$@)" ] || \
-               echo "TEXT_BASE = 0xFFF00000" >$(obj)board/tqm5200/config.tmp
-       @$(MKCONFIG) -n $@ -a TQM5200 powerpc mpc5xxx tqm5200 tqc
-
-#########################################################################
-## MPC512x Systems
-#########################################################################
-
-# generic boards
-################
-pdm360ng_config:       unconfig
-       @$(MKCONFIG) $@ powerpc mpc512x $(call lcname,$@)
-
-# vendor specific boards (sorted by vendor)
-###########################################
-aria_config:   unconfig
-       @$(MKCONFIG) $@ powerpc mpc512x aria davedenx
-
-mecp5123_config:       unconfig
-       @$(MKCONFIG) $@ powerpc mpc512x mecp5123 esd
-
-# special boards
-################
-mpc5121ads_config \
-mpc5121ads_rev2_config \
-       : unconfig
-       @mkdir -p $(obj)include
-       @if [ "$(findstring rev2,$@)" ] ; then \
-               echo "#define CONFIG_ADS5121_REV2 1" > $(obj)include/config.h; \
-       fi
-       @$(MKCONFIG) -n $@ -a mpc5121ads powerpc mpc512x mpc5121ads freescale
-
-#########################################################################
-## MPC8xx Systems
-#########################################################################
-
-# generic boards
-################
-
-c2mon_config           \
-EP88x_config           \
-ESTEEM192E_config      \
-ETX094_config          \
-FLAGADM_config         \
-GENIETV_config         \
-GTH_config             \
-hermes_config          \
-IP860_config           \
-LANTEC_config          \
-lwmon_config           \
-NX823_config           \
-quantum_config         \
-R360MPI_config         \
-RBC823_config          \
-rmu_config             \
-spc1920_config         \
-svm_sc8xx_config       \
-uc100_config   :       unconfig
-       @$(MKCONFIG) $@ powerpc mpc8xx $(call lcname,$@)
-
-RPXClassic_config      \
-RPXlite_config         \
-RRvision_config        :       unconfig
-       @$(MKCONFIG) $@ powerpc mpc8xx $(@:_config=)
-
-# vendor specific boards (sorted by vendor)
-###########################################
-
-MHPC_config:           unconfig
-       @$(MKCONFIG) $@ powerpc mpc8xx mhpc eltec
-
-TOP860_config:         unconfig
-       @$(MKCONFIG) $@ powerpc mpc8xx top860 emk
-
-kmsupx4_config \
-mgsuvd_config  :       unconfig
-       @$(MKCONFIG) $@ powerpc mpc8xx km8xx keymile
-
-KUP4K_config   \
-KUP4X_config   :       unconfig
-       @$(MKCONFIG) $@ powerpc mpc8xx $(call lcname,$@) kup
-
-ELPT860_config:                unconfig
-       @$(MKCONFIG) $@ powerpc mpc8xx elpt860 LEOX
-
-stxxtc_config: unconfig
-       @$(MKCONFIG) $@ powerpc mpc8xx stxxtc stx
-
-HMI10_config   \
-SM850_config   :       unconfig
-       @$(MKCONFIG) $@ powerpc mpc8xx tqm8xx tqc
-
-CCM_config     \
-IAD210_config  \
-pcu_e_config   :       unconfig
-       @$(MKCONFIG) $@ powerpc mpc8xx $(@:_config=) siemens
-
-QS823_config   \
-QS850_config   :       unconfig
-       @$(MKCONFIG) $@ powerpc mpc8xx qs850 snmc
-
-QS860T_config  :       unconfig
-       @$(MKCONFIG) $@ powerpc mpc8xx qs860t snmc
-
-AMX860_config  :       unconfig
-       @$(MKCONFIG) $@ powerpc mpc8xx amx860 westel
-
-# special boards
-################
-
-Adder87x_config \
-AdderII_config \
-AdderUSB_config        \
-Adder_config   \
-       :               unconfig
-       @mkdir -p $(obj)include
-       $(if $(findstring AdderII,$@), \
-               @echo "#define CONFIG_MPC852T" > $(obj)include/config.h)
-       @$(MKCONFIG) -n $@ -a Adder powerpc mpc8xx adder
-
-cogent_mpc8xx_config:  unconfig
-       @$(MKCONFIG) $(@:_config=) powerpc mpc8xx cogent
-
-ADS860_config    \
-FADS823_config   \
-FADS850SAR_config \
-MPC86xADS_config  \
-MPC885ADS_config  \
-FADS860T_config:       unconfig
-       @$(MKCONFIG) -n $@ $@ powerpc mpc8xx fads
-
-GEN860T_SC_config      \
-GEN860T_config: unconfig
-       @mkdir -p $(obj)include
-       @[ -z "$(findstring _SC,$@)" ] || \
-               echo "#define CONFIG_SC" >>$(obj)include/config.h
-       @$(MKCONFIG) -n $@ -a GEN860T powerpc mpc8xx gen860t
-
-ICU862_100MHz_config   \
-ICU862_config: unconfig
-       @mkdir -p $(obj)include
-       @[ -z "$(findstring _100MHz,$@)" ] || \
-               echo "#define CONFIG_100MHz" >>$(obj)include/config.h
-       @$(MKCONFIG) -n $@ -a ICU862 powerpc mpc8xx icu862
-
-IVML24_256_config \
-IVML24_128_config \
-IVML24_config: unconfig
-       @mkdir -p $(obj)include
-       @[ -z "$(findstring IVML24_config,$@)" ] || \
-               echo "#define CONFIG_IVML24_16M" >>$(obj)include/config.h
-       @[ -z "$(findstring IVML24_128_config,$@)" ] || \
-               echo "#define CONFIG_IVML24_32M" >>$(obj)include/config.h
-       @[ -z "$(findstring IVML24_256_config,$@)" ] || \
-               echo "#define CONFIG_IVML24_64M" >>$(obj)include/config.h
-       @$(MKCONFIG) -n $@ -a IVML24 powerpc mpc8xx ivm
-
-IVMS8_256_config \
-IVMS8_128_config \
-IVMS8_config:  unconfig
-       @mkdir -p $(obj)include
-       @[ -z "$(findstring IVMS8_config,$@)" ] || \
-               echo "#define CONFIG_IVMS8_16M" >>$(obj)include/config.h
-       @[ -z "$(findstring IVMS8_128_config,$@)" ] || \
-               echo "#define CONFIG_IVMS8_32M" >>$(obj)include/config.h
-       @[ -z "$(findstring IVMS8_256_config,$@)" ] || \
-               echo "#define CONFIG_IVMS8_64M" >>$(obj)include/config.h
-       @$(MKCONFIG) -n $@ -a IVMS8 powerpc mpc8xx ivm
-
-MBX_config     \
-MBX860T_config:        unconfig
-       @$(MKCONFIG) -n $@ $@ powerpc mpc8xx mbx8xx
-
-NETVIA_V2_config \
-NETVIA_config:         unconfig
-       @mkdir -p $(obj)include
-       @[ -z "$(findstring NETVIA_config,$@)" ] || \
-               echo "#define CONFIG_NETVIA_VERSION 1" >>$(obj)include/config.h
-       @[ -z "$(findstring NETVIA_V2_config,$@)" ] || \
-               echo "#define CONFIG_NETVIA_VERSION 2" >>$(obj)include/config.h
-       @$(MKCONFIG) -n $@ -a NETVIA powerpc mpc8xx netvia
-
-NETPHONE_V2_config \
-NETPHONE_config:       unconfig
-       @mkdir -p $(obj)include
-       @[ -z "$(findstring NETPHONE_config,$@)" ] || \
-               echo "#define CONFIG_NETPHONE_VERSION 1" >>$(obj)include/config.h
-       @[ -z "$(findstring NETPHONE_V2_config,$@)" ] || \
-               echo "#define CONFIG_NETPHONE_VERSION 2" >>$(obj)include/config.h
-       @$(MKCONFIG) -n $@ -a NETPHONE powerpc mpc8xx netphone
-
-NETTA_ISDN_6412_SWAPHOOK_config \
-NETTA_ISDN_SWAPHOOK_config \
-NETTA_6412_SWAPHOOK_config \
-NETTA_SWAPHOOK_config \
-NETTA_ISDN_6412_config \
-NETTA_ISDN_config \
-NETTA_6412_config \
-NETTA_config:          unconfig
-       @mkdir -p $(obj)include
-       @[ -z "$(findstring ISDN_,$@)" ] || \
-               echo "#define CONFIG_NETTA_ISDN 1" >>$(obj)include/config.h
-       @[ -n "$(findstring ISDN_,$@)" ] || \
-               echo "#undef CONFIG_NETTA_ISDN" >>$(obj)include/config.h
-       @[ -z "$(findstring 6412_,$@)" ] || \
-               echo "#define CONFIG_NETTA_6412 1" >>$(obj)include/config.h
-       @[ -n "$(findstring 6412_,$@)" ] || \
-               echo "#undef CONFIG_NETTA_6412" >>$(obj)include/config.h
-       @[ -z "$(findstring SWAPHOOK_,$@)" ] || \
-               echo "#define CONFIG_NETTA_SWAPHOOK 1" >>$(obj)include/config.h
-       @[ -n "$(findstring SWAPHOOK_,$@)" ] || \
-               echo "#undef CONFIG_NETTA_SWAPHOOK" >>$(obj)include/config.h
-       @$(MKCONFIG) -n $@ -a NETTA powerpc mpc8xx netta
-
-NETTA2_V2_config \
-NETTA2_config:         unconfig
-       @mkdir -p $(obj)include
-       @[ -z "$(findstring NETTA2_config,$@)" ] || \
-               echo "#define CONFIG_NETTA2_VERSION 1" >>$(obj)include/config.h
-       @[ -z "$(findstring NETTA2_V2_config,$@)" ] || \
-               echo "#define CONFIG_NETTA2_VERSION 2" >>$(obj)include/config.h
-       @$(MKCONFIG) -n $@ -a NETTA2 powerpc mpc8xx netta2
-
-NC650_Rev1_config \
-NC650_Rev2_config \
-CP850_config:  unconfig
-       @mkdir -p $(obj)include
-       @[ -z "$(findstring CP850,$@)" ] || \
-               { echo "#define CONFIG_CP850 1" >>$(obj)include/config.h ; \
-                 echo "#define CONFIG_IDS852_REV2 1" >>$(obj)include/config.h ; \
-               }
-       @[ -z "$(findstring Rev1,$@)" ] || \
-               { echo "#define CONFIG_IDS852_REV1 1" >>$(obj)include/config.h ; \
-               }
-       @[ -z "$(findstring Rev2,$@)" ] || \
-               { echo "#define CONFIG_IDS852_REV2 1" >>$(obj)include/config.h ; \
-               }
-       @$(MKCONFIG) -n $@ -a NC650 powerpc mpc8xx nc650
-
-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_LCD_config    \
-RPXlite_DW_NVRAM_64_LCD_config \
-RPXlite_DW_config:     unconfig
-       @mkdir -p $(obj)include
-       @[ -z "$(findstring _64,$@)" ] || \
-               echo "#define RPXlite_64MHz"            >>$(obj)include/config.h
-       @[ -z "$(findstring _LCD,$@)" ] || \
-               { echo "#define CONFIG_LCD"             >>$(obj)include/config.h ; \
-                 echo "#define CONFIG_NEC_NL6448BC20"  >>$(obj)include/config.h ; \
-               }
-       @[ -z "$(findstring _NVRAM,$@)" ] || \
-               echo "#define  CONFIG_ENV_IS_IN_NVRAM"  >>$(obj)include/config.h
-       @$(MKCONFIG) -n $@ -a RPXlite_DW powerpc mpc8xx RPXlite_dw
-
-RRvision_LCD_config:   unconfig
-       @mkdir -p $(obj)include
-       @echo "#define CONFIG_LCD" >$(obj)include/config.h
-       @echo "#define CONFIG_SHARP_LQ104V7DS01" >>$(obj)include/config.h
-       @$(MKCONFIG) -a RRvision powerpc mpc8xx RRvision
-
-SPD823TS_config:       unconfig
-       @$(MKCONFIG) $@ powerpc mpc8xx spd8xx
-
-SXNI855T_config:       unconfig
-       @$(MKCONFIG) $@ powerpc mpc8xx sixnet
-
-# Play some tricks for configuration selection
-# Only 855 and 860 boards may come with FEC
-# and only 823 boards may have LCD support
-xtract_8xx = $(subst _LCD,,$1)
-
-FPS850L_config         \
-FPS860L_config         \
-NSCU_config            \
-TQM823L_config         \
-TQM823L_LCD_config     \
-TQM850L_config         \
-TQM855L_config         \
-TQM860L_config         \
-TQM862L_config         \
-TQM823M_config         \
-TQM850M_config         \
-TQM855M_config         \
-TQM860M_config         \
-TQM862M_config         \
-TQM866M_config         \
-TQM885D_config         \
-TK885D_config          \
-virtlab2_config:       unconfig
-       @mkdir -p $(obj)include
-       @[ -z "$(findstring _LCD,$@)" ] || \
-               { echo "#define CONFIG_LCD"             >>$(obj)include/config.h ; \
-                 echo "#define CONFIG_NEC_NL6448BC20"  >>$(obj)include/config.h ; \
-               }
-       @$(MKCONFIG) -n $@ -a $(call xtract_8xx,$@) powerpc mpc8xx tqm8xx tqc
-
-TTTech_config: unconfig
-       @mkdir -p $(obj)include
-       @echo "#define CONFIG_LCD" >$(obj)include/config.h
-       @echo "#define CONFIG_SHARP_LQ104V7DS01" >>$(obj)include/config.h
-       @$(MKCONFIG) -a TQM823L powerpc mpc8xx tqm8xx tqc
-
-v37_config:    unconfig
-       @mkdir -p $(obj)include
-       @echo "#define CONFIG_LCD" >$(obj)include/config.h
-       @echo "#define CONFIG_SHARP_LQ084V1DG21" >>$(obj)include/config.h
-       @$(MKCONFIG) $@ powerpc mpc8xx v37
-
-wtk_config:    unconfig
-       @mkdir -p $(obj)include
-       @echo "#define CONFIG_LCD" >$(obj)include/config.h
-       @echo "#define CONFIG_SHARP_LQ065T9DR51U" >>$(obj)include/config.h
-       @$(MKCONFIG) -a TQM823L powerpc mpc8xx tqm8xx tqc
-
-#########################################################################
-## PPC4xx Systems
-#########################################################################
-
-# generic boards
-################
-
-csb272_config  \
-csb472_config  \
-ERIC_config    \
-G2000_config   \
-JSE_config     \
-korat_config   \
-lwmon5_config  \
-ML2_config     \
-pcs440ep_config        \
-quad100hd_config\
-sbc405_config  \
-sc3_config     \
-zeus_config:   unconfig
-       @$(MKCONFIG) $@ powerpc ppc4xx $(call lcname,$@)
-
-# vendor specific boards (sorted by vendor)
-###########################################
-
-acadia_config  \
-bamboo_config  \
-bubinga_config \
-ebony_config   \
-katmai_config  \
-luan_config    \
-makalu_config  \
-ocotea_config  \
-redwood_config \
-taihu_config   \
-taishan_config \
-yucca_config:  unconfig
-       @$(MKCONFIG) $@ powerpc ppc4xx $(call lcname,$@) amcc
-
-AP1000_config:unconfig
-       @$(MKCONFIG) $@ powerpc ppc4xx $(call lcname,$@) amirix
-
-ADCIOP_config  \
-APC405_config  \
-AR405_config   \
-ASH405_config  \
-CANBT_config   \
-CMS700_config  \
-CPCI2DP_config \
-CPCIISER4_config\
-DASA_SIM_config        \
-DP405_config   \
-DU405_config   \
-DU440_config   \
-HH405_config   \
-HUB405_config  \
-PCI405_config  \
-PLU405_config  \
-PMC405_config  \
-PMC405DE_config        \
-PMC440_config  \
-VOH405_config  \
-VOM405_config  \
-WUH405_config: unconfig
-       @$(MKCONFIG) $@ powerpc ppc4xx $(call lcname,$@) esd
-
-CRAYL1_config: unconfig
-       @$(MKCONFIG) $@ powerpc ppc4xx L1 cray
-
-dlvision_config                \
-gdppc440etx_config     \
-neo_config     :       unconfig
-       @$(MKCONFIG) $@ powerpc ppc4xx $(call lcname,$@) gdsys
-
-icon_config:   unconfig
-       @$(MKCONFIG) $@ powerpc ppc4xx $(call lcname,$@) mosaixtech
-
-MIP405_config  \
-PIP405_config: unconfig
-       @$(MKCONFIG) $@ powerpc ppc4xx $(call lcname,$@) mpl
-
-hcu4_config    \
-hcu5_config    \
-mcu25_config:  unconfig
-       @mkdir -p $(obj)board/netstal/common
-       @$(MKCONFIG) $@ powerpc ppc4xx $(call lcname,$@) netstal
-
-alpr_config    \
-p3p440_config: unconfig
-       @$(MKCONFIG) $@ powerpc ppc4xx $(call lcname,$@) prodrive
-
-KAREF_config   \
-METROBOX_config: unconfig
-       @$(MKCONFIG) $@ powerpc ppc4xx $(call lcname,$@) sandburst
-
-XPEDITE1000_config:    unconfig
-       @$(MKCONFIG) $@ powerpc ppc4xx $(call lcname,$@) xes
-
-# special boards
-################
-
-acadia_nand_config:    unconfig
-       @mkdir -p $(obj)include $(obj)board/amcc/acadia
-       @mkdir -p $(obj)nand_spl/board/amcc/acadia
-       @echo "#define CONFIG_NAND_U_BOOT" > $(obj)include/config.h
-       @echo "TEXT_BASE = 0x01000000" > $(obj)board/amcc/acadia/config.tmp
-       @echo "CONFIG_NAND_U_BOOT = y" >> $(obj)include/config.mk
-       @$(MKCONFIG) -n $@ -a acadia powerpc ppc4xx acadia amcc
-
-bamboo_nand_config:    unconfig
-       @mkdir -p $(obj)include $(obj)board/amcc/bamboo
-       @mkdir -p $(obj)nand_spl/board/amcc/bamboo
-       @echo "#define CONFIG_NAND_U_BOOT" > $(obj)include/config.h
-       @echo "TEXT_BASE = 0x01000000" > $(obj)board/amcc/bamboo/config.tmp
-       @echo "CONFIG_NAND_U_BOOT = y" >> $(obj)include/config.mk
-       @$(MKCONFIG) -n $@ -a bamboo powerpc ppc4xx bamboo amcc
-
-# Arches, Canyonlands & Glacier use different U-Boot images
-arches_config \
-canyonlands_config \
-glacier_config:        unconfig
-       @mkdir -p $(obj)include
-       @echo "#define CONFIG_$$(echo $(subst ,,$(@:_config=)) | \
-               tr '[:lower:]' '[:upper:]')" >$(obj)include/config.h
-       @$(MKCONFIG) -n $@ -a canyonlands powerpc ppc4xx canyonlands amcc
-
-canyonlands_nand_config \
-glacier_nand_config:   unconfig
-       @mkdir -p $(obj)include $(obj)board/amcc/canyonlands
-       @mkdir -p $(obj)nand_spl/board/amcc/canyonlands
-       @echo "#define CONFIG_NAND_U_BOOT" > $(obj)include/config.h
-       @echo "#define CONFIG_$$(echo $(subst ,,$(@:_nand_config=)) | \
-               tr '[:lower:]' '[:upper:]')" >> $(obj)include/config.h
-       @echo "TEXT_BASE = 0x01000000" > $(obj)board/amcc/canyonlands/config.tmp
-       @echo "CONFIG_NAND_U_BOOT = y" >> $(obj)include/config.mk
-       @$(MKCONFIG) -n $@ -a canyonlands powerpc ppc4xx canyonlands amcc
-
-CATcenter_config       \
-CATcenter_25_config    \
-CATcenter_33_config:   unconfig
-       @mkdir -p $(obj)include
-       @echo "/* CATcenter uses PPChameleon Model ME */"  > $(obj)include/config.h
-       @echo "#define CONFIG_PPCHAMELEON_MODULE_MODEL 1" >> $(obj)include/config.h
-       @[ -z "$(findstring _25,$@)" ] || \
-               echo "#define CONFIG_PPCHAMELEON_CLK_25" >> $(obj)include/config.h
-       @[ -z "$(findstring _33,$@)" ] || \
-               echo "#define CONFIG_PPCHAMELEON_CLK_33" >> $(obj)include/config.h
-       @$(MKCONFIG) -n $@ -a CATcenter powerpc ppc4xx PPChameleonEVB dave
-
-CPCI405_config         \
-CPCI4052_config                \
-CPCI405DT_config       \
-CPCI405AB_config:      unconfig
-       @mkdir -p $(obj)board/esd/cpci405
-       @$(MKCONFIG) -n $@ $@ powerpc ppc4xx cpci405 esd
-
-fx12mm_flash_config: unconfig
-       @mkdir -p $(obj)include $(obj)board/xilinx/ppc405-generic
-       @mkdir -p $(obj)include $(obj)board/avnet/fx12mm
-       @echo "LDSCRIPT:=$(SRCTREE)/board/xilinx/ppc405-generic/u-boot-rom.lds"\
-               > $(obj)board/avnet/fx12mm/config.tmp
-       @echo "TEXT_BASE := 0xFFCB0000" \
-               >> $(obj)board/avnet/fx12mm/config.tmp
-       @$(MKCONFIG) fx12mm powerpc ppc4xx fx12mm avnet
-
-fx12mm_config: unconfig
-       @mkdir -p $(obj)include $(obj)board/xilinx/ppc405-generic
-       @mkdir -p $(obj)include $(obj)board/avnet/fx12mm
-       @echo "LDSCRIPT:=$(SRCTREE)/board/xilinx/ppc405-generic/u-boot-ram.lds"\
-               > $(obj)board/avnet/fx12mm/config.tmp
-       @echo "TEXT_BASE := 0x03000000" \
-               >> $(obj)board/avnet/fx12mm/config.tmp
-       @$(MKCONFIG) fx12mm powerpc ppc4xx fx12mm avnet
-
-# Compact-Center(codename intip) & DevCon-Center use different U-Boot images
-intip_config \
-devconcenter_config:   unconfig
-       @mkdir -p $(obj)include
-       @echo "#define CONFIG_$$(echo $(subst ,,$(@:_config=)) | \
-               tr '[:lower:]' '[:upper:]')" >$(obj)include/config.h
-       @$(MKCONFIG) -n $@ -a intip powerpc ppc4xx intip gdsys
-
-# Kilauea & Haleakala images are identical (recognized via PVR)
-kilauea_config \
-haleakala_config: unconfig
-       @$(MKCONFIG) -n $@ kilauea powerpc 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
-       @echo "TEXT_BASE = 0x01000000" > $(obj)board/amcc/kilauea/config.tmp
-       @echo "CONFIG_NAND_U_BOOT = y" >> $(obj)include/config.mk
-       @$(MKCONFIG) -n $@ -a kilauea powerpc ppc4xx kilauea amcc
-
-MIP405T_config:        unconfig
-       @mkdir -p $(obj)include
-       @echo "#define CONFIG_MIP405T" >$(obj)include/config.h
-       @$(XECHO) "Enable subset config for MIP405T"
-       @$(MKCONFIG) -a MIP405 powerpc ppc4xx mip405 mpl
-
-ml507_flash_config: unconfig
-       @mkdir -p $(obj)include $(obj)board/xilinx/ppc440-generic
-       @mkdir -p $(obj)include $(obj)board/xilinx/ml507
-       @echo "LDSCRIPT:=$(SRCTREE)/board/xilinx/ppc440-generic/u-boot-rom.lds"\
-               > $(obj)board/xilinx/ml507/config.tmp
-       @echo "TEXT_BASE := 0xFE360000" \
-               >> $(obj)board/xilinx/ml507/config.tmp
-       @$(MKCONFIG) ml507 powerpc ppc4xx ml507 xilinx
-
-ml507_config: unconfig
-       @mkdir -p $(obj)include $(obj)board/xilinx/ppc440-generic
-       @mkdir -p $(obj)include $(obj)board/xilinx/ml507
-       @echo "LDSCRIPT:=$(SRCTREE)/board/xilinx/ppc440-generic/u-boot-ram.lds"\
-               > $(obj)board/xilinx/ml507/config.tmp
-       @echo "TEXT_BASE := 0x04000000"  \
-               >> $(obj)board/xilinx/ml507/config.tmp
-       @$(MKCONFIG) $@ powerpc ppc4xx ml507 xilinx
-
-OCRTC_config           \
-ORSG_config:   unconfig
-       @$(MKCONFIG) -n $@ $@ powerpc ppc4xx ocrtc esd
-
-PPChameleonEVB_config          \
-PPChameleonEVB_BA_25_config    \
-PPChameleonEVB_ME_25_config    \
-PPChameleonEVB_HI_25_config    \
-PPChameleonEVB_BA_33_config    \
-PPChameleonEVB_ME_33_config    \
-PPChameleonEVB_HI_33_config:   unconfig
-       @mkdir -p $(obj)include
-       @[ -z "$(findstring EVB_BA,$@)" ] || \
-               echo "#define CONFIG_PPCHAMELEON_MODULE_MODEL 0" >>$(obj)include/config.h
-       @[ -z "$(findstring EVB_ME,$@)" ] || \
-               echo "#define CONFIG_PPCHAMELEON_MODULE_MODEL 1" >>$(obj)include/config.h
-       @[ -z "$(findstring EVB_HI,$@)" ] || \
-               echo "#define CONFIG_PPCHAMELEON_MODULE_MODEL 2" >>$(obj)include/config.h
-       @[ -z "$(findstring _25,$@)" ] || \
-               echo "#define CONFIG_PPCHAMELEON_CLK_25" >>$(obj)include/config.h
-       @[ -z "$(findstring _33,$@)" ] || \
-               echo "#define CONFIG_PPCHAMELEON_CLK_33" >>$(obj)include/config.h
-       @$(MKCONFIG) -n $@ -a PPChameleonEVB powerpc ppc4xx PPChameleonEVB dave
-
-sequoia_config \
-rainier_config: unconfig
-       @mkdir -p $(obj)include
-       @echo "#define CONFIG_$$(echo $(subst ,,$(@:_config=)) | \
-               tr '[:lower:]' '[:upper:]')" >$(obj)include/config.h
-       @$(MKCONFIG) -n $@ -a sequoia powerpc ppc4xx sequoia amcc
-
-sequoia_nand_config \
-rainier_nand_config: unconfig
-       @mkdir -p $(obj)include $(obj)board/amcc/sequoia
-       @mkdir -p $(obj)nand_spl/board/amcc/sequoia
-       @echo "#define CONFIG_NAND_U_BOOT" > $(obj)include/config.h
-       @echo "#define CONFIG_$$(echo $(subst ,,$(@:_config=)) | \
-               tr '[:lower:]' '[:upper:]')" >> $(obj)include/config.h
-       @echo "TEXT_BASE = 0x01000000" > $(obj)board/amcc/sequoia/config.tmp
-       @echo "CONFIG_NAND_U_BOOT = y" >> $(obj)include/config.mk
-       @$(MKCONFIG) -n $@ -a sequoia powerpc ppc4xx sequoia amcc
-
-sequoia_ramboot_config \
-rainier_ramboot_config: unconfig
-       @mkdir -p $(obj)include $(obj)board/amcc/sequoia
-       @echo "#define CONFIG_SYS_RAMBOOT" > $(obj)include/config.h
-       @echo "#define CONFIG_$$(echo $(subst ,,$(@:_config=)) | \
-               tr '[:lower:]' '[:upper:]')" >> $(obj)include/config.h
-       @echo "TEXT_BASE = 0x01000000" > $(obj)board/amcc/sequoia/config.tmp
-       @echo "LDSCRIPT = board/amcc/sequoia/u-boot-ram.lds" >> \
-               $(obj)board/amcc/sequoia/config.tmp
-       @$(MKCONFIG) -n $@ -a sequoia powerpc ppc4xx sequoia amcc
-
-v5fx30teval_config: unconfig
-       @mkdir -p $(obj)include $(obj)board/xilinx/ppc440-generic
-       @mkdir -p $(obj)include $(obj)board/avnet/v5fx30teval
-       @echo "LDSCRIPT:=$(SRCTREE)/board/xilinx/ppc440-generic/u-boot-ram.lds"\
-               > $(obj)board/avnet/v5fx30teval/config.tmp
-       @echo "TEXT_BASE := 0x03000000" \
-               >> $(obj)board/avnet/v5fx30teval/config.tmp
-       @$(MKCONFIG) $@ powerpc ppc4xx v5fx30teval avnet
-
-v5fx30teval_flash_config: unconfig
-       @mkdir -p $(obj)include $(obj)board/xilinx/ppc440-generic
-       @mkdir -p $(obj)include $(obj)board/avnet/v5fx30teval
-       @echo "LDSCRIPT:=$(SRCTREE)/board/xilinx/ppc440-generic/u-boot-rom.lds"\
-               > $(obj)board/avnet/v5fx30teval/config.tmp
-       @echo "TEXT_BASE := 0xFF1C0000" \
-               >> $(obj)board/avnet/v5fx30teval/config.tmp
-       @$(MKCONFIG) v5fx30teval powerpc ppc4xx v5fx30teval avnet
-
-W7OLMC_config  \
-W7OLMG_config: unconfig
-       @$(MKCONFIG) $@ powerpc ppc4xx w7o
-
-# Walnut & Sycamore images are identical (recognized via PVR)
-walnut_config \
-sycamore_config: unconfig
-       @$(MKCONFIG) -n $@ walnut powerpc ppc4xx walnut amcc
-
-xilinx-ppc405-generic_flash_config: unconfig
-       @mkdir -p $(obj)include $(obj)board/xilinx/ppc405-generic
-       @echo "LDSCRIPT:=$(SRCTREE)/board/xilinx/ppc405-generic/u-boot-rom.lds"\
-               > $(obj)board/xilinx/ppc405-generic/config.tmp
-       @echo "TEXT_BASE := 0xFE360000" \
-               >> $(obj)board/xilinx/ppc405-generic/config.tmp
-       @$(MKCONFIG) xilinx-ppc405-generic powerpc ppc4xx ppc405-generic xilinx
-
-xilinx-ppc405-generic_config: unconfig
-       @mkdir -p $(obj)include $(obj)board/xilinx/ppc405-generic
-       @echo "LDSCRIPT:=$(SRCTREE)/board/xilinx/ppc405-generic/u-boot-ram.lds"\
-               > $(obj)board/xilinx/ppc405-generic/config.tmp
-       @echo "TEXT_BASE := 0x04000000" \
-               >> $(obj)board/xilinx/ppc405-generic/config.tmp
-       @$(MKCONFIG) xilinx-ppc405-generic powerpc ppc4xx ppc405-generic xilinx
-
-xilinx-ppc440-generic_flash_config: unconfig
-       @mkdir -p $(obj)include $(obj)board/xilinx/ppc440-generic
-       @echo "LDSCRIPT:=$(SRCTREE)/board/xilinx/ppc440-generic/u-boot-rom.lds"\
-               > $(obj)board/xilinx/ppc440-generic/config.tmp
-       @echo "TEXT_BASE := 0xFE360000" \
-               >> $(obj)board/xilinx/ppc440-generic/config.tmp
-       @$(MKCONFIG) xilinx-ppc440-generic powerpc ppc4xx ppc440-generic xilinx
-
-xilinx-ppc440-generic_config: unconfig
-       @mkdir -p $(obj)include $(obj)board/xilinx/ppc440-generic
-       @echo "LDSCRIPT:=$(SRCTREE)/board/xilinx/ppc440-generic/u-boot-ram.lds"\
-               > $(obj)board/xilinx/ppc440-generic/config.tmp
-       @echo "TEXT_BASE := 0x04000000" \
-               >> $(obj)board/xilinx/ppc440-generic/config.tmp
-       @$(MKCONFIG) xilinx-ppc440-generic powerpc ppc4xx ppc440-generic xilinx
-
-yosemite_config \
-yellowstone_config: unconfig
-       @mkdir -p $(obj)include
-       @echo "#define CONFIG_$$(echo $(subst ,,$(@:_config=)) | \
-               tr '[:lower:]' '[:upper:]')" >$(obj)include/config.h
-       @$(MKCONFIG) -n $@ -a yosemite powerpc ppc4xx yosemite amcc
-
-#########################################################################
-## MPC8220 Systems
-#########################################################################
-
-# generic boards
-################
-sorcery_config:                unconfig
-       @$(MKCONFIG) $@ powerpc mpc8220 $(call lcname,$@)
-
-Alaska8220_config      \
-Yukon8220_config:      unconfig
-       @$(MKCONFIG) $@ powerpc mpc8220 alaska
-
-#########################################################################
-## MPC824x Systems
-#########################################################################
-
-# generic boards
-################
-A3000_config   \
-barco_config   \
-BMW_config     \
-CU824_config   \
-HIDDEN_DRAGON_config \
-MOUSSE_config  \
-MUSENKI_config \
-MVBLUE_config  \
-OXC_config     \
-PN62_config    \
-sbc8240_config \
-utx8245_config:        unconfig
-       @$(MKCONFIG) $@ powerpc mpc824x $(call lcname,$@)
-
-# vendor specific boards (sorted by vendor)
-###########################################
-
-debris_config  \
-kvme080_config:        unconfig
-       @$(MKCONFIG) $@ powerpc mpc824x $(call lcname,$@) etin
-
-# special boards
-################
-eXalion_config: unconfig
-       @$(MKCONFIG) $(@:_config=) powerpc mpc824x eXalion
-
-CPC45_config   \
-CPC45_ROMBOOT_config:  unconfig
-       @mkdir -p $(obj)include ;                               \
-       if [ "$(findstring _ROMBOOT_,$@)" ] ; then \
-               echo "CONFIG_BOOT_ROM = y" >> $(obj)include/config.mk ; \
-       else \
-               echo "CONFIG_BOOT_ROM = n" >> $(obj)include/config.mk ; \
-       fi; \
-       echo "export CONFIG_BOOT_ROM" >> $(obj)include/config.mk;
-       @$(MKCONFIG) -n $@ CPC45 powerpc mpc824x cpc45
-
-# HDLAN is broken ATM. Should be fixed as soon as hardware is available and as
-# time permits.
-#linkstation_HDLAN_config \
-# Remove this line when HDLAN is fixed
-linkstation_HGLAN_config: unconfig
-       @mkdir -p $(obj)include
-       @case $@ in \
-               *HGLAN*) echo "#define CONFIG_HGLAN 1" >$(obj)include/config.h; ;; \
-               *HDLAN*) echo "#define CONFIG_HLAN 1" >$(obj)include/config.h; ;; \
-       esac
-       @$(MKCONFIG) -n $@ -a linkstation powerpc mpc824x linkstation
-
-Sandpoint8240_config: unconfig
-       @$(MKCONFIG) $@ powerpc mpc824x sandpoint
-
-Sandpoint8245_config: unconfig
-       @$(MKCONFIG) $@ powerpc mpc824x sandpoint
-
-#########################################################################
-## MPC8260 Systems
-#########################################################################
-
-# generic boards
-################
-atc_config             \
-ep8260_config          \
-ep82xxm_config         \
-gw8260_config          \
-hymod_config           \
-IDS8247_config         \
-IPHASE4539_config      \
-ppmc8260_config                \
-RPXsuper_config                \
-rsdproto_config                \
-sacsng_config          \
-sbc8260_config         \
-ZPC1900_config:                unconfig
-       @$(MKCONFIG) $@ powerpc mpc8260 $(call lcname,$@)
-
-# vendor specific boards (sorted by vendor)
-###########################################
-
-MPC8266ADS_config:     unconfig
-       @$(MKCONFIG) $@ powerpc mpc8260 $(call lcname,$@) freescale
-
-mgcoge_config  :       unconfig
-       @$(MKCONFIG) $@ powerpc mpc8260 $(call lcname,$@) keymile
-
-SCM_config:            unconfig
-       @$(MKCONFIG) $@ powerpc mpc8260 $(call ucname,$@) siemens
-
-TQM8272_config: unconfig
-       @$(MKCONFIG) TQM8272 powerpc mpc8260 $(call lcname,$@) tqc
-
-# special boards
-################
-
-cogent_mpc8260_config: unconfig
-       @$(MKCONFIG) $(@:_config=) powerpc mpc8260 cogent
-
-CPU86_config   \
-CPU86_ROMBOOT_config: unconfig
-       @mkdir -p  $(obj)include ;                              \
-       if [ "$(findstring _ROMBOOT_,$@)" ] ; then \
-               echo "CONFIG_BOOT_ROM = y" >> $(obj)include/config.mk ; \
-       else \
-               echo "CONFIG_BOOT_ROM = n" >> $(obj)include/config.mk ; \
-       fi; \
-       echo "export CONFIG_BOOT_ROM" >> $(obj)include/config.mk;
-       @$(MKCONFIG) -n $@ CPU86 powerpc mpc8260 cpu86
-
-CPU87_config   \
-CPU87_ROMBOOT_config: unconfig
-       @mkdir -p $(obj)include ;                               \
-       if [ "$(findstring _ROMBOOT_,$@)" ] ; then \
-               echo "CONFIG_BOOT_ROM = y" >> $(obj)include/config.mk ; \
-       else \
-               echo "CONFIG_BOOT_ROM = n" >> $(obj)include/config.mk ; \
-       fi; \
-       echo "export CONFIG_BOOT_ROM" >> $(obj)include/config.mk;
-       @$(MKCONFIG) -n $@ CPU87 powerpc mpc8260 cpu87
-
-ep8248_config  \
-ep8248E_config :       unconfig
-       @$(MKCONFIG) -n $@ ep8248 powerpc mpc8260 ep8248
-
-ISPAN_config           \
-ISPAN_REVB_config:     unconfig
-       @mkdir -p $(obj)include
-       @if [ "$(findstring _REVB_,$@)" ] ; then \
-               echo "#define CONFIG_SYS_REV_B" > $(obj)include/config.h ; \
-       fi
-       @$(MKCONFIG) -n $@ -a ISPAN powerpc mpc8260 ispan
-
-MPC8260ADS_config      \
-MPC8260ADS_lowboot_config      \
-MPC8260ADS_33MHz_config        \
-MPC8260ADS_33MHz_lowboot_config        \
-MPC8260ADS_40MHz_config        \
-MPC8260ADS_40MHz_lowboot_config        \
-MPC8272ADS_config      \
-MPC8272ADS_lowboot_config      \
-PQ2FADS_config         \
-PQ2FADS_lowboot_config         \
-PQ2FADS-VR_config      \
-PQ2FADS-VR_lowboot_config      \
-PQ2FADS-ZU_config      \
-PQ2FADS-ZU_lowboot_config      \
-PQ2FADS-ZU_66MHz_config        \
-PQ2FADS-ZU_66MHz_lowboot_config        \
-       :               unconfig
-       @mkdir -p $(obj)include
-       @mkdir -p $(obj)board/freescale/mpc8260ads
-       $(if $(findstring PQ2FADS,$@), \
-       @echo "#define CONFIG_ADSTYPE CONFIG_SYS_PQ2FADS" > $(obj)include/config.h, \
-       @echo "#define CONFIG_ADSTYPE CONFIG_SYS_"$(subst MPC,,$(word 1,$(subst _, ,$@))) > $(obj)include/config.h)
-       $(if $(findstring MHz,$@), \
-       @echo "#define CONFIG_8260_CLKIN" $(subst MHz,,$(word 2,$(subst _, ,$@)))"000000" >> $(obj)include/config.h, \
-       $(if $(findstring VR,$@), \
-       @echo "#define CONFIG_8260_CLKIN 66000000" >> $(obj)include/config.h))
-       @[ -z "$(findstring lowboot_,$@)" ] || \
-               echo "TEXT_BASE = 0xFF800000" >$(obj)board/freescale/mpc8260ads/config.tmp
-       @$(MKCONFIG) -n $@ -a MPC8260ADS powerpc mpc8260 mpc8260ads freescale
-
-muas3001_dev_config \
-muas3001_config        :       unconfig
-       @mkdir -p $(obj)include
-       @mkdir -p $(obj)board/muas3001
-       @if [ "$(findstring dev,$@)" ] ; then \
-               echo "#define CONFIG_MUAS_DEV_BOARD" > $(obj)include/config.h ; \
-       fi
-       @$(MKCONFIG) -n $@ -a muas3001 powerpc mpc8260 muas3001
-
-# PM825/PM826 default configuration:  small (= 8 MB) Flash / boot from 64-bit flash
-PM825_config   \
-PM825_ROMBOOT_config   \
-PM825_BIGFLASH_config  \
-PM825_ROMBOOT_BIGFLASH_config  \
-PM826_config   \
-PM826_ROMBOOT_config   \
-PM826_BIGFLASH_config  \
-PM826_ROMBOOT_BIGFLASH_config: unconfig
-       @mkdir -p $(obj)include
-       @mkdir -p $(obj)board/pm826
-       @if [ "$(findstring PM825_,$@)" ] ; then \
-               echo "#define CONFIG_PCI"       >$(obj)include/config.h ; \
-       else \
-               >$(obj)include/config.h ; \
-       fi
-       @if [ "$(findstring _ROMBOOT_,$@)" ] ; then \
-               echo "#define CONFIG_BOOT_ROM" >>$(obj)include/config.h ; \
-               echo "TEXT_BASE = 0xFF800000" >$(obj)board/pm826/config.tmp ; \
-               if [ "$(findstring _BIGFLASH_,$@)" ] ; then \
-                       echo "#define CONFIG_FLASH_32MB" >>$(obj)include/config.h ; \
-               fi; \
-       else \
-               if [ "$(findstring _BIGFLASH_,$@)" ] ; then \
-                       $(XECHO) "... with 32 MB Flash" ; \
-                       echo "#define CONFIG_FLASH_32MB" >>$(obj)include/config.h ; \
-                       echo "TEXT_BASE = 0x40000000" >$(obj)board/pm826/config.tmp ; \
-               else \
-                       echo "TEXT_BASE = 0xFF000000" >$(obj)board/pm826/config.tmp ; \
-               fi; \
-       fi
-       @$(MKCONFIG) -n $@ -a PM826 powerpc mpc8260 pm826
-
-PM828_config   \
-PM828_PCI_config       \
-PM828_ROMBOOT_config   \
-PM828_ROMBOOT_PCI_config:      unconfig
-       @mkdir -p $(obj)include
-       @mkdir -p $(obj)board/pm826
-       @if [ "$(findstring _PCI_,$@)" ] ; then \
-               echo "#define CONFIG_PCI"  >>$(obj)include/config.h ; \
-       fi
-       @if [ "$(findstring _ROMBOOT_,$@)" ] ; then \
-               echo "#define CONFIG_BOOT_ROM" >>$(obj)include/config.h ; \
-               echo "TEXT_BASE = 0xFF800000" >$(obj)board/pm826/config.tmp ; \
-       fi
-       @$(MKCONFIG) -n $@ -a PM828 powerpc mpc8260 pm828
-
-Rattler8248_config     \
-Rattler_config:                unconfig
-       @mkdir -p $(obj)include
-       $(if $(findstring 8248,$@), \
-               @echo "#define CONFIG_MPC8248" > $(obj)include/config.h)
-       @$(MKCONFIG) -n $@ -a Rattler powerpc mpc8260 rattler
-
-TQM8255_AA_config \
-TQM8260_AA_config \
-TQM8260_AB_config \
-TQM8260_AC_config \
-TQM8260_AD_config \
-TQM8260_AE_config \
-TQM8260_AF_config \
-TQM8260_AG_config \
-TQM8260_AH_config \
-TQM8260_AI_config \
-TQM8265_AA_config:  unconfig
-       @mkdir -p $(obj)include
-       @case "$@" in \
-       TQM8255_AA_config) CTYPE=MPC8255; CFREQ=300; CACHE=no;  BMODE=8260;;  \
-       TQM8260_AA_config) CTYPE=MPC8260; CFREQ=200; CACHE=no;  BMODE=8260;; \
-       TQM8260_AB_config) CTYPE=MPC8260; CFREQ=200; CACHE=yes; BMODE=60x;;  \
-       TQM8260_AC_config) CTYPE=MPC8260; CFREQ=200; CACHE=yes; BMODE=60x;;  \
-       TQM8260_AD_config) CTYPE=MPC8260; CFREQ=300; CACHE=no;  BMODE=60x;;  \
-       TQM8260_AE_config) CTYPE=MPC8260; CFREQ=266; CACHE=no;  BMODE=8260;; \
-       TQM8260_AF_config) CTYPE=MPC8260; CFREQ=300; CACHE=no;  BMODE=60x;;  \
-       TQM8260_AG_config) CTYPE=MPC8260; CFREQ=300; CACHE=no;  BMODE=8260;; \
-       TQM8260_AH_config) CTYPE=MPC8260; CFREQ=300; CACHE=yes; BMODE=60x;;  \
-       TQM8260_AI_config) CTYPE=MPC8260; CFREQ=300; CACHE=no;  BMODE=60x;;  \
-       TQM8265_AA_config) CTYPE=MPC8265; CFREQ=300; CACHE=no;  BMODE=60x;;  \
-       esac; \
-       if [ "$${CTYPE}" != "MPC8260" ] ; then \
-               echo "#define CONFIG_$${CTYPE}" >>$(obj)include/config.h ; \
-       fi; \
-       echo "#define CONFIG_$${CFREQ}MHz"      >>$(obj)include/config.h ; \
-       if [ "$${CACHE}" = "yes" ] ; then \
-               echo "#define CONFIG_L2_CACHE"  >>$(obj)include/config.h ; \
-       else \
-               echo "#undef CONFIG_L2_CACHE"   >>$(obj)include/config.h ; \
-       fi; \
-       if [ "$${BMODE}" = "60x" ] ; then \
-               echo "#define CONFIG_BUSMODE_60x" >>$(obj)include/config.h ; \
-       else \
-               echo "#undef CONFIG_BUSMODE_60x"  >>$(obj)include/config.h ; \
-       fi
-       @$(MKCONFIG) -n $@ -a TQM8260 powerpc mpc8260 tqm8260 tqc
-
-VoVPN-GW_66MHz_config  \
-VoVPN-GW_100MHz_config:                unconfig
-       @mkdir -p $(obj)include
-       @echo "#define CONFIG_CLKIN_$(word 2,$(subst _, ,$@))" > $(obj)include/config.h
-       @$(MKCONFIG) -n $@ -a VoVPN-GW powerpc mpc8260 vovpn-gw funkwerk
-
 #########################################################################
 ## Coldfire
 #########################################################################
 
-# generic boards
-################
-
-idmr_config:           unconfig
-       @$(MKCONFIG) $@ m68k mcf52x2 $(call lcname,$@)
-
-# vendor specific boards (sorted by vendor)
-###########################################
-
-TASREG_config :                unconfig
-       @$(MKCONFIG) $@ m68k mcf52x2 $(call lcname,$@) esd
-
-M5208EVBE_config       \
-M5249EVB_config                \
-M5253DEMO_config       \
-M5253EVBE_config       \
-M5271EVB_config                \
-M5272C3_config         \
-M5275EVB_config                \
-M5282EVB_config                \
-M53017EVB_config:      unconfig
-       @$(MKCONFIG) $@ m68k mcf52x2 $(call lcname,$@) freescale
-
-EP2500_config  :       unconfig
-       @$(MKCONFIG) $@ m68k mcf52x2 $(call lcname,$@) Mercury
-
-# special boards
-################
-
 astro_mcf5373l_config \
 astro_mcf5373l_RAM_config :    unconfig
        @$(MKCONFIG) -n $@ -t $@ astro_mcf5373l m68k mcf532x mcf5373l astro
@@ -1704,13 +521,13 @@ M52277EVB_stmicro_config :       unconfig
        esac; \
        if [ "$${FLASH}" = "SPANSION" ] ; then \
                echo "#define CONFIG_SYS_SPANSION_BOOT" >> $(obj)include/config.h ; \
-               echo "TEXT_BASE = 0x00000000" > $(obj)board/freescale/m52277evb/config.tmp ; \
+               echo "CONFIG_SYS_TEXT_BASE = 0x00000000" > $(obj)board/freescale/m52277evb/config.tmp ; \
                cp $(obj)board/freescale/m52277evb/u-boot.spa $(obj)board/freescale/m52277evb/u-boot.lds ; \
        fi; \
        if [ "$${FLASH}" = "STMICRO" ] ; then \
                echo "#define CONFIG_CF_SBF"    >> $(obj)include/config.h ; \
                echo "#define CONFIG_SYS_STMICRO_BOOT"  >> $(obj)include/config.h ; \
-               echo "TEXT_BASE = 0x43E00000" > $(obj)board/freescale/m52277evb/config.tmp ; \
+               echo "CONFIG_SYS_TEXT_BASE = 0x43E00000" > $(obj)board/freescale/m52277evb/config.tmp ; \
                cp $(obj)board/freescale/m52277evb/u-boot.stm $(obj)board/freescale/m52277evb/u-boot.lds ; \
        fi
        @$(MKCONFIG) -n $@ -a M52277EVB m68k mcf5227x m52277evb freescale
@@ -1725,10 +542,10 @@ M5235EVB_Flash32_config: unconfig
        esac; \
        if [ "$${FLASH}" != "16" ] ; then \
                echo "#define NORFLASH_PS32BIT  1" >> $(obj)include/config.h ; \
-               echo "TEXT_BASE = 0xFFC00000" > $(obj)board/freescale/m5235evb/config.tmp ; \
+               echo "CONFIG_SYS_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 \
-               echo "TEXT_BASE = 0xFFE00000" > $(obj)board/freescale/m5235evb/config.tmp ; \
+               echo "CONFIG_SYS_TEXT_BASE = 0xFFE00000" > $(obj)board/freescale/m5235evb/config.tmp ; \
                cp $(obj)board/freescale/m5235evb/u-boot.16 $(obj)board/freescale/m5235evb/u-boot.lds ; \
        fi
        @$(MKCONFIG) -n $@ -a M5235EVB m68k mcf523x m5235evb freescale
@@ -1739,13 +556,13 @@ cobra5272_config :               unconfig
 EB+MCF-EV123_config :          unconfig
        @mkdir -p $(obj)include
        @mkdir -p $(obj)board/BuS/EB+MCF-EV123
-       @echo "TEXT_BASE = 0xFFE00000"|tee $(obj)board/BuS/EB+MCF-EV123/textbase.mk
+       @echo "CONFIG_SYS_TEXT_BASE = 0xFFE00000"|tee $(obj)board/BuS/EB+MCF-EV123/textbase.mk
        @$(MKCONFIG) -n $@ 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
-       @echo "TEXT_BASE = 0xF0000000"|tee $(obj)board/BuS/EB+MCF-EV123/textbase.mk
+       @echo "CONFIG_SYS_TEXT_BASE = 0xF0000000"|tee $(obj)board/BuS/EB+MCF-EV123/textbase.mk
        @$(MKCONFIG) -n $@ EB+MCF-EV123 m68k mcf52x2 EB+MCF-EV123 BuS
 
 M5329AFEE_config \
@@ -1775,13 +592,13 @@ M54451EVB_stmicro_config :       unconfig
        M54451EVB_stmicro_config)       FLASH=STMICRO;; \
        esac; \
        if [ "$${FLASH}" = "NOR" ] ; then \
-               echo "TEXT_BASE = 0x00000000" > $(obj)board/freescale/m54451evb/config.tmp ; \
+               echo "CONFIG_SYS_TEXT_BASE = 0x00000000" > $(obj)board/freescale/m54451evb/config.tmp ; \
                cp $(obj)board/freescale/m54451evb/u-boot.spa $(obj)board/freescale/m54451evb/u-boot.lds ; \
        fi; \
        if [ "$${FLASH}" = "STMICRO" ] ; then \
                echo "#define CONFIG_CF_SBF"    >> $(obj)include/config.h ; \
                echo "#define CONFIG_SYS_STMICRO_BOOT"  >> $(obj)include/config.h ; \
-               echo "TEXT_BASE = 0x47E00000" > $(obj)board/freescale/m54451evb/config.tmp ; \
+               echo "CONFIG_SYS_TEXT_BASE = 0x47E00000" > $(obj)board/freescale/m54451evb/config.tmp ; \
                cp $(obj)board/freescale/m54451evb/u-boot.stm $(obj)board/freescale/m54451evb/u-boot.lds ; \
        fi; \
        echo "#define CONFIG_SYS_INPUT_CLKSRC 24000000" >> $(obj)include/config.h ;
@@ -1807,18 +624,18 @@ M54455EVB_stm33_config : unconfig
        esac; \
        if [ "$${FLASH}" = "INTEL" ] ; then \
                echo "#define CONFIG_SYS_INTEL_BOOT" >> $(obj)include/config.h ; \
-               echo "TEXT_BASE = 0x00000000" > $(obj)board/freescale/m54455evb/config.tmp ; \
+               echo "CONFIG_SYS_TEXT_BASE = 0x00000000" > $(obj)board/freescale/m54455evb/config.tmp ; \
                cp $(obj)board/freescale/m54455evb/u-boot.int $(obj)board/freescale/m54455evb/u-boot.lds ; \
        fi; \
        if [ "$${FLASH}" = "ATMEL" ] ; then \
                echo "#define CONFIG_SYS_ATMEL_BOOT"    >> $(obj)include/config.h ; \
-               echo "TEXT_BASE = 0x04000000" > $(obj)board/freescale/m54455evb/config.tmp ; \
+               echo "CONFIG_SYS_TEXT_BASE = 0x04000000" > $(obj)board/freescale/m54455evb/config.tmp ; \
                cp $(obj)board/freescale/m54455evb/u-boot.atm $(obj)board/freescale/m54455evb/u-boot.lds ; \
        fi; \
        if [ "$${FLASH}" = "STMICRO" ] ; then \
                echo "#define CONFIG_CF_SBF"    >> $(obj)include/config.h ; \
                echo "#define CONFIG_SYS_STMICRO_BOOT"  >> $(obj)include/config.h ; \
-               echo "TEXT_BASE = 0x4FE00000" > $(obj)board/freescale/m54455evb/config.tmp ; \
+               echo "CONFIG_SYS_TEXT_BASE = 0x4FE00000" > $(obj)board/freescale/m54455evb/config.tmp ; \
                cp $(obj)board/freescale/m54455evb/u-boot.stm $(obj)board/freescale/m54455evb/u-boot.lds ; \
        fi; \
        echo "#define CONFIG_SYS_INPUT_CLKSRC $${FREQ}" >> $(obj)include/config.h ; \
@@ -1892,538 +709,24 @@ M5485HFE_config :       unconfig
        fi
        @$(MKCONFIG) -n $@ -a M5485EVB m68k mcf547x_8x m548xevb freescale
 
-#########################################################################
-## MPC83xx Systems
-#########################################################################
-
-# generic boards
-################
-
-# vendor specific boards (sorted by vendor)
-###########################################
-
-MPC8323ERDB_config     \
-MPC8349EMDS_config     \
-MPC837XERDB_config:    unconfig
-       @$(MKCONFIG) $@ powerpc mpc83xx $(call lcname,$@) freescale
-
-kmeter1_config: unconfig
-       @$(MKCONFIG) $@ powerpc mpc83xx $(call lcname,$@) keymile
-
-MVBLM7_config: unconfig
-       @$(MKCONFIG) $@ powerpc mpc83xx $(call lcname,$@) matrix_vision
-
-TQM834x_config:        unconfig
-       @$(MKCONFIG) $@ powerpc mpc83xx $(call lcname,$@) tqc
-
-# special boards
-################
-
-MPC8313ERDB_33_config \
-MPC8313ERDB_66_config \
-MPC8313ERDB_NAND_33_config \
-MPC8313ERDB_NAND_66_config: unconfig
-       @mkdir -p $(obj)include
-       @mkdir -p $(obj)board/freescale/mpc8313erdb
-       @if [ "$(findstring _33_,$@)" ] ; then \
-               echo "#define CONFIG_SYS_33MHZ" >>$(obj)include/config.h ; \
-       fi ; \
-       if [ "$(findstring _66_,$@)" ] ; then \
-               echo "#define CONFIG_SYS_66MHZ" >>$(obj)include/config.h ; \
-       fi ; \
-       if [ "$(findstring _NAND_,$@)" ] ; then \
-               echo "TEXT_BASE = 0x00100000" > $(obj)board/freescale/mpc8313erdb/config.tmp ; \
-               echo "#define CONFIG_NAND_U_BOOT" >>$(obj)include/config.h ; \
-       fi ;
-       @if [ "$(findstring _NAND_,$@)" ] ; then \
-               echo "CONFIG_NAND_U_BOOT = y" >> $(obj)include/config.mk ; \
-       fi ;
-       @$(MKCONFIG) -n $@ -a MPC8313ERDB powerpc mpc83xx mpc8313erdb freescale
-
-MPC8315ERDB_NAND_config \
-MPC8315ERDB_config: unconfig
-       @$(MKCONFIG) -n $@ -t $@ MPC8315ERDB powerpc mpc83xx mpc8315erdb freescale
-
-MPC832XEMDS_config \
-MPC832XEMDS_HOST_33_config \
-MPC832XEMDS_HOST_66_config \
-MPC832XEMDS_SLAVE_config \
-MPC832XEMDS_ATM_config:        unconfig
-       @mkdir -p $(obj)include
-       @if [ "$(findstring _HOST_,$@)" ] ; then \
-               echo "#define CONFIG_PCI" >>$(obj)include/config.h ; \
-       fi ; \
-       if [ "$(findstring _SLAVE_,$@)" ] ; then \
-               echo "#define CONFIG_PCI" >>$(obj)include/config.h ; \
-               echo "#define CONFIG_PCISLAVE" >>$(obj)include/config.h ; \
-       fi ; \
-       if [ "$(findstring _33_,$@)" ] ; then \
-               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 "#define PCI_66M" >>$(obj)include/config.h ; \
-               echo "#define CONFIG_PQ_MDS_PIB 1" >>$(obj)include/config.h ; \
-       fi ; \
-       if [ "$(findstring _ATM_,$@)" ] ; then \
-               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) -n $@ -a MPC832XEMDS powerpc mpc83xx mpc832xemds freescale
-
-MPC8349ITX_config \
-MPC8349ITX_LOWBOOT_config \
-MPC8349ITXGP_config:   unconfig
-       @mkdir -p $(obj)include
-       @mkdir -p $(obj)board/freescale/mpc8349itx
-       @echo "#define CONFIG_$(subst _LOWBOOT,,$(@:_config=))" >> $(obj)include/config.h
-       @if [ "$(findstring GP,$@)" ] ; then \
-               echo "TEXT_BASE = 0xFE000000" >$(obj)board/freescale/mpc8349itx/config.tmp ; \
-       fi
-       @if [ "$(findstring LOWBOOT,$@)" ] ; then \
-               echo "TEXT_BASE = 0xFE000000" >$(obj)board/freescale/mpc8349itx/config.tmp ; \
-       fi
-       @$(MKCONFIG) -n $@ -a MPC8349ITX powerpc mpc83xx mpc8349itx freescale
-
-MPC8360EMDS_config \
-MPC8360EMDS_HOST_33_config \
-MPC8360EMDS_HOST_66_config \
-MPC8360EMDS_SLAVE_config \
-MPC8360EMDS_ATM_config: unconfig
-       @mkdir -p $(obj)include
-       @if [ "$(findstring _HOST_,$@)" ] ; then \
-               echo "#define CONFIG_PCI" >>$(obj)include/config.h ; \
-       fi ; \
-       if [ "$(findstring _SLAVE_,$@)" ] ; then \
-               echo "#define CONFIG_PCI" >>$(obj)include/config.h ; \
-               echo "#define CONFIG_PCISLAVE" >>$(obj)include/config.h ; \
-       fi ; \
-       if [ "$(findstring _33_,$@)" ] ; then \
-               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 "#define PCI_66M" >>$(obj)include/config.h ; \
-               echo "#define CONFIG_PQ_MDS_PIB 1" >>$(obj)include/config.h ; \
-       fi ; \
-       if [ "$(findstring _ATM_,$@)" ] ; then \
-               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) -n $@ -a MPC8360EMDS powerpc mpc83xx mpc8360emds freescale
-
-MPC8360ERDK_33_config \
-MPC8360ERDK_66_config \
-MPC8360ERDK_config:    unconfig
-       @mkdir -p $(obj)include
-       @if [ "$(findstring _33_,$@)" ] ; then \
-               echo "#define CONFIG_CLKIN_33MHZ" >>$(obj)include/config.h ;\
-       fi ;
-       @$(MKCONFIG) -n $@ -a MPC8360ERDK powerpc mpc83xx mpc8360erdk freescale
-
-MPC837XEMDS_config \
-MPC837XEMDS_HOST_config:       unconfig
-       @mkdir -p $(obj)include
-       @if [ "$(findstring _HOST_,$@)" ] ; then \
-               echo "#define CONFIG_PCI" >>$(obj)include/config.h ; \
-       fi ;
-       @$(MKCONFIG) -n $@ -a MPC837XEMDS powerpc mpc83xx mpc837xemds freescale
-
-sbc8349_config \
-sbc8349_PCI_33_config \
-sbc8349_PCI_66_config: unconfig
-       @$(MKCONFIG) -n $@ -t $@ sbc8349 powerpc mpc83xx sbc8349
-
-SIMPC8313_LP_config \
-SIMPC8313_SP_config: unconfig
-       @mkdir -p $(obj)include
-       @mkdir -p $(obj)board/sheldon/simpc8313
-       @if [ "$(findstring _LP_,$@)" ] ; then \
-               echo "#define CONFIG_NAND_LP" >> $(obj)include/config.h ; \
-       fi ; \
-       if [ "$(findstring _SP_,$@)" ] ; then \
-               echo "#define CONFIG_NAND_SP" >> $(obj)include/config.h ; \
-       fi ;
-       @echo "CONFIG_NAND_U_BOOT = y" >> $(obj)include/config.mk
-       @$(MKCONFIG) -n $@ -a SIMPC8313 powerpc mpc83xx simpc8313 sheldon
-
-caddy2_config \
-vme8349_config:                unconfig
-       @$(MKCONFIG) -n $@ -t $@ vme8349 powerpc mpc83xx vme8349 esd
-
-#########################################################################
-## MPC85xx Systems
-#########################################################################
-
-# generic boards
-################
-
-ATUM8548_config                \
-PM854_config           \
-PM856_config           \
-socrates_config:       unconfig
-       @$(MKCONFIG) $@ powerpc mpc85xx $(call lcname,$@)
-
-# vendor specific boards (sorted by vendor)
-###########################################
-
-MPC8540ADS_config      \
-MPC8560ADS_config      \
-MPC8544DS_config       \
-MPC8568MDS_config:     unconfig
-       @$(MKCONFIG) $@ powerpc mpc85xx $(call lcname,$@) freescale
-
-stxgp3_config:         unconfig
-       @$(MKCONFIG) $@ powerpc mpc85xx $(call lcname,$@) stx
-
-XPEDITE5200_config     \
-XPEDITE5370_config:    unconfig
-       @$(MKCONFIG) $@ powerpc mpc85xx $(call lcname,$@) xes
-
-# special boards
-################
-MPC8536DS_NAND_config \
-MPC8536DS_SDCARD_config \
-MPC8536DS_SPIFLASH_config \
-MPC8536DS_36BIT_config \
-MPC8536DS_config:       unconfig
-       @$(MKCONFIG) -n $@ -t $@ MPC8536DS powerpc mpc85xx mpc8536ds freescale
-
-MPC8540EVAL_config \
-MPC8540EVAL_33_config \
-MPC8540EVAL_66_config \
-MPC8540EVAL_33_slave_config \
-MPC8540EVAL_66_slave_config:   unconfig
-       @mkdir -p $(obj)include
-       @if [ -z "$(findstring _33_,$@)" ] ; then \
-               echo "#define CONFIG_SYSCLK_66M" >>$(obj)include/config.h ; \
-       fi ; \
-       if [ "$(findstring _slave_,$@)" ] ; then \
-               echo "#define CONFIG_PCI_SLAVE" >>$(obj)include/config.h ; \
-       fi
-       @$(MKCONFIG) -n $@ -a MPC8540EVAL powerpc mpc85xx mpc8540eval
-
-MPC8541CDS_legacy_config \
-MPC8541CDS_config:     unconfig
-       @mkdir -p $(obj)include
-       @if [ "$(findstring _legacy_,$@)" ] ; then \
-               echo "#define CONFIG_LEGACY" >>$(obj)include/config.h ; \
-       fi
-       @$(MKCONFIG) -n $@ -a MPC8541CDS powerpc mpc85xx mpc8541cds freescale
-
-MPC8548CDS_legacy_config \
-MPC8548CDS_config:     unconfig
-       @mkdir -p $(obj)include
-       @if [ "$(findstring _legacy_,$@)" ] ; then \
-               echo "#define CONFIG_LEGACY" >>$(obj)include/config.h ; \
-       fi
-       @$(MKCONFIG) -n $@ -a MPC8548CDS powerpc mpc85xx mpc8548cds freescale
-
-MPC8555CDS_legacy_config \
-MPC8555CDS_config:     unconfig
-       @mkdir -p $(obj)include
-       @if [ "$(findstring _legacy_,$@)" ] ; then \
-               echo "#define CONFIG_LEGACY" >>$(obj)include/config.h ; \
-       fi
-       @$(MKCONFIG) -n $@ -a MPC8555CDS powerpc mpc85xx mpc8555cds freescale
-
-MPC8569MDS_ATM_config \
-MPC8569MDS_NAND_config \
-MPC8569MDS_config:     unconfig
-       @$(MKCONFIG) -n $@ -t $@ MPC8569MDS powerpc mpc85xx mpc8569mds freescale
-
-MPC8572DS_36BIT_config \
-MPC8572DS_config:       unconfig
-       @$(MKCONFIG) -n $@ -t $@ MPC8572DS powerpc mpc85xx mpc8572ds freescale
-
-P2020DS_36BIT_config \
-P2020DS_config:                unconfig
-       @$(MKCONFIG) -n $@ -t $@ P2020DS powerpc mpc85xx p2020ds freescale
-
-P1011RDB_config        \
-P1011RDB_NAND_config \
-P1011RDB_SDCARD_config \
-P1011RDB_SPIFLASH_config \
-P1020RDB_config        \
-P1020RDB_NAND_config \
-P1020RDB_SDCARD_config \
-P1020RDB_SPIFLASH_config \
-P2010RDB_config \
-P2010RDB_NAND_config \
-P2010RDB_SDCARD_config \
-P2010RDB_SPIFLASH_config \
-P2020RDB_config \
-P2020RDB_NAND_config \
-P2020RDB_SDCARD_config \
-P2020RDB_SPIFLASH_config:      unconfig
-       @$(MKCONFIG) -n $@ -t $@ P1_P2_RDB powerpc mpc85xx p1_p2_rdb freescale
-
-sbc8540_config \
-sbc8540_33_config \
-sbc8540_66_config:     unconfig
-       @$(MKCONFIG) -n $@ -t $@ SBC8540 powerpc mpc85xx sbc8560
-
-sbc8548_config \
-sbc8548_PCI_33_config \
-sbc8548_PCI_66_config \
-sbc8548_PCI_33_PCIE_config \
-sbc8548_PCI_66_PCIE_config: unconfig
-       @$(MKCONFIG) -n $@ -t $@ sbc8548 powerpc mpc85xx sbc8548
-
-sbc8560_config \
-sbc8560_33_config \
-sbc8560_66_config:     unconfig
-       @$(MKCONFIG) -n $@ -t $@ sbc8560 powerpc mpc85xx sbc8560
-
-stxssa_config          \
-stxssa_4M_config:      unconfig
-       @mkdir -p $(obj)include
-       @if [ "$(findstring _4M_,$@)" ] ; then \
-               echo "#define CONFIG_STXSSA_4M" >>$(obj)include/config.h ; \
-       fi
-       @$(MKCONFIG) -n $@ -a stxssa powerpc mpc85xx stxssa stx
-
-TQM8540_config         \
-TQM8541_config         \
-TQM8548_config         \
-TQM8548_AG_config      \
-TQM8548_BE_config      \
-TQM8555_config         \
-TQM8560_config:                unconfig
-       @mkdir -p $(obj)include
-       @BTYPE=$(@:_config=); \
-       CTYPE=$(subst TQM,,$(subst _AG,,$(subst _BE,,$(@:_config=)))); \
-       echo "#define CONFIG_MPC$${CTYPE}">>$(obj)include/config.h; \
-       echo "#define CONFIG_$${BTYPE}">>$(obj)include/config.h; \
-       echo "#define CONFIG_HOSTNAME tqm$${CTYPE}">>$(obj)include/config.h; \
-       echo "#define CONFIG_BOARDNAME \"$${BTYPE}\"">>$(obj)include/config.h;
-       @echo "CONFIG_$(@:_config=) = y">>$(obj)include/config.mk;
-       @$(MKCONFIG) -n $@ -a TQM85xx powerpc mpc85xx tqm85xx tqc
-
-#########################################################################
-## MPC86xx Systems
-#########################################################################
-
-# generic boards
-################
-
-sbc8641d_config:       unconfig
-       @$(MKCONFIG) $@ powerpc mpc86xx $(call lcname,$@)
-
-# vendor specific boards (sorted by vendor)
-###########################################
-
-MPC8610HPCD_config:    unconfig
-       @$(MKCONFIG) $@ powerpc mpc86xx $(call lcname,$@) freescale
-
-XPEDITE5170_config:    unconfig
-       @$(MKCONFIG) $@ powerpc mpc86xx $(call lcname,$@) xes
-
-# special boards
-################
-
-MPC8641HPCN_36BIT_config \
-MPC8641HPCN_config:    unconfig
-       @mkdir -p $(obj)include
-       @if [ "$(findstring _36BIT_,$@)" ] ; then \
-               echo "#define CONFIG_PHYS_64BIT" >>$(obj)include/config.h ; \
-       fi
-       @$(MKCONFIG) -n $@ -a MPC8641HPCN powerpc mpc86xx mpc8641hpcn freescale
-
-#########################################################################
-## 74xx/7xx Systems
-#########################################################################
-
-# generic boards
-################
-
-ppmc7xx_config: unconfig
-       @$(MKCONFIG) $@ powerpc 74xx_7xx $(call lcname,$@)
-
-# vendor specific boards (sorted by vendor)
-###########################################
-
-BAB7xx_config  \
-ELPPC_config:  unconfig
-       @$(MKCONFIG) $@ powerpc 74xx_7xx $(call lcname,$@) eltec
-
-CPCI750_config:        unconfig
-       @$(MKCONFIG) $@ powerpc 74xx_7xx $(call lcname,$@) esd
-
-mpc7448hpc2_config:  unconfig
-       @$(MKCONFIG) $@ powerpc 74xx_7xx $(call lcname,$@) freescale
-
-AmigaOneG3SE_config:   unconfig
-       @$(MKCONFIG) $@ powerpc 74xx_7xx $(@:_config=) MAI
-
-DB64360_config \
-DB64460_config:        unconfig
-       @$(MKCONFIG) $@ powerpc 74xx_7xx $(call lcname,$@) Marvell
-
-# special boards
-################
-
-EVB64260_config        \
-EVB64260_750CX_config: unconfig
-       @$(MKCONFIG) -n $@ EVB64260 powerpc 74xx_7xx evb64260
-
-P3G4_config: unconfig
-       @$(MKCONFIG) $@ powerpc 74xx_7xx evb64260
-
-p3m750_config  \
-p3m7448_config:                unconfig
-       @mkdir -p $(obj)include
-       @if [ "$(findstring 750_,$@)" ] ; then \
-               echo "#define CONFIG_P3M750" >>$(obj)include/config.h ; \
-       else \
-               echo "#define CONFIG_P3M7448" >>$(obj)include/config.h ; \
-       fi
-       @$(MKCONFIG) -n $@ -a p3mx powerpc 74xx_7xx p3mx prodrive
-
-PCIPPC2_config \
-PCIPPC6_config: unconfig
-       @$(MKCONFIG) -n $@ $@ powerpc 74xx_7xx pcippc2
-
-ZUMA_config:   unconfig
-       @$(MKCONFIG) $@ powerpc 74xx_7xx evb64260
-
 #========================================================================
 # ARM
 #========================================================================
-#########################################################################
-## StrongARM Systems
-#########################################################################
-
-# generic boards
-################
-assabet_config \
-dnp1110_config \
-gcplus_config  \
-lart_config    \
-shannon_config :       unconfig
-       @$(MKCONFIG) $@ arm sa1100 $(call lcname,$@)
-
-#########################################################################
-## ARM92xT Systems
-#########################################################################
-
-# generic boards
-################
-
-edb9301_config \
-edb9302_config \
-edb9302a_config \
-edb9307_config \
-edb9307a_config \
-edb9312_config \
-edb9315_config \
-edb9315a_config: unconfig
-       @$(MKCONFIG) -n $@ -t $@ edb93xx arm arm920t edb93xx NULL ep93xx
-
-mx1ads_config  \
-mx1fs2_config  :       unconfig
-       @$(MKCONFIG) $@ arm arm920t $(call lcname,$@) NULL imx
-
-sbc2410x_config: unconfig
-       @$(MKCONFIG) $@ arm arm920t $(call lcname,$@) NULL s3c24x0
-
-scb9328_config :       unconfig
-       @$(MKCONFIG) $@ arm arm920t $(call lcname,$@) NULL imx
-
-cm4008_config  \
-cm41xx_config  :       unconfig
-       @$(MKCONFIG) $@ arm arm920t $(call lcname,$@) NULL ks8695
-
-netstar_config         \
-voiceblue_config:      unconfig
-       @$(MKCONFIG) $@ arm arm925t $(call lcname,$@)
-
-# vendor specific boards (sorted by vendor)
-###########################################
-
-a320evb_config :       unconfig
-       @$(MKCONFIG) $@ arm arm920t $(call lcname,$@) faraday a320
-
-smdk2400_config                \
-smdk2410_config        :       unconfig
-       @$(MKCONFIG) $@ arm arm920t $(call lcname,$@) samsung s3c24x0
 
 #########################################################################
 ## Atmel AT91RM9200 Systems
 #########################################################################
 
-# generic boards
-################
-
-cmc_pu2_config \
-csb637_config  \
-kb9202_config  \
-m501sk_config  \
-mp2usb_config  :       unconfig
-       @$(MKCONFIG) $@ arm arm920t $(call lcname,$@) NULL at91rm9200
-
-# vendor specific boards (sorted by vendor)
-###########################################
-
-at91rm9200dk_config    \
-at91rm9200ek_config    :       unconfig
-       @$(MKCONFIG) $@ arm arm920t $(call lcname,$@) atmel at91rm9200
-
-eb_cpux9k2_config      :       unconfig
-       @$(MKCONFIG) $@ arm arm920t $(call lcname,$@) BuS at91
-
-omap1510inn_config :   unconfig
-       @$(MKCONFIG) $@ arm arm925t $(call lcname,$@) ti
-
-# special boards
-################
-
 CPUAT91_RAM_config \
 CPUAT91_config :       unconfig
        @mkdir -p $(obj)include
        @echo "#define CONFIG_$(@:_config=) 1"  >$(obj)include/config.h
-       @$(MKCONFIG) -n $@ -a cpuat91 arm arm920t cpuat91 eukrea at91rm9200
+       @$(MKCONFIG) -n $@ -a cpuat91 arm arm920t cpuat91 eukrea at91
 
 #########################################################################
 ## ARM926EJ-S Systems
 #########################################################################
 
-# generic boards
-################
-
-afeb9260_config:       unconfig
-       @$(MKCONFIG) $@ arm arm926ejs $(call lcname,$@) NULL at91
-
-# vendor specific boards (sorted by vendor)
-###########################################
-
-at91cap9adk_config     :       unconfig
-       @$(MKCONFIG) $@ arm arm926ejs $(call lcname,$@) atmel at91
-
-meesc_config   \
-otc570_config  :       unconfig
-       @$(MKCONFIG) $@ arm arm926ejs $(call lcname,$@) esd at91
-
-guruplug_config                \
-mv88f6281gtw_ge_config \
-openrd_base_config     \
-rd6281a_config         \
-sheevaplug_config:     unconfig
-       @$(MKCONFIG) $@ arm arm926ejs $(call lcname,$@) Marvell kirkwood
-
-VCMA9_config   :       unconfig
-       @$(MKCONFIG) $@ arm arm920t $(call lcname,$@) mpl s3c24x0
-
-pm9261_config  \
-pm9263_config  :       unconfig
-       @$(MKCONFIG) $@ arm arm926ejs $(call lcname,$@) ronetix at91
-
-omap5912osk_config :   unconfig
-       @$(MKCONFIG) $@ arm arm926ejs $(call lcname,$@) ti omap
-
-# special boards
-################
-
 at91sam9260ek_nandflash_config \
 at91sam9260ek_dataflash_cs0_config \
 at91sam9260ek_dataflash_cs1_config \
@@ -2544,6 +847,10 @@ at91sam9g45ekes_config    :       unconfig
        fi;
        @$(MKCONFIG) -n $@ -a at91sam9m10g45ek arm arm926ejs at91sam9m10g45ek atmel at91
 
+pm9g45_config  :       unconfig
+       @mkdir -p $(obj)include
+       @$(MKCONFIG) -a pm9g45 arm arm926ejs pm9g45 ronetix at91
+
 SBC35_A9G20_NANDFLASH_config \
 SBC35_A9G20_EEPROM_config \
 SBC35_A9G20_config     :       unconfig
@@ -2587,26 +894,6 @@ cp922_XA10_config \
 cp1026_config: unconfig
        @board/armltd/integrator/split_by_variant.sh cp $@
 
-da830evm_config                        \
-davinci_dvevm_config           \
-davinci_schmoogie_config       \
-davinci_sffsdr_config          \
-davinci_sonata_config          \
-davinci_dm355evm_config                \
-davinci_dm355leopard_config    \
-davinci_dm365evm_config                \
-davinci_dm6467evm_config       :       unconfig
-       @$(MKCONFIG) -n $@ $@ arm arm926ejs \
-               $(subst davinci_,,$(@:_config=)) davinci davinci
-
-magnesium_config       \
-imx27lite_config:      unconfig
-       @$(MKCONFIG) $@ arm arm926ejs imx27lite logicpd mx27
-
-lpd7a400_config \
-lpd7a404_config:       unconfig
-       @$(MKCONFIG) $@ arm lh7a40x lpd7a40x
-
 nhk8815_config \
 nhk8815_onenand_config:        unconfig
        @mkdir -p $(obj)include
@@ -2655,9 +942,6 @@ spear320_config :  unconfig
 spear600_config :      unconfig
        @$(MKCONFIG) -n $@ -t $@ spear6xx arm arm926ejs $(@:_config=) spear spear
 
-suen3_config:  unconfig
-       @$(MKCONFIG) $@ arm arm926ejs km_arm keymile kirkwood
-
 SX1_stdout_serial_config \
 SX1_config:            unconfig
        @mkdir -p $(obj)include
@@ -2682,19 +966,29 @@ trab_old_config: unconfig
        @[ -z "$(findstring _bigflash,$@)" ] || \
                { echo "#define CONFIG_FLASH_16MB" >>$(obj)include/config.h ; \
                  echo "#define CONFIG_RAM_16MB"   >>$(obj)include/config.h ; \
-                 echo "TEXT_BASE = 0x0CF40000" >$(obj)board/trab/config.tmp ; \
+                 echo "CONFIG_SYS_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 "TEXT_BASE = 0x0CF40000" >$(obj)board/trab/config.tmp ; \
+                 echo "CONFIG_SYS_TEXT_BASE = 0x0CF40000" >$(obj)board/trab/config.tmp ; \
                }
-       @$(MKCONFIG) -n $@ -a trab arm arm920t trab NULL s3c24x0
+       @$(MKCONFIG) -n $@ -a trab arm arm920t trab - s3c24x0
 
 tx25_config    : unconfig
        @echo "CONFIG_NAND_U_BOOT = y" >> $(obj)include/config.mk
        @$(MKCONFIG) $@ arm arm926ejs tx25 karo mx25
 
+edb9301_config \
+edb9302_config \
+edb9302a_config \
+edb9307_config \
+edb9307a_config \
+edb9312_config \
+edb9315_config \
+edb9315a_config: unconfig
+       @$(MKCONFIG) -n $@ -t $(@:_config=) edb93xx arm arm920t edb93xx - ep93xx
+
 #########################################################################
 # ARM supplied Versatile development boards
 #########################################################################
@@ -2705,104 +999,9 @@ versatilepb_config :     unconfig
        @board/armltd/versatile/split_by_variant.sh $@
 
 #########################################################################
-## S3C44B0 Systems
-#########################################################################
-
-B2_config      :       unconfig
-       @$(MKCONFIG) $@ arm s3c44b0 $(call ucname,$@) dave
-
-#########################################################################
-## ARM720T Systems
-#########################################################################
-
-# generic boards
-################
-
-armadillo_config       \
-ep7312_config          \
-impa7_config           \
-modnet50_config :      unconfig
-       @$(MKCONFIG) $@ arm arm720t $(call lcname,$@)
-
-evb4510_config :       unconfig
-       @$(MKCONFIG) $@ arm arm720t $(call lcname,$@) NULL s3c4510b
-
-lpc2292sodimm_config:  unconfig
-       @$(MKCONFIG) $@ arm arm720t $(call lcname,$@) NULL lpc2292
-
-# vendor specific boards (sorted by vendor)
-###########################################
-
-SMN42_config   :       unconfig
-       @$(MKCONFIG) $@ arm arm720t $(call ucname,$@) siemens lpc2292
-
-#########################################################################
-## ARM CORTEX Systems
-#########################################################################
-omapname = $(shell echo $(1) | sed -e 's/omap[0-9]_//' -e 's/\(.*\)_config/\L\1/')
-
-# generic boards
-################
-
-omap3_overo_config     \
-omap3_pandora_config : unconfig
-       @$(MKCONFIG) $@ arm arm_cortexa8 $(call omapname,$@) NULL omap3
-
-# vendor specific boards (sorted by vendor)
-###########################################
-
-mx51evk_config : unconfig
-       @$(MKCONFIG) $@ arm arm_cortexa8 $(call lcname,$@) freescale mx51
-
-omap3_zoom1_config     \
-omap3_zoom2_config :   unconfig
-       @$(MKCONFIG) $@ arm arm_cortexa8 $(call omapname,$@) logicpd omap3
-
-smdkc100_config:       unconfig
-       @$(MKCONFIG) $@ arm arm_cortexa8 $(call lcname,$@) samsung s5pc1xx
-
-omap3_beagle_config    \
-omap3_evm_config       \
-omap3_sdp3430_config : unconfig
-       @$(MKCONFIG) $@ arm arm_cortexa8 $(call omapname,$@) ti omap3
-
-devkit8000_config :    unconfig
-       @$(MKCONFIG) $@ arm arm_cortexa8 $(call lcname,$@) timll omap3
-
-#########################################################################
 ## XScale Systems
 #########################################################################
 
-# generic boards
-################
-
-actux1_config  \
-actux2_config  \
-actux3_config  \
-actux4_config  \
-ixdp425_config \
-ixdpg425_config        :       unconfig
-       @$(MKCONFIG) $@ arm ixp $(call lcname,$@)
-
-cerf250_config \
-cradle_config  \
-csb226_config  \
-delta_config   \
-innokom_config \
-lubbock_config \
-pleb2_config   \
-logodl_config  \
-pxa255_idp_config \
-wepep250_config        \
-xaeniax_config \
-xm250_config   \
-xsengine_config \
-zylonite_config :
-       @$(MKCONFIG) $@ arm pxa $(call lcname,$@)
-
-# special boards
-################
-
 pdnb3_config \
 scpu_config:   unconfig
        @mkdir -p $(obj)include
@@ -2823,32 +1022,11 @@ trizepsiv_config        :       unconfig
 ## ARM1136 Systems
 #########################################################################
 
-# generic boards
-################
-
-# vendor specific boards (sorted by vendor)
-###########################################
-
-qong_config            : unconfig
-       @$(MKCONFIG) $@ arm arm1136 $(call lcname,$@) davedenx mx31
-
-mx31ads_config         : unconfig
-       @$(MKCONFIG) $@ arm arm1136 $(call lcname,$@) freescale mx31
-
-imx31_litekit_config   : unconfig
-       @$(MKCONFIG) $@ arm arm1136 $(call lcname,$@) logicpd mx31
-
-omap2420h4_config      : unconfig
-       @$(MKCONFIG) $@ arm arm1136 $(call lcname,$@) ti omap24xx
-
-# special boards
-################
-
 apollon_config         : unconfig
        @mkdir -p $(obj)include
        @echo "#define CONFIG_ONENAND_U_BOOT" > $(obj)include/config.h
        @echo "CONFIG_ONENAND_U_BOOT = y" >> $(obj)include/config.mk
-       @$(MKCONFIG) $@ arm arm1136 apollon NULL omap24xx
+       @$(MKCONFIG) $@ arm arm1136 apollon - omap24xx
 
 imx31_phycore_eet_config \
 imx31_phycore_config   : unconfig
@@ -2856,7 +1034,7 @@ imx31_phycore_config      : unconfig
        @if [ -n "$(findstring _eet_,$@)" ]; then                       \
                echo "#define CONFIG_IMX31_PHYCORE_EET" >> $(obj)include/config.h;      \
        fi
-       @$(MKCONFIG) -n $@ -a imx31_phycore arm arm1136 imx31_phycore NULL mx31
+       @$(MKCONFIG) -n $@ -a imx31_phycore arm arm1136 imx31_phycore - mx31
 
 mx31pdk_config \
 mx31pdk_nand_config    : unconfig
@@ -2883,24 +1061,8 @@ smdk6400_config  :       unconfig
        else                                                                            \
                echo "RAM_TEXT = 0xc7e00000" >> $(obj)board/samsung/smdk6400/config.tmp;\
        fi
-       @$(MKCONFIG) $(subst _noUSB,,$(@:_config=)) arm arm1176 smdk6400 samsung s3c64xx
-
-#========================================================================
-# i386
-#========================================================================
-#########################################################################
-## AMD SC520 CDP
-#########################################################################
-
-# generic boards
-################
-eNET_config            \
-sc520_cdp_config       \
-sc520_spunk_config     :       unconfig
-       @$(MKCONFIG) $@ i386 i386 $(call lcname,$@) NULL sc520
-
-sc520_spunk_rel_config :       unconfig
-       @$(MKCONFIG) $@ i386 i386 sc520_spunk NULL sc520
+       @$(MKCONFIG) smdk6400 arm arm1176 smdk6400 samsung s3c64xx
+       @echo "CONFIG_NAND_U_BOOT = y" >> $(obj)include/config.mk
 
 #========================================================================
 # MIPS
@@ -2909,15 +1071,6 @@ sc520_spunk_rel_config   :       unconfig
 ## MIPS32 4Kc
 #########################################################################
 
-# generic boards
-################
-
-tb0229_config: unconfig
-       @$(MKCONFIG) $@ mips mips $(call lcname,$@)
-
-# special boards
-################
-
 incaip_100MHz_config   \
 incaip_133MHz_config   \
 incaip_150MHz_config   \
@@ -3000,13 +1153,6 @@ qemu_mips_config : unconfig
        @echo "#define CONFIG_QEMU_MIPS 1" >$(obj)include/config.h
        @$(MKCONFIG) -a qemu-mips mips mips qemu-mips
 
-#########################################################################
-## MIPS64 5Kc
-#########################################################################
-
-purple_config :                unconfig
-       @$(MKCONFIG) $@ mips mips purple
-
 #========================================================================
 # Nios
 #========================================================================
@@ -3015,18 +1161,6 @@ purple_config :          unconfig
 ## Nios-II
 #########################################################################
 
-# vendor specific boards (sorted by vendor)
-###########################################
-
-EP1C20_config  \
-EP1S10_config  \
-EP1S40_config  : unconfig
-       @$(MKCONFIG) $@ nios2 nios2 $(call lcname,$@) altera
-
-PK1C20_config  \
-PCI5441_config : unconfig
-       @$(MKCONFIG) $@ nios2 nios2 $(call lcname,$@) psyent
-
 # nios2 generic boards
 NIOS2_GENERIC = nios2-generic
 
@@ -3034,60 +1168,14 @@ $(NIOS2_GENERIC:%=%_config) : unconfig
        @$(MKCONFIG) $@ nios2 nios2 nios2-generic altera
 
 #========================================================================
-## Microblaze
-#========================================================================
-
-microblaze-generic_config:     unconfig
-       @$(MKCONFIG) $@ microblaze microblaze microblaze-generic xilinx
-
-#========================================================================
 # Blackfin
 #========================================================================
 
-# Analog Devices boards
-BFIN_BOARDS = bf518f-ezbrd bf526-ezbrd bf527-ezkit bf533-ezkit bf533-stamp \
-       bf537-pnav bf537-stamp bf538f-ezkit bf548-ezkit bf561-ezkit
-
-# Bluetechnix tinyboards
-BFIN_BOARDS += cm-bf527 cm-bf533 cm-bf537e cm-bf537u cm-bf548 cm-bf561 \
-       tcm-bf518 tcm-bf537
-
-# Misc third party boards
-BFIN_BOARDS += bf537-minotaur bf537-srv1 bf561-acvilon blackstamp ip04
-
-# I-SYST Micromodule
-BFIN_BOARDS += ibf-dsp561
-
-$(BFIN_BOARDS:%=%_config)      : unconfig
-       @$(MKCONFIG) $@ blackfin blackfin $(@:_config=)
-
 bf527-ezkit-v2_config  : unconfig
        @$(MKCONFIG) -t BF527_EZKIT_REV_2_1 \
                bf527-ezkit blackfin blackfin bf527-ezkit
 
 #========================================================================
-# AVR32
-#========================================================================
-
-atngw100_config        :       unconfig
-       @$(MKCONFIG) $@ avr32 at32ap atngw100 atmel at32ap700x
-
-atstk1002_config       \
-atstk1003_config       \
-atstk1004_config       \
-atstk1006_config       :       unconfig
-       @$(MKCONFIG) $@ avr32 at32ap atstk1000 atmel at32ap700x
-
-favr-32-ezkit_config   :       unconfig
-       @$(MKCONFIG) $@ avr32 at32ap favr-32-ezkit earthlcd at32ap700x
-
-hammerhead_config      :       unconfig
-       @$(MKCONFIG) $@ avr32 at32ap hammerhead miromico at32ap700x
-
-mimc200_config         :       unconfig
-       @$(MKCONFIG) $@ avr32 at32ap mimc200 mimc at32ap700x
-
-#========================================================================
 # SH3 (SuperH)
 #========================================================================
 
@@ -3154,7 +1242,7 @@ sh7785lcr_config  :   unconfig
        @echo "#define CONFIG_SH7785LCR 1" > $(obj)include/config.h
        @if [ "$(findstring 32bit, $@)" ] ; then \
                echo "#define CONFIG_SH_32BIT 1" >> $(obj)include/config.h ; \
-               echo "TEXT_BASE = 0x8ff80000" > \
+               echo "CONFIG_SYS_TEXT_BASE = 0x8ff80000" > \
                        $(obj)board/renesas/sh7785lcr/config.tmp ; \
        fi
        @$(MKCONFIG) -n $@ -a sh7785lcr sh sh4 sh7785lcr renesas
@@ -3169,28 +1257,6 @@ espt_config  :   unconfig
        @echo "#define CONFIG_ESPT 1" > $(obj)include/config.h
        @$(MKCONFIG) -a $@ sh sh4 espt
 
-#========================================================================
-# SPARC
-#========================================================================
-
-#########################################################################
-## LEON2
-#########################################################################
-
-grsim_leon2_config : unconfig
-       @$(MKCONFIG) $@ sparc leon2 $(call lcname,$@) gaisler
-
-#########################################################################
-## LEON3
-#########################################################################
-
-gr_xc3s_1500_config    \
-gr_cpci_ax2000_config  \
-gr_ep2s60_config       \
-grsim_config   :       unconfig
-       @$(MKCONFIG) $@ sparc leon3 $(call lcname,$@) gaisler
-
-#########################################################################
 #########################################################################
 #########################################################################
 
@@ -3214,10 +1280,10 @@ clean:
               $(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/matrix_vision/*/bootscript.img                 \
               $(obj)board/netstar/{eeprom,crcek,crcit,*.srec,*.bin}      \
               $(obj)board/trab/trab_fkt   $(obj)board/voiceblue/eeprom   \
               $(obj)board/armltd/{integratorap,integratorcp}/u-boot.lds  \
-              $(obj)arch/blackfin/lib/u-boot.lds                                 \
               $(obj)u-boot.lds                                           \
               $(obj)arch/blackfin/cpu/bootrom-asm-offsets.[chs]
        @rm -f $(obj)include/bmp_logo.h
@@ -3232,7 +1298,7 @@ clean:
                | xargs rm -f
 
 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
@@ -3258,6 +1324,6 @@ endif
 
 backup:
        F=`basename $(TOPDIR)` ; cd .. ; \
-       gtar --force-local -zcvf `date "+$$F-%Y-%m-%d-%T.tar.gz"` $$F
+       gtar --force-local -zcvf `LC_ALL=C date "+$$F-%Y-%m-%d-%T.tar.gz"` $$F
 
 #########################################################################