mx8: move non soc specific fw out of imx-base

It is unlikely that all future mx8 machines will require ath10k fw. So add
it in the specific board configuration and not in imx-base.inc.

Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>

diff --git a/conf/machine/imx8mmevk.conf b/conf/machine/imx8mmevk.conf
index 1515d5d8b7b9101d8231fc0978eca70747c37129..820011010e9732eab48ea4fb07d596a0045e381f 100644 (file)
--- a/conf/machine/imx8mmevk.conf
+++ b/conf/machine/imx8mmevk.conf
@@ -54,3 +54,6 @@ UBOOT_MAKE_TARGET = ""
 IMX_BOOT_SEEK = "33"
 
 OPTEE_BIN_EXT = "8mm"
+
+# Add additional firmware
+MACHINE_FIRMWARE_append = " linux-firmware-ath10k"

diff --git a/conf/machine/imx8mqevk.conf b/conf/machine/imx8mqevk.conf
index 1fe0c76940de78a625bb8576e882ee900aea25bb..f3280b9c910a84b5938921d8b92227680ebec12d 100644 (file)
--- a/conf/machine/imx8mqevk.conf
+++ b/conf/machine/imx8mqevk.conf
@@ -51,3 +51,6 @@ UBOOT_MAKE_TARGET = ""
 IMX_BOOT_SEEK = "33"
 
 OPTEE_BIN_EXT = "8mq"
+
+# Add additional firmware
+MACHINE_FIRMWARE_append = " linux-firmware-ath10k"

diff --git a/conf/machine/imx8qmmek.conf b/conf/machine/imx8qmmek.conf
index b71dfcadcfe9b9fb09f337a67fbd3a8de1b4c201..e1f26b44ff1b2d8ae0418c29ebe79a257b905786 100644 (file)
--- a/conf/machine/imx8qmmek.conf
+++ b/conf/machine/imx8qmmek.conf
@@ -47,3 +47,6 @@ IMAGE_BOOTFILES_DEPENDS += "firmware-imx:do_deploy"
 IMAGE_BOOTFILES += "hdmitxfw.bin hdmirxfw.bin dpfw.bin"
 
 BOARD_TYPE = "mek"
+
+# Add additional firmware
+MACHINE_FIRMWARE_append = " linux-firmware-ath10k"

diff --git a/conf/machine/imx8qxpmek.conf b/conf/machine/imx8qxpmek.conf
index 61cb51fdb3fbdd96fe83782d67b8969311781c89..2ffbcacc2d7bdc27507d99c8e2b7486c3ded966e 100644 (file)
--- a/conf/machine/imx8qxpmek.conf
+++ b/conf/machine/imx8qxpmek.conf
@@ -38,3 +38,6 @@ IMAGE_BOOTLOADER = "imx-boot"
 IMX_BOOT_SEEK = "32"
 
 BOARD_TYPE = "mek"
+
+# Add additional firmware
+MACHINE_FIRMWARE_append = " linux-firmware-ath10k"

diff --git a/conf/machine/include/imx-base.inc b/conf/machine/include/imx-base.inc
index a0f13a7683acbe098404758c7506634c333a2d10..572e8e5e6f421683892d40ae59d75038bd6c5564 100644 (file)
--- a/conf/machine/include/imx-base.inc
+++ b/conf/machine/include/imx-base.inc
@@ -197,7 +197,6 @@ MACHINE_FIRMWARE_append_mx6sll = " firmware-imx-epdc"
 MACHINE_FIRMWARE_append_mx6ull = " firmware-imx-epdc"
 MACHINE_FIRMWARE_append_mx53 = " firmware-imx-vpu-imx53 firmware-imx-sdma-imx53"
 MACHINE_FIRMWARE_append_mx51 = " firmware-imx-vpu-imx51 firmware-imx-sdma-imx51"
-MACHINE_FIRMWARE_append_mx8 = " linux-firmware-ath10k"
 MACHINE_FIRMWARE_append_mx8qxp = " firmware-imx-vpu-imx8qxp"
 MACHINE_FIRMWARE_append_use-mainline-bsp = " linux-firmware-imx-sdma-imx6q linux-firmware-imx-sdma-imx7d firmware-imx-vpu-imx6q firmware-imx-vpu-imx6d"