diff --git a/Makefile b/Makefile
index 7c13ce826b6079cde6bb43a9b89443f44e524eae..7c6c786125cf5b245de93d1afe1e539f17e9d995 100644
--- a/Makefile
+++ b/Makefile
@@ -922,7 +922,7 @@ MBX860T_config:	unconfig
 	@$(MKCONFIG) $(@:_config=) ppc mpc8xx mbx8xx
 
 mgsuvd_config:		unconfig
-	@$(MKCONFIG) $(@:_config=) ppc mpc8xx mgsuvd
+	@$(MKCONFIG) $(@:_config=) ppc mpc8xx mgsuvd keymile
 
 MHPC_config:		unconfig
 	@$(MKCONFIG) $(@:_config=) ppc mpc8xx mhpc eltec
@@ -1706,7 +1706,7 @@ ISPAN_REVB_config:	unconfig
 	@$(MKCONFIG) -a ISPAN ppc mpc8260 ispan
 
 mgcoge_config	:	unconfig
-	@$(MKCONFIG) mgcoge ppc mpc8260 mgcoge
+	@$(MKCONFIG) mgcoge ppc mpc8260 mgcoge keymile
 
 MPC8260ADS_config	\
 MPC8260ADS_lowboot_config	\
diff --git a/board/mgcoge/Makefile b/board/keymile/mgcoge/Makefile
similarity index 95%
rename from board/mgcoge/Makefile
rename to board/keymile/mgcoge/Makefile
index d4087ccbb67959f37bdb25a9e34e0ed4583a6c85..e00295d62e8e61db8d93a4708f5c7750699660b1 100644
--- a/board/mgcoge/Makefile
+++ b/board/keymile/mgcoge/Makefile
@@ -22,6 +22,9 @@
 #
 
 include $(TOPDIR)/config.mk
+ifneq ($(OBJTREE),$(SRCTREE))
+$(shell mkdir -p $(obj)../common)
+endif
 
 LIB	= $(obj)lib$(BOARD).a
 
diff --git a/board/mgcoge/config.mk b/board/keymile/mgcoge/config.mk
similarity index 100%
rename from board/mgcoge/config.mk
rename to board/keymile/mgcoge/config.mk
diff --git a/board/mgcoge/mgcoge.c b/board/keymile/mgcoge/mgcoge.c
similarity index 100%
rename from board/mgcoge/mgcoge.c
rename to board/keymile/mgcoge/mgcoge.c
diff --git a/board/mgsuvd/Makefile b/board/keymile/mgsuvd/Makefile
similarity index 95%
rename from board/mgsuvd/Makefile
rename to board/keymile/mgsuvd/Makefile
index af0d400c885aee883978f7858b0be3eb0a5b1478..efdd410b0c480f84157cc9ba162197cbf38c8fbc 100644
--- a/board/mgsuvd/Makefile
+++ b/board/keymile/mgsuvd/Makefile
@@ -22,6 +22,9 @@
 #
 
 include $(TOPDIR)/config.mk
+ifneq ($(OBJTREE),$(SRCTREE))
+$(shell mkdir -p $(obj)../common)
+endif
 
 LIB	= $(obj)lib$(BOARD).a
 
diff --git a/board/mgsuvd/config.mk b/board/keymile/mgsuvd/config.mk
similarity index 100%
rename from board/mgsuvd/config.mk
rename to board/keymile/mgsuvd/config.mk
diff --git a/board/mgsuvd/mgsuvd.c b/board/keymile/mgsuvd/mgsuvd.c
similarity index 100%
rename from board/mgsuvd/mgsuvd.c
rename to board/keymile/mgsuvd/mgsuvd.c
diff --git a/board/mgsuvd/u-boot.lds b/board/keymile/mgsuvd/u-boot.lds
similarity index 100%
rename from board/mgsuvd/u-boot.lds
rename to board/keymile/mgsuvd/u-boot.lds