summaryrefslogtreecommitdiffstats
path: root/board
diff options
context:
space:
mode:
authorKipisz, Steven <s-kipisz2@ti.com>2015-10-29 16:50:43 -0500
committerTom Rini <trini@konsulko.com>2015-11-18 08:47:03 -0500
commit74cc8b097d9aff8b8671396f66ece4cf2de0a36d (patch)
tree466ec08043033cb0060479a007176e340fafef3c /board
parent9884f44cab5d1ce944b1dc087c9bb8db0efb5160 (diff)
downloadblackbird-obmc-uboot-74cc8b097d9aff8b8671396f66ece4cf2de0a36d.tar.gz
blackbird-obmc-uboot-74cc8b097d9aff8b8671396f66ece4cf2de0a36d.zip
board: ti: beagle_x15: Rename to indicate support for TI am57xx evms
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> Acked-by: Nishanth Menon <nm@ti.com> Acked-by: Lokesh Vutla <lokeshvutla@ti.com>
Diffstat (limited to 'board')
-rw-r--r--board/ti/am57xx/Kconfig (renamed from board/ti/beagle_x15/Kconfig)4
-rw-r--r--board/ti/am57xx/MAINTAINERS7
-rw-r--r--board/ti/am57xx/Makefile (renamed from board/ti/beagle_x15/Makefile)0
-rw-r--r--board/ti/am57xx/board.c (renamed from board/ti/beagle_x15/board.c)0
-rw-r--r--board/ti/am57xx/mux_data.h (renamed from board/ti/beagle_x15/mux_data.h)0
-rw-r--r--board/ti/beagle_x15/MAINTAINERS6
6 files changed, 9 insertions, 8 deletions
diff --git a/board/ti/beagle_x15/Kconfig b/board/ti/am57xx/Kconfig
index a305ff1044..bdb779511b 100644
--- a/board/ti/beagle_x15/Kconfig
+++ b/board/ti/am57xx/Kconfig
@@ -1,12 +1,12 @@
if TARGET_BEAGLE_X15
config SYS_BOARD
- default "beagle_x15"
+ default "am57xx"
config SYS_VENDOR
default "ti"
config SYS_CONFIG_NAME
- default "beagle_x15"
+ default "am57xx_evm"
endif
diff --git a/board/ti/am57xx/MAINTAINERS b/board/ti/am57xx/MAINTAINERS
new file mode 100644
index 0000000000..b8ae0199e3
--- /dev/null
+++ b/board/ti/am57xx/MAINTAINERS
@@ -0,0 +1,7 @@
+AM57XX EVM
+M: Felipe Balbi <balbi@ti.com>
+S: Maintained
+F: board/ti/am57xx/
+F: include/configs/am57xx_evm.h
+F: configs/am57xx_evm_defconfig
+F: configs/am57xx_evm_nodt_defconfig
diff --git a/board/ti/beagle_x15/Makefile b/board/ti/am57xx/Makefile
index 5cd6873f5e..5cd6873f5e 100644
--- a/board/ti/beagle_x15/Makefile
+++ b/board/ti/am57xx/Makefile
diff --git a/board/ti/beagle_x15/board.c b/board/ti/am57xx/board.c
index 042f9ab196..042f9ab196 100644
--- a/board/ti/beagle_x15/board.c
+++ b/board/ti/am57xx/board.c
diff --git a/board/ti/beagle_x15/mux_data.h b/board/ti/am57xx/mux_data.h
index 23f22a02be..23f22a02be 100644
--- a/board/ti/beagle_x15/mux_data.h
+++ b/board/ti/am57xx/mux_data.h
diff --git a/board/ti/beagle_x15/MAINTAINERS b/board/ti/beagle_x15/MAINTAINERS
deleted file mode 100644
index 3f84defcee..0000000000
--- a/board/ti/beagle_x15/MAINTAINERS
+++ /dev/null
@@ -1,6 +0,0 @@
-BEAGLE X15
-M: Felipe Balbi <balbi@ti.com>
-S: Maintained
-F: board/ti/beagle_x15/
-F: include/configs/beagle_x15.h
-F: configs/beagle_x15_defconfig
OpenPOWER on IntegriCloud