[thud/master][PATCH 0/4] Initial support for J7 (J721e SoC) platform

[thud/master][PATCH 0/4] Initial support for J7 (J721e SoC) platform

[Denys Dmytriyenko]

Add support for J7 (J721e SoC) to Arago distro and TISDK builds. Requires
corresponding changes in meta-ti BSP layer.

Denys Dmytriyenko (4):
  packagegroups,tisdk-makefile: de-scope some K3 features to AM65 for
    now
  ti-sci-fw: upgrade to 2019.05 and add support for J7 platform
  u-boot-k3-r5: add support for J7 platform
  arago-core-tisdk,matrix: add support for J7 building headless target
    for now

 ...ci-fw_2019.04a.bb => ti-sci-fw_2019.05.bb} | 48 +++++++++++++------
 .../u-boot/u-boot-k3-r5_2019.01.bb            |  1 +
 .../images/arago-core-tisdk-image.inc         |  5 ++
 .../packagegroups/packagegroup-arago-test.bb  |  2 +-
 ...ackagegroup-arago-tisdk-addons-sdk-host.bb |  4 +-
 ...kagegroup-arago-tisdk-addons-sdk-target.bb |  2 +-
 .../packagegroup-arago-tisdk-addons.bb        |  7 ++-
 .../packagegroup-arago-tisdk-hmi-sdk-host.bb  |  2 +-
 .../packagegroup-arago-tisdk-hmi.bb           |  2 +-
 ...ackagegroup-arago-tisdk-matrix-sdk-host.bb |  1 +
 .../packagegroup-arago-tisdk-matrix.bb        |  5 +-
 ...gegroup-arago-tisdk-multimedia-sdk-host.bb |  2 +-
 ...group-arago-tisdk-multimedia-sdk-target.bb |  2 +-
 ...ckagegroup-arago-toolchain-tisdk-target.bb |  2 +
 .../ti-tisdk-makefile_1.0.bb                  |  8 +++-
 .../recipes-core/matrix/matrix-gui_2.0.bb     |  1 +
 16 files changed, 65 insertions(+), 29 deletions(-)
 rename meta-arago-distro/recipes-bsp/ti-sci-fw/{ti-sci-fw_2019.04a.bb => ti-sci-fw_2019.05.bb} (61%)

-- 
2.17.1

[thud/master][PATCH 1/4] packagegroups, tisdk-makefile: de-scope some K3 features to AM65 for now

[Denys Dmytriyenko]

J7 is a new platform in K3 family and support of some features is not ready yet:
* Graphics
* Multimedia
* IPC
* PRU-ICSS

Any SW component that implements above features or requires those as dependency
is being limited to AM65xx for now.

Signed-off-by: Denys Dmytriyenko <denys@ti.com>
---
 .../recipes-core/packagegroups/packagegroup-arago-test.bb | 2 +-
 .../packagegroup-arago-tisdk-addons-sdk-host.bb           | 4 ++--
 .../packagegroup-arago-tisdk-addons-sdk-target.bb         | 2 +-
 .../packagegroups/packagegroup-arago-tisdk-addons.bb      | 7 +++----
 .../packagegroup-arago-tisdk-hmi-sdk-host.bb              | 2 +-
 .../packagegroups/packagegroup-arago-tisdk-hmi.bb         | 2 +-
 .../packagegroup-arago-tisdk-matrix-sdk-host.bb           | 1 +
 .../packagegroups/packagegroup-arago-tisdk-matrix.bb      | 5 ++++-
 .../packagegroup-arago-tisdk-multimedia-sdk-host.bb       | 2 +-
 .../packagegroup-arago-tisdk-multimedia-sdk-target.bb     | 2 +-
 .../packagegroup-arago-toolchain-tisdk-target.bb          | 2 ++
 .../ti-tisdk-makefile/ti-tisdk-makefile_1.0.bb            | 8 ++++++--
 12 files changed, 24 insertions(+), 15 deletions(-)

diff --git a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-test.bb b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-test.bb
index 5b45597b..9c95670a 100644
--- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-test.bb
+++ b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-test.bb
@@ -62,7 +62,7 @@ ARAGO_TI_TEST_append_omap-a15 = " \
     ti-ipc-test \
     "
 
-ARAGO_TI_TEST_append_k3 = " \
+ARAGO_TI_TEST_append_am65xx = " \
     ti-ipc-test \
     "
 
diff --git a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-addons-sdk-host.bb b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-addons-sdk-host.bb
index 3b734554..19f2bcf4 100644
--- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-addons-sdk-host.bb
+++ b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-addons-sdk-host.bb
@@ -36,7 +36,7 @@ UTILS_append_k2g = " \
     pru-icss-src \
 "
 
-UTILS_append_k3 = " \
+UTILS_append_am65xx = " \
     pru-icss-src \
 "
 
@@ -100,7 +100,7 @@ EXTRA_PACKAGES_append_ti43x = " \
     pdm-anomaly-detection-src \
 "
 
-EXTRA_PACKAGES_append_k3 = " \
+EXTRA_PACKAGES_append_am65xx = " \
     pdm-anomaly-detection-src \
 "
 
diff --git a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-addons-sdk-target.bb b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-addons-sdk-target.bb
index 8bce1756..375473c0 100644
--- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-addons-sdk-target.bb
+++ b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-addons-sdk-target.bb
@@ -172,7 +172,7 @@ EXTRA_PACKAGES_append_omap-a15 = " voxelsdk-dev \
                                 ${ARMNN_PACKAGES} \
                                 pdm-anomaly-detection-dev \
 "
-EXTRA_PACKAGES_append_k3 = " arm-compute-library-dev \
+EXTRA_PACKAGES_append_am65xx = " arm-compute-library-dev \
                              ${ARMNN_PACKAGES} \
                              pdm-anomaly-detection-dev \
 "
diff --git a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-addons.bb b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-addons.bb
index 6558a21a..2f903ff7 100644
--- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-addons.bb
+++ b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-addons.bb
@@ -72,11 +72,10 @@ UTILS_append_k3 = " mmc-utils \
                     can-utils \
                     parted \
                     switch-config \
-                    pru-icss \
-                    ti-ipc-rtos-fw \
                     irqbalance \
 "
 
+UTILS_append_am65xx = " ti-ipc-rtos-fw pru-icss"
 UTILS_append_omapl138 = " ti-ipc-rtos-fw"
 
 UTILS_append_dra7xx = " can-utils \
@@ -168,7 +167,7 @@ EXTRA_PACKAGES_append_omap-a15 = " voxelsdk \
                                    pdm-anomaly-detection \
 "
 
-EXTRA_PACKAGES_append_k3 = " arm-compute-library \
+EXTRA_PACKAGES_append_am65xx = " arm-compute-library \
                              ${ARMNN_PACKAGES} \
                              pdm-anomaly-detection \
 "
@@ -176,7 +175,7 @@ EXTRA_PACKAGES_append_k3 = " arm-compute-library \
 EXTRA_PACKAGES_append_omap-a15 = " ti-ipc-examples-linux"
 EXTRA_PACKAGES_append_keystone = " ti-ipc-examples-linux"
 EXTRA_PACKAGES_append_omapl138 = " ti-ipc-examples-linux"
-EXTRA_PACKAGES_append_k3 = " ti-ipc-examples-linux"
+EXTRA_PACKAGES_append_am65xx = " ti-ipc-examples-linux"
 
 EXTRA_PACKAGES_append_am335x-evm = " pruss-lld-apps acontis-atemsys"
 EXTRA_PACKAGES_append_am437x-evm = " pruss-lld-apps"
diff --git a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-hmi-sdk-host.bb b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-hmi-sdk-host.bb
index 1399690b..1eb83d18 100644
--- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-hmi-sdk-host.bb
+++ b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-hmi-sdk-host.bb
@@ -25,7 +25,7 @@ HMI_append_omap-a15 = " \
     mmwavegesture-hmi-src \
 "
 
-HMI_append_k3 = " \
+HMI_append_am65xx = " \
     evse-hmi-src \
     mmwavegesture-hmi-src \
 "
diff --git a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-hmi.bb b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-hmi.bb
index 74dbcd7b..10f6d306 100644
--- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-hmi.bb
+++ b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-hmi.bb
@@ -26,7 +26,7 @@ HMI_append_omap-a15 = " \
     mmwavegesture-hmi \
 "
 
-HMI_append_k3 = " \
+HMI_append_am65xx = " \
     evse-hmi \
     mmwavegesture-hmi \
 "
diff --git a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-matrix-sdk-host.bb b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-matrix-sdk-host.bb
index 11355fcc..fddc9297 100644
--- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-matrix-sdk-host.bb
+++ b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-matrix-sdk-host.bb
@@ -13,6 +13,7 @@ MATRIX_GUI = " \
 
 MATRIX_GUI_keystone = ""
 MATRIX_GUI_omapl138 = ""
+MATRIX_GUI_j7-evm = ""
 
 RDEPENDS_${PN} = "\
     matrix-gui-src \
diff --git a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-matrix.bb b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-matrix.bb
index 100d4070..8f34ec7b 100644
--- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-matrix.bb
+++ b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-matrix.bb
@@ -20,6 +20,7 @@ MATRIX_GUI = "               \
 
 MATRIX_GUI_keystone = ""
 MATRIX_GUI_omapl138 = ""
+MATRIX_GUI_j7-evm = ""
 
 MATRIX_COMMON_APPS = "              \
     matrix-gui-armbenchmarks-demos  \
@@ -45,6 +46,8 @@ MATRIX_TOUCH_APPS = " \
 
 MATRIX_QT_APPS_keystone = ""
 MATRIX_QT_APPS_omapl138 = ""
+MATRIX_QT_APPS_j7-evm = ""
+
 #MATRIX_QT_APPS_remove_k3 = "matrix-qt5-demo-browser"
 #MATRIX_QT_APPS_append_k3 = " \
 #    matrix-qt5-demo-webkit-browser \
@@ -165,7 +168,7 @@ MATRIX_APPS_append_omap-a15 = "     \
     matrix-analytics-pdm-anomaly-detection \
 "
 
-MATRIX_APPS_append_k3 = "           \
+MATRIX_APPS_append_am65xx = "           \
     matrix-multimedia-demo-aac      \
     matrix-multimedia-demo-audiocapture \
     matrix-multimedia-demo-h264dec  \
diff --git a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-multimedia-sdk-host.bb b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-multimedia-sdk-host.bb
index 9b6a81fb..2ab9dc7d 100644
--- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-multimedia-sdk-host.bb
+++ b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-multimedia-sdk-host.bb
@@ -16,7 +16,7 @@ MULTIMEDIA_append_ti43x = " \
 
 MULTIMEDIA_append_ti33x = " barcode-roi-src"
 
-MULTIMEDIA_append_k3 = " barcode-roi-src"
+MULTIMEDIA_append_am65xx = " barcode-roi-src"
 
 MULTIMEDIA_append_omap-a15 = " \
     dual-camera-demo-src \
diff --git a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-multimedia-sdk-target.bb b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-multimedia-sdk-target.bb
index ae391247..50842ba5 100644
--- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-multimedia-sdk-target.bb
+++ b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-multimedia-sdk-target.bb
@@ -17,7 +17,7 @@ MULTIMEDIA_append_dra7xx = " \
 MULTIMEDIA_append_ti33x = " barcode-roi-dev"
 MULTIMEDIA_append_ti43x = " barcode-roi-dev"
 MULTIMEDIA_append_omap-a15 = " barcode-roi-dev"
-MULTIMEDIA_append_k3 = " barcode-roi-dev"
+MULTIMEDIA_append_am65xx = " barcode-roi-dev"
 
 MULTIMEDIA_append_keystone = " \
     hevc-arm-decoder-dev \
diff --git a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-toolchain-tisdk-target.bb b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-toolchain-tisdk-target.bb
index a3c9377c..7db6c67f 100644
--- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-toolchain-tisdk-target.bb
+++ b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-toolchain-tisdk-target.bb
@@ -11,6 +11,7 @@ QT_TOOLCHAIN_TARGET = "\
 "
 QT_TOOLCHAIN_TARGET_keystone = ""
 QT_TOOLCHAIN_TARGET_omapl138 = ""
+QT_TOOLCHAIN_TARGET_j7-evm = ""
 
 TISDK_TOOLCHAIN_BASE_TARGET = "\
     packagegroup-arago-standalone-sdk-target \
@@ -23,6 +24,7 @@ TISDK_TOOLCHAIN_EXTRA_TARGET = "\
 "
 TISDK_TOOLCHAIN_EXTRA_TARGET_keystone = ""
 TISDK_TOOLCHAIN_EXTRA_TARGET_omapl138 = ""
+TISDK_TOOLCHAIN_EXTRA_TARGET_j7-evm = ""
 
 RDEPENDS_${PN} = "\
     ${QT_TOOLCHAIN_TARGET} \
diff --git a/meta-arago-distro/recipes-tisdk/ti-tisdk-makefile/ti-tisdk-makefile_1.0.bb b/meta-arago-distro/recipes-tisdk/ti-tisdk-makefile/ti-tisdk-makefile_1.0.bb
index e0d409a2..f289a56b 100644
--- a/meta-arago-distro/recipes-tisdk/ti-tisdk-makefile/ti-tisdk-makefile_1.0.bb
+++ b/meta-arago-distro/recipes-tisdk/ti-tisdk-makefile/ti-tisdk-makefile_1.0.bb
@@ -63,6 +63,7 @@ MAKEFILES_MATRIX_GUI = "matrix-gui-browser \
 
 MAKEFILES_MATRIX_GUI_keystone = ""
 MAKEFILES_MATRIX_GUI_omapl138 = ""
+MAKEFILES_MATRIX_GUI_j7-evm = ""
 
 MAKEFILES_COMMON = "linux \
                     matrix-gui \
@@ -179,12 +180,15 @@ MAKEFILES_append_k3 = " u-boot-spl \
                         barcode-roi \
                         cryptodev \
                         ti-sgx-ddk-km-k3 \
-                        pru-icss \
                         sysfw-image \
 			mmwavegesture-hmi \
                         pdm-anomaly-detection \
 "
 
+MAKEFILES_append_am65xx = " \
+                        pru-icss \
+"
+
 # Use this to export kernel arch to ARCH
 #
 # We need to be very careful here. This class will also overwrite UBOOT_ARCH
@@ -214,7 +218,7 @@ PRU_ICSS_INSTALL_TARGET_ti33x = "pru-icss_install_am335x"
 PRU_ICSS_INSTALL_TARGET_ti43x = "pru-icss_install_am437x"
 PRU_ICSS_INSTALL_TARGET_omap-a15 = "pru-icss_install_am572x"
 PRU_ICSS_INSTALL_TARGET_k2g = "pru-icss_install_k2g"
-PRU_ICSS_INSTALL_TARGET_k3 = "pru-icss_install_am65x"
+PRU_ICSS_INSTALL_TARGET_am65xx = "pru-icss_install_am65x"
 
 
 # If it's not defined at all, like for zImage case
-- 
2.17.1

[thud/master][PATCH 2/4] ti-sci-fw: upgrade to 2019.05 and add support for J7 platform

[Denys Dmytriyenko]

Signed-off-by: Denys Dmytriyenko <denys@ti.com>
---
 ...ci-fw_2019.04a.bb => ti-sci-fw_2019.05.bb} | 48 +++++++++++++------
 1 file changed, 34 insertions(+), 14 deletions(-)
 rename meta-arago-distro/recipes-bsp/ti-sci-fw/{ti-sci-fw_2019.04a.bb => ti-sci-fw_2019.05.bb} (61%)

diff --git a/meta-arago-distro/recipes-bsp/ti-sci-fw/ti-sci-fw_2019.04a.bb b/meta-arago-distro/recipes-bsp/ti-sci-fw/ti-sci-fw_2019.05.bb
similarity index 61%
rename from meta-arago-distro/recipes-bsp/ti-sci-fw/ti-sci-fw_2019.04a.bb
rename to meta-arago-distro/recipes-bsp/ti-sci-fw/ti-sci-fw_2019.05.bb
index 60e15892..e783f33d 100644
--- a/meta-arago-distro/recipes-bsp/ti-sci-fw/ti-sci-fw_2019.04a.bb
+++ b/meta-arago-distro/recipes-bsp/ti-sci-fw/ti-sci-fw_2019.05.bb
@@ -14,11 +14,9 @@ PACKAGE_ARCH = "${MACHINE_ARCH}"
 TI_SECURE_DEV_PKG ?= ""
 export TI_SECURE_DEV_PKG
 
-SRCREV = "b41c4f097ab6f341462645f76059f48f78bbd17e"
-
+SRCREV = "94a06ceb66aa821b293e8b903f6b65346d33328d"
 BRANCH ?= "ti-linux-firmware"
-
-SRCREV_imggen = "f68fe913c16f13a7e04f6f340de1c4f6cc561c10"
+SRCREV_imggen = "45a79c0ec817df212296bb148aa55f888d3a7f8b"
 SRCREV_FORMAT = "imggen"
 
 SRC_URI = " \
@@ -26,7 +24,7 @@ SRC_URI = " \
 	git://git.ti.com/processor-firmware/system-firmware-image-gen.git;protocol=git;branch=master;destsuffix=imggen;name=imggen \
 "
 
-# Please note, "install.source.dir.local" is not a real URL, files need to be pre-downloaded
+# Please note, "install.source.dir.local" is not a real URL, below files need to be pre-downloaded
 SRC_URI_append_am65xx-hs-evm = " \
 	http://install.source.dir.local/ti-sci-firmware-am65x-hs-cert.bin;name=hs-cert \
 	http://install.source.dir.local/ti-sci-firmware-am65x-hs-enc.bin;name=hs-enc \
@@ -39,20 +37,42 @@ SRC_URI[hs-enc.sha256sum] = "73a17fd6ee2770d12ba328dd64009572b9ab0fbd4989111b34a
 
 S = "${WORKDIR}/git"
 
-SYSFW_TISCI_am65xx-evm = "${S}/ti-sysfw/ti-sci-firmware-am65x-gp.bin"
-SYSFW_TISCI_am65xx-hs-evm = "${WORKDIR}/ti-sci-firmware-am65x-hs-*.bin"
-SYSFW_BINARY = "sysfw.itb"
+SYSFW_SOC_am65xx = "am65x"
+SYSFW_SOC_j7-evm = "j721e"
+SYSFW_CONFIG = "evm"
+
+SYSFW_PREFIX = "ti-sci-firmware"
+
+SYSFW_BASE = "${SYSFW_PREFIX}-${SYSFW_SOC}-gp"
+SYSFW_BASE_am65xx-hs-evm = "${SYSFW_PREFIX}-${SYSFW_SOC}-hs"
+
+SYSFW_TISCI = "${S}/ti-sysfw/${SYSFW_BASE}.bin"
+SYSFW_TISCI_am65xx-hs-evm = "${WORKDIR}/${SYSFW_BASE}-*.bin"
+
+SYSFW_BINARY = "sysfw-${SYSFW_SOC}-${SYSFW_CONFIG}.itb"
 SYSFW_IMAGE = "sysfw-${PV}.itb"
+SYSFW_SYMLINK = "sysfw.itb"
+
+CFLAGS[unexport] = "1"
+LDFLAGS[unexport] = "1"
+AS[unexport] = "1"
+LD[unexport] = "1"
+
+do_configure[noexec] = "1"
 
 CROSS_COMPILE_V7 = "${@['${TARGET_SYS}-','${ELT_TARGET_SYS_ARMV7}-'][d.getVar('TOOLCHAIN_TYPE') == 'external' and d.getVar('TOOLCHAIN_BRAND') == 'linaro']}"
 CROSS_COMPILE_V7 = "${@['${TARGET_SYS}-','${EAT_TARGET_SYS_ARMV7}-'][d.getVar('TOOLCHAIN_TYPE') == 'external' and d.getVar('TOOLCHAIN_BRAND') == 'arm']}"
 PATH_prepend = "${TOOLCHAIN_PATH_ARMV7}/bin:"
 
-EXTRA_OEMAKE = "CROSS_COMPILE=${CROSS_COMPILE_V7} SYSFW_DL_URL='' SYSFW_HS_DL_URL='' SYSFW_HS_INNER_CERT_DL_URL=''"
-EXTRA_OEMAKE_append_am65xx-hs-evm = " HS=1"
+EXTRA_OEMAKE = "\
+    CROSS_COMPILE=${CROSS_COMPILE_V7} SYSFW_DL_URL='' SYSFW_HS_DL_URL='' SYSFW_HS_INNER_CERT_DL_URL='' \
+    SYSFW_PATH="${SYSFW_TISCI}" SOC=${SYSFW_SOC} CONFIG=${SYSFW_CONFIG} \
+"
+EXTRA_OEMAKE_append_am65xx-hs-evm = " \
+    HS=1 SYSFW_HS_PATH="${WORKDIR}/${SYSFW_BASE}-enc.bin" SYSFW_HS_INNER_CERT_PATH="${WORKDIR}/${SYSFW_BASE}-cert.bin" \
+"
 
 do_compile() {
-	cp ${SYSFW_TISCI} ${WORKDIR}/imggen/
 	cd ${WORKDIR}/imggen/
 	oe_runmake
 }
@@ -60,7 +80,7 @@ do_compile() {
 do_install() {
 	install -d ${D}/boot
 	install -m 644 ${WORKDIR}/imggen/${SYSFW_BINARY} ${D}/boot/${SYSFW_IMAGE}
-	ln -sf ${SYSFW_IMAGE} ${D}/boot/${SYSFW_BINARY}
+	ln -sf ${SYSFW_IMAGE} ${D}/boot/${SYSFW_SYMLINK}
 }
 
 FILES_${PN} = "/boot"
@@ -70,8 +90,8 @@ inherit deploy
 do_deploy () {
 	install -d ${DEPLOYDIR}
 	install -m 644 ${WORKDIR}/imggen/${SYSFW_BINARY} ${DEPLOYDIR}/${SYSFW_IMAGE}
-	rm -f ${DEPLOYDIR}/${SYSFW_BINARY}
-	ln -sf ${SYSFW_IMAGE} ${DEPLOYDIR}/${SYSFW_BINARY}
+	rm -f ${DEPLOYDIR}/${SYSFW_SYMLINK}
+	ln -sf ${SYSFW_IMAGE} ${DEPLOYDIR}/${SYSFW_SYMLINK}
 
 	install -m 644 ${SYSFW_TISCI} ${DEPLOYDIR}/
 }
-- 
2.17.1

[thud/master][PATCH 3/4] u-boot-k3-r5: add support for J7 platform

[Denys Dmytriyenko]

Signed-off-by: Denys Dmytriyenko <denys@ti.com>
---
 meta-arago-distro/recipes-bsp/u-boot/u-boot-k3-r5_2019.01.bb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/meta-arago-distro/recipes-bsp/u-boot/u-boot-k3-r5_2019.01.bb b/meta-arago-distro/recipes-bsp/u-boot/u-boot-k3-r5_2019.01.bb
index fae3d623..0263b668 100644
--- a/meta-arago-distro/recipes-bsp/u-boot/u-boot-k3-r5_2019.01.bb
+++ b/meta-arago-distro/recipes-bsp/u-boot/u-boot-k3-r5_2019.01.bb
@@ -13,6 +13,7 @@ PATH_prepend = "${TOOLCHAIN_PATH_ARMV7}/bin:"
 
 UBOOT_MACHINE_am65xx-evm = "am65x_evm_r5_defconfig"
 UBOOT_MACHINE_am65xx-hs-evm = "am65x_hs_evm_r5_defconfig"
+UBOOT_MACHINE_j7-evm = "j721e_evm_r5_defconfig"
 
 EXTRA_OEMAKE = 'ARCH=arm CROSS_COMPILE=${CROSS_COMPILE_V7} CC="${CROSS_COMPILE_V7}gcc ${TOOLCHAIN_OPTIONS}" V=1'
 EXTRA_OEMAKE += 'HOSTCC="${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_LDFLAGS}"'
-- 
2.17.1

[thud/master][PATCH 4/4] arago-core-tisdk, matrix: add support for J7 building headless target for now

[Denys Dmytriyenko]

Signed-off-by: Denys Dmytriyenko <denys@ti.com>
---
 .../recipes-core/images/arago-core-tisdk-image.inc           | 5 +++++
 meta-arago-extras/recipes-core/matrix/matrix-gui_2.0.bb      | 1 +
 2 files changed, 6 insertions(+)

diff --git a/meta-arago-distro/recipes-core/images/arago-core-tisdk-image.inc b/meta-arago-distro/recipes-core/images/arago-core-tisdk-image.inc
index 544f4e35..45a8c1bd 100644
--- a/meta-arago-distro/recipes-core/images/arago-core-tisdk-image.inc
+++ b/meta-arago-distro/recipes-core/images/arago-core-tisdk-image.inc
@@ -29,6 +29,7 @@ DTB_FILTER_k2e = "k2e"
 DTB_FILTER_k2g = "k2g"
 DTB_FILTER_omapl138 = "da850"
 DTB_FILTER_am65xx = "am65"
+DTB_FILTER_j7-evm = "j721e"
 
 # List of target side images to build for the SDK
 TARGET_IMAGES = "arago-base-tisdk-image tisdk-rootfs-image arago-tiny-image"
@@ -39,6 +40,7 @@ TARGET_IMAGES_append_dra7xx-evm = " netboot-initrd"
 # Some devices do not support display and use a server image instead
 TARGET_IMAGES_keystone = "arago-base-tisdk-image tisdk-server-rootfs-image tisdk-server-extra-rootfs-image arago-tiny-image"
 TARGET_IMAGES_omapl138 = "arago-base-tisdk-image tisdk-server-rootfs-image tisdk-server-extra-rootfs-image arago-tiny-image"
+TARGET_IMAGES_j7-evm = "arago-base-tisdk-image tisdk-server-rootfs-image tisdk-server-extra-rootfs-image arago-tiny-image"
 
 TISDK_TOOLCHAIN = "meta-toolchain-arago-tisdk"
 TOOLCHAIN_SUFFIX = "-tisdk"
@@ -47,6 +49,8 @@ TISDK_TOOLCHAIN_keystone = "meta-toolchain-arago-tisdk-server"
 TOOLCHAIN_SUFFIX_keystone = "-tisdk-server"
 TISDK_TOOLCHAIN_omapl138 = "meta-toolchain-arago-tisdk-server"
 TOOLCHAIN_SUFFIX_omapl138 = "-tisdk-server"
+TISDK_TOOLCHAIN_j7-evm = "meta-toolchain-arago-tisdk-server"
+TOOLCHAIN_SUFFIX_j7-evm = "-tisdk-server"
 
 IMAGE_INSTALL_QT = "\
     packagegroup-arago-tisdk-qte-sdk-host \
@@ -54,6 +58,7 @@ IMAGE_INSTALL_QT = "\
 
 IMAGE_INSTALL_QT_keystone = ""
 IMAGE_INSTALL_QT_omapl138 = ""
+IMAGE_INSTALL_QT_j7-evm = ""
 
 IMAGE_INSTALL = "\
     packagegroup-arago-tisdk-addons-sdk-host \
diff --git a/meta-arago-extras/recipes-core/matrix/matrix-gui_2.0.bb b/meta-arago-extras/recipes-core/matrix/matrix-gui_2.0.bb
index 82f9d07d..e14205a1 100644
--- a/meta-arago-extras/recipes-core/matrix/matrix-gui_2.0.bb
+++ b/meta-arago-extras/recipes-core/matrix/matrix-gui_2.0.bb
@@ -58,6 +58,7 @@ do_install(){
 GUIDEPS = "matrix-gui-browser refresh-screen"
 GUIDEPS_keystone = ""
 GUIDEPS_omapl138 = ""
+GUIDEPS_j7-evm = ""
 
 RDEPENDS_${PN} += "matrix-lighttpd-config lighttpd lighttpd-module-cgi lighttpd-module-compress lighttpd-module-expire php php-cgi php-cli ${GUIDEPS}"
 
-- 
2.17.1