From 7b8a17be6743d4e585392eb61a569a63c9ba4f4b Mon Sep 17 00:00:00 2001 From: Scott Murray Date: Thu, 5 Sep 2024 15:16:51 -0400 Subject: meta-agl-bsp: Kingfisher updates Updates to work with the new scarthgap-v5.9.4 branch in meta-rcar: - Remove ti-bt bbappend and other references, as using ti-bt has been dropped by upstream. - Remove si-tools and ti-bt-firmware bbappend tweaks that were to support usrmerge, as upstream seems to have incorporated them. - Replace IMAGE_NAME and IMAGE_LINK_NAME redefinitions with use of the new IMAGE_MACHINE_SUFFIX variable which achieves the same result. Bug-AGL: SPEC-5191 Change-Id: Ice07296a8560e07ce4b5705e6c2fa9f47896bfa0 Signed-off-by: Scott Murray Reviewed-on: https://gerrit.automotivelinux.org/gerrit/c/AGL/meta-agl/+/30248 Tested-by: Jenkins Job builder account Reviewed-by: Jan-Simon Moeller ci-image-build: Jenkins Job builder account ci-image-boot-test: Jenkins Job builder account (cherry picked from commit 210cd32190b72bcad81520e5ad153bc489ea8741) Reviewed-on: https://gerrit.automotivelinux.org/gerrit/c/AGL/meta-agl/+/30214 --- .../cogent-symlinks/recipes-bsp/ti-bt | 1 - .../conf/include/rcar-gen3-adas.inc | 4 +--- .../recipes-bsp/si-tools/si-tools.bbappend | 24 ++++------------------ .../ti-bt-firmware/ti-bt-firmware_git.bbappend | 6 ------ .../recipes-bsp/ti-bt/ti-bt/ti-uim.service | 10 --------- .../recipes-bsp/ti-bt/ti-bt_%.bbappend | 18 ---------------- 6 files changed, 5 insertions(+), 58 deletions(-) delete mode 120000 meta-agl-bsp/meta-rcar-gen3-adas/cogent-symlinks/recipes-bsp/ti-bt delete mode 100644 meta-agl-bsp/meta-rcar-gen3-adas/recipes-bsp/ti-bt-firmware/ti-bt-firmware_git.bbappend delete mode 100644 meta-agl-bsp/meta-rcar-gen3-adas/recipes-bsp/ti-bt/ti-bt/ti-uim.service delete mode 100644 meta-agl-bsp/meta-rcar-gen3-adas/recipes-bsp/ti-bt/ti-bt_%.bbappend (limited to 'meta-agl-bsp') diff --git a/meta-agl-bsp/meta-rcar-gen3-adas/cogent-symlinks/recipes-bsp/ti-bt b/meta-agl-bsp/meta-rcar-gen3-adas/cogent-symlinks/recipes-bsp/ti-bt deleted file mode 120000 index 13ea60b90..000000000 --- a/meta-agl-bsp/meta-rcar-gen3-adas/cogent-symlinks/recipes-bsp/ti-bt +++ /dev/null @@ -1 +0,0 @@ -../../../../../bsp/meta-rcar/meta-rcar-gen3-adas/recipes-bsp/ti-bt \ No newline at end of file diff --git a/meta-agl-bsp/meta-rcar-gen3-adas/conf/include/rcar-gen3-adas.inc b/meta-agl-bsp/meta-rcar-gen3-adas/conf/include/rcar-gen3-adas.inc index 0c344a471..40d0ef0cb 100644 --- a/meta-agl-bsp/meta-rcar-gen3-adas/conf/include/rcar-gen3-adas.inc +++ b/meta-agl-bsp/meta-rcar-gen3-adas/conf/include/rcar-gen3-adas.inc @@ -6,8 +6,7 @@ # recipes. AGL_FEATURES:append:rcar-gen3 = " kingfisher" -IMAGE_NAME:rcar-gen3 = "${IMAGE_BASENAME}-${MACHINE}-kf${IMAGE_VERSION_SUFFIX}" -IMAGE_LINK_NAME:rcar-gen3 = "${IMAGE_BASENAME}-${MACHINE}-kf" +IMAGE_MACHINE_SUFFIX = "-${MACHINE}-kf" TOOLCHAIN_OUTPUTNAME:rcar-gen3 = "${SDK_NAME}-kf-toolchain-${SDK_VERSION}" # Radio packages @@ -15,6 +14,5 @@ IMAGE_INSTALL:append:rcar-gen3 = " \ si-tools \ si-init \ linux-firmware-wl18xx \ - ti-bt \ ti-bt-firmware \ " diff --git a/meta-agl-bsp/meta-rcar-gen3-adas/recipes-bsp/si-tools/si-tools.bbappend b/meta-agl-bsp/meta-rcar-gen3-adas/recipes-bsp/si-tools/si-tools.bbappend index 7121bd168..9a5347b68 100644 --- a/meta-agl-bsp/meta-rcar-gen3-adas/recipes-bsp/si-tools/si-tools.bbappend +++ b/meta-agl-bsp/meta-rcar-gen3-adas/recipes-bsp/si-tools/si-tools.bbappend @@ -6,23 +6,7 @@ SRC_URI += " \ EXTRA_OEMAKE:append = " 'LDFLAGS=${LDFLAGS}'" -do_install() { - install -d ${D}${bindir} - install -d ${D}${nonarch_base_libdir}/firmware/radio/ - - install -m 755 si_ctl ${D}${bindir} - install -m 755 si_flash ${D}${bindir} - for file in ${SCRIPTS}; do - install -m 755 ${S}/scripts/$file ${D}${bindir} - sed -e 's,^\(SI_ARGS\s*=\s*\).*,\1"/dev/i2c-12 0x65",' -i ${D}${bindir}/$file - done - - for file in ${FIRMWARE}; do - install -m 644 ${S}/firmware/$file ${D}${nonarch_base_libdir}/firmware/radio/ - done -} - -FILES:${PN} = " \ - ${bindir} \ - ${nonarch_base_libdir}/firmware/radio \ -" +# Setting LDFLAGS fixes the QA issue, disable INSANE_SKIP over-ride +# done in the recipe +INSANE_SKIP:${PN} = "" +INSANE_SKIP:${PN}-dev = "" \ No newline at end of file diff --git a/meta-agl-bsp/meta-rcar-gen3-adas/recipes-bsp/ti-bt-firmware/ti-bt-firmware_git.bbappend b/meta-agl-bsp/meta-rcar-gen3-adas/recipes-bsp/ti-bt-firmware/ti-bt-firmware_git.bbappend deleted file mode 100644 index 52bee656d..000000000 --- a/meta-agl-bsp/meta-rcar-gen3-adas/recipes-bsp/ti-bt-firmware/ti-bt-firmware_git.bbappend +++ /dev/null @@ -1,6 +0,0 @@ -do_install() { - install -d ${D}${nonarch_base_libdir}/firmware/ti-connectivity/ - cp *.bts ${D}${nonarch_base_libdir}/firmware/ti-connectivity/ -} - -FILES:${PN} = "${nonarch_base_libdir}/firmware/ti-connectivity/*" diff --git a/meta-agl-bsp/meta-rcar-gen3-adas/recipes-bsp/ti-bt/ti-bt/ti-uim.service b/meta-agl-bsp/meta-rcar-gen3-adas/recipes-bsp/ti-bt/ti-bt/ti-uim.service deleted file mode 100644 index 214e60707..000000000 --- a/meta-agl-bsp/meta-rcar-gen3-adas/recipes-bsp/ti-bt/ti-bt/ti-uim.service +++ /dev/null @@ -1,10 +0,0 @@ -[Unit] -Description=User Mode Init Manager for TI shared transport -Before=bluetooth.service - -[Service] -ExecStartPre=-/sbin/modprobe -q btwilink -ExecStart=/usr/bin/uim -f /sys/devices/platform/kim - -[Install] -WantedBy=multi-user.target diff --git a/meta-agl-bsp/meta-rcar-gen3-adas/recipes-bsp/ti-bt/ti-bt_%.bbappend b/meta-agl-bsp/meta-rcar-gen3-adas/recipes-bsp/ti-bt/ti-bt_%.bbappend deleted file mode 100644 index 55d570fc7..000000000 --- a/meta-agl-bsp/meta-rcar-gen3-adas/recipes-bsp/ti-bt/ti-bt_%.bbappend +++ /dev/null @@ -1,18 +0,0 @@ -inherit systemd - -FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" - -SRC_URI += "file://ti-uim.service" - -SYSTEMD_SERVICE:${PN} = "ti-uim.service" - -PR = "r0" -PV = "0.1+git${SRCPV}" - -do_install:append() { - # We do not want the blacklist - rm -f ${D}/${sysconfdir}/modprobe.d/ti_bt.conf - - install -d ${D}${systemd_unitdir}/system/ - install -m 0644 ${WORKDIR}/ti-uim.service ${D}${systemd_unitdir}/system -} -- cgit 1.2.3-korg