diff options
| author | Andrejs Cainikovs <andrejs.cainikovs@toradex.com> | 2022-05-24 09:51:41 +0200 |
|---|---|---|
| committer | Max Krummenacher <max.krummenacher@toradex.com> | 2022-05-25 12:01:43 +0000 |
| commit | 18e03f3806b1f41194259dc412c10b309c6f5171 (patch) | |
| tree | ba9925b103695b30a0d4046c89779c3e22342995 | |
| parent | d985d1b3c6bdb271cfeddc7f09f382c6ddba6939 (diff) | |
linux-firmware: adjust SD8997 firmware location
Now, when SD-UART firmware handling is in the upstream, we need
to adjust to new firmware location, thus removing a hackish way
of having to overwrite the original firmware file.
Related-to: ELB-4452
Signed-off-by: Andrejs Cainikovs <andrejs.cainikovs@toradex.com>
| -rw-r--r-- | recipes-kernel/linux-firmware/linux-firmware_%.bbappend | 15 | ||||
| -rw-r--r-- | recipes-support/btuart/btuart.bb | 8 |
2 files changed, 8 insertions, 15 deletions
diff --git a/recipes-kernel/linux-firmware/linux-firmware_%.bbappend b/recipes-kernel/linux-firmware/linux-firmware_%.bbappend index b6bf6e4..a2b35da 100644 --- a/recipes-kernel/linux-firmware/linux-firmware_%.bbappend +++ b/recipes-kernel/linux-firmware/linux-firmware_%.bbappend @@ -9,20 +9,21 @@ SRCREV_imx-firmware = "a312213179f671cecba5f32aa839cc752a3e817f" SRCREV_FORMAT = "default_imx-firmware" do_install_append () { - install -d ${D}${sysconfdir}/firmware - - # Install NXP Connectivity - install -d ${D}${nonarch_base_libdir}/firmware/nxp - install -m 0644 ${WORKDIR}/imx-firmware/nxp/wifi_mod_para.conf ${D}${nonarch_base_libdir}/firmware/nxp - # Install NXP Connectivity SDIO8997 firmware + install -d ${D}${nonarch_base_libdir}/firmware/nxp + install -m 0644 ${WORKDIR}/imx-firmware/nxp/wifi_mod_para.conf ${D}${nonarch_base_libdir}/firmware/nxp install -m 0644 ${WORKDIR}/imx-firmware/nxp/FwImage_8997_SD/ed_mac_ctrl_V3_8997.conf ${D}${nonarch_base_libdir}/firmware/nxp install -m 0644 ${WORKDIR}/imx-firmware/nxp/FwImage_8997_SD/sdiouart8997_combo_v4.bin ${D}${nonarch_base_libdir}/firmware/nxp install -m 0644 ${WORKDIR}/imx-firmware/nxp/FwImage_8997_SD/txpwrlimit_cfg_8997.conf ${D}${nonarch_base_libdir}/firmware/nxp + + # Upstream SDIO8997 driver firmware is located elsewhere + install -d ${D}${nonarch_base_libdir}/firmware/mrvl + lnr ${D}${nonarch_base_libdir}/firmware/nxp/sdiouart8997_combo_v4.bin ${D}${nonarch_base_libdir}/firmware/mrvl/sdiouart8997_combo_v4.bin } PACKAGES =+ " ${PN}-nxp89xx" FILES_${PN}-nxp89xx = " \ - ${nonarch_base_libdir}/firmware/nxp/* \ + ${nonarch_base_libdir}/firmware/nxp/* \ + ${nonarch_base_libdir}/firmware/mrvl/* \ " diff --git a/recipes-support/btuart/btuart.bb b/recipes-support/btuart/btuart.bb index d59f6e4..5cc4066 100644 --- a/recipes-support/btuart/btuart.bb +++ b/recipes-support/btuart/btuart.bb @@ -34,12 +34,4 @@ pkg_postinst_ontarget_${PN}_verdin-imx8mp () { /bin/systemctl stop btuart.service exit 0 fi - - # V1.1A and later require sdiouart Wi-Fi/BT firmware - mv -f ${nonarch_base_libdir}/firmware/mrvl/sdsd8997_combo_v4.bin ${nonarch_base_libdir}/firmware/mrvl/sdsd8997_combo_v4.bin.orig - ln -s ${nonarch_base_libdir}/firmware/nxp/sdiouart8997_combo_v4.bin ${nonarch_base_libdir}/firmware/mrvl/sdsd8997_combo_v4.bin - # power-cycle Wi-Fi/BT module - echo -n "30b40000.mmc" > /sys/bus/platform/drivers/sdhci-esdhc-imx/unbind - sleep 1 - echo -n "30b40000.mmc" > /sys/bus/platform/drivers/sdhci-esdhc-imx/bind } |