diff options
| -rw-r--r-- | conf/machine/imx6qdlsabreauto.conf | 2 | ||||
| -rw-r--r-- | conf/machine/imx6qdlsabresd.conf | 2 | ||||
| -rw-r--r-- | conf/machine/imx6slevk.conf | 2 | ||||
| -rw-r--r-- | conf/machine/imx6sllevk.conf | 2 | ||||
| -rw-r--r-- | conf/machine/imx6sxsabreauto.conf | 2 | ||||
| -rw-r--r-- | conf/machine/imx6sxsabresd.conf | 2 | ||||
| -rw-r--r-- | conf/machine/imx6ulevk.conf | 2 | ||||
| -rw-r--r-- | conf/machine/imx6ullevk.conf | 2 | ||||
| -rw-r--r-- | conf/machine/imx6ulz-14x14-evk.conf | 2 | ||||
| -rw-r--r-- | conf/machine/imx7dsabresd.conf | 2 | ||||
| -rw-r--r-- | conf/machine/imx7ulpevk.conf | 2 | ||||
| -rw-r--r-- | conf/machine/imx8mq-evk.conf | 2 | ||||
| -rw-r--r-- | conf/machine/imx8qm-mek.conf | 2 | ||||
| -rw-r--r-- | conf/machine/include/imx8dxl-evk.inc | 2 | ||||
| -rw-r--r-- | conf/machine/include/imx8mm-evk.inc | 2 | ||||
| -rw-r--r-- | conf/machine/include/imx8mn-evk.inc | 2 | ||||
| -rw-r--r-- | conf/machine/include/imx8mp-evk.inc | 2 | ||||
| -rw-r--r-- | 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" | |||
| 73 | 73 | ||
| 74 | MACHINE_FIRMWARE:append:mx6 = " linux-firmware-ath6k" | 74 | MACHINE_FIRMWARE:append:mx6 = " linux-firmware-ath6k" |
| 75 | 75 | ||
| 76 | MACHINE_FEATURES += " pci wifi bluetooth" | 76 | 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" | |||
| 79 | 79 | ||
| 80 | MACHINE_FIRMWARE:append:mx6 = " linux-firmware-ath6k" | 80 | MACHINE_FIRMWARE:append:mx6 = " linux-firmware-ath6k" |
| 81 | 81 | ||
| 82 | MACHINE_FEATURES += " pci wifi bluetooth" | 82 | 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" | |||
| 34 | 34 | ||
| 35 | SERIAL_CONSOLES = "115200;ttymxc0" | 35 | SERIAL_CONSOLES = "115200;ttymxc0" |
| 36 | 36 | ||
| 37 | MACHINE_FEATURES += "pci wifi bluetooth bcm4339 bcm43455" | 37 | MACHINE_FEATURES += "pci wifi bluetooth bcm4339 bcm43455 nxp8987-sdio" |
| 38 | 38 | ||
| 39 | MACHINE_FIRMWARE += "linux-firmware-ath6k firmware-imx-epdc" | 39 | 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" | |||
| 30 | 30 | ||
| 31 | SERIAL_CONSOLES = "115200;ttymxc0" | 31 | SERIAL_CONSOLES = "115200;ttymxc0" |
| 32 | 32 | ||
| 33 | MACHINE_FEATURES += "wifi bluetooth bcm4339 bcm43455" | 33 | MACHINE_FEATURES += "wifi bluetooth bcm4339 bcm43455 nxp8987-sdio" |
| 34 | 34 | ||
| 35 | # MESA DRI library | 35 | # MESA DRI library |
| 36 | XSERVER += "mesa-driver-swrast" | 36 | 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" | |||
| 31 | 31 | ||
| 32 | MACHINE_FIRMWARE:append:mx6 = " linux-firmware-ath6k" | 32 | MACHINE_FIRMWARE:append:mx6 = " linux-firmware-ath6k" |
| 33 | 33 | ||
| 34 | MACHINE_FEATURES += " pci wifi bluetooth" | 34 | 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" | |||
| 45 | 45 | ||
| 46 | MACHINE_FIRMWARE:append:mx6 = " linux-firmware-ath6k" | 46 | MACHINE_FIRMWARE:append:mx6 = " linux-firmware-ath6k" |
| 47 | 47 | ||
| 48 | MACHINE_FEATURES += "pci wifi bluetooth bcm4339 bcm43455" | 48 | 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:" | |||
| 9 | include conf/machine/include/imx-base.inc | 9 | include conf/machine/include/imx-base.inc |
| 10 | include conf/machine/include/arm/armv7a/tune-cortexa7.inc | 10 | include conf/machine/include/arm/armv7a/tune-cortexa7.inc |
| 11 | 11 | ||
| 12 | MACHINE_FEATURES += "wifi bluetooth bcm4339 bcm43455" | 12 | MACHINE_FEATURES += "wifi bluetooth bcm4339 bcm43455 nxp8987-sdio" |
| 13 | 13 | ||
| 14 | KERNEL_DEVICETREE = " \ | 14 | KERNEL_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 05847a974..d2b4843a6 100644 --- a/conf/machine/imx6ullevk.conf +++ b/conf/machine/imx6ullevk.conf | |||
| @@ -9,7 +9,7 @@ MACHINEOVERRIDES =. "mx6ull:" | |||
| 9 | include conf/machine/include/imx-base.inc | 9 | include conf/machine/include/imx-base.inc |
| 10 | include conf/machine/include/arm/armv7a/tune-cortexa7.inc | 10 | include conf/machine/include/arm/armv7a/tune-cortexa7.inc |
| 11 | 11 | ||
| 12 | MACHINE_FEATURES += "wifi bluetooth bcm4339 bcm43455" | 12 | MACHINE_FEATURES += "wifi bluetooth bcm4339 bcm43455 nxp8801-sdio nxp8987-sdio" |
| 13 | 13 | ||
| 14 | KERNEL_DEVICETREE = " \ | 14 | KERNEL_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 16d259a79..994ad850c 100644 --- a/conf/machine/imx6ulz-14x14-evk.conf +++ b/conf/machine/imx6ulz-14x14-evk.conf | |||
| @@ -9,7 +9,7 @@ MACHINEOVERRIDES =. "mx6ulz:" | |||
| 9 | include conf/machine/include/imx-base.inc | 9 | include conf/machine/include/imx-base.inc |
| 10 | include conf/machine/include/arm/armv7a/tune-cortexa7.inc | 10 | include conf/machine/include/arm/armv7a/tune-cortexa7.inc |
| 11 | 11 | ||
| 12 | MACHINE_FEATURES += "wifi bluetooth bcm4339 bcm43455" | 12 | MACHINE_FEATURES += "wifi bluetooth bcm4339 bcm43455 nxp8987-sdio" |
| 13 | 13 | ||
| 14 | KERNEL_DEVICETREE = " \ | 14 | KERNEL_DEVICETREE = " \ |
| 15 | imx6ulz-14x14-evk.dtb \ | 15 | 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:" | |||
| 9 | require conf/machine/include/imx-base.inc | 9 | require conf/machine/include/imx-base.inc |
| 10 | include conf/machine/include/arm/armv7a/tune-cortexa7.inc | 10 | include conf/machine/include/arm/armv7a/tune-cortexa7.inc |
| 11 | 11 | ||
| 12 | MACHINE_FEATURES += "pci wifi bluetooth bcm4339 bcm43455" | 12 | MACHINE_FEATURES += "pci wifi bluetooth bcm4339 bcm43455 nxp8987-sdio" |
| 13 | 13 | ||
| 14 | KERNEL_DEVICETREE = "imx7d-sdb.dtb" | 14 | KERNEL_DEVICETREE = "imx7d-sdb.dtb" |
| 15 | KERNEL_DEVICETREE:append:use-nxp-bsp = " \ | 15 | 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:" | |||
| 9 | require conf/machine/include/imx-base.inc | 9 | require conf/machine/include/imx-base.inc |
| 10 | include conf/machine/include/arm/armv7a/tune-cortexa7.inc | 10 | include conf/machine/include/arm/armv7a/tune-cortexa7.inc |
| 11 | 11 | ||
| 12 | MACHINE_FEATURES += "pci wifi bluetooth bcm43430" | 12 | MACHINE_FEATURES += "pci wifi bluetooth bcm43430 nxp8987-sdio" |
| 13 | 13 | ||
| 14 | KERNEL_DEVICETREE = " \ | 14 | KERNEL_DEVICETREE = " \ |
| 15 | imx7ulp-evk.dtb \ | 15 | 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 | |||
| 18 | # inline NEON and FPU code generation | 18 | # inline NEON and FPU code generation |
| 19 | DEFAULTTUNE:use-mainline-bsp = "cortexa53-crypto" | 19 | DEFAULTTUNE:use-mainline-bsp = "cortexa53-crypto" |
| 20 | 20 | ||
| 21 | MACHINE_FEATURES += "pci wifi bluetooth bcm43455 bcm4356" | 21 | MACHINE_FEATURES += "pci wifi bluetooth bcm43455 bcm4356 nxp8997-pcie nxp8997-sdio nxp9098-pcie nxp9098-sdio" |
| 22 | MACHINE_FEATURES:append:use-nxp-bsp = " optee bcm4359" | 22 | MACHINE_FEATURES:append:use-nxp-bsp = " optee bcm4359" |
| 23 | 23 | ||
| 24 | MACHINE_SOCARCH_FILTER:append:mx8mq = " virtual/libopenvg virtual/libgles1 virtual/libgles2 virtual/egl virtual/mesa virtual/libgl virtual/libg2d" | 24 | 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 | |||
| 11 | 11 | ||
| 12 | IMX_DEFAULT_BSP = "nxp" | 12 | IMX_DEFAULT_BSP = "nxp" |
| 13 | 13 | ||
| 14 | MACHINE_FEATURES += "pci optee bcm43455 bcm4356" | 14 | MACHINE_FEATURES += "pci optee bcm43455 bcm4356 nxp8997-pcie nxp9098-pcie" |
| 15 | MACHINE_FEATURES:append:use-nxp-bsp = " bcm4359" | 15 | MACHINE_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 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 | |||
| 5 | 5 | ||
| 6 | IMX_DEFAULT_BSP = "nxp" | 6 | IMX_DEFAULT_BSP = "nxp" |
| 7 | 7 | ||
| 8 | MACHINE_FEATURES += "pci bcm43455 bcm4356" | 8 | MACHINE_FEATURES += "pci bcm43455 bcm4356 nxp8997-pcie nxp9098-pcie" |
| 9 | MACHINE_FEATURES:append:use-nxp-bsp = " bcm4359" | 9 | MACHINE_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 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 | |||
| 12 | # inline NEON and FPU code generation | 12 | # inline NEON and FPU code generation |
| 13 | DEFAULTTUNE:use-mainline-bsp = "cortexa53-crypto" | 13 | DEFAULTTUNE:use-mainline-bsp = "cortexa53-crypto" |
| 14 | 14 | ||
| 15 | MACHINE_FEATURES += "pci wifi bluetooth bcm43455 bcm4356" | 15 | MACHINE_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 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 | |||
| 12 | # inline NEON and FPU code generation | 12 | # inline NEON and FPU code generation |
| 13 | DEFAULTTUNE:use-mainline-bsp = "cortexa53-crypto" | 13 | DEFAULTTUNE:use-mainline-bsp = "cortexa53-crypto" |
| 14 | 14 | ||
| 15 | MACHINE_FEATURES += "wifi bluetooth bcm43455 bcm4356" | 15 | MACHINE_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 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 | |||
| 12 | # inline NEON and FPU code generation | 12 | # inline NEON and FPU code generation |
| 13 | DEFAULTTUNE:use-mainline-bsp = "cortexa53-crypto" | 13 | DEFAULTTUNE:use-mainline-bsp = "cortexa53-crypto" |
| 14 | 14 | ||
| 15 | MACHINE_FEATURES += "pci wifi bluetooth" | 15 | MACHINE_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 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 | |||
| 3 | 3 | ||
| 4 | IMX_DEFAULT_BSP = "nxp" | 4 | IMX_DEFAULT_BSP = "nxp" |
| 5 | 5 | ||
| 6 | MACHINE_FEATURES += "pci optee bcm43455 bcm4356" | 6 | MACHINE_FEATURES += "pci optee bcm43455 bcm4356 nxp8997-pcie nxp9098-pcie" |
| 7 | MACHINE_FEATURES:append:use-nxp-bsp = " bcm4359" | 7 | MACHINE_FEATURES:append:use-nxp-bsp = " bcm4359" |
| 8 | 8 | ||
| 9 | # Don't include kernels in standard images | 9 | # Don't include kernels in standard images |
