diff --git a/Makefile b/Makefile
index 3fe0596213bd5f600ef35e91c6016eb232efa8d0..61331604094d2b8206fadc0f2df8e783919121c8 100644
--- a/Makefile
+++ b/Makefile
@@ -1091,38 +1091,6 @@ smdk6400_config	:	unconfig
 	@$(MKCONFIG) smdk6400 arm arm1176 smdk6400 samsung s3c64xx
 	@echo "CONFIG_NAND_U_BOOT = y" >> $(obj)include/config.mk
 
-#========================================================================
-# MIPS
-#========================================================================
-#########################################################################
-## MIPS32 4Kc
-#########################################################################
-
-vct_premium_config		\
-vct_premium_small_config	\
-vct_premium_onenand_config	\
-vct_premium_onenand_small_config \
-vct_platinum_config		\
-vct_platinum_small_config	\
-vct_platinum_onenand_config	\
-vct_platinum_onenand_small_config \
-vct_platinumavc_config		\
-vct_platinumavc_small_config	\
-vct_platinumavc_onenand_config	\
-vct_platinumavc_onenand_small_config: unconfig
-	@mkdir -p $(obj)include
-	@[ -z "$(findstring _premium,$@)" ] || \
-		echo "#define CONFIG_VCT_PREMIUM" > $(obj)include/config.h
-	@[ -z "$(findstring _platinum_,$@)" ] || \
-		echo "#define CONFIG_VCT_PLATINUM" > $(obj)include/config.h
-	@[ -z "$(findstring _platinumavc,$@)" ] || \
-		echo "#define CONFIG_VCT_PLATINUMAVC" > $(obj)include/config.h
-	@[ -z "$(findstring _onenand,$@)" ] || \
-		echo "#define CONFIG_VCT_ONENAND" >> $(obj)include/config.h
-	@[ -z "$(findstring _small,$@)" ] || \
-		echo "#define CONFIG_VCT_SMALL_IMAGE" >> $(obj)include/config.h
-	@$(MKCONFIG)  -n $@ -a vct mips mips vct micronas
-
 #========================================================================
 # Nios
 #========================================================================
diff --git a/boards.cfg b/boards.cfg
index d3edc9f81a1705355cae3669728454b86c34b0ee..b8369e1f15da9a64ef5bd89a633c2fc2a97d74a6 100644
--- a/boards.cfg
+++ b/boards.cfg
@@ -227,6 +227,18 @@ pb1000                       mips        mips        pb1x00              -
 purple                       mips        mips
 qemu_mips                    mips        mips        qemu-mips           -              -           qemu-mips
 tb0229                       mips        mips
+vct_premium                  mips        mips        vct                 micronas       -           vct:VCT_PREMIUM
+vct_premium_small            mips        mips        vct                 micronas       -           vct:VCT_PREMIUM,VCT_SMALL_IMAGE
+vct_premium_onenand          mips        mips        vct                 micronas       -           vct:VCT_PREMIUM,VCT_ONENAND
+vct_premium_onenand_small    mips        mips        vct                 micronas       -           vct:VCT_PREMIUM,VCT_ONENAND,VCT_SMALL_IMAGE
+vct_platinum                 mips        mips        vct                 micronas       -           vct:VCT_PLATINUM
+vct_platinum_small           mips        mips        vct                 micronas       -           vct:VCT_PLATINUM,VCT_SMALL_IMAGE
+vct_platinum_onenand         mips        mips        vct                 micronas       -           vct:VCT_PLATINUM,VCT_ONENAND
+vct_platinum_onenand_small   mips        mips        vct                 micronas       -           vct:VCT_PLATINUM,VCT_ONENAND,VCT_SMALL_IMAGE
+vct_platinumavc              mips        mips        vct                 micronas       -           vct:VCT_PLATINUMAVC
+vct_platinumavc_small        mips        mips        vct                 micronas       -           vct:VCT_PLATINUMAVC,VCT_SMALL_IMAGE
+vct_platinumavc_onenand      mips        mips        vct                 micronas       -           vct:VCT_PLATINUMAVC,VCT_ONENAND
+vct_platinumavc_onenand_small mips       mips        vct                 micronas       -           vct:VCT_PLATINUMAVC,VCT_ONENAND,VCT_SMALL_IMAGE
 PCI5441                      nios2       nios2       pci5441             psyent
 PK1C20                       nios2       nios2       pk1c20              psyent
 EVB64260                     powerpc     74xx_7xx    evb64260            -              -           EVB64260