3 files changed, 56 insertions, 41 deletions
diff --git a/bsp/meta-ti/recipes-bsp/prueth-fw/prueth-fw-am65x_git.bb b/bsp/meta-ti/recipes-bsp/prueth-fw/prueth-fw-am65x_git.bb
new file mode 100644
index 00000000..430e2a4e
--- /dev/null
+++ b/bsp/meta-ti/recipes-bsp/prueth-fw/prueth-fw-am65x_git.bb
@@ -0,0 +1,45 @@
+SUMMARY = "PRU Ethernet firmware for AM65x"
+
+require recipes-ti/includes/ti-paths.inc
+require recipes-bsp/emac-lld/emac-lld.inc
+
+LICENSE = "TI-TFL"
+LIC_FILES_CHKSUM = "file://icss_dualmac/src/makefile;beginline=6;endline=53;md5=3f9129d208f240940749757214bdc191"
+
+PR = "r0"
+
+TI_PDK_COMP = "ti.drv.emac.firmware"
+
+B = "${S}/icss_dualmac"
+
+COMPATIBLE_MACHINE = "am65xx"
+
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+
+DEPENDS = "ti-cgt-pru-native"
+
+EXTRA_OEMAKE += "CL_PRU_INSTALL_PATH="${TI_CGT_PRU_INSTALL_DIR}""
+
+do_compile() {
+    oe_runmake -C src
+}
+
+do_install() {
+    install -d ${D}${base_libdir}/firmware/ti-pruss
+
+    install -m 0644 bin/rxl2_txl2_rgmii0/rxl2_txl2.out \
+        ${D}${base_libdir}/firmware/ti-pruss/am65x-pru0-prueth-fw.elf
+
+    install -m 0644 bin/rtu_test0/rtu_v2.out \
+        ${D}${base_libdir}/firmware/ti-pruss/am65x-rtu0-prueth-fw.elf
+
+    install -m 0644 bin/rxl2_txl2_rgmii1/rxl2_txl2.out \
+        ${D}${base_libdir}/firmware/ti-pruss/am65x-pru1-prueth-fw.elf
+
+    install -m 0644 bin/rtu_test1/rtu_v2.out \
+        ${D}${base_libdir}/firmware/ti-pruss/am65x-rtu1-prueth-fw.elf
+}
+
+FILES_${PN} = "${base_libdir}/firmware"
+
+INSANE_SKIP_${PN} = "arch"
diff --git a/bsp/meta-ti/recipes-bsp/prueth-fw/prueth-fw-bin_git.bb b/bsp/meta-ti/recipes-bsp/prueth-fw/prueth-fw-bin_git.bb
deleted file mode 100644
index 60dc0879..00000000
--- a/bsp/meta-ti/recipes-bsp/prueth-fw/prueth-fw-bin_git.bb
+++ /dev/null
@@ -1,32 +0,0 @@
-SUMMARY = "PRU Ethernet firmware for AM65xx"
-
-LICENSE = "TI-TFL"
-LIC_FILES_CHKSUM = "file://LICENSE.ti;md5=b5aebf0668bdf95621259288c4a46d76"
-
-PV = "5.3.0.5"
-
-CLEANBROKEN = "1"
-
-COMPATIBLE_MACHINE = "am65xx-evm"
-
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-
-SRCREV = "534ba03becfa9b39ccbd42b97e091abd94a207e7"
-BRANCH ?= "ti-linux-firmware"
-
-SRC_URI = "git://git.ti.com/processor-firmware/ti-linux-firmware.git;protocol=git;branch=${BRANCH}"
-
-S = "${WORKDIR}/git"
-
-TARGET = "am65x-pru0-prueth-fw.elf am65x-pru1-prueth-fw.elf am65x-rtu0-prueth-fw.elf am65x-rtu1-prueth-fw.elf"
-
-do_install() {
-	install -d ${D}${base_libdir}/firmware/ti-pruss
-	for f in ${TARGET}; do
-		install -m 0644 ${S}/ti-pruss/$f ${D}${base_libdir}/firmware/ti-pruss/$f
-	done
-}
-
-FILES_${PN} = "${base_libdir}/firmware"
-
-INSANE_SKIP_${PN} = "arch"
diff --git a/bsp/meta-ti/recipes-bsp/prueth-fw/prueth-fw_git.bb b/bsp/meta-ti/recipes-bsp/prueth-fw/prueth-fw_git.bb
index 573a428b..f7718ad2 100644
--- a/bsp/meta-ti/recipes-bsp/prueth-fw/prueth-fw_git.bb
+++ b/bsp/meta-ti/recipes-bsp/prueth-fw/prueth-fw_git.bb
@@ -4,32 +4,34 @@ require recipes-ti/includes/ti-paths.inc
 require recipes-bsp/icss-emac-lld/icss-emac-lld.inc
 
 LICENSE = "TI-TFL"
-LIC_FILES_CHKSUM = "file://src/firmware_version.h;beginline=6;endline=53;md5=1f0a640a261059cdcbbcf01e6a739ff3"
+LIC_FILES_CHKSUM = "file://icss_dualemac/src/firmware_version.h;beginline=6;endline=53;md5=1f0a640a261059cdcbbcf01e6a739ff3"
 
-PV = "${PV_DUALEMAC_FW}"
 PR = "${INC_PR}.0"
 
-S = "${WORKDIR}/${ICSS_EMAC_LLD_GIT_DESTSUFFIX}/firmware/icss_dualemac"
+TI_PDK_COMP = "ti.drv.icss_emac.firmware"
 
-COMPATIBLE_MACHINE = "am57xx-evm|am437x-evm|am335x-evm|k2g"
+B = "${S}/icss_dualemac"
+
+COMPATIBLE_MACHINE = "am57xx-evm|am57xx-hs-evm|ti43x|ti33x|k2g"
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
 DEPENDS = "ti-cgt-pru-native"
 
 PRU_VERSION = ""
-PRU_VERSION_am335x-evm = "REV1"
-PRU_VERSION_am437x-evm = "REV1"
+PRU_VERSION_ti33x = "REV1"
+PRU_VERSION_ti43x = "REV1"
 PRU_VERSION_am57xx-evm = "REV2"
+PRU_VERSION_am57xx-hs-evm = "REV2"
 PRU_VERSION_k2g = "REV2"
 
 FW_PREFIX = ""
-FW_PREFIX_am335x-evm = "am335x"
-FW_PREFIX_am437x-evm = "am437x"
+FW_PREFIX_ti33x = "am335x"
+FW_PREFIX_ti43x = "am437x"
 FW_PREFIX_am57xx-evm = "am57xx"
+FW_PREFIX_am57xx-hs-evm = "am57xx"
 FW_PREFIX_k2g = "k2g"
 
-
 EXTRA_OEMAKE += "CL_PRU_INSTALL_PATH="${TI_CGT_PRU_INSTALL_DIR}" PRU_VERSION_LIST="${PRU_VERSION}""
 
 do_install() {