embeddedTS · markfeathers · Jul 30, 2025 · Jul 30, 2025 · Jul 30, 2025 · Jul 31, 2025
diff --git a/configs/tsimx6_debian_12_headless_defconfig b/configs/tsimx6_debian_12_headless_defconfig
@@ -14,9 +14,15 @@ CONFIG_DS_COMPONENT_TS4900_FPGA=y
 CONFIG_DS_COMPONENT_TSSUPERVISORUPDATE=y
 CONFIG_DS_TSSILOMON_SERVICE=y
 CONFIG_DS_COMPONENT_TS_UBOOT_CONFIGS=y
+CONFIG_DS_MODULE_MWIFIEX=y
+CONFIG_DS_MODULE_MWIFIEX_GIT_VERSION="lf-6.6.52_2.2.0"
+CONFIG_DS_COMPONENT_IMX_FIRMWARE=y
+CONFIG_DS_COMPONENT_IMX_FIRMWARE_GIT_VERSION="lf-6.6.52_2.2.0"
 CONFIG_DS_COMPONENT_WILC3000_FIRMWARE=y
 CONFIG_DS_MODULE_WILC3000=y
 CONFIG_DS_MODULE_WILC3000_GIT_VERSION="linux4microchip-2024.04-community"
+CONFIG_DS_COMPONENT_MURATA_NXP_LINUX_CALIBRATION=y
+CONFIG_DS_COMPONENT_MURATA_NXP_LINUX_CALIBRATION_GIT_VERSION="imx-6-6-23"
 CONFIG_DS_COMPONENT_WL12XX_FIRMWARE=y
 CONFIG_DS_COMPONENT_LINUX_FIRMWARE=y
 CONFIG_DS_COMPONENT_LINUX_FIRMWARE_QCA9377=y

diff --git a/configs/tsimx6_debian_12_minimal_defconfig b/configs/tsimx6_debian_12_minimal_defconfig
@@ -9,9 +9,15 @@ CONFIG_DS_KERNEL_INSTALL_UIMAGE_LOADADDR=0x10008000
 CONFIG_DS_COMPONENT_LEGACY_BOOTSCRIPT=y
 CONFIG_DS_COMPONENT_LEGACY_BOOTSCRIPT_CMDLINE="console=ttymxc0,115200 init=/sbin/init loglevel=4"
 CONFIG_DS_COMPONENT_TS4900_FPGA=y
+CONFIG_DS_MODULE_MWIFIEX=y
+CONFIG_DS_MODULE_MWIFIEX_GIT_VERSION="lf-6.6.52_2.2.0"
+CONFIG_DS_COMPONENT_IMX_FIRMWARE=y
+CONFIG_DS_COMPONENT_IMX_FIRMWARE_GIT_VERSION="lf-6.6.52_2.2.0"
 CONFIG_DS_COMPONENT_WILC3000_FIRMWARE=y
 CONFIG_DS_MODULE_WILC3000=y
 CONFIG_DS_MODULE_WILC3000_GIT_VERSION="linux4microchip-2024.04-community"
+CONFIG_DS_COMPONENT_MURATA_NXP_LINUX_CALIBRATION=y
+CONFIG_DS_COMPONENT_MURATA_NXP_LINUX_CALIBRATION_GIT_VERSION="imx-6-6-23"
 CONFIG_DS_COMPONENT_WL12XX_FIRMWARE=y
 CONFIG_DS_COMPONENT_LINUX_FIRMWARE=y
 CONFIG_DS_COMPONENT_LINUX_FIRMWARE_QCA9377=y

diff --git a/configs/tsimx6_debian_12_x11_defconfig b/configs/tsimx6_debian_12_x11_defconfig
@@ -18,9 +18,15 @@ CONFIG_DS_COMPONENT_TS_X11_CALIBRATION=y
 CONFIG_DS_TSSILOMON_SERVICE=y
 CONFIG_DS_COMPONENT_TS_UBOOT_CONFIGS=y
 CONFIG_DS_COMPONENT_XORG_ETNAVIV=y
+CONFIG_DS_MODULE_MWIFIEX=y
+CONFIG_DS_MODULE_MWIFIEX_GIT_VERSION="lf-6.6.52_2.2.0"
+CONFIG_DS_COMPONENT_IMX_FIRMWARE=y
+CONFIG_DS_COMPONENT_IMX_FIRMWARE_GIT_VERSION="lf-6.6.52_2.2.0"
 CONFIG_DS_COMPONENT_WILC3000_FIRMWARE=y
 CONFIG_DS_MODULE_WILC3000=y
 CONFIG_DS_MODULE_WILC3000_GIT_VERSION="linux4microchip-2024.04-community"
+CONFIG_DS_COMPONENT_MURATA_NXP_LINUX_CALIBRATION=y
+CONFIG_DS_COMPONENT_MURATA_NXP_LINUX_CALIBRATION_GIT_VERSION="imx-6-6-23"
 CONFIG_DS_COMPONENT_WL12XX_FIRMWARE=y
 CONFIG_DS_COMPONENT_LINUX_FIRMWARE=y
 CONFIG_DS_COMPONENT_LINUX_FIRMWARE_QCA9377=y

diff --git a/configs/tsimx6_ubuntu_24_04_headless_defconfig b/configs/tsimx6_ubuntu_24_04_headless_defconfig
@@ -16,9 +16,15 @@ CONFIG_DS_COMPONENT_TSSUPERVISORUPDATE=y
 CONFIG_DS_TSSILOMON_SERVICE=y
 CONFIG_DS_COMPONENT_TS_UBOOT_CONFIGS=y
 CONFIG_DS_COMPONENT_XORG_ETNAVIV=y
+CONFIG_DS_MODULE_MWIFIEX=y
+CONFIG_DS_MODULE_MWIFIEX_GIT_VERSION="lf-6.6.52_2.2.0"
+CONFIG_DS_COMPONENT_IMX_FIRMWARE=y
+CONFIG_DS_COMPONENT_IMX_FIRMWARE_GIT_VERSION="lf-6.6.52_2.2.0"
 CONFIG_DS_COMPONENT_WILC3000_FIRMWARE=y
 CONFIG_DS_MODULE_WILC3000=y
 CONFIG_DS_MODULE_WILC3000_GIT_VERSION="linux4microchip-2024.04-community"
+CONFIG_DS_COMPONENT_MURATA_NXP_LINUX_CALIBRATION=y
+CONFIG_DS_COMPONENT_MURATA_NXP_LINUX_CALIBRATION_GIT_VERSION="imx-6-6-23"
 CONFIG_DS_COMPONENT_WL12XX_FIRMWARE=y
 CONFIG_DS_COMPONENT_LINUX_FIRMWARE=y
 CONFIG_DS_COMPONENT_LINUX_FIRMWARE_QCA9377=y

diff --git a/configs/tsimx6_ubuntu_24_04_minimal_defconfig b/configs/tsimx6_ubuntu_24_04_minimal_defconfig
@@ -9,9 +9,15 @@ CONFIG_DS_KERNEL_INSTALL_UIMAGE_LOADADDR=0x10008000
 CONFIG_DS_COMPONENT_LEGACY_BOOTSCRIPT=y
 CONFIG_DS_COMPONENT_LEGACY_BOOTSCRIPT_CMDLINE="console=ttymxc0,115200 init=/sbin/init loglevel=4"
 CONFIG_DS_COMPONENT_TS4900_FPGA=y
+CONFIG_DS_MODULE_MWIFIEX=y
+CONFIG_DS_MODULE_MWIFIEX_GIT_VERSION="lf-6.6.52_2.2.0"
+CONFIG_DS_COMPONENT_IMX_FIRMWARE=y
+CONFIG_DS_COMPONENT_IMX_FIRMWARE_GIT_VERSION="lf-6.6.52_2.2.0"
 CONFIG_DS_COMPONENT_WILC3000_FIRMWARE=y
 CONFIG_DS_MODULE_WILC3000=y
 CONFIG_DS_MODULE_WILC3000_GIT_VERSION="linux4microchip-2024.04-community"
+CONFIG_DS_COMPONENT_MURATA_NXP_LINUX_CALIBRATION=y
+CONFIG_DS_COMPONENT_MURATA_NXP_LINUX_CALIBRATION_GIT_VERSION="imx-6-6-23"
 CONFIG_DS_COMPONENT_WL12XX_FIRMWARE=y
 CONFIG_DS_COMPONENT_LINUX_FIRMWARE=y
 CONFIG_DS_COMPONENT_LINUX_FIRMWARE_QCA9377=y

diff --git a/configs/tsimx6_ubuntu_24_04_x11_defconfig b/configs/tsimx6_ubuntu_24_04_x11_defconfig
@@ -18,9 +18,15 @@ CONFIG_DS_COMPONENT_TS_X11_CALIBRATION=y
 CONFIG_DS_TSSILOMON_SERVICE=y
 CONFIG_DS_COMPONENT_TS_UBOOT_CONFIGS=y
 CONFIG_DS_COMPONENT_XORG_ETNAVIV=y
+CONFIG_DS_MODULE_MWIFIEX=y
+CONFIG_DS_MODULE_MWIFIEX_GIT_VERSION="lf-6.6.52_2.2.0"
+CONFIG_DS_COMPONENT_IMX_FIRMWARE=y
+CONFIG_DS_COMPONENT_IMX_FIRMWARE_GIT_VERSION="lf-6.6.52_2.2.0"
 CONFIG_DS_COMPONENT_WILC3000_FIRMWARE=y
 CONFIG_DS_MODULE_WILC3000=y
 CONFIG_DS_MODULE_WILC3000_GIT_VERSION="linux4microchip-2024.04-community"
+CONFIG_DS_COMPONENT_MURATA_NXP_LINUX_CALIBRATION=y
+CONFIG_DS_COMPONENT_MURATA_NXP_LINUX_CALIBRATION_GIT_VERSION="imx-6-6-23"
 CONFIG_DS_COMPONENT_WL12XX_FIRMWARE=y
 CONFIG_DS_COMPONENT_LINUX_FIRMWARE=y
 CONFIG_DS_COMPONENT_LINUX_FIRMWARE_QCA9377=y

diff --git a/configs/tsimx9_debian_12_headless_defconfig b/configs/tsimx9_debian_12_headless_defconfig
@@ -2,11 +2,17 @@ CONFIG_DS_ARCH_AARCH64=y
 CONFIG_DS_DISTRO_DEBIAN_12=y
 CONFIG_DS_PACKAGELIST="debian_12_headless.txt"
 CONFIG_DS_KERNEL_PROVIDER_GIT_URL="git@github.com:embeddedTS/prototype-linux-imx93.git"
-CONFIG_DS_KERNEL_PROVIDER_GIT_VERSION="bf62281ae2c421ccb1c5425609fc0e38ab3ec913"
+CONFIG_DS_KERNEL_PROVIDER_GIT_VERSION="ee246c7c97f1c75ccbdf5e1617cdccd53d173bb7"
 CONFIG_DS_KERNEL_DEFCONFIG="ts9370_defconfig"
 CONFIG_DS_KERNEL_INSTALL_DEVICETREE_FILESYSTEM="freescale/imx93-ts4300-16 freescale/imx93-ts4300-16-ts-rd-mipi2dp freescale/imx93-ts4300-16-ts-rd-mipi2dp-ti freescale/imx93-ts4300 freescale/imx93-ts9370 freescale/imx93-ts9390"
 CONFIG_DS_COMPONENT_TSSUPERVISORUPDATE=y
 CONFIG_DS_COMPONENT_TS_UBOOT_CONFIGS=y
+CONFIG_DS_MODULE_MWIFIEX=y
+CONFIG_DS_MODULE_MWIFIEX_GIT_VERSION="lf-6.6.52_2.2.0"
+CONFIG_DS_COMPONENT_IMX_FIRMWARE=y
+CONFIG_DS_COMPONENT_IMX_FIRMWARE_GIT_VERSION="lf-6.6.52_2.2.0"
+CONFIG_DS_COMPONENT_MURATA_NXP_LINUX_CALIBRATION=y
+CONFIG_DS_COMPONENT_MURATA_NXP_LINUX_CALIBRATION_GIT_VERSION="imx-6-6-23"
 CONFIG_DS_COMPONENT_LINUX_FIRMWARE=y
 CONFIG_DS_COMPONENT_LINUX_FIRMWARE_QCA9377=y
 CONFIG_DS_COMPONENT_DISTROBOOT_SCRIPTS=y

diff --git a/configs/tsimx9_debian_12_minimal_defconfig b/configs/tsimx9_debian_12_minimal_defconfig
@@ -2,9 +2,15 @@ CONFIG_DS_ARCH_AARCH64=y
 CONFIG_DS_DISTRO_DEBIAN_12=y
 CONFIG_DS_PACKAGELIST="debian_12_minimal.txt"
 CONFIG_DS_KERNEL_PROVIDER_GIT_URL="git@github.com:embeddedTS/prototype-linux-imx93.git"
-CONFIG_DS_KERNEL_PROVIDER_GIT_VERSION="bf62281ae2c421ccb1c5425609fc0e38ab3ec913"
+CONFIG_DS_KERNEL_PROVIDER_GIT_VERSION="ee246c7c97f1c75ccbdf5e1617cdccd53d173bb7"
 CONFIG_DS_KERNEL_DEFCONFIG="ts9370_defconfig"
 CONFIG_DS_KERNEL_INSTALL_DEVICETREE_FILESYSTEM="freescale/imx93-ts4300-16 freescale/imx93-ts4300-16-ts-rd-mipi2dp freescale/imx93-ts4300-16-ts-rd-mipi2dp-ti freescale/imx93-ts4300 freescale/imx93-ts9370 freescale/imx93-ts9390"
+CONFIG_DS_MODULE_MWIFIEX=y
+CONFIG_DS_MODULE_MWIFIEX_GIT_VERSION="lf-6.6.52_2.2.0"
+CONFIG_DS_COMPONENT_IMX_FIRMWARE=y
+CONFIG_DS_COMPONENT_IMX_FIRMWARE_GIT_VERSION="lf-6.6.52_2.2.0"
+CONFIG_DS_COMPONENT_MURATA_NXP_LINUX_CALIBRATION=y
+CONFIG_DS_COMPONENT_MURATA_NXP_LINUX_CALIBRATION_GIT_VERSION="imx-6-6-23"
 CONFIG_DS_COMPONENT_LINUX_FIRMWARE=y
 CONFIG_DS_COMPONENT_LINUX_FIRMWARE_QCA9377=y
 CONFIG_DS_COMPONENT_DISTROBOOT_SCRIPTS=y

diff --git a/configs/tsimx9_debian_12_x11_defconfig b/configs/tsimx9_debian_12_x11_defconfig
@@ -2,13 +2,19 @@ CONFIG_DS_ARCH_AARCH64=y
 CONFIG_DS_DISTRO_DEBIAN_12=y
 CONFIG_DS_PACKAGELIST="debian_12_x11.txt"
 CONFIG_DS_KERNEL_PROVIDER_GIT_URL="git@github.com:embeddedTS/prototype-linux-imx93.git"
-CONFIG_DS_KERNEL_PROVIDER_GIT_VERSION="bf62281ae2c421ccb1c5425609fc0e38ab3ec913"
+CONFIG_DS_KERNEL_PROVIDER_GIT_VERSION="ee246c7c97f1c75ccbdf5e1617cdccd53d173bb7"
 CONFIG_DS_KERNEL_DEFCONFIG="ts9370_defconfig"
 CONFIG_DS_KERNEL_INSTALL_DEVICETREE_FILESYSTEM="freescale/imx93-ts4300-16 freescale/imx93-ts4300-16-ts-rd-mipi2dp freescale/imx93-ts4300-16-ts-rd-mipi2dp-ti freescale/imx93-ts4300 freescale/imx93-ts9370 freescale/imx93-ts9390"
 CONFIG_DS_COMPONENT_TSSUPERVISORUPDATE=y
 CONFIG_DS_COMPONENT_TS_TOUCHSCREEN_CALIBRATIONS=y
 CONFIG_DS_COMPONENT_TS_X11_CALIBRATION=y
 CONFIG_DS_COMPONENT_TS_UBOOT_CONFIGS=y
+CONFIG_DS_MODULE_MWIFIEX=y
+CONFIG_DS_MODULE_MWIFIEX_GIT_VERSION="lf-6.6.52_2.2.0"
+CONFIG_DS_COMPONENT_IMX_FIRMWARE=y
+CONFIG_DS_COMPONENT_IMX_FIRMWARE_GIT_VERSION="lf-6.6.52_2.2.0"
+CONFIG_DS_COMPONENT_MURATA_NXP_LINUX_CALIBRATION=y
+CONFIG_DS_COMPONENT_MURATA_NXP_LINUX_CALIBRATION_GIT_VERSION="imx-6-6-23"
 CONFIG_DS_COMPONENT_LINUX_FIRMWARE=y
 CONFIG_DS_COMPONENT_LINUX_FIRMWARE_QCA9377=y
 CONFIG_DS_COMPONENT_DISTROBOOT_SCRIPTS=y

diff --git a/tasks/components/Kconfig b/tasks/components/Kconfig
@@ -34,13 +34,19 @@ endmenu
 
 menu "NXP"
 source "tasks/components/xorg-etnaviv/Kconfig"
+source "tasks/components/mwifiex-external-module/Kconfig"
+source "tasks/components/imx-firmware/Kconfig"
 endmenu
 
 menu "Microchip"
 source "tasks/components/wilc-firmware/Kconfig"
 source "tasks/components/wilc3000-external-module/Kconfig"
 endmenu
 
+menu "Murata"
+source "tasks/components/murata-nxp-linux-calibration/Kconfig"
+endmenu
+
 menu "TI"
 source "tasks/components/wl12xx-firmware/Kconfig"
 endmenu

diff --git a/tasks/components/imx-firmware/Kconfig b/tasks/components/imx-firmware/Kconfig
@@ -0,0 +1,25 @@
+config DS_COMPONENT_IMX_FIRMWARE
+	bool "imx-firmware for wifi modules"
+	help
+	  Installs NXP IMX Firmware
+
+config DS_COMPONENT_IMX_FIRMWARE_GIT_VERSION
+	depends on DS_COMPONENT_IMX_FIRMWARE
+	string "imx-firmware GIT srcrev"
+	help
+	  Specify tag or branch to checkout before installing
+
+# The way the driver expects firmare at this time, it is mutually exclusive
+# and only one can be populated at /lib/firmare/nxp/ at a time
+choice
+	depends on DS_COMPONENT_IMX_FIRMWARE
+	prompt "Select WIFI firmware from imx-firmware"
+	help
+	  Choose one of the supported firmware variants for the IW612 module.
+
+config DS_COMPONENT_IMX_FIRMWARE_IW612_SD
+	bool "IW612_SD Firmware"
+	help
+	  Installs firmware for IW612_SD wifi/bt module
+
+endchoice
diff --git a/tasks/components/imx-firmware/fetch.sh b/tasks/components/imx-firmware/fetch.sh
@@ -0,0 +1,17 @@
+#!/bin/bash -e
+
+
+SOURCE="$DS_WORK/components/imx-firmware"
+GITURL="https://github.com/nxp-imx/imx-firmware.git"
+
+install -d "$SOURCE"
+common/host/fetch_git.sh "$GITURL" "$CONFIG_DS_COMPONENT_IMX_FIRMWARE_GIT_VERSION" "$SOURCE"
+
+install -d "$DS_OVERLAY/lib/firmware/nxp/"
+
+if [ "${CONFIG_DS_COMPONENT_IMX_FIRMWARE_IW612_SD}" == "y" ]; then
+    install -m 644 "${SOURCE}/nxp/FwImage_IW612_SD/sd_w61x_v1.bin.se" "$DS_OVERLAY/lib/firmware/nxp/"
+    install -m 644 "${SOURCE}/nxp/FwImage_IW612_SD/sduart_nw61x_v1.bin.se" "$DS_OVERLAY/lib/firmware/nxp/"
+    install -m 644 "${SOURCE}/nxp/FwImage_IW612_SD/uartspi_n61x_v1.bin.se" "$DS_OVERLAY/lib/firmware/nxp/"
+    install -m 644 "${SOURCE}/nxp/FwImage_IW612_SD/uartuart_n61x_v1.bin.se" "$DS_OVERLAY/lib/firmware/nxp/"
+fi
diff --git a/tasks/components/imx-firmware/manifest.yaml b/tasks/components/imx-firmware/manifest.yaml
@@ -0,0 +1,5 @@
+config: DS_COMPONENT_IMX_FIRMWARE
+tasks:
+- cmd: fetch.sh
+  cmd_type: host
+  description: Installing IMX firmware
diff --git a/tasks/components/murata-nxp-linux-calibration/Kconfig b/tasks/components/murata-nxp-linux-calibration/Kconfig
@@ -0,0 +1,52 @@
+config DS_COMPONENT_MURATA_NXP_LINUX_CALIBRATION
+	bool "Murata NXP WIFI Calibration firmware"
+	help
+	  Installs Murata NXP Calibration Firmware
+
+config DS_COMPONENT_MURATA_NXP_LINUX_CALIBRATION_GIT_VERSION
+	depends on DS_COMPONENT_MURATA_NXP_LINUX_CALIBRATION
+	string "Murata NXP WIFI Calibration firmware GIT srcrev"
+	help
+	  Specify tag or branch to checkout before building.
+
+choice
+	depends on DS_COMPONENT_MURATA_NXP_LINUX_CALIBRATION
+	prompt "Select Murata module"
+	help
+	  Choose one of the supported firmware variants for the IW612 module.
+
+config DS_COMPONENT_MURATA_NXP_LINUX_CALIBRATION_2DL
+	depends on DS_COMPONENT_MURATA_NXP_LINUX_CALIBRATION
+	bool "Type 2DL Firmware"
+	help
+	  Installs calibration for type 2DL module
+
+endchoice
+
+choice
+	depends on DS_COMPONENT_MURATA_NXP_LINUX_CALIBRATION
+	prompt "Select country code for firmware"
+	help
+	  Choose one of the supported firmware variants for the IW612 module.
+
+config DS_COMPONENT_MURATA_NXP_LINUX_CALIBRATION_2DL_US
+	bool "US"
+	help
+	  Installs US calibration values
+
+config DS_COMPONENT_MURATA_NXP_LINUX_CALIBRATION_2DL_EU
+	bool "EU"
+	help
+	  Installs US calibration values
+
+config DS_COMPONENT_MURATA_NXP_LINUX_CALIBRATION_2DL_JP
+	bool "JP"
+	help
+	  Installs US calibration values
+
+config DS_COMPONENT_MURATA_NXP_LINUX_CALIBRATION_2DL_CA
+	bool "CA"
+	help
+	  Installs US calibration values
+
+endchoice
diff --git a/tasks/components/murata-nxp-linux-calibration/fetch.sh b/tasks/components/murata-nxp-linux-calibration/fetch.sh
@@ -0,0 +1,20 @@
+#!/bin/bash -e
+
+SOURCE="$DS_WORK/components/murata-firmware/"
+GITURL="https://github.com/murata-wireless/nxp-linux-calibration.git"
+
+install -d "$SOURCE"
+common/host/fetch_git.sh "$GITURL" "$CONFIG_DS_COMPONENT_MURATA_NXP_LINUX_CALIBRATION_GIT_VERSION" "$SOURCE"
+
+install -d "$DS_OVERLAY/lib/firmware/nxp/murata/"
+install -d "$DS_OVERLAY/lib/firmware/nxp/murata/files"
+
+install -m 644 "${SOURCE}/LICENSE" "$DS_OVERLAY/lib/firmware/nxp/murata/LICENSE"
+install -m 644 "${SOURCE}/murata/switch_regions.sh" "$DS_OVERLAY/lib/firmware/nxp/murata/"
+install -m 644 "${SOURCE}/murata/files/bt_power_config_1.sh" "$DS_OVERLAY/lib/firmware/nxp/murata/files/"
+install -m 644 "${SOURCE}/murata/files/wifi_mod_para_murata.conf" "$DS_OVERLAY/lib/firmware/nxp/murata/files/"
+
+if [ "${DS_COMPONENT_MURATA_NXP_LINUX_CALIBRATION_2DL}" == "y" ]; then
+    install -d "$DS_OVERLAY/lib/firmware/nxp/murata/files/2DL"
+    install -m 644 "${SOURCE}/murata/files/2DL/"* "$DS_OVERLAY/lib/firmware/nxp/murata/files/2DL/"
+fi
diff --git a/tasks/components/murata-nxp-linux-calibration/install.sh b/tasks/components/murata-nxp-linux-calibration/install.sh
@@ -0,0 +1,20 @@
+#!/bin/bash -e
+
+MODULE=""
+CC=""
+
+if [ "${CONFIG_DS_COMPONENT_MURATA_NXP_LINUX_CALIBRATION_2DL}" == "y" ]; then
+	MODULE="2DL"
+fi
+
+if [ "${CONFIG_DS_COMPONENT_MURATA_NXP_LINUX_CALIBRATION_2DL_US}" == "y" ]; then
+	CC="US"
+elif [ "${CONFIG_DS_COMPONENT_MURATA_NXP_LINUX_CALIBRATION_2DL_EU}" == "y" ]; then
+	CC="EU"
+elif [ "${CONFIG_DS_COMPONENT_MURATA_NXP_LINUX_CALIBRATION_2DL_JP}" == "y" ]; then
+	CC="JP"
+elif [ "${CONFIG_DS_COMPONENT_MURATA_NXP_LINUX_CALIBRATION_2DL_CA}" == "y" ]; then
+	CC="CA"
+fi
+
+/bin/bash /lib/firmware/nxp/murata/switch_regions.sh "$MODULE" "$CC"
diff --git a/tasks/components/murata-nxp-linux-calibration/manifest.yaml b/tasks/components/murata-nxp-linux-calibration/manifest.yaml
@@ -0,0 +1,8 @@
+config: DS_COMPONENT_MURATA_NXP_LINUX_CALIBRATION
+tasks:
+- cmd: fetch.sh
+  cmd_type: host
+  description: Installing Murata nxp-linux-calibration firmware
+- cmd: install.sh
+  cmd_type: target
+  description: Installing and Enabling Murata nxp-linux-calibration firmware
diff --git a/tasks/components/mwifiex-external-module/Kconfig b/tasks/components/mwifiex-external-module/Kconfig
@@ -0,0 +1,10 @@
+config DS_MODULE_MWIFIEX
+	bool "mwifiex-module"
+	help
+	  This module provides the drivers from NXP's mwifiex, for iw6xx support
+
+config DS_MODULE_MWIFIEX_GIT_VERSION
+	depends on DS_MODULE_MWIFIEX
+	string "mwifiex-module GIT srcrev"
+	help
+	  Specify tag or branch to checkout before building.
diff --git a/tasks/components/mwifiex-external-module/build.sh b/tasks/components/mwifiex-external-module/build.sh
@@ -0,0 +1,15 @@
+#!/bin/bash -e
+
+SOURCE="$DS_WORK/components/mwifiex-external-module/"
+# Kernel modules must install over existing kernel deploy to correctly provide
+# module metadata (eg depmod, symvers, etc) for any external modules
+INSTALL="$DS_WORK/overlays/kernel/"
+KERNEL_SOURCE="$DS_WORK/kernel/linux/"
+export KBUILD_OUTPUT="$DS_WORK/kernel/linux-kbuild/"
+
+cd "$KERNEL_SOURCE"
+make M="$SOURCE" modules -j"$(nproc)"
+make M="$SOURCE" INSTALL_MOD_PATH="$INSTALL" modules_install
+
+install -d "$DS_WORK/overlays/kernel/etc/modules-load.d/"
+echo "moal" > "$DS_WORK/overlays/kernel/etc/modules-load.d/moal.conf"
diff --git a/tasks/components/mwifiex-external-module/fetch.sh b/tasks/components/mwifiex-external-module/fetch.sh
@@ -0,0 +1,7 @@
+#!/bin/bash -e
+
+SOURCE="$DS_WORK/components/mwifiex-external-module/"
+GITURL="https://github.com/nxp-imx/mwifiex.git"
+
+install -d "$SOURCE"
+common/host/fetch_git.sh "$GITURL" "$CONFIG_DS_MODULE_MWIFIEX_GIT_VERSION" "$SOURCE"
diff --git a/tasks/components/mwifiex-external-module/manifest.yaml b/tasks/components/mwifiex-external-module/manifest.yaml
@@ -0,0 +1,10 @@
+config: DS_MODULE_MWIFIEX
+tasks:
+- cmd: fetch.sh
+  cmd_type: host
+  description: Fetching mwifiex-external-module
+- cmd: build.sh
+  cmd_type: docker
+  dependencies:
+    - DS_KERNEL
+  description: Building mwifiex-external-module