[PATCH v1] board: ti: beagle_x15: Reused to support am57xx_evm

Rename the beagle_x15 directory to am57xx to support TI EVMs that use
the AM57xx processor. By doing this we have common code reuse. There
will be multiple TI EVMs that use the same code base.

This will cause changes in build procedures for existing
beagleboard-x15 users.

This is in perparation for follow on patches that will introduce
support for follow on TI EVMs.

Information about the TI AM57xx EVM can be found here
http://www.ti.com/tool/tmdxevm5728

For now, we did turn off CONFIG_DM and CONFIG_DEFAULT_DEVICE_TREE
as we are expecting to add additional boards shortly.

Signed-off-by: Steve Kipisz <s-kipisz2@ti.com>
Signed-off-by: Schuyler Patton <spatton@ti.com>

[...]

For now, we did turn off CONFIG_DM and CONFIG_DEFAULT_DEVICE_TREE
as we are expecting to add additional boards shortly.

[...]

diff --git a/configs/am57xx_evm_defconfig b/configs/am57xx_evm_defconfig
index f6566bf..7573246 100644
--- a/configs/am57xx_evm_defconfig
+++ b/configs/am57xx_evm_defconfig
@@ -1,19 +1,8 @@
CONFIG_ARM=y
CONFIG_OMAP54XX=y
-CONFIG_TARGET_BEAGLE_X15=y
-CONFIG_DEFAULT_DEVICE_TREE="am57xx-beagle-x15"

NAK. While I do agree to the rename to encompass the platform better,
I disagree to disable DM and device tree for x15 - neither of which
should necessary for the rename.

There's two sides to this. Do we want to go with starting out with N
binaries for N platforms (so DM+DT+N defconfigs, but yes, it's
u-boot.bin + dt cat'd on the end...). Or do we want to go non-DM+DT and
multiple in one binary until we sort out and then implement something
that lets do multiple DTs?

BeagleBoard X15 (http://beagleboard.org/x15) support in u-boot does
actually support two different platform configuration offered by
TI. In addition to BeagleBoard X15, it also supports the TMDXEVM5728
(or more commonly known as AM5728-evm).

Information about the TI AM57xx EVM can be found here
http://www.ti.com/tool/tmdxevm5728

The EVM configuration is 1-1 compatible with BeagleBoard X15 with the
additional support for mPCIe, mSATA, LCD, touchscreen, Camera, push
button and TI's wlink8 offering.

Hence, we rename the beagle_x15 directory to am57xx to support TI
EVMs that use the AM57xx processor. By doing this we have common code
reuse. This sets the stage to have a common u-boot image solution for
multiple TI EVMs such as that already done for am335x and am437x. This
sets the stage for upcoming multiple TI EVMs that share the same code
base.

NOTE: Commit eae7ae185335 ("am437x: Add am57xx_evm_defconfig using
CONFIG_DM") introduced DT support for beagle_x15 under am57xx_evm
platform name. However, this ignored the potential confusion arising for
users as a result. To prevent this, existing beagle_x15_defconfig is
renamed as am57xx_evm_nodt_defconfig to denote that this is the "non
device tree" configuration for the same platform. We still retain
am57xx-beagle-x15.dts at this point, since we just require the common
minimum dts.

As a result of this change, users should expect changes in build
procedures('make am57xx_evm_nodt_defconfig' instead of 'make
beagle_x15_defconfig'). Hopefully, this would be a one-time change.

Signed-off-by: Steve Kipisz <s-kipisz2@ti.com>
Signed-off-by: Schuyler Patton <spatton@ti.com>

BeagleBoard X15 (http://beagleboard.org/x15) support in u-boot does
actually support two different platform configuration offered by
TI. In addition to BeagleBoard X15, it also supports the TMDXEVM5728
(or more commonly known as AM5728-evm).

Information about the TI AM57xx EVM can be found here
http://www.ti.com/tool/tmdxevm5728

The EVM configuration is 1-1 compatible with BeagleBoard X15 with the
additional support for mPCIe, mSATA, LCD, touchscreen, Camera, push
button and TI's wlink8 offering.

Hence, we rename the beagle_x15 directory to am57xx to support TI
EVMs that use the AM57xx processor. By doing this we have common code
reuse. This sets the stage to have a common u-boot image solution for
multiple TI EVMs such as that already done for am335x and am437x. This
sets the stage for upcoming multiple TI EVMs that share the same code
base.

NOTE: Commit eae7ae185335 ("am437x: Add am57xx_evm_defconfig using
CONFIG_DM") introduced DT support for beagle_x15 under am57xx_evm
platform name. However, this ignored the potential confusion arising for
users as a result. To prevent this, existing beagle_x15_defconfig is
renamed as am57xx_evm_nodt_defconfig to denote that this is the "non
device tree" configuration for the same platform. We still retain
am57xx-beagle-x15.dts at this point, since we just require the common
minimum dts.

As a result of this change, users should expect changes in build
procedures('make am57xx_evm_nodt_defconfig' instead of 'make
beagle_x15_defconfig'). Hopefully, this would be a one-time change.

Signed-off-by: Steve Kipisz <s-kipisz2@ti.com>
Signed-off-by: Schuyler Patton <spatton@ti.com>
---
v2 Based on:
master 677f970 common/board_f.c: modify the macro to use get_clocks() more common

Build testing: MAKEALL -s omap5 (no warnings/build errors)
Boot Testing:
am57xx_evm_config: http://pastebin.ubuntu.com/13002904/
am57xx_evm_config: http://pastebin.ubuntu.com/13002955/
am57xx_evm_nodt_config: http://pastebin.ubuntu.com/13003008/

Changes in V2 (since v1):
  - keep the dt version alive(going with Tom's suggestion:
    http://marc.info/?l=u-boot&m=144615230220768&w=2 )
  - redo commit message to be more clear
v1: http://marc.info/?t=144607224500010&r=1&w=2
  (mailing list squashed original submission)

arch/arm/cpu/armv7/omap5/Kconfig | 2 +-
board/ti/{beagle_x15 => am57xx}/Kconfig | 4 ++--
board/ti/am57xx/MAINTAINERS | 7 +++++++
board/ti/{beagle_x15 => am57xx}/Makefile | 0
board/ti/{beagle_x15 => am57xx}/board.c | 0
board/ti/{beagle_x15 => am57xx}/mux_data.h | 0
board/ti/beagle_x15/MAINTAINERS | 6 ------
configs/{beagle_x15_defconfig => am57xx_evm_nodt_defconfig} | 0
include/configs/{beagle_x15.h => am57xx_evm.h} | 6 +++---
9 files changed, 13 insertions(+), 12 deletions(-)
rename board/ti/{beagle_x15 => am57xx}/Kconfig (70%)
create mode 100644 board/ti/am57xx/MAINTAINERS
rename board/ti/{beagle_x15 => am57xx}/Makefile (100%)
rename board/ti/{beagle_x15 => am57xx}/board.c (100%)
rename board/ti/{beagle_x15 => am57xx}/mux_data.h (100%)
delete mode 100644 board/ti/beagle_x15/MAINTAINERS
rename configs/{beagle_x15_defconfig => am57xx_evm_nodt_defconfig} (100%)
rename include/configs/{beagle_x15.h => am57xx_evm.h} (96%)

Mostly looks fine to me. now.
while digging at this, I noticed
const struct omap_sysinfo sysinfo is hardcoded to "Board: BeagleBoard
x15\n"

I suppose, I suppose it is ok to leave that.. Tom, Lokesh, Felipe: any
comments?

if that is not a problem,
Acked-by: Nishanth Menon <nm@ti.com>

BeagleBoard X15 (http://beagleboard.org/x15) support in u-boot does
actually support two different platform configuration offered by
TI. In addition to BeagleBoard X15, it also supports the TMDXEVM5728
(or more commonly known as AM5728-evm).

Information about the TI AM57xx EVM can be found here
http://www.ti.com/tool/tmdxevm5728

The EVM configuration is 1-1 compatible with BeagleBoard X15 with the
additional support for mPCIe, mSATA, LCD, touchscreen, Camera, push
button and TI's wlink8 offering.

Hence, we rename the beagle_x15 directory to am57xx to support TI
EVMs that use the AM57xx processor. By doing this we have common code
reuse. This sets the stage to have a common u-boot image solution for
multiple TI EVMs such as that already done for am335x and am437x. This
sets the stage for upcoming multiple TI EVMs that share the same code
base.

NOTE: Commit eae7ae185335 ("am437x: Add am57xx_evm_defconfig using
CONFIG_DM") introduced DT support for beagle_x15 under am57xx_evm
platform name. However, this ignored the potential confusion arising for
users as a result. To prevent this, existing beagle_x15_defconfig is
renamed as am57xx_evm_nodt_defconfig to denote that this is the "non
device tree" configuration for the same platform. We still retain
am57xx-beagle-x15.dts at this point, since we just require the common
minimum dts.

As a result of this change, users should expect changes in build
procedures('make am57xx_evm_nodt_defconfig' instead of 'make
beagle_x15_defconfig'). Hopefully, this would be a one-time change.

Signed-off-by: Steve Kipisz <s-kipisz2@ti.com>
Signed-off-by: Schuyler Patton <spatton@ti.com>
---
v2 Based on:
master 677f970 common/board_f.c: modify the macro to use get_clocks() more common

Build testing: MAKEALL -s omap5 (no warnings/build errors)
Boot Testing:
am57xx_evm_config: http://pastebin.ubuntu.com/13002904/
am57xx_evm_config: http://pastebin.ubuntu.com/13002955/
am57xx_evm_nodt_config: http://pastebin.ubuntu.com/13003008/

Changes in V2 (since v1):
  - keep the dt version alive(going with Tom's suggestion:
    http://marc.info/?l=u-boot&m=144615230220768&w=2 )
  - redo commit message to be more clear
v1: http://marc.info/?t=144607224500010&r=1&w=2
  (mailing list squashed original submission)

arch/arm/cpu/armv7/omap5/Kconfig | 2 +-
board/ti/{beagle_x15 => am57xx}/Kconfig | 4 ++--
board/ti/am57xx/MAINTAINERS | 7 +++++++
board/ti/{beagle_x15 => am57xx}/Makefile | 0
board/ti/{beagle_x15 => am57xx}/board.c | 0
board/ti/{beagle_x15 => am57xx}/mux_data.h | 0
board/ti/beagle_x15/MAINTAINERS | 6 ------
configs/{beagle_x15_defconfig => am57xx_evm_nodt_defconfig} | 0
include/configs/{beagle_x15.h => am57xx_evm.h} | 6 +++---
9 files changed, 13 insertions(+), 12 deletions(-)
rename board/ti/{beagle_x15 => am57xx}/Kconfig (70%)
create mode 100644 board/ti/am57xx/MAINTAINERS
rename board/ti/{beagle_x15 => am57xx}/Makefile (100%)
rename board/ti/{beagle_x15 => am57xx}/board.c (100%)
rename board/ti/{beagle_x15 => am57xx}/mux_data.h (100%)
delete mode 100644 board/ti/beagle_x15/MAINTAINERS
rename configs/{beagle_x15_defconfig => am57xx_evm_nodt_defconfig} (100%)
rename include/configs/{beagle_x15.h => am57xx_evm.h} (96%)

Mostly looks fine to me. now.
while digging at this, I noticed
const struct omap_sysinfo sysinfo is hardcoded to "Board: BeagleBoard
x15\n"

I suppose, I suppose it is ok to leave that.. Tom, Lokesh, Felipe: any
comments?

omap_sysinfo will not be used with DT at all. I guess this is ok. (This
should be cleaned when only DT is present).
Acked-by: Lokesh Vutla <lokeshvutla@ti.com>

Thanks and regards,
Lokesh

Applied to u-boot/master, thanks!