* prueth-fw and icss-emac-lld shared the same source repo, so make them share the same inc file which specifies the sources. * Add the FW versions to the icss-emac-lld.inc so that there can be a single location for updates.
Signed-off-by: Jacob Stiffler <[email protected]> --- v2 changes: Move LIC_FILES_CHKSUM after including common file so that it is valid. recipes-bsp/icss-emac-lld/icss-emac-lld.inc | 6 ++++++ recipes-bsp/prueth-fw/prueth-fw_git.bb | 21 +++++---------------- 2 files changed, 11 insertions(+), 16 deletions(-) diff --git a/recipes-bsp/icss-emac-lld/icss-emac-lld.inc b/recipes-bsp/icss-emac-lld/icss-emac-lld.inc index ebe66af..9c93b75 100644 --- a/recipes-bsp/icss-emac-lld/icss-emac-lld.inc +++ b/recipes-bsp/icss-emac-lld/icss-emac-lld.inc @@ -16,7 +16,13 @@ BRANCH = "${ICSS_EMAC_LLD_GIT_BRANCH}" SRC_URI = "${ICSS_EMAC_LLD_GIT_URI};destsuffix=${ICSS_EMAC_LLD_GIT_DESTSUFFIX};protocol=${ICSS_EMAC_LLD_GIT_PROTOCOL};branch=${BRANCH}" SRCREV = "${ICSS_EMAC_LLD_SRCREV}" + +# The LLD version PV = "01.00.00.15A" + +# The FW version(s) +PV_DUALEMAC_FW = "5.2.7" + INC_PR = "r0" S = "${WORKDIR}/${ICSS_EMAC_LLD_GIT_DESTSUFFIX}" diff --git a/recipes-bsp/prueth-fw/prueth-fw_git.bb b/recipes-bsp/prueth-fw/prueth-fw_git.bb index ddcb9ec..573a428 100644 --- a/recipes-bsp/prueth-fw/prueth-fw_git.bb +++ b/recipes-bsp/prueth-fw/prueth-fw_git.bb @@ -1,24 +1,13 @@ DESCRIPTION = "PRU Ethernet firmware for AM57xx, AM437x, AM335x and K2G" -LICENSE = "TI-TFL" -LIC_FILES_CHKSUM = "file://src/firmware_version.h;beginline=6;endline=53;md5=1f0a640a261059cdcbbcf01e6a739ff3" - require recipes-ti/includes/ti-paths.inc +require recipes-bsp/icss-emac-lld/icss-emac-lld.inc -ICSS_EMAC_LLD_GIT_URI = "git://git.ti.com/keystone-rtos/icss-emac.git" -ICSS_EMAC_LLD_GIT_PROTOCOL = "git" -ICSS_EMAC_LLD_GIT_BRANCH = "master" -ICSS_EMAC_LLD_GIT_DESTSUFFIX = "git/ti/drv/icss_emac" - -# Below commit ID corresponds to "DEV.ICSS_EMAC_LLD.01.00.00.14" -ICSS_EMAC_LLD_SRCREV = "7541d801b2f1be93fd02511cdf2143b0a200cc36" - -BRANCH = "${ICSS_EMAC_LLD_GIT_BRANCH}" -SRC_URI = "${ICSS_EMAC_LLD_GIT_URI};destsuffix=${ICSS_EMAC_LLD_GIT_DESTSUFFIX};protocol=${ICSS_EMAC_LLD_GIT_PROTOCOL};branch=${BRANCH}" +LICENSE = "TI-TFL" +LIC_FILES_CHKSUM = "file://src/firmware_version.h;beginline=6;endline=53;md5=1f0a640a261059cdcbbcf01e6a739ff3" -SRCREV = "${ICSS_EMAC_LLD_SRCREV}" -PV = "5.2.0" -PR = "r0" +PV = "${PV_DUALEMAC_FW}" +PR = "${INC_PR}.0" S = "${WORKDIR}/${ICSS_EMAC_LLD_GIT_DESTSUFFIX}/firmware/icss_dualemac" -- 2.7.4 -- _______________________________________________ meta-ti mailing list [email protected] https://lists.yoctoproject.org/listinfo/meta-ti
