diff mbox

[U-Boot,v1] board: ti: beagle_x15: Reused to support am57xx_evm

Message ID 1446067477-31111-1-git-send-email-s-kipisz2@ti.com
State Superseded
Headers show

Commit Message

Kipisz, Steven Oct. 28, 2015, 9:24 p.m. UTC 
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>
---
 arch/arm/cpu/armv7/omap5/Kconfig               |  6 +++---
 board/ti/{beagle_x15 => am57xx}/Kconfig        |  6 +++---
 board/ti/am57xx/MAINTAINERS                    |  6 ++++++
 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/am57xx_evm_defconfig                   | 13 +------------
 configs/beagle_x15_defconfig                   |  8 --------
 include/configs/{beagle_x15.h => am57xx_evm.h} |  6 +++---
 10 files changed, 16 insertions(+), 35 deletions(-)
 rename board/ti/{beagle_x15 => am57xx}/Kconfig (55%)
 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
 delete mode 100644 configs/beagle_x15_defconfig
 rename include/configs/{beagle_x15.h => am57xx_evm.h} (96%)

Comments

Nishanth Menon Oct. 29, 2015, 5:25 p.m. UTC | #1 
On 10/28/2015 04:24 PM, Steve Kipisz wrote:
[...]
> 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.
Tom Rini Oct. 29, 2015, 8:57 p.m. UTC | #2 
On Thu, Oct 29, 2015 at 12:25:45PM -0500, Nishanth Menon wrote:
> On 10/28/2015 04:24 PM, Steve Kipisz wrote:
> [...]
> > 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?
diff mbox

Patch

diff --git a/arch/arm/cpu/armv7/omap5/Kconfig b/arch/arm/cpu/armv7/omap5/Kconfig
index 20c3bd9..7734c50 100644
--- a/arch/arm/cpu/armv7/omap5/Kconfig
+++ b/arch/arm/cpu/armv7/omap5/Kconfig
@@ -13,8 +13,8 @@  config TARGET_OMAP5_UEVM
 config TARGET_DRA7XX_EVM
 	bool "TI DRA7XX"
 
-config TARGET_BEAGLE_X15
-	bool "BeagleBoard X15"
+config TARGET_AM57XX_EVM
+	bool "TI AM57XX EVM board"
 
 endchoice
 
@@ -24,6 +24,6 @@  config SYS_SOC
 source "board/compulab/cm_t54/Kconfig"
 source "board/ti/omap5_uevm/Kconfig"
 source "board/ti/dra7xx/Kconfig"
-source "board/ti/beagle_x15/Kconfig"
+source "board/ti/am57xx/Kconfig"
 
 endif
diff --git a/board/ti/beagle_x15/Kconfig b/board/ti/am57xx/Kconfig
similarity index 55%
rename from board/ti/beagle_x15/Kconfig
rename to board/ti/am57xx/Kconfig
index a305ff1..0302dad 100644
--- a/board/ti/beagle_x15/Kconfig
+++ b/board/ti/am57xx/Kconfig
@@ -1,12 +1,12 @@ 
-if TARGET_BEAGLE_X15
+if TARGET_AM57XX_EVM
 
 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 0000000..d0bb67a
--- /dev/null
+++ b/board/ti/am57xx/MAINTAINERS
@@ -0,0 +1,6 @@ 
+AM57XX EVM
+M:	Felipe Balbi <balbi@ti.com>
+S:	Maintained
+F:	board/ti/iam57xx_evm/
+F:	include/configs/am57xx_evm.h
+F:	configs/am57xx_evm_defconfig
diff --git a/board/ti/beagle_x15/Makefile b/board/ti/am57xx/Makefile
similarity index 100%
rename from board/ti/beagle_x15/Makefile
rename to board/ti/am57xx/Makefile
diff --git a/board/ti/beagle_x15/board.c b/board/ti/am57xx/board.c
similarity index 100%
rename from board/ti/beagle_x15/board.c
rename to board/ti/am57xx/board.c
diff --git a/board/ti/beagle_x15/mux_data.h b/board/ti/am57xx/mux_data.h
similarity index 100%
rename from board/ti/beagle_x15/mux_data.h
rename to 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 3f84def..0000000
--- 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
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"
+CONFIG_TARGET_AM57XX_EVM=y
 CONFIG_SPL=y
-CONFIG_SPL_STACK_R=y
-CONFIG_SPL_STACK_R_ADDR=0x82000000
 CONFIG_SYS_EXTRA_OPTIONS="CONS_INDEX=3"
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_SETEXPR is not set
-# CONFIG_CMD_NFS is not set
-CONFIG_OF_CONTROL=y
-CONFIG_DM=y
-CONFIG_SPI_FLASH=y
-CONFIG_SPI_FLASH_BAR=y
-CONFIG_DM_GPIO=y
-CONFIG_DM_SERIAL=y
-CONFIG_DM_MMC=y
diff --git a/configs/beagle_x15_defconfig b/configs/beagle_x15_defconfig
deleted file mode 100644
index 3b3c027..0000000
--- a/configs/beagle_x15_defconfig
+++ /dev/null
@@ -1,8 +0,0 @@ 
-CONFIG_ARM=y
-CONFIG_OMAP54XX=y
-CONFIG_TARGET_BEAGLE_X15=y
-CONFIG_SPL=y
-CONFIG_SYS_EXTRA_OPTIONS="CONS_INDEX=3"
-# CONFIG_CMD_IMLS is not set
-# CONFIG_CMD_FLASH is not set
-# CONFIG_CMD_SETEXPR is not set
diff --git a/include/configs/beagle_x15.h b/include/configs/am57xx_evm.h
similarity index 96%
rename from include/configs/beagle_x15.h
rename to include/configs/am57xx_evm.h
index d38b7b5..6308cab 100644
--- a/include/configs/beagle_x15.h
+++ b/include/configs/am57xx_evm.h
@@ -9,8 +9,8 @@ 
  * SPDX-License-Identifier:	GPL-2.0+
  */
 
-#ifndef __CONFIG_BEAGLE_X15_H
-#define __CONFIG_BEAGLE_X15_H
+#ifndef __CONFIG_AM57XX_EVM_H
+#define __CONFIG_AM57XX_EVM_H
 
 #define CONFIG_AM57XX
 
@@ -88,4 +88,4 @@ 
 #define CONFIG_SYS_SCSI_MAX_DEVICE	(CONFIG_SYS_SCSI_MAX_SCSI_ID * \
 						CONFIG_SYS_SCSI_MAX_LUN)
 
-#endif /* __CONFIG_BEAGLE_X5_H */
+#endif /* __CONFIG_AM57XX_EVM_H */