diff --git a/iopsys-econet/en7523/UNION_EN7523_GLIBC_7915D_ActiveEthWan_KERNEL_5_4_demo.mak b/iopsys-econet/en7523/UNION_EN7523_GLIBC_7915D_ActiveEthWan_KERNEL_5_4_demo.mak
index 924bb1a13d483d9750c9e9d0036836d9b03c5cc6..50eff87418b92c04b5a7d66e1f83fbf525cb97bb 100755
--- a/iopsys-econet/en7523/UNION_EN7523_GLIBC_7915D_ActiveEthWan_KERNEL_5_4_demo.mak
+++ b/iopsys-econet/en7523/UNION_EN7523_GLIBC_7915D_ActiveEthWan_KERNEL_5_4_demo.mak
@@ -79,7 +79,7 @@ TCSUPPORT_USB_HOST_LED=y
 TCSUPPORT_NAND_FLASH=y
 TCSUPPORT_MT7570=y
 NOT_SUPPORT_BADBLOCK_CHECK=y
-TCSUPPORT_NAND_BMT=y
+# TCSUPPORT_NAND_BMT is not set
 TCSUPPORT_RA_HWNAT=y
 TCSUPPORT_HWNAT_V3=y
 TCSUPPORT_RA_HWNAT_ENHANCE_HOOK=y
@@ -97,7 +97,7 @@ TCSUPPORT_EPON_OAM=y
 TCSUPPORT_EPON_OAM_CTC=y
 TCSUPPORT_EPON_OAM_LAN_DBG=y
 # TCSUPPORT_UART2 is not set
-TCSUPPORT_SPI_CONTROLLER_ECC=y
+# TCSUPPORT_SPI_CONTROLLER_ECC is not set
 
 #
 # Common Feature
@@ -153,8 +153,10 @@ TCSUPPORT_IGMP_PROXY_V3=y
 TCSUPPORT_IGMP_SNOOPING=y
 TCSUPPORT_IGMPSNOOPING_ENHANCE=y
 TCSUPPORT_MULTICAST_SPEED=y
-TCSUPPORT_MTD_PARTITIONS_CMDLINE=y
-TCSUPPORT_PARTITIONS_CMDLINE_STR="40m[tclinux],40m[tclinux_slave],8m[rootfs_data]"
+# TCSUPPORT_MTD_PARTITIONS_CMDLINE is not set
+# TCSUPPORT_SQUASHFS_PARTITIONS_CMDLINE_STR is not set
+# TCSUPPORT_UBIFS_PARTITIONS_CMDLINE_STR is not set
+# TCSUPPORT_PARTITIONS_CMDLINE_STR is not set
 TCSUPPORT_MTD_PARTITION_NUM=9
 TCSUPPORT_MTD_ENCHANCEMENT=y
 TCSUPPORT_RESERVEAREA_BLOCK=6
@@ -177,10 +179,13 @@ TCSUPPORT_ECNT_SKBMGR=y
 TCSUPPORT_USER_DEFINE_FIRST_MAC=-1
 TCSUPPORT_WLAN_AC=y
 TCSUPPORT_NPTv6=y
-TCSUPPORT_ORN_EBTABLES=y
+# TCSUPPORT_ORN_EBTABLES is not set
 #
 # Customer feature
 #
+TCSUPPORT_CT=y
+TCSUPPORT_CT_WLAN_NODE=y
+TCSUPPORT_CT_VLAN_TAG=y
 TCSUPPORT_IGMP_PROXY=y
 TCSUPPORT_IGMP_QUICK_LEAVE=y
 TCSUPPORT_VIR_SERVER=y
@@ -197,3 +202,4 @@ TCSUPPORT_BLAPI=y
 BSP =y
 TCSUPPORT_OPENWRT=y
 TCSUPPORT_ARM_SECURE_BOOT=y
+TCSUPPORT_IOPSYS_DISABLE_IPV6_DEV_CONFIG_ECNT_HOOK=y
diff --git a/iopsys-econet/en7523/config-5.4 b/iopsys-econet/en7523/config-5.4
index cd17396f6267506820700ca24d04457b7f7b3e9a..a590fb874bf51ba3a48234c413105f01f57a1a44 100755
--- a/iopsys-econet/en7523/config-5.4
+++ b/iopsys-econet/en7523/config-5.4
@@ -52,6 +52,8 @@ CONFIG_BLK_DEV_RAM=y
 CONFIG_BLK_DEV_RAM_COUNT=16
 CONFIG_BLK_DEV_RAM_SIZE=4096
 CONFIG_BLK_DEV_SD=m
+CONFIG_BLK_DEV_LOOP=y
+CONFIG_BLK_DEV_LOOP_MIN_COUNT=8
 CONFIG_BLK_DEV_THROTTLING=y
 # CONFIG_BLK_DEV_THROTTLING_LOW is not set
 CONFIG_BLK_MQ_PCI=y
@@ -82,7 +84,7 @@ CONFIG_BRIDGE_EBT_T_NAT=m
 CONFIG_BRIDGE_EBT_VLAN=m
 CONFIG_BRIDGE_NETFILTER=y
 CONFIG_BRIDGE_NF_EBTABLES=m
-# CONFIG_BRIDGE_VLAN_FILTERING is not set
+CONFIG_BRIDGE_VLAN_FILTERING=y
 CONFIG_CACHE_L2X0=y
 CONFIG_CFS_BANDWIDTH=y
 CONFIG_CGROUPS=y
@@ -233,6 +235,7 @@ CONFIG_GENERIC_STRNCPY_FROM_USER=y
 CONFIG_GENERIC_STRNLEN_USER=y
 CONFIG_GENERIC_TIME_VSYSCALL=y
 CONFIG_GPIOLIB=y
+CONFIG_GPIO_EN7523=y
 CONFIG_GRACE_PERIOD=m
 CONFIG_GRO_CELLS=y
 CONFIG_HANDLE_DOMAIN_IRQ=y
@@ -362,7 +365,7 @@ CONFIG_LOCALVERSION_AUTO=y
 CONFIG_LOCKD=m
 CONFIG_LOCK_DEBUGGING_SUPPORT=y
 CONFIG_LOCK_SPIN_ON_OWNER=y
-CONFIG_LOG_BUF_SHIFT=14
+CONFIG_LOG_BUF_SHIFT=17
 CONFIG_LWTUNNEL=y
 # CONFIG_LWTUNNEL_BPF is not set
 CONFIG_MAGIC_SYSRQ=y
@@ -376,6 +379,7 @@ CONFIG_MIGHT_HAVE_CACHE_L2X0=y
 CONFIG_MIGRATION=y
 CONFIG_MODULES_USE_ELF_REL=y
 # CONFIG_MOUSE_BCM5974 is not set
+# CONFIG_MOUSE_CYAPA is not set
 CONFIG_MOUSE_PS2=m
 CONFIG_MOUSE_PS2_ALPS=y
 CONFIG_MOUSE_PS2_BYD=y
@@ -384,6 +388,7 @@ CONFIG_MOUSE_PS2_CYPRESS=y
 CONFIG_MOUSE_PS2_FOCALTECH=y
 CONFIG_MOUSE_PS2_LOGIPS2PP=y
 CONFIG_MOUSE_PS2_SYNAPTICS=y
+# CONFIG_MOUSE_PS2_SYNAPTICS_SMBUS is not set
 # CONFIG_MOUSE_PS2_TOUCHKIT is not set
 CONFIG_MOUSE_PS2_TRACKPOINT=y
 # CONFIG_MOUSE_SERIAL is not set
@@ -396,12 +401,27 @@ CONFIG_MTD_CFI_ADV_OPTIONS=y
 CONFIG_MTD_CFI_GEOMETRY=y
 # CONFIG_MTD_CFI_INTELEXT is not set
 # CONFIG_MTD_COMPLEX_MAPPINGS is not set
-CONFIG_MTD_ECNT=y
+# CONFIG_MTD_ECNT is not set
 CONFIG_MTD_JEDECPROBE=y
 CONFIG_MTD_NAND_CORE=y
-CONFIG_MTD_NAND_ECC_SW_HAMMING=y
-CONFIG_MTD_RAW_NAND=y
-CONFIG_MTD_SPIFLASH=y
+CONFIG_MTD_SPI_NAND=y
+CONFIG_ECONET_BMT_BBT_HACK=y
+CONFIG_ECONET_READ_FLASH_BYTE_HACK=y
+
+CONFIG_SPI=y
+CONFIG_SPI_MASTER=y
+CONFIG_SPI_MEM=y
+CONFIG_SPI_EN75XX=y
+
+# CONFIG_MTD_NAND_ECC_SW_HAMMING is not set
+# CONFIG_MTD_RAW_NAND is not set
+# CONFIG_MTD_SPIFLASH is not set
+CONFIG_MTD_UBI=y
+CONFIG_MTD_UBI_BEB_LIMIT=20
+CONFIG_MTD_UBI_GLUEBI=y
+CONFIG_MTD_UBI_BLOCK=y
+CONFIG_MTD_UBI_WL_THRESHOLD=4096
+CONFIG_MTD_CMDLINE_PARTS=y
 CONFIG_MUTEX_SPIN_ON_OWNER=y
 CONFIG_NAMESPACES=y
 CONFIG_NEED_DMA_MAP_STATE=y
@@ -449,8 +469,8 @@ CONFIG_NETFILTER_XT_TARGET_LOG=m
 CONFIG_NETFILTER_XT_TARGET_MARK=y
 CONFIG_NETFILTER_XT_TARGET_MASQUERADE=y
 CONFIG_NETFILTER_XT_TARGET_NETMAP=y
-CONFIG_NETFILTER_XT_TARGET_NFLOG=y
-CONFIG_NETFILTER_XT_TARGET_NFQUEUE=y
+CONFIG_NETFILTER_XT_TARGET_NFLOG=m
+CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
 CONFIG_NETFILTER_XT_TARGET_NOTRACK=y
 CONFIG_NETFILTER_XT_TARGET_REDIRECT=y
 CONFIG_NETFILTER_XT_TARGET_TCPMSS=y
@@ -595,6 +615,16 @@ CONFIG_PPP_DEFLATE=y
 # CONFIG_PPP_MULTILINK is not set
 CONFIG_PRINTK_TIME=y
 # CONFIG_PROC_PID_CPUSET is not set
++CONFIG_PSTORE=y
++# CONFIG_PSTORE_842_COMPRESS is not set
++CONFIG_PSTORE_CONSOLE=y
++# CONFIG_PSTORE_DEFLATE_COMPRESS is not set
++# CONFIG_PSTORE_LZ4HC_COMPRESS is not set
++# CONFIG_PSTORE_LZ4_COMPRESS is not set
++# CONFIG_PSTORE_LZO_COMPRESS is not set
++CONFIG_PSTORE_PMSG=y
++CONFIG_PSTORE_RAM=y
++# CONFIG_PSTORE_ZSTD_COMPRESS is not set
 CONFIG_PROC_VMCORE=y
 CONFIG_RATIONAL=y
 CONFIG_RCU_CPU_STALL_TIMEOUT=21
@@ -664,6 +694,11 @@ CONFIG_TIMER_PROBE=y
 # CONFIG_TMPFS_XATTR is not set
 CONFIG_TREE_RCU=y
 CONFIG_TREE_SRCU=y
+CONFIG_UBIFS_FS=y
+# CONFIG_UBIFS_FS_ADVANCED_COMPR is not set
+CONFIG_UBIFS_FS_LZO=y
+CONFIG_UBIFS_FS_ZLIB=y
+CONFIG_UBIFS_FS_ZSTD=y
 CONFIG_UEVENT_HELPER_PATH=""
 CONFIG_UNCOMPRESS_INCLUDE="debug/uncompress.h"
 CONFIG_UNWINDER_ARM=y
diff --git a/iopsys-econet/en7523/target.mk b/iopsys-econet/en7523/target.mk
index ae6edd0c1d2354ed0d8f2c4dcec7320822263d53..a381fd3d84a95f1ef0d0cf6380e62f12e9d6bc83 100755
--- a/iopsys-econet/en7523/target.mk
+++ b/iopsys-econet/en7523/target.mk
@@ -6,9 +6,8 @@ ARCH:=arm
 SUBTARGET:=en7523
 BOARDNAME:=en7523 based boards
 CPU_TYPE:=cortex-a7
-FEATURES:=squashfs nand ramdisk
-
-KERNEL_PATCHVER:=5.4
+FEATURES:=squashfs nand ramdisk ubifs jffs2_nand
+KERNELNAME:=vmlinux
 
 define Target/Description
 	Build firmware images for Airoha en7523 ARM based boards.