From a97c71c6311a360cb1689a9746220d0ee0aae4b9 Mon Sep 17 00:00:00 2001 From: Max Krummenacher Date: Sun, 6 Jan 2019 13:02:45 +0100 Subject: [PATCH] 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 --- conf/machine/imx8mmevk.conf | 3 +++ conf/machine/imx8mqevk.conf | 3 +++ conf/machine/imx8qmmek.conf | 3 +++ conf/machine/imx8qxpmek.conf | 3 +++ conf/machine/include/imx-base.inc | 1 - 5 files changed, 12 insertions(+), 1 deletion(-) diff --git a/conf/machine/imx8mmevk.conf b/conf/machine/imx8mmevk.conf index 1515d5d8..82001101 100644 --- 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 1fe0c769..f3280b9c 100644 --- 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 b71dfcad..e1f26b44 100644 --- 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 61cb51fd..2ffbcacc 100644 --- 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 a0f13a76..572e8e5e 100644 --- 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" -- 2.40.1