summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDenys Drozdov <denys.drozdov@toradex.com>2021-07-14 14:51:45 +0300
committerMax Krummenacher <max.krummenacher@toradex.com>2021-07-18 11:44:45 +0200
commit2c42ed4dd4fbcbfbe50f9c250a25b70b3c30ea60 (patch)
tree3ea9bc547da981c7afd3dcbb3cf5e8098cff85d6
parentac73a7f9f890281f97ea88f846351cb744268026 (diff)
firmware-imx: imx6: Keep NXP VPU prorietary libraries
NXP provides proprietary VPU libraries with media codecs, required for video/audio decoding. The support of VPU libraries might be required for Torizon compatibility Related-to: ELB-3945 Signed-off-by: Denys Drozdov <denys.drozdov@toradex.com> (cherry picked from commit a4f212ee0314ddab4129da607bfa922a94f7e6b9)
-rw-r--r--conf/machine/include/apalis-imx6.inc1
-rw-r--r--conf/machine/include/colibri-imx6.inc1
2 files changed, 0 insertions, 2 deletions
diff --git a/conf/machine/include/apalis-imx6.inc b/conf/machine/include/apalis-imx6.inc
index 71f44c7..c2ae376 100644
--- a/conf/machine/include/apalis-imx6.inc
+++ b/conf/machine/include/apalis-imx6.inc
@@ -27,7 +27,6 @@ UBOOT_DTB_LOADADDRESS_apalis-imx6 = "0x12100000"
UBOOT_DTBO_LOADADDRESS_apalis-imx6 = "0x17000000"
MACHINE_FIRMWARE_remove = "firmware-imx-epdc"
-MACHINE_FIRMWARE_remove_use-mainline-bsp = "firmware-imx-vpu-imx6q firmware-imx-vpu-imx6d"
TEZI_EXTERNAL_KERNEL_DEVICETREE_BOOT = "apalis-imx6_hdmi_overlay.dtbo"
TEZI_EXTERNAL_KERNEL_DEVICETREE_BOOT_use-mainline-bsp = "apalis-imx6_parallel-rgb_overlay.dtbo display-edt7_overlay.dtbo apalis-imx6_stmpe-ts_overlay.dtbo apalis-imx6_hdmi_overlay.dtbo"
diff --git a/conf/machine/include/colibri-imx6.inc b/conf/machine/include/colibri-imx6.inc
index e77550a..1c11dc0 100644
--- a/conf/machine/include/colibri-imx6.inc
+++ b/conf/machine/include/colibri-imx6.inc
@@ -25,7 +25,6 @@ PREFERRED_PROVIDER_u-boot-default-script = "u-boot-distro-boot"
UBOOT_SUFFIX = "img"
MACHINE_FIRMWARE_remove = "firmware-imx-epdc"
-MACHINE_FIRMWARE_remove_use-mainline-bsp = "firmware-imx-vpu-imx6q firmware-imx-vpu-imx6d"
UBOOT_ENTRYPOINT_colibri-imx6 = "0x11000000"
UBOOT_DTB_LOADADDRESS_colibri-imx6 = "0x12100000"