[meta-ti] Denys Dmytriyenko : u-boot-ti-staging: add support for DRA7 and AM4 secure devices

[Arago Project git]

Module: meta-ti
Branch: master
Commit: d3e3d05baab04a19a1b3f5718a47b3098c55e428
URL:    http://arago-project.org/git/meta-ti.git?a=commit;h=d3e3d05baab04a19a1b3f5718a47b3098c55e428

Author: Denys Dmytriyenko <denys at ti.com>
Date:   Tue Feb 23 03:54:22 2016 +0000

u-boot-ti-staging: add support for DRA7 and AM4 secure devices

Signed-off-by: Denys Dmytriyenko <denys at ti.com>

---

 recipes-bsp/u-boot/u-boot-ti-staging_2015.07.bb |   15 ++++++++++++++-
 1 files changed, 14 insertions(+), 1 deletions(-)

diff --git a/recipes-bsp/u-boot/u-boot-ti-staging_2015.07.bb b/recipes-bsp/u-boot/u-boot-ti-staging_2015.07.bb
index 304b0ab..ed827fc 100644
--- a/recipes-bsp/u-boot/u-boot-ti-staging_2015.07.bb
+++ b/recipes-bsp/u-boot/u-boot-ti-staging_2015.07.bb
@@ -7,7 +7,7 @@ DESCRIPTION = "u-boot bootloader for TI devices"
 
 LIC_FILES_CHKSUM = "file://Licenses/README;md5=0507cd7da8e7ad6d6701926ec9b84c95"
 
-PR = "r19"
+PR = "r20"
 PV_append = "+git${SRCPV}"
 
 SRC_URI = "git://git.ti.com/ti-u-boot/ti-u-boot.git;protocol=git;branch=${BRANCH}"
@@ -16,6 +16,12 @@ BRANCH ?= "ti-u-boot-2015.07"
 
 SRCREV = "dca348d604c0117fa7851e3a4a194bedb42b739b"
 
+# Support for secure devices - detailed info is in doc/README.ti-secure
+TI_SECURE_DEV_PKG ?= ""
+TI_SECURE_DEV_PKG_dra7xx-hs-evm = "${TI_SECURE_DEV_PKG_DRA7}"
+TI_SECURE_DEV_PKG_am437x-hs-evm = "${TI_SECURE_DEV_PKG_AM4}"
+export TI_SECURE_DEV_PKG
+
 SPL_BINARY = "MLO"
 SPL_UART_BINARY = "u-boot-spl.bin"
 
@@ -36,6 +42,13 @@ UBOOT_SPI_SYMLINK = "u-boot-${MACHINE}.img"
 UBOOT_SPI_GPH_IMAGE = "u-boot-spi-${MACHINE}-${PV}-${PR}.gph"
 UBOOT_SPI_GPH_SYMLINK = "u-boot-spi-${MACHINE}.gph"
 
+do_compile_append_am437x-hs-evm () {
+	if [ -f ${S}/u-boot-spl_HS_ISSW ]; then
+		rm -rf ${S}/MLO
+		cp ${S}/u-boot-spl_HS_ISSW ${S}/MLO
+	fi
+}
+
 do_install_append_keystone () {
 	install ${S}/spl/${UBOOT_SPI_SPL_BINARY} ${D}/boot/${UBOOT_SPI_SPL_IMAGE}
 	ln -sf ${UBOOT_SPI_SPL_IMAGE} ${D}/boot/${UBOOT_SPI_SPL_BINARY}