Denys Dmytriyenko
2018-09-13 19:43:10 UTC
Also install and deploy versioned SYSFW binary with short symlink.
Signed-off-by: Denys Dmytriyenko <***@ti.com>
---
v2 - replace remaining 2 instances of sysfw.bin with ${SYSFW_BINARY}
.../recipes-bsp/u-boot/u-boot-k3-r5_2018.01.bb | 19 ++++++++++++-------
1 file changed, 12 insertions(+), 7 deletions(-)
diff --git a/meta-arago-distro/recipes-bsp/u-boot/u-boot-k3-r5_2018.01.bb b/meta-arago-distro/recipes-bsp/u-boot/u-boot-k3-r5_2018.01.bb
index 0ff5658..04476ae 100644
--- a/meta-arago-distro/recipes-bsp/u-boot/u-boot-k3-r5_2018.01.bb
+++ b/meta-arago-distro/recipes-bsp/u-boot/u-boot-k3-r5_2018.01.bb
@@ -7,10 +7,12 @@ PKG_${PN}-dbg = "${PN}-dbg"
COMPATIBLE_MACHINE = "k3"
-SYSFW_VER = "2018.07a"
-SYSFW_BIN_am65xx-evm = "ti-sci-firmware-am6x-gp.bin"
+SYSFW_VER = "2018.08b"
+SYSFW_TISCI_am65xx-evm = "ti-sci-firmware-am65x-gp.bin"
+SYSFW_BINARY = "sysfw.bin"
+SYSFW_IMAGE = "sysfw-${SYSFW_VER}.bin"
-SRCREV_sysfw = "2035022224dcc885ac2cd0b11f8c76190f5af962"
+SRCREV_sysfw = "463b1b4a50e8e361fa333f87caf74d2e05bc0a82"
SYSFW_BRANCH = "ti-linux-firmware-4.1.y"
SRCREV_FORMAT = "sysfw"
@@ -25,7 +27,7 @@ UBOOT_MACHINE_am65xx-evm = "am65x_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}"'
-EXTRA_OEMAKE += 'SYSFW=${WORKDIR}/sysfw.bin'
+EXTRA_OEMAKE += 'SYSFW=${WORKDIR}/${SYSFW_BINARY}'
UBOOT_BINARY = "tiboot3.bin"
UBOOT_IMAGE = "tiboot3-${MACHINE}-${PV}-${PR}.bin"
@@ -33,13 +35,16 @@ UBOOT_SYMLINK = "tiboot3-${MACHINE}.bin"
SPL_BINARY_k3 = ""
do_configure_append() {
- ${WORKDIR}/gen_x509_cert.sh -m rom -c m3 -b ${WORKDIR}/fw/ti-sysfw/${SYSFW_BIN} -o ${WORKDIR}/sysfw.bin -l 0x40000
+ ${WORKDIR}/gen_x509_cert.sh -m rom -c m3 -b ${WORKDIR}/fw/ti-sysfw/${SYSFW_TISCI} -o ${WORKDIR}/${SYSFW_BINARY} -l 0x40000
}
do_install_append() {
- install -m 644 ${WORKDIR}/sysfw.bin ${D}/boot/
+ install -m 644 ${WORKDIR}/${SYSFW_BINARY} ${D}/boot/${SYSFW_IMAGE}
+ ln -sf ${SYSFW_IMAGE} ${D}/boot/${SYSFW_BINARY}
}
do_deploy_append() {
- install -m 644 ${WORKDIR}/sysfw.bin ${DEPLOYDIR}/
+ install -m 644 ${WORKDIR}/${SYSFW_BINARY} ${DEPLOYDIR}/${SYSFW_IMAGE}
+ rm -f ${DEPLOYDIR}/${SYSFW_BINARY}
+ ln -sf ${SYSFW_IMAGE} ${DEPLOYDIR}/${SYSFW_BINARY}
}
Signed-off-by: Denys Dmytriyenko <***@ti.com>
---
v2 - replace remaining 2 instances of sysfw.bin with ${SYSFW_BINARY}
.../recipes-bsp/u-boot/u-boot-k3-r5_2018.01.bb | 19 ++++++++++++-------
1 file changed, 12 insertions(+), 7 deletions(-)
diff --git a/meta-arago-distro/recipes-bsp/u-boot/u-boot-k3-r5_2018.01.bb b/meta-arago-distro/recipes-bsp/u-boot/u-boot-k3-r5_2018.01.bb
index 0ff5658..04476ae 100644
--- a/meta-arago-distro/recipes-bsp/u-boot/u-boot-k3-r5_2018.01.bb
+++ b/meta-arago-distro/recipes-bsp/u-boot/u-boot-k3-r5_2018.01.bb
@@ -7,10 +7,12 @@ PKG_${PN}-dbg = "${PN}-dbg"
COMPATIBLE_MACHINE = "k3"
-SYSFW_VER = "2018.07a"
-SYSFW_BIN_am65xx-evm = "ti-sci-firmware-am6x-gp.bin"
+SYSFW_VER = "2018.08b"
+SYSFW_TISCI_am65xx-evm = "ti-sci-firmware-am65x-gp.bin"
+SYSFW_BINARY = "sysfw.bin"
+SYSFW_IMAGE = "sysfw-${SYSFW_VER}.bin"
-SRCREV_sysfw = "2035022224dcc885ac2cd0b11f8c76190f5af962"
+SRCREV_sysfw = "463b1b4a50e8e361fa333f87caf74d2e05bc0a82"
SYSFW_BRANCH = "ti-linux-firmware-4.1.y"
SRCREV_FORMAT = "sysfw"
@@ -25,7 +27,7 @@ UBOOT_MACHINE_am65xx-evm = "am65x_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}"'
-EXTRA_OEMAKE += 'SYSFW=${WORKDIR}/sysfw.bin'
+EXTRA_OEMAKE += 'SYSFW=${WORKDIR}/${SYSFW_BINARY}'
UBOOT_BINARY = "tiboot3.bin"
UBOOT_IMAGE = "tiboot3-${MACHINE}-${PV}-${PR}.bin"
@@ -33,13 +35,16 @@ UBOOT_SYMLINK = "tiboot3-${MACHINE}.bin"
SPL_BINARY_k3 = ""
do_configure_append() {
- ${WORKDIR}/gen_x509_cert.sh -m rom -c m3 -b ${WORKDIR}/fw/ti-sysfw/${SYSFW_BIN} -o ${WORKDIR}/sysfw.bin -l 0x40000
+ ${WORKDIR}/gen_x509_cert.sh -m rom -c m3 -b ${WORKDIR}/fw/ti-sysfw/${SYSFW_TISCI} -o ${WORKDIR}/${SYSFW_BINARY} -l 0x40000
}
do_install_append() {
- install -m 644 ${WORKDIR}/sysfw.bin ${D}/boot/
+ install -m 644 ${WORKDIR}/${SYSFW_BINARY} ${D}/boot/${SYSFW_IMAGE}
+ ln -sf ${SYSFW_IMAGE} ${D}/boot/${SYSFW_BINARY}
}
do_deploy_append() {
- install -m 644 ${WORKDIR}/sysfw.bin ${DEPLOYDIR}/
+ install -m 644 ${WORKDIR}/${SYSFW_BINARY} ${DEPLOYDIR}/${SYSFW_IMAGE}
+ rm -f ${DEPLOYDIR}/${SYSFW_BINARY}
+ ln -sf ${SYSFW_IMAGE} ${DEPLOYDIR}/${SYSFW_BINARY}
}
--
2.7.4
2.7.4