diff options
author | Otavio Salvador <otavio@ossystems.com.br> | 2024-05-12 18:22:12 -0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-05-12 18:22:12 -0300 |
commit | 2f8342bcc785b9f01c95a0b695f5583e0924bad7 (patch) | |
tree | ef9cf89b6f604f07e8f458659811bf2106f198a8 | |
parent | 8e0655d886aada3f0ac1a5e336d314674fa205f5 (diff) | |
parent | 46a800cccd23243b94c3a0b256b2f0d5201abd58 (diff) | |
download | meta-freescale-2f8342bcc785b9f01c95a0b695f5583e0924bad7.tar.gz |
Merge pull request #1818 from Livius90/master
Sync firmware-imx_8.23.bb with meta-imx-bsp layer
-rw-r--r-- | recipes-bsp/firmware-imx/firmware-imx_8.23.bb | 23 |
1 files changed, 19 insertions, 4 deletions
diff --git a/recipes-bsp/firmware-imx/firmware-imx_8.23.bb b/recipes-bsp/firmware-imx/firmware-imx_8.23.bb index a9e36b5e..0c935b92 100644 --- a/recipes-bsp/firmware-imx/firmware-imx_8.23.bb +++ b/recipes-bsp/firmware-imx/firmware-imx_8.23.bb | |||
@@ -1,5 +1,5 @@ | |||
1 | # Copyright (C) 2012-2016 Freescale Semiconductor | 1 | # Copyright (C) 2012-2016 Freescale Semiconductor |
2 | # Copyright 2017-2021 NXP | 2 | # Copyright 2017-2021,2023 NXP |
3 | # Copyright (C) 2018 O.S. Systems Software LTDA. | 3 | # Copyright (C) 2018 O.S. Systems Software LTDA. |
4 | SUMMARY = "Freescale i.MX firmware" | 4 | SUMMARY = "Freescale i.MX firmware" |
5 | DESCRIPTION = "Freescale i.MX firmware such as for the VPU" | 5 | DESCRIPTION = "Freescale i.MX firmware such as for the VPU" |
@@ -10,14 +10,21 @@ PE = "1" | |||
10 | 10 | ||
11 | inherit allarch | 11 | inherit allarch |
12 | 12 | ||
13 | IMX_USE_LINUX_FIRMWARE_SDMA ?= "1" | ||
14 | |||
13 | do_install() { | 15 | do_install() { |
14 | install -d ${D}${nonarch_base_libdir}/firmware/imx | 16 | install -d ${D}${nonarch_base_libdir}/firmware/imx |
15 | 17 | ||
16 | # SDMA Firmware section | 18 | # SDMA Firmware section |
17 | install -d ${D}${nonarch_base_libdir}/firmware/imx/sdma | 19 | install -d ${D}${nonarch_base_libdir}/firmware/imx/sdma |
18 | install -m 0644 ${S}/firmware/sdma/* ${D}${nonarch_base_libdir}/firmware/imx/sdma | 20 | install -m 0644 ${S}/firmware/sdma/* ${D}${nonarch_base_libdir}/firmware/imx/sdma |
19 | rm -f ${D}${nonarch_base_libdir}/firmware/imx/sdma/sdma-imx6q.bin | 21 | # Define IMX_USE_LINUX_FIRMWARE_SDMA = "0" in layer.conf, machine.conf, local.conf |
20 | rm -f ${D}${nonarch_base_libdir}/firmware/imx/sdma/sdma-imx7d.bin | 22 | # or in .bbappend to use sdma-imx6q/7d.bin from here and not linux-firmware |
23 | if [ ${IMX_USE_LINUX_FIRMWARE_SDMA} -gt 0 ] | ||
24 | then | ||
25 | rm -f ${D}${nonarch_base_libdir}/firmware/imx/sdma/sdma-imx6q.bin | ||
26 | rm -f ${D}${nonarch_base_libdir}/firmware/imx/sdma/sdma-imx7d.bin | ||
27 | fi | ||
21 | 28 | ||
22 | # EASRC Firmware section | 29 | # EASRC Firmware section |
23 | install -d ${D}${nonarch_base_libdir}/firmware/imx/easrc | 30 | install -d ${D}${nonarch_base_libdir}/firmware/imx/easrc |
@@ -53,6 +60,11 @@ do_install() { | |||
53 | # as some of other files are provided by packages from other recipes. | 60 | # as some of other files are provided by packages from other recipes. |
54 | install -d ${D}${nonarch_base_libdir}/firmware/vpu | 61 | install -d ${D}${nonarch_base_libdir}/firmware/vpu |
55 | install -m 0644 ${S}/firmware/vpu/vpu_fw_imx*.bin ${D}${nonarch_base_libdir}/firmware/vpu | 62 | install -m 0644 ${S}/firmware/vpu/vpu_fw_imx*.bin ${D}${nonarch_base_libdir}/firmware/vpu |
63 | # Update i.MX8 vpu firmware path to align with kernel6.5+ | ||
64 | install -d ${D}${nonarch_base_libdir}/firmware/amphion/vpu/ | ||
65 | mv ${D}${nonarch_base_libdir}/firmware/vpu/vpu_fw_imx8* ${D}${nonarch_base_libdir}/firmware/amphion/vpu/ | ||
66 | # Install i.MX 95 VPU firmware | ||
67 | install -m 0644 ${S}/firmware/vpu/wave633c_codec_fw.bin ${D}${nonarch_base_libdir}/firmware | ||
56 | } | 68 | } |
57 | 69 | ||
58 | # | 70 | # |
@@ -88,6 +100,7 @@ python populate_packages:prepend() { | |||
88 | 100 | ||
89 | os.chdir(cwd) | 101 | os.chdir(cwd) |
90 | 102 | ||
103 | |||
91 | easrcdir = bb.data.expand('${nonarch_base_libdir}/firmware/imx/easrc', d) | 104 | easrcdir = bb.data.expand('${nonarch_base_libdir}/firmware/imx/easrc', d) |
92 | do_split_packages(d, easrcdir, '^easrc-([^_]*).*\.bin', | 105 | do_split_packages(d, easrcdir, '^easrc-([^_]*).*\.bin', |
93 | output_pattern='firmware-imx-easrc-%s', | 106 | output_pattern='firmware-imx-easrc-%s', |
@@ -144,7 +157,7 @@ PACKAGES_DYNAMIC = "${PN}-vpu-* ${PN}-sdma-* ${PN}-easrc-* ${PN}-xcvr-* ${PN}-xu | |||
144 | # is empty. | 157 | # is empty. |
145 | # Therefore, we opt-out from producing -dev package here, since also for firmware | 158 | # Therefore, we opt-out from producing -dev package here, since also for firmware |
146 | # files it makes no sense. | 159 | # files it makes no sense. |
147 | PACKAGES = "${PN} ${PN}-epdc ${PN}-hdmi" | 160 | PACKAGES = "${PN} ${PN}-epdc ${PN}-hdmi ${PN}-vpu-amphion ${PN}-vpu-wave" |
148 | 161 | ||
149 | FILES:${PN}-epdc = "${nonarch_base_libdir}/firmware/imx/epdc/" | 162 | FILES:${PN}-epdc = "${nonarch_base_libdir}/firmware/imx/epdc/" |
150 | FILES:${PN}-hdmi = " \ | 163 | FILES:${PN}-hdmi = " \ |
@@ -152,5 +165,7 @@ FILES:${PN}-hdmi = " \ | |||
152 | ${nonarch_base_libdir}/firmware/hdmirxfw.bin \ | 165 | ${nonarch_base_libdir}/firmware/hdmirxfw.bin \ |
153 | ${nonarch_base_libdir}/firmware/dpfw.bin \ | 166 | ${nonarch_base_libdir}/firmware/dpfw.bin \ |
154 | " | 167 | " |
168 | FILES:${PN}-vpu-amphion = "${nonarch_base_libdir}/firmware/amphion/vpu/*" | ||
169 | FILES:${PN}-vpu-wave = "${nonarch_base_libdir}/firmware/wave633c_codec_fw.bin" | ||
155 | 170 | ||
156 | COMPATIBLE_MACHINE = "(imx-generic-bsp)" | 171 | COMPATIBLE_MACHINE = "(imx-generic-bsp)" |