summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTom Hochstein <tom.hochstein@nxp.com>2022-12-16 12:23:41 -0700
committerTom Hochstein <tom.hochstein@nxp.com>2022-12-27 11:46:37 -0700
commit42c17f72373103b74733781e7ba01bad8c560a00 (patch)
tree992a080a1c99d3c2e45a2b8b2d8eb0ed433c2a71
parent2c188229155c84830bbfaba5c038184c7d137c3d (diff)
downloadmeta-freescale-42c17f72373103b74733781e7ba01bad8c560a00.tar.gz
conf/machine: Add NXP WiFi/BT support to NXP boards
Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
-rw-r--r--conf/machine/imx6qdlsabreauto.conf2
-rw-r--r--conf/machine/imx6qdlsabresd.conf2
-rw-r--r--conf/machine/imx6slevk.conf2
-rw-r--r--conf/machine/imx6sllevk.conf2
-rw-r--r--conf/machine/imx6sxsabreauto.conf2
-rw-r--r--conf/machine/imx6sxsabresd.conf2
-rw-r--r--conf/machine/imx6ulevk.conf2
-rw-r--r--conf/machine/imx6ullevk.conf2
-rw-r--r--conf/machine/imx6ulz-14x14-evk.conf2
-rw-r--r--conf/machine/imx7dsabresd.conf2
-rw-r--r--conf/machine/imx7ulpevk.conf2
-rw-r--r--conf/machine/imx8mq-evk.conf2
-rw-r--r--conf/machine/imx8qm-mek.conf2
-rw-r--r--conf/machine/include/imx8dxl-evk.inc2
-rw-r--r--conf/machine/include/imx8mm-evk.inc2
-rw-r--r--conf/machine/include/imx8mn-evk.inc2
-rw-r--r--conf/machine/include/imx8mp-evk.inc2
-rw-r--r--conf/machine/include/imx8x-mek.inc2
18 files changed, 18 insertions, 18 deletions
diff --git a/conf/machine/imx6qdlsabreauto.conf b/conf/machine/imx6qdlsabreauto.conf
index b7b44589..3c6fd151 100644
--- a/conf/machine/imx6qdlsabreauto.conf
+++ b/conf/machine/imx6qdlsabreauto.conf
@@ -73,4 +73,4 @@ SERIAL_CONSOLES = "115200;ttymxc3"
73 73
74MACHINE_FIRMWARE:append:mx6 = " linux-firmware-ath6k" 74MACHINE_FIRMWARE:append:mx6 = " linux-firmware-ath6k"
75 75
76MACHINE_FEATURES += " pci wifi bluetooth" 76MACHINE_FEATURES += " pci wifi bluetooth nxp8987-sdio"
diff --git a/conf/machine/imx6qdlsabresd.conf b/conf/machine/imx6qdlsabresd.conf
index 7c40a860..046a7c7f 100644
--- a/conf/machine/imx6qdlsabresd.conf
+++ b/conf/machine/imx6qdlsabresd.conf
@@ -79,4 +79,4 @@ SERIAL_CONSOLES = "115200;ttymxc0"
79 79
80MACHINE_FIRMWARE:append:mx6 = " linux-firmware-ath6k" 80MACHINE_FIRMWARE:append:mx6 = " linux-firmware-ath6k"
81 81
82MACHINE_FEATURES += " pci wifi bluetooth" 82MACHINE_FEATURES += " pci wifi bluetooth nxp8987-sdio"
diff --git a/conf/machine/imx6slevk.conf b/conf/machine/imx6slevk.conf
index a0048974..976e6a3a 100644
--- a/conf/machine/imx6slevk.conf
+++ b/conf/machine/imx6slevk.conf
@@ -34,6 +34,6 @@ OPTEE_BIN_EXT = "6slevk"
34 34
35SERIAL_CONSOLES = "115200;ttymxc0" 35SERIAL_CONSOLES = "115200;ttymxc0"
36 36
37MACHINE_FEATURES += "pci wifi bluetooth bcm4339 bcm43455" 37MACHINE_FEATURES += "pci wifi bluetooth bcm4339 bcm43455 nxp8987-sdio"
38 38
39MACHINE_FIRMWARE += "linux-firmware-ath6k firmware-imx-epdc" 39MACHINE_FIRMWARE += "linux-firmware-ath6k firmware-imx-epdc"
diff --git a/conf/machine/imx6sllevk.conf b/conf/machine/imx6sllevk.conf
index bd0fe73d..43564aea 100644
--- a/conf/machine/imx6sllevk.conf
+++ b/conf/machine/imx6sllevk.conf
@@ -30,7 +30,7 @@ OPTEE_BIN_EXT:imx6sllevk = "6sllevk"
30 30
31SERIAL_CONSOLES = "115200;ttymxc0" 31SERIAL_CONSOLES = "115200;ttymxc0"
32 32
33MACHINE_FEATURES += "wifi bluetooth bcm4339 bcm43455" 33MACHINE_FEATURES += "wifi bluetooth bcm4339 bcm43455 nxp8987-sdio"
34 34
35# MESA DRI library 35# MESA DRI library
36XSERVER += "mesa-driver-swrast" 36XSERVER += "mesa-driver-swrast"
diff --git a/conf/machine/imx6sxsabreauto.conf b/conf/machine/imx6sxsabreauto.conf
index 18f490f4..69bc901b 100644
--- a/conf/machine/imx6sxsabreauto.conf
+++ b/conf/machine/imx6sxsabreauto.conf
@@ -31,4 +31,4 @@ SERIAL_CONSOLES = "115200;ttymxc3"
31 31
32MACHINE_FIRMWARE:append:mx6 = " linux-firmware-ath6k" 32MACHINE_FIRMWARE:append:mx6 = " linux-firmware-ath6k"
33 33
34MACHINE_FEATURES += " pci wifi bluetooth" 34MACHINE_FEATURES += " pci wifi bluetooth nxp8987-sdio"
diff --git a/conf/machine/imx6sxsabresd.conf b/conf/machine/imx6sxsabresd.conf
index 9f939ca7..45d6e265 100644
--- a/conf/machine/imx6sxsabresd.conf
+++ b/conf/machine/imx6sxsabresd.conf
@@ -45,4 +45,4 @@ SERIAL_CONSOLES = "115200;ttymxc0"
45 45
46MACHINE_FIRMWARE:append:mx6 = " linux-firmware-ath6k" 46MACHINE_FIRMWARE:append:mx6 = " linux-firmware-ath6k"
47 47
48MACHINE_FEATURES += "pci wifi bluetooth bcm4339 bcm43455" 48MACHINE_FEATURES += "pci wifi bluetooth bcm4339 bcm43455 nxp8987-sdio"
diff --git a/conf/machine/imx6ulevk.conf b/conf/machine/imx6ulevk.conf
index e775b4b7..4232ce89 100644
--- a/conf/machine/imx6ulevk.conf
+++ b/conf/machine/imx6ulevk.conf
@@ -9,7 +9,7 @@ MACHINEOVERRIDES =. "mx6ul:"
9include conf/machine/include/imx-base.inc 9include conf/machine/include/imx-base.inc
10include conf/machine/include/arm/armv7a/tune-cortexa7.inc 10include conf/machine/include/arm/armv7a/tune-cortexa7.inc
11 11
12MACHINE_FEATURES += "wifi bluetooth bcm4339 bcm43455" 12MACHINE_FEATURES += "wifi bluetooth bcm4339 bcm43455 nxp8987-sdio"
13 13
14KERNEL_DEVICETREE = " \ 14KERNEL_DEVICETREE = " \
15 imx6ul-14x14-evk-btwifi.dtb \ 15 imx6ul-14x14-evk-btwifi.dtb \
diff --git a/conf/machine/imx6ullevk.conf b/conf/machine/imx6ullevk.conf
index 05847a97..d2b4843a 100644
--- a/conf/machine/imx6ullevk.conf
+++ b/conf/machine/imx6ullevk.conf
@@ -9,7 +9,7 @@ MACHINEOVERRIDES =. "mx6ull:"
9include conf/machine/include/imx-base.inc 9include conf/machine/include/imx-base.inc
10include conf/machine/include/arm/armv7a/tune-cortexa7.inc 10include conf/machine/include/arm/armv7a/tune-cortexa7.inc
11 11
12MACHINE_FEATURES += "wifi bluetooth bcm4339 bcm43455" 12MACHINE_FEATURES += "wifi bluetooth bcm4339 bcm43455 nxp8801-sdio nxp8987-sdio"
13 13
14KERNEL_DEVICETREE = " \ 14KERNEL_DEVICETREE = " \
15 imx6ull-14x14-evk.dtb \ 15 imx6ull-14x14-evk.dtb \
diff --git a/conf/machine/imx6ulz-14x14-evk.conf b/conf/machine/imx6ulz-14x14-evk.conf
index 16d259a7..994ad850 100644
--- a/conf/machine/imx6ulz-14x14-evk.conf
+++ b/conf/machine/imx6ulz-14x14-evk.conf
@@ -9,7 +9,7 @@ MACHINEOVERRIDES =. "mx6ulz:"
9include conf/machine/include/imx-base.inc 9include conf/machine/include/imx-base.inc
10include conf/machine/include/arm/armv7a/tune-cortexa7.inc 10include conf/machine/include/arm/armv7a/tune-cortexa7.inc
11 11
12MACHINE_FEATURES += "wifi bluetooth bcm4339 bcm43455" 12MACHINE_FEATURES += "wifi bluetooth bcm4339 bcm43455 nxp8987-sdio"
13 13
14KERNEL_DEVICETREE = " \ 14KERNEL_DEVICETREE = " \
15 imx6ulz-14x14-evk.dtb \ 15 imx6ulz-14x14-evk.dtb \
diff --git a/conf/machine/imx7dsabresd.conf b/conf/machine/imx7dsabresd.conf
index 267d3b38..f85505ae 100644
--- a/conf/machine/imx7dsabresd.conf
+++ b/conf/machine/imx7dsabresd.conf
@@ -9,7 +9,7 @@ MACHINEOVERRIDES =. "mx7:mx7d:"
9require conf/machine/include/imx-base.inc 9require conf/machine/include/imx-base.inc
10include conf/machine/include/arm/armv7a/tune-cortexa7.inc 10include conf/machine/include/arm/armv7a/tune-cortexa7.inc
11 11
12MACHINE_FEATURES += "pci wifi bluetooth bcm4339 bcm43455" 12MACHINE_FEATURES += "pci wifi bluetooth bcm4339 bcm43455 nxp8987-sdio"
13 13
14KERNEL_DEVICETREE = "imx7d-sdb.dtb" 14KERNEL_DEVICETREE = "imx7d-sdb.dtb"
15KERNEL_DEVICETREE:append:use-nxp-bsp = " \ 15KERNEL_DEVICETREE:append:use-nxp-bsp = " \
diff --git a/conf/machine/imx7ulpevk.conf b/conf/machine/imx7ulpevk.conf
index 77774e2c..9e677cf7 100644
--- a/conf/machine/imx7ulpevk.conf
+++ b/conf/machine/imx7ulpevk.conf
@@ -9,7 +9,7 @@ MACHINEOVERRIDES =. "mx7:mx7ulp:"
9require conf/machine/include/imx-base.inc 9require conf/machine/include/imx-base.inc
10include conf/machine/include/arm/armv7a/tune-cortexa7.inc 10include conf/machine/include/arm/armv7a/tune-cortexa7.inc
11 11
12MACHINE_FEATURES += "pci wifi bluetooth bcm43430" 12MACHINE_FEATURES += "pci wifi bluetooth bcm43430 nxp8987-sdio"
13 13
14KERNEL_DEVICETREE = " \ 14KERNEL_DEVICETREE = " \
15 imx7ulp-evk.dtb \ 15 imx7ulp-evk.dtb \
diff --git a/conf/machine/imx8mq-evk.conf b/conf/machine/imx8mq-evk.conf
index c1abe991..779ac478 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
18# inline NEON and FPU code generation 18# inline NEON and FPU code generation
19DEFAULTTUNE:use-mainline-bsp = "cortexa53-crypto" 19DEFAULTTUNE:use-mainline-bsp = "cortexa53-crypto"
20 20
21MACHINE_FEATURES += "pci wifi bluetooth bcm43455 bcm4356" 21MACHINE_FEATURES += "pci wifi bluetooth bcm43455 bcm4356 nxp8997-pcie nxp8997-sdio nxp9098-pcie nxp9098-sdio"
22MACHINE_FEATURES:append:use-nxp-bsp = " optee bcm4359" 22MACHINE_FEATURES:append:use-nxp-bsp = " optee bcm4359"
23 23
24MACHINE_SOCARCH_FILTER:append:mx8mq = " virtual/libopenvg virtual/libgles1 virtual/libgles2 virtual/egl virtual/mesa virtual/libgl virtual/libg2d" 24MACHINE_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 ab5bdf9c..a83e46ea 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
11 11
12IMX_DEFAULT_BSP = "nxp" 12IMX_DEFAULT_BSP = "nxp"
13 13
14MACHINE_FEATURES += "pci optee bcm43455 bcm4356" 14MACHINE_FEATURES += "pci optee bcm43455 bcm4356 nxp8997-pcie nxp9098-pcie"
15MACHINE_FEATURES:append:use-nxp-bsp = " bcm4359" 15MACHINE_FEATURES:append:use-nxp-bsp = " bcm4359"
16 16
17# Don't include kernels in standard images 17# Don't include kernels in standard images
diff --git a/conf/machine/include/imx8dxl-evk.inc b/conf/machine/include/imx8dxl-evk.inc
index f940fef7..0f9aa1f0 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
5 5
6IMX_DEFAULT_BSP = "nxp" 6IMX_DEFAULT_BSP = "nxp"
7 7
8MACHINE_FEATURES += "pci bcm43455 bcm4356" 8MACHINE_FEATURES += "pci bcm43455 bcm4356 nxp8997-pcie nxp9098-pcie"
9MACHINE_FEATURES:append:use-nxp-bsp = " bcm4359" 9MACHINE_FEATURES:append:use-nxp-bsp = " bcm4359"
10 10
11# Don't include kernels in standard images 11# Don't include kernels in standard images
diff --git a/conf/machine/include/imx8mm-evk.inc b/conf/machine/include/imx8mm-evk.inc
index 0130592f..507da6aa 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
12# inline NEON and FPU code generation 12# inline NEON and FPU code generation
13DEFAULTTUNE:use-mainline-bsp = "cortexa53-crypto" 13DEFAULTTUNE:use-mainline-bsp = "cortexa53-crypto"
14 14
15MACHINE_FEATURES += "pci wifi bluetooth bcm43455 bcm4356" 15MACHINE_FEATURES += "pci wifi bluetooth bcm43455 bcm4356 nxp8987-sdio"
16 16
17# NXP BSP can consume proprietary jailhouse and BCM4359 firmware 17# NXP BSP can consume proprietary jailhouse and BCM4359 firmware
18# Since the firmware is not available publicly, and rather distributed 18# 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 99dbe1e3..f44b7a9d 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
12# inline NEON and FPU code generation 12# inline NEON and FPU code generation
13DEFAULTTUNE:use-mainline-bsp = "cortexa53-crypto" 13DEFAULTTUNE:use-mainline-bsp = "cortexa53-crypto"
14 14
15MACHINE_FEATURES += "wifi bluetooth bcm43455 bcm4356" 15MACHINE_FEATURES += "wifi bluetooth bcm43455 bcm4356 nxp8987-sdio"
16 16
17# NXP BSP can consume proprietary jailhouse and Broadcom drivers 17# NXP BSP can consume proprietary jailhouse and Broadcom drivers
18# OP-TEE is also applicable to NXP BSP, mainline BSP seems not to have 18# 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 2f630ab4..8866331c 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
12# inline NEON and FPU code generation 12# inline NEON and FPU code generation
13DEFAULTTUNE:use-mainline-bsp = "cortexa53-crypto" 13DEFAULTTUNE:use-mainline-bsp = "cortexa53-crypto"
14 14
15MACHINE_FEATURES += "pci wifi bluetooth" 15MACHINE_FEATURES += "pci wifi bluetooth nxp8997-pcie nxp8997-sdio nxp9098-pcie nxp9098-sdio"
16 16
17# NXP BSP can consume proprietary jailhouse and Marvell drivers 17# NXP BSP can consume proprietary jailhouse and Marvell drivers
18# OP-TEE is also applicable to NXP BSP, mainline BSP seems not to have 18# 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 55bce728..9eaa77c5 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
3 3
4IMX_DEFAULT_BSP = "nxp" 4IMX_DEFAULT_BSP = "nxp"
5 5
6MACHINE_FEATURES += "pci optee bcm43455 bcm4356" 6MACHINE_FEATURES += "pci optee bcm43455 bcm4356 nxp8997-pcie nxp9098-pcie"
7MACHINE_FEATURES:append:use-nxp-bsp = " bcm4359" 7MACHINE_FEATURES:append:use-nxp-bsp = " bcm4359"
8 8
9# Don't include kernels in standard images 9# Don't include kernels in standard images