[U-Boot] [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 --- 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%)
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 */
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.
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?
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%)
diff --git a/arch/arm/cpu/armv7/omap5/Kconfig b/arch/arm/cpu/armv7/omap5/Kconfig index 20c3bd9..bfa264e 100644 --- a/arch/arm/cpu/armv7/omap5/Kconfig +++ b/arch/arm/cpu/armv7/omap5/Kconfig @@ -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 70% rename from board/ti/beagle_x15/Kconfig rename to board/ti/am57xx/Kconfig index a305ff1..bdb7795 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 0000000..b8ae019 --- /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 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/beagle_x15_defconfig b/configs/am57xx_evm_nodt_defconfig similarity index 100% rename from configs/beagle_x15_defconfig rename to configs/am57xx_evm_nodt_defconfig 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 */
On 10/29/2015 04:50 PM, Steve Kipisz wrote:
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
diff --git a/arch/arm/cpu/armv7/omap5/Kconfig b/arch/arm/cpu/armv7/omap5/Kconfig index 20c3bd9..bfa264e 100644 --- a/arch/arm/cpu/armv7/omap5/Kconfig +++ b/arch/arm/cpu/armv7/omap5/Kconfig @@ -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 70% rename from board/ti/beagle_x15/Kconfig rename to board/ti/am57xx/Kconfig index a305ff1..bdb7795 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 0000000..b8ae019 --- /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 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/beagle_x15_defconfig b/configs/am57xx_evm_nodt_defconfig similarity index 100% rename from configs/beagle_x15_defconfig rename to configs/am57xx_evm_nodt_defconfig 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 */
On Saturday 31 October 2015 09:44 PM, Nishanth Menon wrote:
On 10/29/2015 04:50 PM, Steve Kipisz wrote:
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
if that is not a problem, Acked-by: Nishanth Menon nm@ti.com
diff --git a/arch/arm/cpu/armv7/omap5/Kconfig b/arch/arm/cpu/armv7/omap5/Kconfig index 20c3bd9..bfa264e 100644 --- a/arch/arm/cpu/armv7/omap5/Kconfig +++ b/arch/arm/cpu/armv7/omap5/Kconfig @@ -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 70% rename from board/ti/beagle_x15/Kconfig rename to board/ti/am57xx/Kconfig index a305ff1..bdb7795 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 0000000..b8ae019 --- /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 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/beagle_x15_defconfig b/configs/am57xx_evm_nodt_defconfig similarity index 100% rename from configs/beagle_x15_defconfig rename to configs/am57xx_evm_nodt_defconfig 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 */
On Thu, Oct 29, 2015 at 04:50:43PM -0500, Kipisz, Steven wrote:
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
Applied to u-boot/master, thanks!
participants (4)
-
Lokesh Vutla -
Nishanth Menon -
Steve Kipisz -
Tom Rini