ARM: AM57xx: Enable fit support

This series adds support for AM572x-IDK and FIT support on all AM57xx platforms.

Testing:
AM57xx-evm: http://pastebin.ubuntu.com/16315497/
AM572x-IDK: http://pastebin.ubuntu.com/16315517/

Lokesh Vutla (4):
board: am57xx: Rename TARGET_BEAGLE_X15 as TARGET_AM57XX_EVM
board: am57xx: fit: add support for selecting dtb dynamically
ARM: AM57xx: Enable FIT
ti_omap5_common: Add right dtb file for AM572x-IDK

Schuyler Patton (1):
ARM: dts: AM572x-IDK Initial Support

 arch/arm/cpu/armv7/omap5/Kconfig    |   4 +-
 arch/arm/dts/Makefile               |   3 +-
 arch/arm/dts/am572x-idk.dts         |  89 +++++++++++
 arch/arm/dts/am57xx-idk-common.dtsi | 302 ++++++++++++++++++++++++++++++++++++
 board/ti/am57xx/Kconfig             |   2 +-
 board/ti/am57xx/board.c             |  14 ++
 configs/am57xx_evm_defconfig        |   6 +-
 configs/am57xx_evm_nodt_defconfig   |   2 +-
 include/configs/ti_omap5_common.h   |   2 +
 9 files changed, 418 insertions(+), 6 deletions(-)
 create mode 100644 arch/arm/dts/am572x-idk.dts
 create mode 100644 arch/arm/dts/am57xx-idk-common.dtsi

2.7.4

board/am57xx supports all boards based on am57xx. Rename the taget as TARGET_AM57XX_EVM.

---
 arch/arm/cpu/armv7/omap5/Kconfig  | 4 ++--
 arch/arm/dts/Makefile             | 2 +-
 board/ti/am57xx/Kconfig           | 2 +-
 configs/am57xx_evm_defconfig      | 2 +-
 configs/am57xx_evm_nodt_defconfig | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

index 026bf24..4fb5ef9 100644
@@ -14,8 +14,8 @@ config TARGET_DRA7XX_EVM
 	bool "TI DRA7XX"
 	select TI_I2C_BOARD_DETECT
 
-config TARGET_BEAGLE_X15
-	bool "BeagleBoard X15"
+config TARGET_AM57XX_EVM
+	bool "AM57XX"
 	select TI_I2C_BOARD_DETECT
 
 endchoice

index d1f8e22..d92c0f7 100644
@@ -103,7 +103,7 @@ dtb-$(CONFIG_ARCH_SOCFPGA) +=				\
 	socfpga_cyclone5_sr1500.dtb
 
 dtb-$(CONFIG_TARGET_DRA7XX_EVM) += dra72-evm.dtb dra7-evm.dtb
-dtb-$(CONFIG_TARGET_BEAGLE_X15) += am57xx-beagle-x15.dtb
+dtb-$(CONFIG_TARGET_AM57XX_EVM) += am57xx-beagle-x15.dtb
 dtb-$(CONFIG_TARGET_STV0991) += stv0991.dtb
 
 dtb-$(CONFIG_LS102XA) += ls1021a-qds-duart.dtb \

index 87654f9..cead0f4 100644
@@ -1,4 +1,4 @@
-if TARGET_BEAGLE_X15
+if TARGET_AM57XX_EVM
 
 config SYS_BOARD
 	default "am57xx"

index 8fc3ebb..aedefb68 100644
@@ -1,6 +1,6 @@
 CONFIG_ARM=y
 CONFIG_OMAP54XX=y
-CONFIG_TARGET_BEAGLE_X15=y
+CONFIG_TARGET_AM57XX_EVM=y
 CONFIG_DM_SERIAL=y
 CONFIG_DM_GPIO=y
 CONFIG_SPL_STACK_R_ADDR=0x82000000

index 47d103b..9c1b5ce 100644
@@ -1,6 +1,6 @@
 CONFIG_ARM=y
 CONFIG_OMAP54XX=y
-CONFIG_TARGET_BEAGLE_X15=y
+CONFIG_TARGET_AM57XX_EVM=y
 CONFIG_SPL=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_BOOTZ=y

2.7.4

FIT allows for a multiple dtb in a single image. SPL needs away to detect the right dtb to be used. Adding support for the same for am57xx platforms.

---
 board/ti/am57xx/board.c | 12 ++++++++++++
 1 file changed, 12 insertions(+)

index 86b8f6e..444e5fa 100644
@@ -686,3 +686,15 @@ int board_early_init_f(void)
 	return 0;
 }
 #endif
+
+#ifdef CONFIG_SPL_LOAD_FIT
+int board_fit_config_name_match(const char *name)
+{
+	if (board_is_x15() && !strcmp(name, "am57xx-beagle-x15"))
+		return 0;
+	else if (board_is_am572x_evm() && !strcmp(name, "am57xx-beagle-x15"))
+		return 0;
+	else
+		return -1;
+}
+#endif

2.7.4

Enable FIT support for AM57xx platforms

---
 configs/am57xx_evm_defconfig | 4 ++++
 1 file changed, 4 insertions(+)

index aedefb68..4e06641 100644
@@ -32,3 +32,7 @@ CONFIG_DM_MMC=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_BAR=y
 CONFIG_SYS_NS16550=y
+CONFIG_FIT=y
+CONFIG_SPL_OF_LIBFDT=y
+CONFIG_SPL_LOAD_FIT=y
+CONFIG_OF_LIST="am57xx-beagle-x15"

2.7.4

From: Schuyler Patton <[email protected]>

Add initial DTS support for AM572-IDK evm.

---
- This is posted to Upstream Linux[1] and has been accepted.

[1] https://lkml.org/lkml/2016/4/12/847

 arch/arm/dts/Makefile               |   3 +-
 arch/arm/dts/am572x-idk.dts         |  89 +++++++++++
 arch/arm/dts/am57xx-idk-common.dtsi | 302 ++++++++++++++++++++++++++++++++++++
 board/ti/am57xx/board.c             |   2 +
 configs/am57xx_evm_defconfig        |   2 +-
 5 files changed, 396 insertions(+), 2 deletions(-)
 create mode 100644 arch/arm/dts/am572x-idk.dts
 create mode 100644 arch/arm/dts/am57xx-idk-common.dtsi

index d92c0f7..df09d15 100644
@@ -103,7 +103,8 @@ dtb-$(CONFIG_ARCH_SOCFPGA) +=				\
 	socfpga_cyclone5_sr1500.dtb
 
 dtb-$(CONFIG_TARGET_DRA7XX_EVM) += dra72-evm.dtb dra7-evm.dtb
-dtb-$(CONFIG_TARGET_AM57XX_EVM) += am57xx-beagle-x15.dtb
+dtb-$(CONFIG_TARGET_AM57XX_EVM) += am57xx-beagle-x15.dtb \
+	am572x-idk.dtb
 dtb-$(CONFIG_TARGET_STV0991) += stv0991.dtb
 
 dtb-$(CONFIG_LS102XA) += ls1021a-qds-duart.dtb \

index 444e5fa..f435f29 100644
@@ -694,6 +694,8 @@ int board_fit_config_name_match(const char *name)
 		return 0;
 	else if (board_is_am572x_evm() && !strcmp(name, "am57xx-beagle-x15"))
 		return 0;
+	else if (board_is_am572x_idk() && !strcmp(name, "am572x-idk"))
+		return 0;
 	else
 		return -1;
 }

index 4e06641..63a2028 100644
@@ -35,4 +35,4 @@ CONFIG_SYS_NS16550=y
 CONFIG_FIT=y
 CONFIG_SPL_OF_LIBFDT=y
 CONFIG_SPL_LOAD_FIT=y
-CONFIG_OF_LIST="am57xx-beagle-x15"
+CONFIG_OF_LIST="am57xx-beagle-x15 am572x-idk"

2.7.4

Add proper dtb file name for AM572x-IDK in env.

---
 include/configs/ti_omap5_common.h | 2 ++
 1 file changed, 2 insertions(+)

index b049be4..92e9099 100644
@@ -104,6 +104,8 @@
 			"setenv fdtfile dra72-evm.dtb; fi;" \
 		"if test $board_name = beagle_x15; then " \
 			"setenv fdtfile am57xx-beagle-x15.dtb; fi;" \
+		"if test $board_name = am572x_idk; then " \
+			"setenv fdtfile am572x-idk.dtb; fi;" \
 		"if test $board_name = am57xx_evm; then " \
 			"setenv fdtfile am57xx-beagle-x15.dtb; fi;" \
 		"if test $fdtfile = undefined; then " \

2.7.4

Hi Tom,

If you are ok with this series can you merge it?

Thanks and regards,
Lokesh

Hmm, oops. I had marked this as superseded by accident. I'm about to push the changes for moving BOOTDELAY into Kconfig and that means a re-sync on defconfigs, can you please pick up my reviewed-by from before and re-post once that's live? Sorry & thanks!

Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20160609/412c2433/attachment.sig>

Just posted the updated series.

Thanks and regards,
Lokesh