diff options
-rw-r--r-- | conf/machine/include/imx-base.inc | 3 | ||||
-rw-r--r-- | recipes-kernel/kernel-modules/kernel-module-nxp89xx_git.bb | 17 | ||||
-rw-r--r-- | recipes-security/optee-imx/optee-test_3.10.0.imx.bb | 6 | ||||
-rw-r--r-- | recipes-security/optee/optee-client.nxp.inc | 2 | ||||
-rw-r--r-- | recipes-security/optee/optee-os.nxp.inc | 3 |
5 files changed, 25 insertions, 6 deletions
diff --git a/conf/machine/include/imx-base.inc b/conf/machine/include/imx-base.inc index 51c62034..309db148 100644 --- a/conf/machine/include/imx-base.inc +++ b/conf/machine/include/imx-base.inc | |||
@@ -304,6 +304,9 @@ MACHINE_FIRMWARE:append = " ${@bb.utils.contains('MACHINE_FEATURES', 'bcm43455', | |||
304 | MACHINE_FIRMWARE:append = " ${@bb.utils.contains('MACHINE_FEATURES', 'bcm4356', 'linux-firmware-bcm4356-pcie', '', d)}" | 304 | MACHINE_FIRMWARE:append = " ${@bb.utils.contains('MACHINE_FEATURES', 'bcm4356', 'linux-firmware-bcm4356-pcie', '', d)}" |
305 | MACHINE_FIRMWARE:append = " ${@bb.utils.contains('MACHINE_FEATURES', 'bcm4359', 'linux-firmware-bcm4359-pcie', '', d)}" | 305 | MACHINE_FIRMWARE:append = " ${@bb.utils.contains('MACHINE_FEATURES', 'bcm4359', 'linux-firmware-bcm4359-pcie', '', d)}" |
306 | 306 | ||
307 | #Extra NXP89xx Wi-Fi and Bluetooth driver | ||
308 | MACHINE_FIRMWARE:append = " ${@bb.utils.contains('MACHINE_FEATURES', 'nxp8987', 'kernel-module-nxp89xx', '', d)}" | ||
309 | |||
307 | # Extra QCA Wi-Fi & BTE driver and firmware | 310 | # Extra QCA Wi-Fi & BTE driver and firmware |
308 | MACHINE_EXTRA_RRECOMMENDS:append = " ${@bb.utils.contains('MACHINE_FEATURES', 'qca6174', 'packagegroup-fsl-qca6174', '', d)}" | 311 | MACHINE_EXTRA_RRECOMMENDS:append = " ${@bb.utils.contains('MACHINE_FEATURES', 'qca6174', 'packagegroup-fsl-qca6174', '', d)}" |
309 | MACHINE_EXTRA_RRECOMMENDS:append = " ${@bb.utils.contains('MACHINE_FEATURES', 'qca9377', 'packagegroup-fsl-qca9377', '', d)}" | 312 | MACHINE_EXTRA_RRECOMMENDS:append = " ${@bb.utils.contains('MACHINE_FEATURES', 'qca9377', 'packagegroup-fsl-qca9377', '', d)}" |
diff --git a/recipes-kernel/kernel-modules/kernel-module-nxp89xx_git.bb b/recipes-kernel/kernel-modules/kernel-module-nxp89xx_git.bb new file mode 100644 index 00000000..f99b7594 --- /dev/null +++ b/recipes-kernel/kernel-modules/kernel-module-nxp89xx_git.bb | |||
@@ -0,0 +1,17 @@ | |||
1 | SUMMARY = "NXP Wi-Fi driver for module 88w8997/8987" | ||
2 | LICENSE = "GPLv2" | ||
3 | LIC_FILES_CHKSUM = "file://gpl-2.0.txt;md5=ab04ac0f249af12befccb94447c08b77" | ||
4 | |||
5 | SRCBRANCH = "lf-5.10.72_2.2.0" | ||
6 | MRVL_SRC ?= "git://source.codeaurora.org/external/imx/mwifiex.git;protocol=https" | ||
7 | SRC_URI = "${MRVL_SRC};branch=${SRCBRANCH}" | ||
8 | SRCREV = "3c2a3c2cd25e9dce95f34c21bb4e728647eb64ee" | ||
9 | |||
10 | S = "${WORKDIR}/git/mxm_wifiex/wlan_src" | ||
11 | |||
12 | inherit module | ||
13 | |||
14 | EXTRA_OEMAKE = "KERNELDIR=${STAGING_KERNEL_BUILDDIR} -C ${STAGING_KERNEL_BUILDDIR} M=${S}" | ||
15 | |||
16 | COMPATIBLE_MACHINE = "(imx)" | ||
17 | |||
diff --git a/recipes-security/optee-imx/optee-test_3.10.0.imx.bb b/recipes-security/optee-imx/optee-test_3.10.0.imx.bb index 76e04f04..0019e8c8 100644 --- a/recipes-security/optee-imx/optee-test_3.10.0.imx.bb +++ b/recipes-security/optee-imx/optee-test_3.10.0.imx.bb | |||
@@ -6,7 +6,7 @@ HOMEPAGE = "http://www.optee.org/" | |||
6 | LICENSE = "BSD" | 6 | LICENSE = "BSD" |
7 | LIC_FILES_CHKSUM = "file://LICENSE.md;md5=daa2bcccc666345ab8940aab1315a4fa" | 7 | LIC_FILES_CHKSUM = "file://LICENSE.md;md5=daa2bcccc666345ab8940aab1315a4fa" |
8 | 8 | ||
9 | DEPENDS = "python3-pycrypto-native python3-pycryptodomex-native optee-os optee-client openssl" | 9 | DEPENDS = "python3-pycryptodome-native python3-pycryptodomex-native optee-os optee-client openssl" |
10 | 10 | ||
11 | SRCBRANCH = "imx_5.4.70_2.3.0" | 11 | SRCBRANCH = "imx_5.4.70_2.3.0" |
12 | 12 | ||
@@ -23,8 +23,8 @@ OPTEE_ARCH ?= "arm32" | |||
23 | OPTEE_ARCH:armv7a = "arm32" | 23 | OPTEE_ARCH:armv7a = "arm32" |
24 | OPTEE_ARCH:aarch64 = "arm64" | 24 | OPTEE_ARCH:aarch64 = "arm64" |
25 | 25 | ||
26 | TA_DEV_KIT_DIR:arm = "${STAGING_INCDIR}/optee/export-user_ta:arm32/" | 26 | TA_DEV_KIT_DIR:arm = "${STAGING_INCDIR}/optee/export-user_ta_arm32/" |
27 | TA_DEV_KIT_DIR:aarch64 = "${STAGING_INCDIR}/optee/export-user_ta:arm64/" | 27 | TA_DEV_KIT_DIR:aarch64 = "${STAGING_INCDIR}/optee/export-user_ta_arm64/" |
28 | 28 | ||
29 | CFLAGS += "--sysroot=${STAGING_DIR_HOST}" | 29 | CFLAGS += "--sysroot=${STAGING_DIR_HOST}" |
30 | CXXFLAGS += "--sysroot=${STAGING_DIR_HOST}" | 30 | CXXFLAGS += "--sysroot=${STAGING_DIR_HOST}" |
diff --git a/recipes-security/optee/optee-client.nxp.inc b/recipes-security/optee/optee-client.nxp.inc index de2ba8ae..fa187e84 100644 --- a/recipes-security/optee/optee-client.nxp.inc +++ b/recipes-security/optee/optee-client.nxp.inc | |||
@@ -17,7 +17,7 @@ S = "${WORKDIR}/git" | |||
17 | B = "${WORKDIR}/build" | 17 | B = "${WORKDIR}/build" |
18 | 18 | ||
19 | OPTEE_ARCH ?= "arm32" | 19 | OPTEE_ARCH ?= "arm32" |
20 | OPTEE_ARCH_armv7a = "arm32" | 20 | OPTEE_ARCH:armv7a = "arm32" |
21 | OPTEE_ARCH:aarch64 = "arm64" | 21 | OPTEE_ARCH:aarch64 = "arm64" |
22 | 22 | ||
23 | EXTRA_OEMAKE = "ARCH=${OPTEE_ARCH} O=${B}" | 23 | EXTRA_OEMAKE = "ARCH=${OPTEE_ARCH} O=${B}" |
diff --git a/recipes-security/optee/optee-os.nxp.inc b/recipes-security/optee/optee-os.nxp.inc index f376b3ce..72af6ca4 100644 --- a/recipes-security/optee/optee-os.nxp.inc +++ b/recipes-security/optee/optee-os.nxp.inc | |||
@@ -18,7 +18,7 @@ B = "${WORKDIR}/build.${PLATFORM_FLAVOR}" | |||
18 | PLATFORM_FLAVOR ?= "${MACHINE}" | 18 | PLATFORM_FLAVOR ?= "${MACHINE}" |
19 | 19 | ||
20 | OPTEE_ARCH ?= "arm64" | 20 | OPTEE_ARCH ?= "arm64" |
21 | OPTEE_ARCH_armv7a = "arm32" | 21 | OPTEE_ARCH:armv7a = "arm32" |
22 | OPTEE_ARCH:aarch64 = "arm64" | 22 | OPTEE_ARCH:aarch64 = "arm64" |
23 | 23 | ||
24 | OPTEE_CORE_LOG_LEVEL ?= "1" | 24 | OPTEE_CORE_LOG_LEVEL ?= "1" |
@@ -73,4 +73,3 @@ FILES:${PN}-staticdev = "/usr/include/optee/" | |||
73 | RDEPENDS:${PN}-dev += "${PN}-staticdev" | 73 | RDEPENDS:${PN}-dev += "${PN}-staticdev" |
74 | 74 | ||
75 | PACKAGE_ARCH = "${MACHINE_ARCH}" | 75 | PACKAGE_ARCH = "${MACHINE_ARCH}" |
76 | |||