diff --git a/meta-digi-arm/conf/machine/include/imx-digi-base.inc b/meta-digi-arm/conf/machine/include/imx-digi-base.inc index f75747ef5..660d384bf 100644 --- a/meta-digi-arm/conf/machine/include/imx-digi-base.inc +++ b/meta-digi-arm/conf/machine/include/imx-digi-base.inc @@ -236,13 +236,13 @@ IMX_EXTRA_FIRMWARE:mx95-generic-bsp = "imx-boot-firmware-files firmware-ele-im # Firmware MACHINE_FIRMWARE ?= "" -MACHINE_FIRMWARE:append:mx6-generic-bsp = " firmware-imx-sdma-imx6q" +MACHINE_FIRMWARE:append:mx6-generic-bsp = " linux-firmware-imx-sdma-imx6q" MACHINE_FIRMWARE:append:mx6q-generic-bsp = " firmware-imx-vpu-imx6q" MACHINE_FIRMWARE:append:mx6dl-generic-bsp = " firmware-imx-vpu-imx6d firmware-imx-epdc" -MACHINE_FIRMWARE:append:mx8mm-generic-bsp = " firmware-imx-sdma-imx7d" -MACHINE_FIRMWARE:append:mx8mn-generic-bsp = " firmware-imx-sdma-imx7d firmware-imx-easrc-imx8mn" -MACHINE_FIRMWARE:append:mx8qxp-generic-bsp = " firmware-imx-sdma-imx7d firmware-imx-vpu-amphion" -MACHINE_FIRMWARE:append:mx8dx-generic-bsp = " firmware-imx-sdma-imx7d firmware-imx-vpu-amphion" +MACHINE_FIRMWARE:append:mx8mm-generic-bsp = " linux-firmware-imx-sdma-imx7d" +MACHINE_FIRMWARE:append:mx8mn-generic-bsp = " linux-firmware-imx-sdma-imx7d firmware-imx-easrc-imx8mn" +MACHINE_FIRMWARE:append:mx8qxp-generic-bsp = " linux-firmware-imx-sdma-imx7d firmware-imx-vpu-amphion" +MACHINE_FIRMWARE:append:mx8dx-generic-bsp = " linux-firmware-imx-sdma-imx7d firmware-imx-vpu-amphion" MACHINE_FIRMWARE:append:mx95-generic-bsp = " firmware-imx-vpu-wave" MACHINE_EXTRA_RRECOMMENDS += "${MACHINE_FIRMWARE}" diff --git a/meta-digi-arm/dynamic-layers/freescale-layer/recipes-bsp/firmware-imx/firmware-imx_%.bbappend b/meta-digi-arm/dynamic-layers/freescale-layer/recipes-bsp/firmware-imx/firmware-imx_%.bbappend deleted file mode 100644 index 9d4bb94b9..000000000 --- a/meta-digi-arm/dynamic-layers/freescale-layer/recipes-bsp/firmware-imx/firmware-imx_%.bbappend +++ /dev/null @@ -1,8 +0,0 @@ -# Copyright (C) 2023, Digi International Inc. - -do_install:append() { - # meta-freescale deletes the SDMA firmware provided by the firmware-imx package, - # in favor of the generic one provided by the linux-firmware package. The one - # provided by NXP is more up-to-date, so we want it back. - install -m 0644 ${S}/firmware/sdma/* ${D}${nonarch_base_libdir}/firmware/imx/sdma -} diff --git a/meta-digi-arm/recipes-kernel/linux-firmware/linux-firmware_%.bbappend b/meta-digi-arm/recipes-kernel/linux-firmware/linux-firmware_%.bbappend deleted file mode 100644 index bf4f143f5..000000000 --- a/meta-digi-arm/recipes-kernel/linux-firmware/linux-firmware_%.bbappend +++ /dev/null @@ -1,8 +0,0 @@ -# Copyright (C) 2022, Digi International Inc. - -# This is an excerpt from the *.bbappend in meta-imx, containing only the -# minimum necessary changes for bitbake to use the SDMA firmware from the -# firmware-imx recipe instead of this one - -# Use the latest version of sdma firmware in firmware-imx -PACKAGES:remove = "${PN}-imx-sdma-license ${PN}-imx-sdma-imx6q ${PN}-imx-sdma-imx7d"