From 42c17f72373103b74733781e7ba01bad8c560a00 Mon Sep 17 00:00:00 2001 From: Tom Hochstein Date: Fri, 16 Dec 2022 12:23:41 -0700 Subject: conf/machine: Add NXP WiFi/BT support to NXP boards Signed-off-by: Tom Hochstein --- conf/machine/imx6qdlsabreauto.conf | 2 +- conf/machine/imx6qdlsabresd.conf | 2 +- conf/machine/imx6slevk.conf | 2 +- conf/machine/imx6sllevk.conf | 2 +- conf/machine/imx6sxsabreauto.conf | 2 +- conf/machine/imx6sxsabresd.conf | 2 +- conf/machine/imx6ulevk.conf | 2 +- conf/machine/imx6ullevk.conf | 2 +- conf/machine/imx6ulz-14x14-evk.conf | 2 +- conf/machine/imx7dsabresd.conf | 2 +- conf/machine/imx7ulpevk.conf | 2 +- conf/machine/imx8mq-evk.conf | 2 +- conf/machine/imx8qm-mek.conf | 2 +- conf/machine/include/imx8dxl-evk.inc | 2 +- conf/machine/include/imx8mm-evk.inc | 2 +- conf/machine/include/imx8mn-evk.inc | 2 +- conf/machine/include/imx8mp-evk.inc | 2 +- conf/machine/include/imx8x-mek.inc | 2 +- 18 files changed, 18 insertions(+), 18 deletions(-) diff --git a/conf/machine/imx6qdlsabreauto.conf b/conf/machine/imx6qdlsabreauto.conf index b7b445898..3c6fd1519 100644 --- a/conf/machine/imx6qdlsabreauto.conf +++ b/conf/machine/imx6qdlsabreauto.conf @@ -73,4 +73,4 @@ SERIAL_CONSOLES = "115200;ttymxc3" MACHINE_FIRMWARE:append:mx6 = " linux-firmware-ath6k" -MACHINE_FEATURES += " pci wifi bluetooth" +MACHINE_FEATURES += " pci wifi bluetooth nxp8987-sdio" diff --git a/conf/machine/imx6qdlsabresd.conf b/conf/machine/imx6qdlsabresd.conf index 7c40a8608..046a7c7f4 100644 --- a/conf/machine/imx6qdlsabresd.conf +++ b/conf/machine/imx6qdlsabresd.conf @@ -79,4 +79,4 @@ SERIAL_CONSOLES = "115200;ttymxc0" MACHINE_FIRMWARE:append:mx6 = " linux-firmware-ath6k" -MACHINE_FEATURES += " pci wifi bluetooth" +MACHINE_FEATURES += " pci wifi bluetooth nxp8987-sdio" diff --git a/conf/machine/imx6slevk.conf b/conf/machine/imx6slevk.conf index a00489748..976e6a3a5 100644 --- a/conf/machine/imx6slevk.conf +++ b/conf/machine/imx6slevk.conf @@ -34,6 +34,6 @@ OPTEE_BIN_EXT = "6slevk" SERIAL_CONSOLES = "115200;ttymxc0" -MACHINE_FEATURES += "pci wifi bluetooth bcm4339 bcm43455" +MACHINE_FEATURES += "pci wifi bluetooth bcm4339 bcm43455 nxp8987-sdio" MACHINE_FIRMWARE += "linux-firmware-ath6k firmware-imx-epdc" diff --git a/conf/machine/imx6sllevk.conf b/conf/machine/imx6sllevk.conf index bd0fe73d4..43564aea7 100644 --- a/conf/machine/imx6sllevk.conf +++ b/conf/machine/imx6sllevk.conf @@ -30,7 +30,7 @@ OPTEE_BIN_EXT:imx6sllevk = "6sllevk" SERIAL_CONSOLES = "115200;ttymxc0" -MACHINE_FEATURES += "wifi bluetooth bcm4339 bcm43455" +MACHINE_FEATURES += "wifi bluetooth bcm4339 bcm43455 nxp8987-sdio" # MESA DRI library XSERVER += "mesa-driver-swrast" diff --git a/conf/machine/imx6sxsabreauto.conf b/conf/machine/imx6sxsabreauto.conf index 18f490f44..69bc901ba 100644 --- a/conf/machine/imx6sxsabreauto.conf +++ b/conf/machine/imx6sxsabreauto.conf @@ -31,4 +31,4 @@ SERIAL_CONSOLES = "115200;ttymxc3" MACHINE_FIRMWARE:append:mx6 = " linux-firmware-ath6k" -MACHINE_FEATURES += " pci wifi bluetooth" +MACHINE_FEATURES += " pci wifi bluetooth nxp8987-sdio" diff --git a/conf/machine/imx6sxsabresd.conf b/conf/machine/imx6sxsabresd.conf index 9f939ca79..45d6e2650 100644 --- a/conf/machine/imx6sxsabresd.conf +++ b/conf/machine/imx6sxsabresd.conf @@ -45,4 +45,4 @@ SERIAL_CONSOLES = "115200;ttymxc0" MACHINE_FIRMWARE:append:mx6 = " linux-firmware-ath6k" -MACHINE_FEATURES += "pci wifi bluetooth bcm4339 bcm43455" +MACHINE_FEATURES += "pci wifi bluetooth bcm4339 bcm43455 nxp8987-sdio" diff --git a/conf/machine/imx6ulevk.conf b/conf/machine/imx6ulevk.conf index e775b4b75..4232ce899 100644 --- a/conf/machine/imx6ulevk.conf +++ b/conf/machine/imx6ulevk.conf @@ -9,7 +9,7 @@ MACHINEOVERRIDES =. "mx6ul:" include conf/machine/include/imx-base.inc include conf/machine/include/arm/armv7a/tune-cortexa7.inc -MACHINE_FEATURES += "wifi bluetooth bcm4339 bcm43455" +MACHINE_FEATURES += "wifi bluetooth bcm4339 bcm43455 nxp8987-sdio" KERNEL_DEVICETREE = " \ imx6ul-14x14-evk-btwifi.dtb \ diff --git a/conf/machine/imx6ullevk.conf b/conf/machine/imx6ullevk.conf index 05847a974..d2b4843a6 100644 --- a/conf/machine/imx6ullevk.conf +++ b/conf/machine/imx6ullevk.conf @@ -9,7 +9,7 @@ MACHINEOVERRIDES =. "mx6ull:" include conf/machine/include/imx-base.inc include conf/machine/include/arm/armv7a/tune-cortexa7.inc -MACHINE_FEATURES += "wifi bluetooth bcm4339 bcm43455" +MACHINE_FEATURES += "wifi bluetooth bcm4339 bcm43455 nxp8801-sdio nxp8987-sdio" KERNEL_DEVICETREE = " \ imx6ull-14x14-evk.dtb \ diff --git a/conf/machine/imx6ulz-14x14-evk.conf b/conf/machine/imx6ulz-14x14-evk.conf index 16d259a79..994ad850c 100644 --- a/conf/machine/imx6ulz-14x14-evk.conf +++ b/conf/machine/imx6ulz-14x14-evk.conf @@ -9,7 +9,7 @@ MACHINEOVERRIDES =. "mx6ulz:" include conf/machine/include/imx-base.inc include conf/machine/include/arm/armv7a/tune-cortexa7.inc -MACHINE_FEATURES += "wifi bluetooth bcm4339 bcm43455" +MACHINE_FEATURES += "wifi bluetooth bcm4339 bcm43455 nxp8987-sdio" KERNEL_DEVICETREE = " \ imx6ulz-14x14-evk.dtb \ diff --git a/conf/machine/imx7dsabresd.conf b/conf/machine/imx7dsabresd.conf index 267d3b388..f85505ae8 100644 --- a/conf/machine/imx7dsabresd.conf +++ b/conf/machine/imx7dsabresd.conf @@ -9,7 +9,7 @@ MACHINEOVERRIDES =. "mx7:mx7d:" require conf/machine/include/imx-base.inc include conf/machine/include/arm/armv7a/tune-cortexa7.inc -MACHINE_FEATURES += "pci wifi bluetooth bcm4339 bcm43455" +MACHINE_FEATURES += "pci wifi bluetooth bcm4339 bcm43455 nxp8987-sdio" KERNEL_DEVICETREE = "imx7d-sdb.dtb" KERNEL_DEVICETREE:append:use-nxp-bsp = " \ diff --git a/conf/machine/imx7ulpevk.conf b/conf/machine/imx7ulpevk.conf index 77774e2c7..9e677cf77 100644 --- a/conf/machine/imx7ulpevk.conf +++ b/conf/machine/imx7ulpevk.conf @@ -9,7 +9,7 @@ MACHINEOVERRIDES =. "mx7:mx7ulp:" require conf/machine/include/imx-base.inc include conf/machine/include/arm/armv7a/tune-cortexa7.inc -MACHINE_FEATURES += "pci wifi bluetooth bcm43430" +MACHINE_FEATURES += "pci wifi bluetooth bcm43430 nxp8987-sdio" KERNEL_DEVICETREE = " \ imx7ulp-evk.dtb \ diff --git a/conf/machine/imx8mq-evk.conf b/conf/machine/imx8mq-evk.conf index c1abe9917..779ac4783 100644 --- a/conf/machine/imx8mq-evk.conf +++ b/conf/machine/imx8mq-evk.conf @@ -18,7 +18,7 @@ require conf/machine/include/arm/armv8a/tune-cortexa53.inc # inline NEON and FPU code generation DEFAULTTUNE:use-mainline-bsp = "cortexa53-crypto" -MACHINE_FEATURES += "pci wifi bluetooth bcm43455 bcm4356" +MACHINE_FEATURES += "pci wifi bluetooth bcm43455 bcm4356 nxp8997-pcie nxp8997-sdio nxp9098-pcie nxp9098-sdio" MACHINE_FEATURES:append:use-nxp-bsp = " optee bcm4359" MACHINE_SOCARCH_FILTER:append:mx8mq = " virtual/libopenvg virtual/libgles1 virtual/libgles2 virtual/egl virtual/mesa virtual/libgl virtual/libg2d" diff --git a/conf/machine/imx8qm-mek.conf b/conf/machine/imx8qm-mek.conf index ab5bdf9c7..a83e46eac 100644 --- a/conf/machine/imx8qm-mek.conf +++ b/conf/machine/imx8qm-mek.conf @@ -11,7 +11,7 @@ require conf/machine/include/arm/armv8a/tune-cortexa72-cortexa53.inc IMX_DEFAULT_BSP = "nxp" -MACHINE_FEATURES += "pci optee bcm43455 bcm4356" +MACHINE_FEATURES += "pci optee bcm43455 bcm4356 nxp8997-pcie nxp9098-pcie" MACHINE_FEATURES:append:use-nxp-bsp = " bcm4359" # Don't include kernels in standard images diff --git a/conf/machine/include/imx8dxl-evk.inc b/conf/machine/include/imx8dxl-evk.inc index f940fef7c..0f9aa1f08 100644 --- a/conf/machine/include/imx8dxl-evk.inc +++ b/conf/machine/include/imx8dxl-evk.inc @@ -5,7 +5,7 @@ require conf/machine/include/arm/armv8a/tune-cortexa35.inc IMX_DEFAULT_BSP = "nxp" -MACHINE_FEATURES += "pci bcm43455 bcm4356" +MACHINE_FEATURES += "pci bcm43455 bcm4356 nxp8997-pcie nxp9098-pcie" MACHINE_FEATURES:append:use-nxp-bsp = " bcm4359" # Don't include kernels in standard images diff --git a/conf/machine/include/imx8mm-evk.inc b/conf/machine/include/imx8mm-evk.inc index 0130592fb..507da6aa3 100644 --- a/conf/machine/include/imx8mm-evk.inc +++ b/conf/machine/include/imx8mm-evk.inc @@ -12,7 +12,7 @@ require conf/machine/include/arm/armv8a/tune-cortexa53.inc # inline NEON and FPU code generation DEFAULTTUNE:use-mainline-bsp = "cortexa53-crypto" -MACHINE_FEATURES += "pci wifi bluetooth bcm43455 bcm4356" +MACHINE_FEATURES += "pci wifi bluetooth bcm43455 bcm4356 nxp8987-sdio" # NXP BSP can consume proprietary jailhouse and BCM4359 firmware # Since the firmware is not available publicly, and rather distributed diff --git a/conf/machine/include/imx8mn-evk.inc b/conf/machine/include/imx8mn-evk.inc index 99dbe1e32..f44b7a9db 100644 --- a/conf/machine/include/imx8mn-evk.inc +++ b/conf/machine/include/imx8mn-evk.inc @@ -12,7 +12,7 @@ require conf/machine/include/arm/armv8a/tune-cortexa53.inc # inline NEON and FPU code generation DEFAULTTUNE:use-mainline-bsp = "cortexa53-crypto" -MACHINE_FEATURES += "wifi bluetooth bcm43455 bcm4356" +MACHINE_FEATURES += "wifi bluetooth bcm43455 bcm4356 nxp8987-sdio" # NXP BSP can consume proprietary jailhouse and Broadcom drivers # OP-TEE is also applicable to NXP BSP, mainline BSP seems not to have diff --git a/conf/machine/include/imx8mp-evk.inc b/conf/machine/include/imx8mp-evk.inc index 2f630ab4b..8866331cc 100644 --- a/conf/machine/include/imx8mp-evk.inc +++ b/conf/machine/include/imx8mp-evk.inc @@ -12,7 +12,7 @@ require conf/machine/include/arm/armv8a/tune-cortexa53.inc # inline NEON and FPU code generation DEFAULTTUNE:use-mainline-bsp = "cortexa53-crypto" -MACHINE_FEATURES += "pci wifi bluetooth" +MACHINE_FEATURES += "pci wifi bluetooth nxp8997-pcie nxp8997-sdio nxp9098-pcie nxp9098-sdio" # NXP BSP can consume proprietary jailhouse and Marvell drivers # OP-TEE is also applicable to NXP BSP, mainline BSP seems not to have diff --git a/conf/machine/include/imx8x-mek.inc b/conf/machine/include/imx8x-mek.inc index 55bce728d..9eaa77c53 100644 --- a/conf/machine/include/imx8x-mek.inc +++ b/conf/machine/include/imx8x-mek.inc @@ -3,7 +3,7 @@ require conf/machine/include/arm/armv8a/tune-cortexa35.inc IMX_DEFAULT_BSP = "nxp" -MACHINE_FEATURES += "pci optee bcm43455 bcm4356" +MACHINE_FEATURES += "pci optee bcm43455 bcm4356 nxp8997-pcie nxp9098-pcie" MACHINE_FEATURES:append:use-nxp-bsp = " bcm4359" # Don't include kernels in standard images -- cgit v1.2.3-54-g00ecf