diff options
Diffstat (limited to 'conf/machine/include')
-rw-r--r-- | conf/machine/include/imx-base.inc | 22 | ||||
-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 |
6 files changed, 24 insertions, 8 deletions
diff --git a/conf/machine/include/imx-base.inc b/conf/machine/include/imx-base.inc index d5458165..b2d8ddf1 100644 --- a/conf/machine/include/imx-base.inc +++ b/conf/machine/include/imx-base.inc | |||
@@ -400,10 +400,26 @@ MACHINE_FIRMWARE:append = " ${@bb.utils.contains('MACHINE_FEATURES', 'bcm4339', | |||
400 | MACHINE_FIRMWARE:append = " ${@bb.utils.contains('MACHINE_FEATURES', 'bcm43430', 'linux-firmware-bcm43430', '', d)}" | 400 | MACHINE_FIRMWARE:append = " ${@bb.utils.contains('MACHINE_FEATURES', 'bcm43430', 'linux-firmware-bcm43430', '', d)}" |
401 | MACHINE_FIRMWARE:append = " ${@bb.utils.contains('MACHINE_FEATURES', 'bcm43455', 'linux-firmware-bcm43455', '', d)}" | 401 | MACHINE_FIRMWARE:append = " ${@bb.utils.contains('MACHINE_FEATURES', 'bcm43455', 'linux-firmware-bcm43455', '', d)}" |
402 | MACHINE_FIRMWARE:append = " ${@bb.utils.contains('MACHINE_FEATURES', 'bcm4356', 'linux-firmware-bcm4356-pcie', '', d)}" | 402 | MACHINE_FIRMWARE:append = " ${@bb.utils.contains('MACHINE_FEATURES', 'bcm4356', 'linux-firmware-bcm4356-pcie', '', d)}" |
403 | MACHINE_FIRMWARE:append = " ${@bb.utils.contains('MACHINE_FEATURES', 'bcm4359', 'linux-firmware-bcm4359-pcie', '', d)}" | 403 | MACHINE_FIRMWARE:append = " ${@bb.utils.contains('MACHINE_FEATURES', 'bcm4359', 'firmware-nxp-wifi-bcm4359-pcie', '', d)}" |
404 | 404 | ||
405 | # Extra NXP89xx Wi-Fi and Bluetooth driver | 405 | # Extra NXP Wi-Fi and Bluetooth driver firmware and driver |
406 | MACHINE_EXTRA_RRECOMMENDS:append = " ${@bb.utils.contains('MACHINE_FEATURES', 'nxp8987', 'kernel-module-nxp89xx', '', d)}" | 406 | MACHINE_FIRMWARE:append = " ${@bb.utils.contains('MACHINE_FEATURES', 'nxp8801-sdio', 'firmware-nxp-wifi-nxp8801-sdio', '', d)}" |
407 | MACHINE_EXTRA_RRECOMMENDS:append = " ${@bb.utils.contains('MACHINE_FEATURES', 'nxp8801-sdio', 'kernel-module-nxp89xx', '', d)}" | ||
408 | |||
409 | MACHINE_FIRMWARE:append = " ${@bb.utils.contains('MACHINE_FEATURES', 'nxp8987-sdio', 'firmware-nxp-wifi-nxp8987-sdio', '', d)}" | ||
410 | MACHINE_EXTRA_RRECOMMENDS:append = " ${@bb.utils.contains('MACHINE_FEATURES', 'nxp8987-sdio', 'kernel-module-nxp89xx', '', d)}" | ||
411 | |||
412 | MACHINE_FIRMWARE:append = " ${@bb.utils.contains('MACHINE_FEATURES', 'nxp8997-pcie', 'firmware-nxp-wifi-nxp8997-pcie', '', d)}" | ||
413 | MACHINE_EXTRA_RRECOMMENDS:append = " ${@bb.utils.contains('MACHINE_FEATURES', 'nxp8997-pcie', 'kernel-module-nxp89xx', '', d)}" | ||
414 | |||
415 | MACHINE_FIRMWARE:append = " ${@bb.utils.contains('MACHINE_FEATURES', 'nxp8997-sdio', 'firmware-nxp-wifi-nxp8997-sdio', '', d)}" | ||
416 | MACHINE_EXTRA_RRECOMMENDS:append = " ${@bb.utils.contains('MACHINE_FEATURES', 'nxp8997-sdio', 'kernel-module-nxp89xx', '', d)}" | ||
417 | |||
418 | MACHINE_FIRMWARE:append = " ${@bb.utils.contains('MACHINE_FEATURES', 'nxp9098-pcie', 'firmware-nxp-wifi-nxp9098-pcie', '', d)}" | ||
419 | MACHINE_EXTRA_RRECOMMENDS:append = " ${@bb.utils.contains('MACHINE_FEATURES', 'nxp9098-pcie', 'kernel-module-nxp89xx', '', d)}" | ||
420 | |||
421 | MACHINE_FIRMWARE:append = " ${@bb.utils.contains('MACHINE_FEATURES', 'nxp9098-sdio', 'firmware-nxp-wifi-nxp9098-sdio', '', d)}" | ||
422 | MACHINE_EXTRA_RRECOMMENDS:append = " ${@bb.utils.contains('MACHINE_FEATURES', 'nxp9098-sdio', 'kernel-module-nxp89xx', '', d)}" | ||
407 | 423 | ||
408 | # Extra QCA Wi-Fi & BTE driver and firmware | 424 | # Extra QCA Wi-Fi & BTE driver and firmware |
409 | MACHINE_EXTRA_RRECOMMENDS:append = " ${@bb.utils.contains('MACHINE_FEATURES', 'qca6174', 'packagegroup-fsl-qca6174', '', d)}" | 425 | MACHINE_EXTRA_RRECOMMENDS:append = " ${@bb.utils.contains('MACHINE_FEATURES', 'qca6174', 'packagegroup-fsl-qca6174', '', d)}" |
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 | ||
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 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 |
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 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 |
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 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 |
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 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 | ||
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 |