Digi
/
meta-digi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

meta-digi-arm: rework machine firmware configuration for NXP platforms 

Move generic IMX machine firmware to imx-digi-base.inc file. This eases
maintenance, as this file follows imx-base.inc in meta-freescale.

Still, configure platform's Digi specific firmware in each machine's
config file.

As a positive side effect, this removes the "firmware-imx-easrc-imx8mn"
firmware file from the 8M Mini, as it's only used in the 8M Nano. This
saves about 263KB.

Signed-off-by: Javier Viguera <javier.viguera@digi.com>
This commit is contained in:
Javier Viguera 2023-03-02 12:06:08 +01:00
parent 077f4dddee
commit e76027fd85
5 changed files with 19 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
meta-digi-arm/conf/machine/include/ccimx6.inc
View File

@ -20,21 +20,13 @@ STORAGE_MEDIA = "mmc"
# Wireless external module # Wireless external module
WIRELESS_MODULE ?= "" WIRELESS_MODULE ?= ""
# Firmware
MACHINE_FIRMWARE ?= "firmware-imx-sdma-imx6q"
MACHINE_FIRMWARE:append:mx6q = " firmware-imx-vpu-imx6q"
MACHINE_FIRMWARE:append:mx6dl = " firmware-imx-vpu-imx6d"
MACHINE_EXTRA_RDEPENDS += " \ MACHINE_EXTRA_RDEPENDS += " \
e2fsprogs-mke2fs \ e2fsprogs-mke2fs \
e2fsprogs-resize2fs \ e2fsprogs-resize2fs \
parted \ parted \
" "
MACHINE_EXTRA_RRECOMMENDS += " \ MACHINE_EXTRA_RRECOMMENDS += "${WIRELESS_MODULE}"
${MACHINE_FIRMWARE} \
${WIRELESS_MODULE} \
"
MACHINE_FEATURES += "accel-graphics wifi bluetooth pci" MACHINE_FEATURES += "accel-graphics wifi bluetooth pci"

8
meta-digi-arm/conf/machine/include/ccimx6ul.inc
View File

@ -22,8 +22,7 @@ WIRELESS_MODULE ?= ""
WIRELESS_MODULE:append = " ${@oe.utils.conditional('HAVE_WIFI', '1', 'kernel-module-qualcomm', '', d)}" WIRELESS_MODULE:append = " ${@oe.utils.conditional('HAVE_WIFI', '1', 'kernel-module-qualcomm', '', d)}"
HAS_WIFI_VIRTWLANS = "true" HAS_WIFI_VIRTWLANS = "true"
# Firmware # Machine firmware
MACHINE_FIRMWARE ?= "firmware-imx-sdma-imx6q"
MACHINE_FIRMWARE:append = " ${@oe.utils.conditional('HAVE_BT', '1', 'firmware-qualcomm-qca6564-bt', '', d)}" MACHINE_FIRMWARE:append = " ${@oe.utils.conditional('HAVE_BT', '1', 'firmware-qualcomm-qca6564-bt', '', d)}"
MACHINE_FIRMWARE:append = " ${@oe.utils.conditional('HAVE_WIFI', '1', 'firmware-qualcomm-qca6564-wifi', '', d)}" MACHINE_FIRMWARE:append = " ${@oe.utils.conditional('HAVE_WIFI', '1', 'firmware-qualcomm-qca6564-wifi', '', d)}"
@ -32,10 +31,7 @@ MACHINE_EXTRA_RDEPENDS += " \
mtd-utils-ubifs \ mtd-utils-ubifs \
" "
MACHINE_EXTRA_RRECOMMENDS += " \ MACHINE_EXTRA_RRECOMMENDS += "${WIRELESS_MODULE}"
${MACHINE_FIRMWARE} \
${WIRELESS_MODULE} \
"
MACHINE_FEATURES += "wifi bluetooth cryptochip mca" MACHINE_FEATURES += "wifi bluetooth cryptochip mca"
MACHINE_FEATURES:remove:use-mainline-bsp = "wifi" MACHINE_FEATURES:remove:use-mainline-bsp = "wifi"

8
meta-digi-arm/conf/machine/include/ccimx8m.inc
View File

@ -34,8 +34,7 @@ WIRELESS_MODULE ?= ""
WIRELESS_MODULE:append = " ${@oe.utils.conditional('HAVE_WIFI', '1', 'kernel-module-qualcomm', '', d)}" WIRELESS_MODULE:append = " ${@oe.utils.conditional('HAVE_WIFI', '1', 'kernel-module-qualcomm', '', d)}"
HAS_WIFI_VIRTWLANS = "true" HAS_WIFI_VIRTWLANS = "true"
# Firmware # Machine firmware
MACHINE_FIRMWARE ?= "firmware-imx-sdma-imx7d firmware-imx-easrc-imx8mn"
MACHINE_FIRMWARE:append = " ${@oe.utils.conditional('HAVE_BT', '1', 'firmware-qualcomm-qca6564-bt', '', d)}" MACHINE_FIRMWARE:append = " ${@oe.utils.conditional('HAVE_BT', '1', 'firmware-qualcomm-qca6564-bt', '', d)}"
MACHINE_FIRMWARE:append = " ${@oe.utils.conditional('HAVE_WIFI', '1', 'firmware-qualcomm-qca6564-wifi', '', d)}" MACHINE_FIRMWARE:append = " ${@oe.utils.conditional('HAVE_WIFI', '1', 'firmware-qualcomm-qca6564-wifi', '', d)}"
@ -46,10 +45,7 @@ MACHINE_EXTRA_RDEPENDS += " \
xbee-init \ xbee-init \
" "
MACHINE_EXTRA_RRECOMMENDS += " \ MACHINE_EXTRA_RRECOMMENDS += "${WIRELESS_MODULE}"
${MACHINE_FIRMWARE} \
${WIRELESS_MODULE} \
"
MACHINE_FEATURES += "accel-graphics wifi bluetooth cryptochip mca optee" MACHINE_FEATURES += "accel-graphics wifi bluetooth cryptochip mca optee"

8
meta-digi-arm/conf/machine/include/ccimx8x.inc
View File

@ -47,8 +47,7 @@ WIRELESS_MODULE ?= ""
WIRELESS_MODULE:append = " ${@oe.utils.conditional('HAVE_WIFI', '1', 'kernel-module-qualcomm', '', d)}" WIRELESS_MODULE:append = " ${@oe.utils.conditional('HAVE_WIFI', '1', 'kernel-module-qualcomm', '', d)}"
HAS_WIFI_VIRTWLANS = "true" HAS_WIFI_VIRTWLANS = "true"
# Firmware # Machine firmware
MACHINE_FIRMWARE ?= "firmware-imx-vpu-imx8 firmware-imx-sdma-imx7d"
MACHINE_FIRMWARE:append = " ${@oe.utils.conditional('HAVE_BT', '1', 'firmware-qualcomm-qca6574-bt', '', d)}" MACHINE_FIRMWARE:append = " ${@oe.utils.conditional('HAVE_BT', '1', 'firmware-qualcomm-qca6574-bt', '', d)}"
MACHINE_FIRMWARE:append = " ${@oe.utils.conditional('HAVE_WIFI', '1', 'firmware-qualcomm-qca6574-wifi', '', d)}" MACHINE_FIRMWARE:append = " ${@oe.utils.conditional('HAVE_WIFI', '1', 'firmware-qualcomm-qca6574-wifi', '', d)}"
@ -63,10 +62,7 @@ MACHINE_EXTRA_RDEPENDS += " \
xbee-init \ xbee-init \
" "
MACHINE_EXTRA_RRECOMMENDS += " \ MACHINE_EXTRA_RRECOMMENDS += "${WIRELESS_MODULE}"
${MACHINE_FIRMWARE} \
${WIRELESS_MODULE} \
"
MACHINE_FEATURES += "accel-graphics wifi bluetooth cryptochip pci mca" MACHINE_FEATURES += "accel-graphics wifi bluetooth cryptochip pci mca"

12
meta-digi-arm/conf/machine/include/imx-digi-base.inc
View File

@ -190,6 +190,18 @@ IMX_EXTRA_FIRMWARE:mx8m-generic-bsp = "firmware-imx-8m"
IMX_EXTRA_FIRMWARE:mx8x-generic-bsp = "imx-sc-firmware imx-seco" IMX_EXTRA_FIRMWARE:mx8x-generic-bsp = "imx-sc-firmware imx-seco"
IMX_EXTRA_FIRMWARE:mx93-generic-bsp = "firmware-imx-9 firmware-sentinel" IMX_EXTRA_FIRMWARE:mx93-generic-bsp = "firmware-imx-9 firmware-sentinel"
# Firmware
MACHINE_FIRMWARE ?= ""
MACHINE_FIRMWARE:append:mx6-generic-bsp = " 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-imx8"
MACHINE_FIRMWARE:append:mx8dx-generic-bsp = " firmware-imx-sdma-imx7d firmware-imx-vpu-imx8"
MACHINE_EXTRA_RRECOMMENDS += "${MACHINE_FIRMWARE}"
# Extra audio support # Extra audio support
IMX_ALSA_EXTRA = "" IMX_ALSA_EXTRA = ""
IMX_ALSA_EXTRA:imx-nxp-bsp = "imx-alsa-plugins" IMX_ALSA_EXTRA:imx-nxp-bsp = "imx-alsa-plugins"