diff options
author | Jun Zhu <junzhu@nxp.com> | 2023-07-12 22:21:18 +0800 |
---|---|---|
committer | Jun Zhu <junzhu@nxp.com> | 2023-07-15 18:07:07 +0800 |
commit | 10751c2f1adcb2a3e6242f090b55a793bf05e16a (patch) | |
tree | 199b48f59d1c500bd536f2909eeffa95220dcffe | |
parent | 3c048a97ad04c37e7d3cac2cc01f872b58488d9b (diff) | |
download | meta-freescale-10751c2f1adcb2a3e6242f090b55a793bf05e16a.tar.gz |
kernel-module-nxp-wlan: Rename it from kernel-module-nxp89xx
NXP Wi-Fi all-on-one driver:
- Supports more Wi-Fi modules: 88w8801/8987/8997/9098 IW416/612
- Uses the new name to align with thus enhancement
Signed-off-by: Jun Zhu <junzhu@nxp.com>
-rw-r--r-- | conf/machine/include/imx-base.inc | 12 | ||||
-rw-r--r-- | recipes-kernel/kernel-modules/kernel-module-nxp-wlan_git.bb (renamed from recipes-kernel/kernel-modules/kernel-module-nxp89xx_git.bb) | 7 |
2 files changed, 12 insertions, 7 deletions
diff --git a/conf/machine/include/imx-base.inc b/conf/machine/include/imx-base.inc index 990b965d..02621f8a 100644 --- a/conf/machine/include/imx-base.inc +++ b/conf/machine/include/imx-base.inc | |||
@@ -428,22 +428,22 @@ MACHINE_FIRMWARE:append = " ${@bb.utils.contains('MACHINE_FEATURES', 'bcm4359', | |||
428 | 428 | ||
429 | # Extra NXP Wi-Fi and Bluetooth driver firmware and driver | 429 | # Extra NXP Wi-Fi and Bluetooth driver firmware and driver |
430 | MACHINE_FIRMWARE:append = " ${@bb.utils.contains('MACHINE_FEATURES', 'nxp8801-sdio', 'firmware-nxp-wifi-nxp8801-sdio', '', d)}" | 430 | MACHINE_FIRMWARE:append = " ${@bb.utils.contains('MACHINE_FEATURES', 'nxp8801-sdio', 'firmware-nxp-wifi-nxp8801-sdio', '', d)}" |
431 | MACHINE_EXTRA_RRECOMMENDS:append = " ${@bb.utils.contains('MACHINE_FEATURES', 'nxp8801-sdio', 'kernel-module-nxp89xx', '', d)}" | 431 | MACHINE_EXTRA_RRECOMMENDS:append = " ${@bb.utils.contains('MACHINE_FEATURES', 'nxp8801-sdio', 'kernel-module-nxp-wlan', '', d)}" |
432 | 432 | ||
433 | MACHINE_FIRMWARE:append = " ${@bb.utils.contains('MACHINE_FEATURES', 'nxp8987-sdio', 'firmware-nxp-wifi-nxp8987-sdio', '', d)}" | 433 | MACHINE_FIRMWARE:append = " ${@bb.utils.contains('MACHINE_FEATURES', 'nxp8987-sdio', 'firmware-nxp-wifi-nxp8987-sdio', '', d)}" |
434 | MACHINE_EXTRA_RRECOMMENDS:append = " ${@bb.utils.contains('MACHINE_FEATURES', 'nxp8987-sdio', 'kernel-module-nxp89xx', '', d)}" | 434 | MACHINE_EXTRA_RRECOMMENDS:append = " ${@bb.utils.contains('MACHINE_FEATURES', 'nxp8987-sdio', 'kernel-module-nxp-wlan', '', d)}" |
435 | 435 | ||
436 | MACHINE_FIRMWARE:append = " ${@bb.utils.contains('MACHINE_FEATURES', 'nxp8997-pcie', 'firmware-nxp-wifi-nxp8997-pcie', '', d)}" | 436 | MACHINE_FIRMWARE:append = " ${@bb.utils.contains('MACHINE_FEATURES', 'nxp8997-pcie', 'firmware-nxp-wifi-nxp8997-pcie', '', d)}" |
437 | MACHINE_EXTRA_RRECOMMENDS:append = " ${@bb.utils.contains('MACHINE_FEATURES', 'nxp8997-pcie', 'kernel-module-nxp89xx', '', d)}" | 437 | MACHINE_EXTRA_RRECOMMENDS:append = " ${@bb.utils.contains('MACHINE_FEATURES', 'nxp8997-pcie', 'kernel-module-nxp-wlan', '', d)}" |
438 | 438 | ||
439 | MACHINE_FIRMWARE:append = " ${@bb.utils.contains('MACHINE_FEATURES', 'nxp8997-sdio', 'firmware-nxp-wifi-nxp8997-sdio', '', d)}" | 439 | MACHINE_FIRMWARE:append = " ${@bb.utils.contains('MACHINE_FEATURES', 'nxp8997-sdio', 'firmware-nxp-wifi-nxp8997-sdio', '', d)}" |
440 | MACHINE_EXTRA_RRECOMMENDS:append = " ${@bb.utils.contains('MACHINE_FEATURES', 'nxp8997-sdio', 'kernel-module-nxp89xx', '', d)}" | 440 | MACHINE_EXTRA_RRECOMMENDS:append = " ${@bb.utils.contains('MACHINE_FEATURES', 'nxp8997-sdio', 'kernel-module-nxp-wlan', '', d)}" |
441 | 441 | ||
442 | MACHINE_FIRMWARE:append = " ${@bb.utils.contains('MACHINE_FEATURES', 'nxp9098-pcie', 'firmware-nxp-wifi-nxp9098-pcie', '', d)}" | 442 | MACHINE_FIRMWARE:append = " ${@bb.utils.contains('MACHINE_FEATURES', 'nxp9098-pcie', 'firmware-nxp-wifi-nxp9098-pcie', '', d)}" |
443 | MACHINE_EXTRA_RRECOMMENDS:append = " ${@bb.utils.contains('MACHINE_FEATURES', 'nxp9098-pcie', 'kernel-module-nxp89xx', '', d)}" | 443 | MACHINE_EXTRA_RRECOMMENDS:append = " ${@bb.utils.contains('MACHINE_FEATURES', 'nxp9098-pcie', 'kernel-module-nxp-wlan', '', d)}" |
444 | 444 | ||
445 | MACHINE_FIRMWARE:append = " ${@bb.utils.contains('MACHINE_FEATURES', 'nxp9098-sdio', 'firmware-nxp-wifi-nxp9098-sdio', '', d)}" | 445 | MACHINE_FIRMWARE:append = " ${@bb.utils.contains('MACHINE_FEATURES', 'nxp9098-sdio', 'firmware-nxp-wifi-nxp9098-sdio', '', d)}" |
446 | MACHINE_EXTRA_RRECOMMENDS:append = " ${@bb.utils.contains('MACHINE_FEATURES', 'nxp9098-sdio', 'kernel-module-nxp89xx', '', d)}" | 446 | MACHINE_EXTRA_RRECOMMENDS:append = " ${@bb.utils.contains('MACHINE_FEATURES', 'nxp9098-sdio', 'kernel-module-nxp-wlan', '', d)}" |
447 | 447 | ||
448 | # Extra QCA Wi-Fi & BTE driver and firmware | 448 | # Extra QCA Wi-Fi & BTE driver and firmware |
449 | MACHINE_EXTRA_RRECOMMENDS:append = " ${@bb.utils.contains('MACHINE_FEATURES', 'qca6174', 'packagegroup-fsl-qca6174', '', d)}" | 449 | MACHINE_EXTRA_RRECOMMENDS:append = " ${@bb.utils.contains('MACHINE_FEATURES', 'qca6174', 'packagegroup-fsl-qca6174', '', d)}" |
diff --git a/recipes-kernel/kernel-modules/kernel-module-nxp89xx_git.bb b/recipes-kernel/kernel-modules/kernel-module-nxp-wlan_git.bb index 8dde6921..db385d18 100644 --- a/recipes-kernel/kernel-modules/kernel-module-nxp89xx_git.bb +++ b/recipes-kernel/kernel-modules/kernel-module-nxp-wlan_git.bb | |||
@@ -2,6 +2,12 @@ SUMMARY = "NXP Wi-Fi driver for module 88w8801/8987/8997/9098 IW416/612" | |||
2 | LICENSE = "GPL-2.0-only" | 2 | LICENSE = "GPL-2.0-only" |
3 | LIC_FILES_CHKSUM = "file://../../LICENSE;md5=ab04ac0f249af12befccb94447c08b77" | 3 | LIC_FILES_CHKSUM = "file://../../LICENSE;md5=ab04ac0f249af12befccb94447c08b77" |
4 | 4 | ||
5 | # For backwards compatibility | ||
6 | PROVIDES += "kernel-module-nxp89xx" | ||
7 | RREPLACES:${PN} = "kernel-module-nxp89xx" | ||
8 | RPROVIDES:${PN} = "kernel-module-nxp89xx" | ||
9 | RCONFLICTS:${PN} = "kernel-module-nxp89xx" | ||
10 | |||
5 | SRCBRANCH = "lf-6.1.22_2.0.0" | 11 | SRCBRANCH = "lf-6.1.22_2.0.0" |
6 | MRVL_SRC ?= "git://github.com/nxp-imx/mwifiex.git;protocol=https" | 12 | MRVL_SRC ?= "git://github.com/nxp-imx/mwifiex.git;protocol=https" |
7 | SRC_URI = "${MRVL_SRC};branch=${SRCBRANCH}" | 13 | SRC_URI = "${MRVL_SRC};branch=${SRCBRANCH}" |
@@ -14,4 +20,3 @@ inherit module | |||
14 | EXTRA_OEMAKE = "KERNELDIR=${STAGING_KERNEL_BUILDDIR} -C ${STAGING_KERNEL_BUILDDIR} M=${S}" | 20 | EXTRA_OEMAKE = "KERNELDIR=${STAGING_KERNEL_BUILDDIR} -C ${STAGING_KERNEL_BUILDDIR} M=${S}" |
15 | 21 | ||
16 | COMPATIBLE_MACHINE = "(imx-nxp-bsp)" | 22 | COMPATIBLE_MACHINE = "(imx-nxp-bsp)" |
17 | |||