diff --git a/Makefile b/Makefile
index 05b404df0f76027eebab375954725481df3c0727..e1f3b7fd16c3a2019089b1c8894975c5f40f0569 100644
--- a/Makefile
+++ b/Makefile
@@ -1136,45 +1136,6 @@ vct_platinumavc_onenand_small_config: unconfig
 		echo "#define CONFIG_VCT_SMALL_IMAGE" >> $(obj)include/config.h
 	@$(MKCONFIG)  -n $@ -a vct mips mips vct micronas
 
-#########################################################################
-## MIPS32 AU1X00
-#########################################################################
-
-dbau1000_config		:	unconfig
-	@mkdir -p $(obj)include
-	@echo "#define CONFIG_DBAU1000 1" >$(obj)include/config.h
-	@$(MKCONFIG) -a dbau1x00 mips mips dbau1x00
-
-dbau1100_config		:	unconfig
-	@mkdir -p $(obj)include
-	@echo "#define CONFIG_DBAU1100 1" >$(obj)include/config.h
-	@$(MKCONFIG) -a dbau1x00 mips mips dbau1x00
-
-dbau1500_config		:	unconfig
-	@mkdir -p $(obj)include
-	@echo "#define CONFIG_DBAU1500 1" >$(obj)include/config.h
-	@$(MKCONFIG) -a dbau1x00 mips mips dbau1x00
-
-dbau1550_config		:	unconfig
-	@mkdir -p $(obj)include
-	@echo "#define CONFIG_DBAU1550 1" >$(obj)include/config.h
-	@$(MKCONFIG) -a dbau1x00 mips mips dbau1x00
-
-dbau1550_el_config	:	unconfig
-	@mkdir -p $(obj)include
-	@echo "#define CONFIG_DBAU1550 1" >$(obj)include/config.h
-	@$(MKCONFIG) -a dbau1x00 mips mips dbau1x00
-
-gth2_config		:	unconfig
-	@mkdir -p $(obj)include
-	@echo "#define CONFIG_GTH2 1" >$(obj)include/config.h
-	@$(MKCONFIG) -a $@ mips mips gth2
-
-pb1000_config		:	unconfig
-	@mkdir -p $(obj)include
-	@echo "#define CONFIG_PB1000 1" >$(obj)include/config.h
-	@$(MKCONFIG) -a pb1x00 mips mips pb1x00
-
 qemu_mips_config	: unconfig
 	@mkdir -p $(obj)include
 	@echo "#define CONFIG_QEMU_MIPS 1" >$(obj)include/config.h
diff --git a/boards.cfg b/boards.cfg
index c977528b1d02701077f3f83faae69df93374fdb4..f1f2506c4108fe1ad8a13a7ab40f1e2c656212f4 100644
--- a/boards.cfg
+++ b/boards.cfg
@@ -213,6 +213,13 @@ M5282EVB                     m68k        mcf52x2     m5282evb            freesca
 M53017EVB                    m68k        mcf52x2     m53017evb           freescale
 EP2500                       m68k        mcf52x2     ep2500              Mercury
 microblaze-generic           microblaze  microblaze  microblaze-generic  xilinx
+dbau1000                     mips        mips        dbau1x00            -              -           dbau1x00:DBAU1000
+dbau1100                     mips        mips        dbau1x00            -              -           dbau1x00:DBAU1100
+dbau1500                     mips        mips        dbau1x00            -              -           dbau1x00:DBAU1500
+dbau1550                     mips        mips        dbau1x00            -              -           dbau1x00:DBAU1550
+dbau1550_el                  mips        mips        dbau1x00            -              -           dbau1x00:DBAU1550
+gth2                         mips        mips
+pb1000                       mips        mips        pb1x00              -              -           pb1x00:PB1000
 purple                       mips        mips
 tb0229                       mips        mips
 PCI5441                      nios2       nios2       pci5441             psyent