diff --git a/boards/common_extras/matter_diffconfig b/boards/common_extras/matter_diffconfig
new file mode 100644
index 0000000000..6d5b3ffaeb
--- /dev/null
+++ b/boards/common_extras/matter_diffconfig
@@ -0,0 +1,5 @@
+# Matter
+CONFIG_PACKAGE_matter=y
+CONFIG_PACKAGE_luci-app-matter=y
+CONFIG_PACKAGE_MAC80211_WEXT=y
+CONFIG_MORSE_WPA_SUPPLICANT_S1G_DBUS=y
diff --git a/boards/ekh-bcm2711/matter_diffconfig b/boards/ekh-bcm2711/matter_diffconfig
new file mode 120000
index 0000000000..af471d8cf6
--- /dev/null
+++ b/boards/ekh-bcm2711/matter_diffconfig
@@ -0,0 +1 @@
+../common_extras/matter_diffconfig
\ No newline at end of file
diff --git a/package/kernel/linux/modules/other.mk b/package/kernel/linux/modules/other.mk
index 3137a612e4..d936cba479 100644
--- a/package/kernel/linux/modules/other.mk
+++ b/package/kernel/linux/modules/other.mk
@@ -30,7 +30,7 @@ $(eval $(call KernelPackage,6lowpan))
 define KernelPackage/bluetooth
   SUBMENU:=$(OTHER_MENU)
   TITLE:=Bluetooth support
-  DEPENDS:=@USB_SUPPORT +kmod-usb-core +kmod-crypto-hash +kmod-crypto-ecb +kmod-lib-crc16 +kmod-hid +kmod-crypto-cmac +kmod-regmap-core +kmod-crypto-ecdh
+  DEPENDS:=@USB_SUPPORT +kmod-usb-core +kmod-crypto-hash +kmod-crypto-ecb +kmod-lib-crc16 +kmod-hid +kmod-crypto-cmac +kmod-regmap-core +kmod-crypto-ecdh +kmod-serdev
   KCONFIG:= \
 	CONFIG_BT \
 	CONFIG_BT_BREDR=y \
@@ -43,7 +43,7 @@ define KernelPackage/bluetooth
 	CONFIG_BT_HCIBTUSB_MTK=y \
 	CONFIG_BT_HCIBTUSB_RTL=y \
 	CONFIG_BT_HCIUART \
-	CONFIG_BT_HCIUART_BCM=n \
+	CONFIG_BT_HCIUART_BCM=y \
 	CONFIG_BT_HCIUART_INTEL=n \
 	CONFIG_BT_HCIUART_H4 \
 	CONFIG_BT_HCIUART_NOKIA=n \
@@ -57,8 +57,9 @@ define KernelPackage/bluetooth
 	$(LINUX_DIR)/drivers/bluetooth/hci_uart.ko \
 	$(LINUX_DIR)/drivers/bluetooth/btusb.ko \
 	$(LINUX_DIR)/drivers/bluetooth/btintel.ko \
-	$(LINUX_DIR)/drivers/bluetooth/btrtl.ko
-  AUTOLOAD:=$(call AutoProbe,bluetooth rfcomm bnep hidp hci_uart btusb)
+	$(LINUX_DIR)/drivers/bluetooth/btrtl.ko \
+	$(LINUX_DIR)/drivers/bluetooth/btbcm.ko
+	AUTOLOAD:=$(call AutoProbe,bluetooth rfcomm bnep hidp hci_uart btusb)
 endef
 
 define KernelPackage/bluetooth/description
@@ -490,6 +491,21 @@ endef
 
 $(eval $(call KernelPackage,sdhci))
 
+define KernelPackage/serdev
+  SUBMENU:=$(OTHER_MENU)
+  TITLE:=Serial device bus support
+  KCONFIG:=CONFIG_SERIAL_DEV_BUS
+  FILES:= \
+	$(LINUX_DIR)/drivers/tty/serdev/serdev.ko
+  AUTOLOAD:=$(call AutoProbe,serdev)
+endef
+
+define KernelPackage/serdev/description
+ Kernel support for devices connected via a serial port
+endef
+
+$(eval $(call KernelPackage,serdev))
+
 
 define KernelPackage/rfkill
   SUBMENU:=$(OTHER_MENU)
diff --git a/package/kernel/mac80211/Makefile b/package/kernel/mac80211/Makefile
index d5877787d5..63b762413e 100644
--- a/package/kernel/mac80211/Makefile
+++ b/package/kernel/mac80211/Makefile
@@ -39,6 +39,7 @@ PKG_CONFIG_DEPENDS:= \
 	CONFIG_PACKAGE_IWLWIFI_DEBUG \
 	CONFIG_PACKAGE_IWLWIFI_DEBUGFS \
 	CONFIG_PACKAGE_RTLWIFI_DEBUG \
+	CONFIG_PACKAGE_MAC80211_WEXT \
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -155,6 +156,9 @@ define KernelPackage/mac80211/config
 		bool "Enable 802.11s mesh support"
 		default y
 
+	config PACKAGE_MAC80211_WEXT
+		bool "Enable wireless extension"
+		default n
   endif
 endef
 
@@ -255,6 +259,11 @@ ifdef CONFIG_PACKAGE_MAC80211_TRACING
 	IWLWIFI_DEVICE_TRACING
 endif
 
+ifdef CONFIG_PACKAGE_MAC80211_WEXT
+  config-y += \
+	CFG80211_WEXT
+endif
+
 config-$(call config_package,mac80211-hwsim) += MAC80211_HWSIM
 config-$(call config_package,mt7601u) += MT7601U
 config-y += WL_MEDIATEK
diff --git a/scripts/morse_setup.sh b/scripts/morse_setup.sh
index 59a00b7d92..5518c1c896 100755
--- a/scripts/morse_setup.sh
+++ b/scripts/morse_setup.sh
@@ -142,6 +142,7 @@ INITIALIZE=
 EXTRAS=
 EXT_TOOLCHAIN=
 GIT_SRC_OVERRIDES=( )
+MODE=""
 while getopts ":l:s:b:x:g:ie:Emh" OPT; do
     case "${OPT}" in
         b)
diff --git a/target/linux/ramips/mt7621/config-5.15 b/target/linux/ramips/mt7621/config-5.15
index a7fc382368..f3bd166cea 100644
--- a/target/linux/ramips/mt7621/config-5.15
+++ b/target/linux/ramips/mt7621/config-5.15
@@ -231,6 +231,7 @@ CONFIG_QUEUED_SPINLOCKS=y
 CONFIG_RALINK=y
 # CONFIG_RALINK_WDT is not set
 CONFIG_RATIONAL=y
+# CONFIG_RAVE_SP_CORE is not set
 CONFIG_REGMAP=y
 CONFIG_REGMAP_I2C=y
 CONFIG_REGMAP_MMIO=y