diff --git a/Makefile b/Makefile
index 51c1af2ae1..831be626d0 100644
--- a/Makefile
+++ b/Makefile
@@ -3149,13 +3149,13 @@ omap3_beagle_config :	unconfig
 	@$(MKCONFIG) $(@:_config=) arm arm_cortexa8 beagle ti omap3
 
 omap3_overo_config :	unconfig
-	@$(MKCONFIG) $(@:_config=) arm arm_cortexa8 overo omap3 omap3
+	@$(MKCONFIG) $(@:_config=) arm arm_cortexa8 overo NULL omap3
 
 omap3_evm_config :	unconfig
 	@$(MKCONFIG) $(@:_config=) arm arm_cortexa8 evm ti omap3
 
 omap3_pandora_config :	unconfig
-	@$(MKCONFIG) $(@:_config=) arm arm_cortexa8 pandora omap3 omap3
+	@$(MKCONFIG) $(@:_config=) arm arm_cortexa8 pandora NULL omap3
 
 omap3_zoom1_config :	unconfig
 	@$(MKCONFIG) $(@:_config=) arm arm_cortexa8 zoom1 logicpd omap3
diff --git a/board/omap3/overo/Makefile b/board/overo/Makefile
similarity index 100%
rename from board/omap3/overo/Makefile
rename to board/overo/Makefile
diff --git a/board/omap3/overo/config.mk b/board/overo/config.mk
similarity index 100%
rename from board/omap3/overo/config.mk
rename to board/overo/config.mk
diff --git a/board/omap3/overo/overo.c b/board/overo/overo.c
similarity index 100%
rename from board/omap3/overo/overo.c
rename to board/overo/overo.c
diff --git a/board/omap3/overo/overo.h b/board/overo/overo.h
similarity index 100%
rename from board/omap3/overo/overo.h
rename to board/overo/overo.h
diff --git a/board/omap3/pandora/Makefile b/board/pandora/Makefile
similarity index 100%
rename from board/omap3/pandora/Makefile
rename to board/pandora/Makefile
diff --git a/board/omap3/pandora/config.mk b/board/pandora/config.mk
similarity index 100%
rename from board/omap3/pandora/config.mk
rename to board/pandora/config.mk
diff --git a/board/omap3/pandora/pandora.c b/board/pandora/pandora.c
similarity index 100%
rename from board/omap3/pandora/pandora.c
rename to board/pandora/pandora.c
diff --git a/board/omap3/pandora/pandora.h b/board/pandora/pandora.h
similarity index 100%
rename from board/omap3/pandora/pandora.h
rename to board/pandora/pandora.h