omap: move TI's boards to board/ti/

---
 Makefile                                       |   14 +++++++-------
 board/{omap3 => ti}/beagle/Makefile            |    0
 board/{omap3 => ti}/beagle/beagle.c            |    0
 board/{omap3 => ti}/beagle/beagle.h            |    0
 board/{omap3 => ti}/beagle/config.mk           |    0
 board/{omap3 => ti}/evm/Makefile               |    0
 board/{omap3 => ti}/evm/config.mk              |    0
 board/{omap3 => ti}/evm/evm.c                  |    0
 board/{omap3 => ti}/evm/evm.h                  |    0
 board/{ => ti}/omap1510inn/Makefile            |    0
 board/{ => ti}/omap1510inn/config.mk           |    0
 board/{ => ti}/omap1510inn/lowlevel_init.S     |    0
 board/{ => ti}/omap1510inn/omap1510innovator.c |    0
 board/{ => ti}/omap1610inn/Makefile            |    0
 board/{ => ti}/omap1610inn/config.mk           |    0
 board/{ => ti}/omap1610inn/flash.c             |    0
 board/{ => ti}/omap1610inn/lowlevel_init.S     |    0
 board/{ => ti}/omap1610inn/omap1610innovator.c |    0
 board/{ => ti}/omap2420h4/Makefile             |    0
 board/{ => ti}/omap2420h4/config.mk            |    0
 board/{ => ti}/omap2420h4/lowlevel_init.S      |    0
 board/{ => ti}/omap2420h4/mem.c                |    0
 board/{ => ti}/omap2420h4/omap2420h4.c         |    0
 board/{ => ti}/omap2420h4/sys_info.c           |    0
 board/{ => ti}/omap5912osk/Makefile            |    0
 board/{ => ti}/omap5912osk/config.mk           |    0
 board/{ => ti}/omap5912osk/lowlevel_init.S     |    0
 board/{ => ti}/omap5912osk/omap5912osk.c       |    0
 board/{ => ti}/omap730p2/Makefile              |    0
 board/{ => ti}/omap730p2/config.mk             |    0
 board/{ => ti}/omap730p2/flash.c               |    0
 board/{ => ti}/omap730p2/lowlevel_init.S       |    0
 board/{ => ti}/omap730p2/omap730p2.c           |    0
 33 files changed, 7 insertions(+), 7 deletions(-)
 rename board/{omap3 => ti}/beagle/Makefile (100%)
 rename board/{omap3 => ti}/beagle/beagle.c (100%)
 rename board/{omap3 => ti}/beagle/beagle.h (100%)
 rename board/{omap3 => ti}/beagle/config.mk (100%)
 rename board/{omap3 => ti}/evm/Makefile (100%)
 rename board/{omap3 => ti}/evm/config.mk (100%)
 rename board/{omap3 => ti}/evm/evm.c (100%)
 rename board/{omap3 => ti}/evm/evm.h (100%)
 rename board/{ => ti}/omap1510inn/Makefile (100%)
 rename board/{ => ti}/omap1510inn/config.mk (100%)
 rename board/{ => ti}/omap1510inn/lowlevel_init.S (100%)
 rename board/{ => ti}/omap1510inn/omap1510innovator.c (100%)
 rename board/{ => ti}/omap1610inn/Makefile (100%)
 rename board/{ => ti}/omap1610inn/config.mk (100%)
 rename board/{ => ti}/omap1610inn/flash.c (100%)
 rename board/{ => ti}/omap1610inn/lowlevel_init.S (100%)
 rename board/{ => ti}/omap1610inn/omap1610innovator.c (100%)
 rename board/{ => ti}/omap2420h4/Makefile (100%)
 rename board/{ => ti}/omap2420h4/config.mk (100%)
 rename board/{ => ti}/omap2420h4/lowlevel_init.S (100%)
 rename board/{ => ti}/omap2420h4/mem.c (100%)
 rename board/{ => ti}/omap2420h4/omap2420h4.c (100%)
 rename board/{ => ti}/omap2420h4/sys_info.c (100%)
 rename board/{ => ti}/omap5912osk/Makefile (100%)
 rename board/{ => ti}/omap5912osk/config.mk (100%)
 rename board/{ => ti}/omap5912osk/lowlevel_init.S (100%)
 rename board/{ => ti}/omap5912osk/omap5912osk.c (100%)
 rename board/{ => ti}/omap730p2/Makefile (100%)
 rename board/{ => ti}/omap730p2/config.mk (100%)
 rename board/{ => ti}/omap730p2/flash.c (100%)
 rename board/{ => ti}/omap730p2/lowlevel_init.S (100%)
 rename board/{ => ti}/omap730p2/omap730p2.c (100%)

index 96cca23..fa56f09 100644
@@ -2928,7 +2928,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))))
 

@@ -2951,10 +2951,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)))
 

@@ -2969,7 +2969,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

@@ -3087,13 +3087,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

@@ -3222,7 +3222,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

similarity index 100%
rename from board/omap3/beagle/Makefile
rename to board/ti/beagle/Makefile

similarity index 100%
rename from board/omap3/beagle/beagle.c
rename to board/ti/beagle/beagle.c

similarity index 100%
rename from board/omap3/beagle/beagle.h
rename to board/ti/beagle/beagle.h

similarity index 100%
rename from board/omap3/beagle/config.mk
rename to board/ti/beagle/config.mk

similarity index 100%
rename from board/omap3/evm/Makefile
rename to board/ti/evm/Makefile

similarity index 100%
rename from board/omap3/evm/config.mk
rename to board/ti/evm/config.mk

similarity index 100%
rename from board/omap3/evm/evm.c
rename to board/ti/evm/evm.c

similarity index 100%
rename from board/omap3/evm/evm.h
rename to board/ti/evm/evm.h

similarity index 100%
rename from board/omap1510inn/Makefile
rename to board/ti/omap1510inn/Makefile

similarity index 100%
rename from board/omap1510inn/config.mk
rename to board/ti/omap1510inn/config.mk

similarity index 100%
rename from board/omap1510inn/lowlevel_init.S
rename to board/ti/omap1510inn/lowlevel_init.S

similarity index 100%
rename from board/omap1510inn/omap1510innovator.c
rename to board/ti/omap1510inn/omap1510innovator.c

similarity index 100%
rename from board/omap1610inn/Makefile
rename to board/ti/omap1610inn/Makefile

similarity index 100%
rename from board/omap1610inn/config.mk
rename to board/ti/omap1610inn/config.mk

similarity index 100%
rename from board/omap1610inn/flash.c
rename to board/ti/omap1610inn/flash.c

similarity index 100%
rename from board/omap1610inn/lowlevel_init.S
rename to board/ti/omap1610inn/lowlevel_init.S

similarity index 100%
rename from board/omap1610inn/omap1610innovator.c
rename to board/ti/omap1610inn/omap1610innovator.c

similarity index 100%
rename from board/omap2420h4/Makefile
rename to board/ti/omap2420h4/Makefile

similarity index 100%
rename from board/omap2420h4/config.mk
rename to board/ti/omap2420h4/config.mk

similarity index 100%
rename from board/omap2420h4/lowlevel_init.S
rename to board/ti/omap2420h4/lowlevel_init.S

similarity index 100%
rename from board/omap2420h4/mem.c
rename to board/ti/omap2420h4/mem.c

similarity index 100%
rename from board/omap2420h4/omap2420h4.c
rename to board/ti/omap2420h4/omap2420h4.c

similarity index 100%
rename from board/omap2420h4/sys_info.c
rename to board/ti/omap2420h4/sys_info.c

similarity index 100%
rename from board/omap5912osk/Makefile
rename to board/ti/omap5912osk/Makefile

similarity index 100%
rename from board/omap5912osk/config.mk
rename to board/ti/omap5912osk/config.mk

similarity index 100%
rename from board/omap5912osk/lowlevel_init.S
rename to board/ti/omap5912osk/lowlevel_init.S

similarity index 100%
rename from board/omap5912osk/omap5912osk.c
rename to board/ti/omap5912osk/omap5912osk.c

similarity index 100%
rename from board/omap730p2/Makefile
rename to board/ti/omap730p2/Makefile

similarity index 100%
rename from board/omap730p2/config.mk
rename to board/ti/omap730p2/config.mk

similarity index 100%
rename from board/omap730p2/flash.c
rename to board/ti/omap730p2/flash.c

similarity index 100%
rename from board/omap730p2/lowlevel_init.S
rename to board/ti/omap730p2/lowlevel_init.S

similarity index 100%
rename from board/omap730p2/omap730p2.c
rename to board/ti/omap730p2/omap730p2.c

1.6.3.1

---
 Makefile                                          |    6 +++---
 board/{ => logicpd}/imx31_litekit/Makefile        |    0
 board/{ => logicpd}/imx31_litekit/config.mk       |    0
 board/{ => logicpd}/imx31_litekit/imx31_litekit.c |    0
 board/{ => logicpd}/imx31_litekit/lowlevel_init.S |    0
 board/{omap3 => logicpd}/zoom1/Makefile           |    0
 board/{omap3 => logicpd}/zoom1/config.mk          |    0
 board/{omap3 => logicpd}/zoom1/zoom1.c            |    0
 board/{omap3 => logicpd}/zoom1/zoom1.h            |    0
 board/{omap3 => logicpd}/zoom2/Makefile           |    0
 board/{omap3 => logicpd}/zoom2/config.mk          |    0
 board/{omap3 => logicpd}/zoom2/debug_board.c      |    0
 board/{omap3 => logicpd}/zoom2/led.c              |    0
 board/{omap3 => logicpd}/zoom2/zoom2.c            |    0
 board/{omap3 => logicpd}/zoom2/zoom2.h            |    0
 board/{omap3 => logicpd}/zoom2/zoom2_serial.c     |    0
 board/{omap3 => logicpd}/zoom2/zoom2_serial.h     |    0
 17 files changed, 3 insertions(+), 3 deletions(-)
 rename board/{ => logicpd}/imx31_litekit/Makefile (100%)
 rename board/{ => logicpd}/imx31_litekit/config.mk (100%)
 rename board/{ => logicpd}/imx31_litekit/imx31_litekit.c (100%)
 rename board/{ => logicpd}/imx31_litekit/lowlevel_init.S (100%)
 rename board/{omap3 => logicpd}/zoom1/Makefile (100%)
 rename board/{omap3 => logicpd}/zoom1/config.mk (100%)
 rename board/{omap3 => logicpd}/zoom1/zoom1.c (100%)
 rename board/{omap3 => logicpd}/zoom1/zoom1.h (100%)
 rename board/{omap3 => logicpd}/zoom2/Makefile (100%)
 rename board/{omap3 => logicpd}/zoom2/config.mk (100%)
 rename board/{omap3 => logicpd}/zoom2/debug_board.c (100%)
 rename board/{omap3 => logicpd}/zoom2/led.c (100%)
 rename board/{omap3 => logicpd}/zoom2/zoom2.c (100%)
 rename board/{omap3 => logicpd}/zoom2/zoom2.h (100%)
 rename board/{omap3 => logicpd}/zoom2/zoom2_serial.c (100%)
 rename board/{omap3 => logicpd}/zoom2/zoom2_serial.h (100%)

index fa56f09..4441f8f 100644
@@ -3099,10 +3099,10 @@ omap3_pandora_config :	unconfig
 	@$(MKCONFIG) $(@:_config=) arm arm_cortexa8 pandora omap3 omap3
 
 omap3_zoom1_config :	unconfig
-	@$(MKCONFIG) $(@:_config=) arm arm_cortexa8 zoom1 omap3 omap3
+	@$(MKCONFIG) $(@:_config=) arm arm_cortexa8 zoom1 logicpd omap3
 
 omap3_zoom2_config :	unconfig
-	@$(MKCONFIG) $(@:_config=) arm arm_cortexa8 zoom2 omap3 omap3
+	@$(MKCONFIG) $(@:_config=) arm arm_cortexa8 zoom2 logicpd omap3
 
 #########################################################################
 ## XScale Systems

@@ -3197,7 +3197,7 @@ apollon_config		: unconfig
 	@echo "CONFIG_ONENAND_U_BOOT = y" >> $(obj)include/config.mk
 
 imx31_litekit_config	: unconfig
-	@$(MKCONFIG) $(@:_config=) arm arm1136 imx31_litekit NULL mx31
+	@$(MKCONFIG) $(@:_config=) arm arm1136 imx31_litekit logicpd mx31
 
 imx31_phycore_eet_config \
 imx31_phycore_config	: unconfig

similarity index 100%
rename from board/imx31_litekit/Makefile
rename to board/logicpd/imx31_litekit/Makefile

similarity index 100%
rename from board/imx31_litekit/config.mk
rename to board/logicpd/imx31_litekit/config.mk

similarity index 100%
rename from board/imx31_litekit/imx31_litekit.c
rename to board/logicpd/imx31_litekit/imx31_litekit.c

similarity index 100%
rename from board/imx31_litekit/lowlevel_init.S
rename to board/logicpd/imx31_litekit/lowlevel_init.S

similarity index 100%
rename from board/omap3/zoom1/Makefile
rename to board/logicpd/zoom1/Makefile

similarity index 100%
rename from board/omap3/zoom1/config.mk
rename to board/logicpd/zoom1/config.mk

similarity index 100%
rename from board/omap3/zoom1/zoom1.c
rename to board/logicpd/zoom1/zoom1.c

similarity index 100%
rename from board/omap3/zoom1/zoom1.h
rename to board/logicpd/zoom1/zoom1.h

similarity index 100%
rename from board/omap3/zoom2/Makefile
rename to board/logicpd/zoom2/Makefile

similarity index 100%
rename from board/omap3/zoom2/config.mk
rename to board/logicpd/zoom2/config.mk

similarity index 100%
rename from board/omap3/zoom2/debug_board.c
rename to board/logicpd/zoom2/debug_board.c

similarity index 100%
rename from board/omap3/zoom2/led.c
rename to board/logicpd/zoom2/led.c

similarity index 100%
rename from board/omap3/zoom2/zoom2.c
rename to board/logicpd/zoom2/zoom2.c

similarity index 100%
rename from board/omap3/zoom2/zoom2.h
rename to board/logicpd/zoom2/zoom2.h

similarity index 100%
rename from board/omap3/zoom2/zoom2_serial.c
rename to board/logicpd/zoom2/zoom2_serial.c

similarity index 100%
rename from board/omap3/zoom2/zoom2_serial.h
rename to board/logicpd/zoom2/zoom2_serial.h

1.6.3.1

---
 Makefile                            |    4 ++--
 board/{omap3 => }/overo/Makefile    |    0
 board/{omap3 => }/overo/config.mk   |    0
 board/{omap3 => }/overo/overo.c     |    0
 board/{omap3 => }/overo/overo.h     |    0
 board/{omap3 => }/pandora/Makefile  |    0
 board/{omap3 => }/pandora/config.mk |    0
 board/{omap3 => }/pandora/pandora.c |    0
 board/{omap3 => }/pandora/pandora.h |    0
 9 files changed, 2 insertions(+), 2 deletions(-)
 rename board/{omap3 => }/overo/Makefile (100%)
 rename board/{omap3 => }/overo/config.mk (100%)
 rename board/{omap3 => }/overo/overo.c (100%)
 rename board/{omap3 => }/overo/overo.h (100%)
 rename board/{omap3 => }/pandora/Makefile (100%)
 rename board/{omap3 => }/pandora/config.mk (100%)
 rename board/{omap3 => }/pandora/pandora.c (100%)
 rename board/{omap3 => }/pandora/pandora.h (100%)

index 4441f8f..ebeda76 100644
@@ -3090,13 +3090,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

similarity index 100%
rename from board/omap3/overo/Makefile
rename to board/overo/Makefile

similarity index 100%
rename from board/omap3/overo/config.mk
rename to board/overo/config.mk

similarity index 100%
rename from board/omap3/overo/overo.c
rename to board/overo/overo.c

similarity index 100%
rename from board/omap3/overo/overo.h
rename to board/overo/overo.h

similarity index 100%
rename from board/omap3/pandora/Makefile
rename to board/pandora/Makefile

similarity index 100%
rename from board/omap3/pandora/config.mk
rename to board/pandora/config.mk

similarity index 100%
rename from board/omap3/pandora/pandora.c
rename to board/pandora/pandora.c

similarity index 100%
rename from board/omap3/pandora/pandora.h
rename to board/pandora/pandora.h

1.6.3.1

Dear Jean-Christophe,

...

Regarding all three patches:

First, as already discussed, I don't like this and feel fine with board/omap3. So a formal NACK from me, knowing that it most probably will be overridden by some others ;)

Second, where do you know from that all these boards are from TI? Are you sure that they are not from SpectrumDigital, Mistral or DigiKey etc?

Third, I don't like the mixing of board and vendor name as directory names. It seems to me that where you think you know the vendor, you use the vendor name, and where you seem to not know it, you use the board name. So, to be consistent, and to overcome vendor name issue above, I'd like to use the board name everywhere. That is:

board/beagle/
board/omap3evm/
board/omap1510inn/
...
board/omap5912osk/
...
board/omap2420h4/
...
board/zoom1/
board/zoom2/
board/overo/
board/pandora/
...

To improve this even more, something like this would be nice:

board/omap3beagle/
board/omap3evm/
board/omap1innovator/
...
board/omap1osk/
...
board/omap2h4/
...
board/omap3zoom1/
board/omap3zoom2/
board/omap3overo/
board/omap3pandora/
...

Best regards

Dirk

Hi Dirk,

<snip>

Jean-Christophe's patches seem to follow the current U-Boot convention - use board/<vendor> when a vendor has multiple boards, and use board/<boardname> when a vendor only has 1 board. I can't speak to the accuracy of how he split boards up, but his idea seems correct.

This isn't in line with how U-Boot currently organizes the board/ directory.

Neither is this. Jean-Christophe seems to be doing the "right" thing with his patches and I'd ACK them assuming the boards are put in the proper board/<vendor> and board/<boardname> directory.

Best,
Peter

Dear Dirk Behme,

Indeed. It's the current rule how we organize boards, and your personal preferences are here indeed not reason enough to reject these patches. Sorry.

Well, if you have better information, then please fill in the gaps here.

No. The rule is that when we have a vendor with several boars (say, more than 2), then we will create a vendor directory.

I understand that here the conditoon "vendor has more than 2 boards" is fulfilled in several cases. Agreed?

You may consider it nice, we don't.

So if anything in JC's patch is incorrect, please provide information to correct it. From what I know, the patch looks OK to me (but I have to admit that I don't know either who the actual board vendors are).

Best regards,

Wolfgang Denk

DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
Weekends were made for programming.                 - Karl Lehenbauer

here you mix board vendor and distributor as example you can buy a atmel ref design at DigiKey or resistor, soc, ddr, etc...

it's not the TI board's name and there is no need to specify in each board name the arch as it's easy to known it via Makefile or config.h and as repeat multiple time on the ml we prefer shorter name

Best Regards,
J.

Dear Jean-Christophe PLAGNIOL-VILLARD,

Sorry for the late comment, but I hust notice that this patch (and the two following ones) moves the board names to the right directories, but it fails to also rename the Make target names and the board config files.

For example, moving board/omap3/beagle/ => board/ti/beagle/ is a perfectly corrrect thing to do, but we should also use this opportunity and fix the make target name (omap3_beagle_config => beagle_config) and the board config file name (include/configs/omap3_beagle.h => include/configs/beagle.h)

Do you see a chance to update your patches once more, so we can do this in one step? I'd prefer to do this at once rather that doing the rename in another patch.

Thanks in advance.

Best regards,

Wolfgang Denk

DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
If you think the problem is bad now, just wait until we've solved it.
                                                        Epstein's Law

I'll prefer to do it in two step as we will face a problem for evm boards as they exist for multiple soc not only TI's.

So for evm I think we need to keep the omap3_evm as we have also as example a dvevm for davinci too

This patch series move vendors to the corrent area the next one will fix the board config and header

Best Regards,
J.