From 500d9d04813bae6b2237a95da52567ca3c005db5 Mon Sep 17 00:00:00 2001 From: Hector Palacios Date: Wed, 30 Jan 2019 09:14:32 +0100 Subject: [PATCH] machine: add firmware-imx-sdma for i.MX6 and i.MX8 platforms The SDMA firmware does no longer live inside the kernel tree. It must now be installed on the rootfs. Signed-off-by: Hector Palacios https://jira.digi.com/browse/DEL-6420 --- meta-digi-arm/conf/machine/include/ccimx6.inc | 2 +- meta-digi-arm/conf/machine/include/ccimx6ul.inc | 7 +++---- meta-digi-arm/conf/machine/include/ccimx8x.inc | 2 +- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/meta-digi-arm/conf/machine/include/ccimx6.inc b/meta-digi-arm/conf/machine/include/ccimx6.inc index 7cf6abb1f..7290c136a 100644 --- a/meta-digi-arm/conf/machine/include/ccimx6.inc +++ b/meta-digi-arm/conf/machine/include/ccimx6.inc @@ -19,7 +19,7 @@ KERNEL_DEFCONFIG ?= "arch/arm/configs/ccimx6sbc_defconfig" WIRELESS_MODULE ?= "" # Firmware -MACHINE_FIRMWARE ?= "" +MACHINE_FIRMWARE ?= "firmware-imx-sdma" MACHINE_FIRMWARE_append_mx6q = " firmware-imx-vpu-imx6q" MACHINE_FIRMWARE_append_mx6dl = " firmware-imx-vpu-imx6d" diff --git a/meta-digi-arm/conf/machine/include/ccimx6ul.inc b/meta-digi-arm/conf/machine/include/ccimx6ul.inc index 863f27bc4..a19b7acd8 100644 --- a/meta-digi-arm/conf/machine/include/ccimx6ul.inc +++ b/meta-digi-arm/conf/machine/include/ccimx6ul.inc @@ -20,7 +20,9 @@ WIRELESS_MODULE_append = " ${@oe.utils.conditional('HAVE_WIFI', '1', 'kernel-mod WLAN_P2P_INTERFACE ?= "p2p0" # Firmware -MACHINE_FIRMWARE ?= "" +MACHINE_FIRMWARE ?= "firmware-imx-sdma" +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_EXTRA_RDEPENDS += " \ imx-kobs \ @@ -41,9 +43,6 @@ MACHINE_EXTRA_RRECOMMENDS_remove_use-mainline-bsp = "${@bb.utils.contains('COMBI MACHINE_FEATURES += "wifi bluetooth cryptochip" -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)}" - # mkfs.ubifs parameters for boot partition (the one holding kernel and device tree files) # Max LEB count (-c 255) calculated for a partition of up to 32 MiB considering 128 KiB erase-block size. MKUBIFS_BOOT_ARGS ?= "-m 2048 -e 126976 -c 255" diff --git a/meta-digi-arm/conf/machine/include/ccimx8x.inc b/meta-digi-arm/conf/machine/include/ccimx8x.inc index 97f856052..29fad1f67 100644 --- a/meta-digi-arm/conf/machine/include/ccimx8x.inc +++ b/meta-digi-arm/conf/machine/include/ccimx8x.inc @@ -26,7 +26,7 @@ KERNEL_DEFCONFIG ?= "arch/arm64/configs/ccimx8x_defconfig" WIRELESS_MODULE ?= "" # Firmware -MACHINE_FIRMWARE ?= "firmware-imx-vpu-imx8" +MACHINE_FIRMWARE ?= "firmware-imx-vpu-imx8 firmware-imx-sdma" MACHINE_EXTRA_RDEPENDS += " \ e2fsprogs-mke2fs \