diff --git a/Makefile b/Makefile
index 9d14210..3c53f0d 100644
--- a/Makefile
+++ b/Makefile
@@ -2987,7 +2987,7 @@ nhk8815_onenand_config:	unconfig
 	@$(MKCONFIG) -a nhk8815 arm arm926ejs nhk8815 st nomadik
 
 omap1510inn_config :	unconfig
-	@$(MKCONFIG) $(@:_config=) arm arm925t omap1510inn
+	@$(MKCONFIG) $(@:_config=) arm arm925t omap1510inn ti
 
 xtract_omap1610xxx = $(subst _cs0boot,,$(subst _cs3boot,,$(subst _cs_autoboot,,$(subst _config,,$1))))
 
@@ -3010,10 +3010,10 @@ omap1610h2_cs_autoboot_config:	unconfig
 		echo "#define CONFIG_CS3_BOOT" >> $(obj)include/config.h ; \
 		$(XECHO) "... configured for CS3 boot"; \
 	fi;
-	@$(MKCONFIG) -a $(call xtract_omap1610xxx,$@) arm arm926ejs omap1610inn NULL omap
+	@$(MKCONFIG) -a $(call xtract_omap1610xxx,$@) arm arm926ejs omap1610inn ti omap
 
 omap5912osk_config :	unconfig
-	@$(MKCONFIG) $(@:_config=) arm arm926ejs omap5912osk NULL omap
+	@$(MKCONFIG) $(@:_config=) arm arm926ejs omap5912osk ti omap
 
 xtract_omap730p2 = $(subst _cs0boot,,$(subst _cs3boot,, $(subst _config,,$1)))
 
@@ -3028,7 +3028,7 @@ omap730p2_cs3boot_config :	unconfig
 		echo "#define CONFIG_CS3_BOOT" >> $(obj)include/config.h ; \
 		$(XECHO) "... configured for CS3 boot"; \
 	fi;
-	@$(MKCONFIG) -a $(call xtract_omap730p2,$@) arm arm926ejs omap730p2 NULL omap
+	@$(MKCONFIG) -a $(call xtract_omap730p2,$@) arm arm926ejs omap730p2 ti omap
 
 rd6281a_config: unconfig
 	@$(MKCONFIG) $(@:_config=) arm arm926ejs $(@:_config=) Marvell kirkwood
@@ -3146,13 +3146,13 @@ SMN42_config	:	unconfig
 #########################################################################
 
 omap3_beagle_config :	unconfig
-	@$(MKCONFIG) $(@:_config=) arm arm_cortexa8 beagle omap3 omap3
+	@$(MKCONFIG) $(@:_config=) arm arm_cortexa8 beagle ti omap3
 
 omap3_overo_config :	unconfig
 	@$(MKCONFIG) $(@:_config=) arm arm_cortexa8 overo omap3 omap3
 
 omap3_evm_config :	unconfig
-	@$(MKCONFIG) $(@:_config=) arm arm_cortexa8 evm omap3 omap3
+	@$(MKCONFIG) $(@:_config=) arm arm_cortexa8 evm ti omap3
 
 omap3_pandora_config :	unconfig
 	@$(MKCONFIG) $(@:_config=) arm arm_cortexa8 pandora omap3 omap3
@@ -3281,7 +3281,7 @@ mx31pdk_nand_config	: unconfig
 	@$(MKCONFIG) -a mx31pdk arm arm1136 mx31pdk freescale mx31
 
 omap2420h4_config	: unconfig
-	@$(MKCONFIG) $(@:_config=) arm arm1136 omap2420h4 NULL omap24xx
+	@$(MKCONFIG) $(@:_config=) arm arm1136 omap2420h4 ti omap24xx
 
 qong_config		: unconfig
 	@$(MKCONFIG) $(@:_config=) arm arm1136 qong davedenx mx31
diff --git a/board/omap3/beagle/Makefile b/board/ti/beagle/Makefile
similarity index 100%
rename from board/omap3/beagle/Makefile
rename to board/ti/beagle/Makefile
diff --git a/board/omap3/beagle/beagle.c b/board/ti/beagle/beagle.c
similarity index 100%
rename from board/omap3/beagle/beagle.c
rename to board/ti/beagle/beagle.c
diff --git a/board/omap3/beagle/beagle.h b/board/ti/beagle/beagle.h
similarity index 100%
rename from board/omap3/beagle/beagle.h
rename to board/ti/beagle/beagle.h
diff --git a/board/omap3/beagle/config.mk b/board/ti/beagle/config.mk
similarity index 100%
rename from board/omap3/beagle/config.mk
rename to board/ti/beagle/config.mk
diff --git a/board/omap3/evm/Makefile b/board/ti/evm/Makefile
similarity index 100%
rename from board/omap3/evm/Makefile
rename to board/ti/evm/Makefile
diff --git a/board/omap3/evm/config.mk b/board/ti/evm/config.mk
similarity index 100%
rename from board/omap3/evm/config.mk
rename to board/ti/evm/config.mk
diff --git a/board/omap3/evm/evm.c b/board/ti/evm/evm.c
similarity index 100%
rename from board/omap3/evm/evm.c
rename to board/ti/evm/evm.c
diff --git a/board/omap3/evm/evm.h b/board/ti/evm/evm.h
similarity index 100%
rename from board/omap3/evm/evm.h
rename to board/ti/evm/evm.h
diff --git a/board/omap1510inn/Makefile b/board/ti/omap1510inn/Makefile
similarity index 100%
rename from board/omap1510inn/Makefile
rename to board/ti/omap1510inn/Makefile
diff --git a/board/omap1510inn/config.mk b/board/ti/omap1510inn/config.mk
similarity index 100%
rename from board/omap1510inn/config.mk
rename to board/ti/omap1510inn/config.mk
diff --git a/board/omap1510inn/lowlevel_init.S b/board/ti/omap1510inn/lowlevel_init.S
similarity index 100%
rename from board/omap1510inn/lowlevel_init.S
rename to board/ti/omap1510inn/lowlevel_init.S
diff --git a/board/omap1510inn/omap1510innovator.c b/board/ti/omap1510inn/omap1510innovator.c
similarity index 100%
rename from board/omap1510inn/omap1510innovator.c
rename to board/ti/omap1510inn/omap1510innovator.c
diff --git a/board/omap1610inn/Makefile b/board/ti/omap1610inn/Makefile
similarity index 100%
rename from board/omap1610inn/Makefile
rename to board/ti/omap1610inn/Makefile
diff --git a/board/omap1610inn/config.mk b/board/ti/omap1610inn/config.mk
similarity index 100%
rename from board/omap1610inn/config.mk
rename to board/ti/omap1610inn/config.mk
diff --git a/board/omap1610inn/flash.c b/board/ti/omap1610inn/flash.c
similarity index 100%
rename from board/omap1610inn/flash.c
rename to board/ti/omap1610inn/flash.c
diff --git a/board/omap1610inn/lowlevel_init.S b/board/ti/omap1610inn/lowlevel_init.S
similarity index 100%
rename from board/omap1610inn/lowlevel_init.S
rename to board/ti/omap1610inn/lowlevel_init.S
diff --git a/board/omap1610inn/omap1610innovator.c b/board/ti/omap1610inn/omap1610innovator.c
similarity index 100%
rename from board/omap1610inn/omap1610innovator.c
rename to board/ti/omap1610inn/omap1610innovator.c
diff --git a/board/omap2420h4/Makefile b/board/ti/omap2420h4/Makefile
similarity index 100%
rename from board/omap2420h4/Makefile
rename to board/ti/omap2420h4/Makefile
diff --git a/board/omap2420h4/config.mk b/board/ti/omap2420h4/config.mk
similarity index 100%
rename from board/omap2420h4/config.mk
rename to board/ti/omap2420h4/config.mk
diff --git a/board/omap2420h4/lowlevel_init.S b/board/ti/omap2420h4/lowlevel_init.S
similarity index 100%
rename from board/omap2420h4/lowlevel_init.S
rename to board/ti/omap2420h4/lowlevel_init.S
diff --git a/board/omap2420h4/mem.c b/board/ti/omap2420h4/mem.c
similarity index 100%
rename from board/omap2420h4/mem.c
rename to board/ti/omap2420h4/mem.c
diff --git a/board/omap2420h4/omap2420h4.c b/board/ti/omap2420h4/omap2420h4.c
similarity index 100%
rename from board/omap2420h4/omap2420h4.c
rename to board/ti/omap2420h4/omap2420h4.c
diff --git a/board/omap2420h4/sys_info.c b/board/ti/omap2420h4/sys_info.c
similarity index 100%
rename from board/omap2420h4/sys_info.c
rename to board/ti/omap2420h4/sys_info.c
diff --git a/board/omap5912osk/Makefile b/board/ti/omap5912osk/Makefile
similarity index 100%
rename from board/omap5912osk/Makefile
rename to board/ti/omap5912osk/Makefile
diff --git a/board/omap5912osk/config.mk b/board/ti/omap5912osk/config.mk
similarity index 100%
rename from board/omap5912osk/config.mk
rename to board/ti/omap5912osk/config.mk
diff --git a/board/omap5912osk/lowlevel_init.S b/board/ti/omap5912osk/lowlevel_init.S
similarity index 100%
rename from board/omap5912osk/lowlevel_init.S
rename to board/ti/omap5912osk/lowlevel_init.S
diff --git a/board/omap5912osk/omap5912osk.c b/board/ti/omap5912osk/omap5912osk.c
similarity index 100%
rename from board/omap5912osk/omap5912osk.c
rename to board/ti/omap5912osk/omap5912osk.c
diff --git a/board/omap730p2/Makefile b/board/ti/omap730p2/Makefile
similarity index 100%
rename from board/omap730p2/Makefile
rename to board/ti/omap730p2/Makefile
diff --git a/board/omap730p2/config.mk b/board/ti/omap730p2/config.mk
similarity index 100%
rename from board/omap730p2/config.mk
rename to board/ti/omap730p2/config.mk
diff --git a/board/omap730p2/flash.c b/board/ti/omap730p2/flash.c
similarity index 100%
rename from board/omap730p2/flash.c
rename to board/ti/omap730p2/flash.c
diff --git a/board/omap730p2/lowlevel_init.S b/board/ti/omap730p2/lowlevel_init.S
similarity index 100%
rename from board/omap730p2/lowlevel_init.S
rename to board/ti/omap730p2/lowlevel_init.S
diff --git a/board/omap730p2/omap730p2.c b/board/ti/omap730p2/omap730p2.c
similarity index 100%
rename from board/omap730p2/omap730p2.c
rename to board/ti/omap730p2/omap730p2.c