diff --git a/airoha/en7523/UNION_EN7523_7915D_ActiveEthWan_KERNEL_5_4_demo.mak b/airoha/en7523/UNION_EN7523_7915D_ActiveEthWan_KERNEL_5_4_demo.mak
index 770c93e430cb40cd66d8e1769914711e8e048dec..043994e304ffc21fd0ec90344791dfb0e29bc1b2 100755
--- a/airoha/en7523/UNION_EN7523_7915D_ActiveEthWan_KERNEL_5_4_demo.mak
+++ b/airoha/en7523/UNION_EN7523_7915D_ActiveEthWan_KERNEL_5_4_demo.mak
@@ -1,39 +1,12 @@
 #
 # Automatically generated make config: don't edit
-# Fri Nov 27 09:58:30 2020
+# Thu Nov 18 23:31:45 2021
 #
-# TCSUPPORT_CPU_TC3162 is not set
-# TCSUPPORT_CPU_TC3162U is not set
-# TCSUPPORT_CPU_RT63260 is not set
-# TCSUPPORT_CPU_TC3262 is not set
-# TCSUPPORT_CPU_TC3182 is not set
-# TCSUPPORT_CPU_RT63165 is not set
-# TCSUPPORT_CPU_RT63365 is not set
-# TCSUPPORT_CPU_RT63368 is not set
-# TCSUPPORT_CPU_RT65168 is not set
-# TCSUPPORT_CPU_MT7510 is not set
-# TCSUPPORT_CPU_EN7512 is not set
-# TCSUPPORT_CPU_EN7521 is not set
-# TCSUPPORT_CPU_EN7516 is not set
-# TCSUPPORT_CPU_EN7527 is not set
+
 # TCSUPPORT_CPU_EN7528 is not set
 # TCSUPPORT_CPU_EN7580 is not set
 TCSUPPORT_CPU_EN7523=y
-# TCSUPPORT_CPU_MT7520 is not set
-# TCSUPPORT_CPU_MT7505 is not set
-# TCSUPPORT_TOOLCHAIN_OLD is not set
-# TCSUPPORT_NEWTOOLCHAIN is not set
-# TCSUPPORT_TOOLCHAIN_G4_9 is not set
-# TCSUPPORT_GCC4_9_GLIBC2_20 is not set
-# TCSUPPORT_GCC4_6_GLIBC2_20 is not set
-# TCSUPPORT_GCC4_6_GLIBC2_22 is not set
-# TCSUPPORT_GCC4_6_UCLIBC is not set
-# TCSUPPORT_GCC4_9_3_UCLIBC0_9_33_2_ARM is not set
-TCSUPPORT_GCC4_9_3_GLIBC2_22_ARM=y
-# TCSUPPORT_GCC9_1_0_GLIBC2_29_ARM is not set
 # TCSUPPORT_KERNEL is not set
-# TCSUPPORT_2_6_36_KERNEL is not set
-# TCSUPPORT_3_18_21_KERNEL is not set
 # TCSUPPORT_4_4_KERNEL is not set
 TCSUPPORT_5_4_KERNEL=y
 WAN_ETHER=y
@@ -54,74 +27,25 @@ TCSUPPORT_WAN_EPON=y
 TCSUPPORT_BOOT_LZMA=y
 TCSUPPORT_DDR_CALI=y
 TCSUPPORT_BOOTROM_LARGE_SIZE=y
-# TCSUPPORT_KERNELCONFIG_AUTO is not set
-# TCSUPPORT_KERNELCONFIG_TC3162 is not set
-# TCSUPPORT_KERNELCONFIG_TC3162_PB is not set
-# TCSUPPORT_KERNELCONFIG_TC3162_VOIP is not set
-# TCSUPPORT_KERNELCONFIG_TC3162_IPv6 is not set
-# TCSUPPORT_KERNELCONFIG_TC3162U is not set
-# TCSUPPORT_KERNELCONFIG_TC3162U_IPv6 is not set
-# TCSUPPORT_KERNELCONFIG_TC3262 is not set
-# TCSUPPORT_KERNELCONFIG_TC3182 is not set
-# TCSUPPORT_KERNELCONFIG_RT63165 is not set
-# TCSUPPORT_KERNELCONFIG_RT63365 is not set
-# TCSUPPORT_KERNELCONFIG_RT65168 is not set
-# TCSUPPORT_KERNELCONFIG_MT7510 is not set
-# TCSUPPORT_KERNELCONFIG_EN7512 is not set
-# TCSUPPORT_KERNELCONFIG_EN7521 is not set
-# TCSUPPORT_KERNELCONFIG_EN7516 is not set
 # TCSUPPORT_KERNELCONFIG_EN7527 is not set
 # TCSUPPORT_KERNELCONFIG_EN7528 is not set
 # TCSUPPORT_KERNELCONFIG_EN7580 is not set
 TCSUPPORT_KERNELCONFIG_EN7523=y
-# TCSUPPORT_KERNELCONFIG_MT7520 is not set
-# TCSUPPORT_KERNELCONFIG_MT7505 is not set
-# TCSUPPORT_BUSYBOX_1_0 is not set
-# TCSUPPORT_BUSYBOX_1_26_2 is not set
-# TCSUPPORT_BUSYBOXCONFIG_AUTO is not set
-# TCSUPPORT_BUSYBOXCONFIG_TC3162 is not set
-# TCSUPPORT_BUSYBOXCONFIG_TC3162_PB is not set
-# TCSUPPORT_BUSYBOXCONFIG_TC3162_IPv6 is not set
-# TCSUPPORT_BUSYBOXCONFIG_TC3162U is not set
-# TCSUPPORT_BUSYBOXCONFIG_TC3162U_IPv6 is not set
-TCSUPPORT_BUSYBOXCONFIG_TC3262=y
 
 #
 # Driver Feature
 #
-# TCSUPPORT_DMT_FTTDP is not set
 TCSUPPORT_DUAL_IMAGE=y
 TCSUPPORT_GPON_DUAL_IMAGE=y
 TCSUPPORT_EPON_DUAL_IMAGE=y
-# TCSUPPORT_DUAL_IMAGE_ENHANCE is not set
-# TCSUPPORT_INIC is not set
-# TCSUPPORT_DSL_PHYMODE is not set
-# TCSUPPORT_DSL_PHYMODE_HOST is not set
 TCSUPPORT_NPU=y
 TCSUPPORT_MT7520_PCIE=y
-# TCSUPPORT_MT7520S is not set
-# TCSUPPORT_CHS is not set
-TCSUPPORT_TR68LED=y
 TCSUPPORT_I2C=y
-# TCSUPPORT_LEDKEY is not set
 TCSUPPORT_WLAN=y
-# TCSUPPORT_WLAN_APCLIENT is not set
 TCSUPPORT_WLAN_8021X=y
-# TCSUPPORT_WLAN_8021X_EXT is not set
-# TCSUPPORT_DOT11N_SPEC_COMPLY is not set
-# TCSUPPORT_WPA2_PRE_AUTH is not set
 TCSUPPORT_WLAN_WPS=y
-# WPS_BTN_NOT_SUPPORT_5G is not set
-# TCSUPPORT_WPS_5G_BTN is not set
-TCSUPPORT_WPS_BTN_DUALBAND=y
 TCSUPPORT_WLAN_WDS=y
 TCSUPPORT_WLAN_IGMPSNOOP=y
-# TCSUPPORT_WLAN_TR181 is not set
-# TCSUPPORT_WLAN_DOT11K_RRM is not set
-# TCSUPPORT_WLAN_DOT11V_WNM is not set
-# TCSUPPORT_WLAN_BNDSTRG is not set
-# TCSUPPORT_WLAN_DOT11R_FT is not set
-# TCSUPPORT_WLAN_VLAN is not set
 TCSUPPORT_HTBW_40M=y
 TCSUPPORT_WLAN_ATE=y
 TCSUPPORT_WLAN_QATOOL=y
@@ -130,83 +54,15 @@ TCSUPPORT_WLAN_MULTI_WPS=y
 TCSUPPORT_WLAN_GPIO=y
 # TCSUPPORT_WLAN_LED_BY_SW is not set
 TCSUPPORT_WLAN_PERSSID_SWITCH=y
-# TCSUPPORT_WLAN_PERSSID_SWITCH_ENHANCE is not set
-# TCSUPPORT_WLAN_PERSSID_RATELIMIT is not set
 TCSUPPORT_WLAN_PMF=y
-# TCSUPPORT_TEST_WLAN_SHORTCUT is not set
-# TCSUPPORT_WLAN_MWDS is not set
 TCSUPPORT_WLAN_TXBF=y
-# TCSUPPORT_SINGLE_SKU_V2 is not set
 TCSUPPORT_EEPROM_ACEXT=y
-# TCSUPPORT_WLAN_DYNAMIC_RX_RATE_ADJ is not set
-# TCSUPPORT_WLAN_MT7615_TXOFFLOAD is not set
-# TCSUPPORT_MIPS_SYNCTYPE10 is not set
-# TCSUPPORT_WLAN_MT7615_V33 is not set
-# TCSUPPORT_WLAN_MT7615_V34 is not set
-# TCSUPPORT_ECNT_MAP is not set
-# TCSUPPORT_ECNT_MAP_ENHANCE is not set
-# TCSUPPORT_MAP_FILTER is not set
-# TCSUPPORT_MAP_WAPP is not set
-# TCSUPPORT_MAP_1905DAEMON is not set
-# TCSUPPORT_MAP_LIBMAPD is not set
-# TCSUPPORT_MAP_MAPDAEMON is not set
-# TCSUPPORT_MESH_ROLE_AUTO_DETECT is not set
-# TCSUPPORT_MESH_ETHETWAN_PORT_ONBOARDING is not set
-# TCSUPPORT_FIRST_IF_NONE is not set
-# TCSUPPORT_FIRST_IF_RT2561 is not set
-# TCSUPPORT_FIRST_IF_RT3390 is not set
-# TCSUPPORT_FIRST_IF_RT5392 is not set
-# TCSUPPORT_FIRST_IF_RT5390 is not set
-# TCSUPPORT_FIRST_IF_RT5390HL is not set
-# TCSUPPORT_FIRST_IF_RT3090 is not set
-# TCSUPPORT_FIRST_IF_MT7601E is not set
-# TCSUPPORT_FIRST_IF_MT7592 is not set
-# TCSUPPORT_FIRST_IF_MULTIDRIVER is not set
-# TCSUPPORT_FIRST_IF_RT5592 is not set
-# TCSUPPORT_FIRST_IF_RT3593 is not set
-# TCSUPPORT_FIRST_IF_RT5592_RT3593 is not set
-# TCSUPPORT_FIRST_IF_MT7610E is not set
-# TCSUPPORT_FIRST_IF_MT7612E is not set
-# TCSUPPORT_FIRST_IF_MT7613E is not set
-# TCSUPPORT_FIRST_IF_MT7615_11N is not set
-# TCSUPPORT_FIRST_IF_MT7615D is not set
-# TCSUPPORT_FIRST_IF_MT7615_11AC is not set
-TCSUPPORT_FIRST_IF_MT7915D=y
-TCSUPPORT_SECOND_IF_NONE=y
-# TCSUPPORT_SECOND_IF_RT2561 is not set
-# TCSUPPORT_SECOND_IF_RT3390 is not set
-# TCSUPPORT_SECOND_IF_RT5392 is not set
-# TCSUPPORT_SECOND_IF_RT5390 is not set
-# TCSUPPORT_SECOND_IF_RT5390HL is not set
-# TCSUPPORT_SECOND_IF_RT3090 is not set
-# TCSUPPORT_SECOND_IF_MT7601E is not set
-# TCSUPPORT_SECOND_IF_MT7592 is not set
-# TCSUPPORT_SECOND_IF_MULTIDRIVER is not set
-# TCSUPPORT_SECOND_IF_RT5592 is not set
-# TCSUPPORT_SECOND_IF_RT3593 is not set
-# TCSUPPORT_SECOND_IF_RT5592_RT3593 is not set
-# TCSUPPORT_SECOND_IF_MT7610E is not set
-# TCSUPPORT_SECOND_IF_MT7612E is not set
-# TCSUPPORT_SECOND_IF_MT7613E is not set
-# TCSUPPORT_SECOND_IF_MT7615_11N is not set
-# TCSUPPORT_SECOND_IF_MT7615_11AC is not set
-# TCSUPPORT_WLAN_MT7615_BUILD_IN is not set
 # TCSUPPORT_WLAN_MT7915_BUILD_IN is not set
-# TCSUPPORT_WLAN_ANTENNA_DIVERSITY is not set
 TCSUPPORT_WLAN_WPA3=y
 TCSUPPORT_WLAN_AX=y
-# TCSUPPORT_CONFIG_FIRST_IF_EPAELNA is not set
+TCSUPPORT_FIRST_IF_MT7915D=y
+TCSUPPORT_SECOND_IF_NONE=y
 TCSUPPORT_CONFIG_FIRST_IF_IPAILNA=y
-# TCSUPPORT_CONFIG_FIRST_IF_IPAELNA is not set
-# TCSUPPORT_CONFIG_FIRST_IF_EPAILNA is not set
-# TCSUPPORT_CONFIG_SECOND_IF_EPAELNA is not set
-# TCSUPPORT_CONFIG_SECOND_IF_IPAILNA is not set
-# TCSUPPORT_CONFIG_SECOND_IF_IPAELNA is not set
-# TCSUPPORT_CONFIG_SECOND_IF_EPAILNA is not set
-# TCSUPPORT_WLAN_MT7592 is not set
-# TCSUPPORT_DUAL_WLAN_MT7615E is not set
-# TCSUPPORT_WLAN_MT7592_V41 is not set
-# TCSUPPORT_WLAN_MT7915_TXOFFLOAD is not set
 TCSUPPORT_WLAN_MT7915D=y
 TCSUPPORT_WLAN_MT76_MAC80211=y
 
@@ -215,35 +71,21 @@ TCSUPPORT_WLAN_MT76_MAC80211=y
 #
 TCSUPPORT_VPN=y
 TCSUPPORT_HW_CRYPTO=y
-# TCSUPPORT_EIP93_VERIFY is not set
 TCSUPPORT_USBHOST=y
 TCSUPPORT_MUH=y
-# TCSUPPORT_MUH_TEST is not set
 TCSUPPORT_USB_NTFS=y
 TCSUPPORT_USB_AUTOMOUNT=y
-# TCSUPPORT_USB_PRINTER_SERVER is not set
-# TCSUPPORT_USB_3G_DONGLE is not set
-# TCSUPPORT_USB_CAMERA is not set
 TCSUPPORT_USB_HOST_LED=y
-# TCSUPPORT_BB_I2C is not set
-# TCSUPPORT_AUTOBENCH is not set
 TCSUPPORT_NAND_FLASH=y
-# TCSUPPORT_NOR_FLASH_USED is not set
 TCSUPPORT_MT7570=y
 NOT_SUPPORT_BADBLOCK_CHECK=y
-# TCSUPPORT_NAND_BADBLOCK_CHECK is not set
-# TCSUPPORT_NAND_RT63368 is not set
 # TCSUPPORT_NAND_BMT is not set
-# TCSUPPORT_SQUASHFS_ADD_YAFFS is not set
 TCSUPPORT_RA_HWNAT=y
 TCSUPPORT_HWNAT_V3=y
-# TCSUPPORT_HWNAT_L2VID is not set
 TCSUPPORT_RA_HWNAT_ENHANCE_HOOK=y
 # TCSUPPORT_HWNAT_WAN_ACCOUNT is not set
-# TCSUPPORT_UNKNOW_MULTICAST_COUNT is not set
 TCSUPPORT_DS_HWNAT_OFFLOAD=y
 TCSUPPORT_DLF_CTRL=y
-# TCSUPPORT_DYING_GASP_OPTIMIZATION is not set
 TCSUPPORT_QDMA_BUFMGR=y
 TCSUPPORT_OMCI=y
 TCSUPPORT_OMCI_EXTENDED_MSG=y
@@ -251,28 +93,15 @@ TCSUPPORT_OMCI_CTC=y
 TCSUPPORT_OMCI_DOT1AG=y
 TCSUPPORT_HGU_OMCI_MIB_UPLOAD_PPTP_ETH_UNI=y
 TCSUPPORT_OMCI_LAN_DEBUG=y
-# TCSUPPORT_OMCI_ALCATEL is not set
-# TCSUPPORT_HUAWEI_OLT_VENDOR_SPECIFIC_ME is not set
 TCSUPPORT_EPON_OAM=y
 TCSUPPORT_EPON_OAM_CTC=y
 TCSUPPORT_EPON_OAM_LAN_DBG=y
-# TCSUPPORT_EPON_FPGA_WORKAROUND is not set
-# TCSUPPORT_EPONCMD is not set
-# TCSUPPORT_MT7530_EXTERNAL is not set
-# TCSUPPORT_PPPOA_ENHANCE is not set
-# TCSUPPORT_MBUF_ENHANCE is not set
-# TCSUPPORT_SIM_CONTROLLER is not set
-# TCSUPPORT_UART_DISABLE is not set
 # TCSUPPORT_UART2 is not set
-# TCSUPPORT_FE_VIP_ENHANCEMENT is not set
 # TCSUPPORT_SPI_CONTROLLER_ECC is not set
-# TCSUPPORT_NAND_FLASH_OTP is not set
-# TCSUPPORT_GRE_TUNNEL_HWNAT is not set
 
 #
 # Common Feature
 #
-# TCSUPPORT_ECNT_LOG is not set
 TCSUPPORT_CPU_ARMV8=y
 # TCSUPPORT_CPU_ARMV8_64 is not set
 TCSUPPORT_UBOOT=y
@@ -282,53 +111,27 @@ TCSUPPORT_ATF_2_1=y
 #
 # Passave Optical Network(PON) Support
 #
-TCSUPPORT_NP=y
-# TCSUPPORT_NP_CMCC is not set
-# TCSUPPORT_ANDLINK is not set
 TCSUPPORT_PON_SEL=y
 TCSUPPORT_MAX_PACKET_2000=y
 TCSUPPORT_GPON_MAPPING=y
 TCSUPPORT_GPON_DOWNSTREAM_MAPPING=y
-# TCSUPPORT_LAN_VLAN is not set
-# TCSUPPORT_LAN_VLAN_RANGE is not set
 TCSUPPORT_EPON_MAPPING=y
 TCSUPPORT_PONMGR=y
 TCSUPPORT_PMMGR=y
 TCSUPPORT_XPON_IGMP=y
-# TCSUPPORT_XPON_IGMP_CHT is not set
 TCSUPPORT_PON_MAC_FILTER=y
 TCSUPPORT_PON_USER_ISOLATION=y
 TCSUPPORT_PON_VLAN=y
-# TCSUPPORT_ETHER_DOWNVLAN is not set
 TCSUPPORT_PON_VLAN_FILTER=y
-# TCSUPPORT_VLAN_PASSTHROUGH is not set
 TCSUPPORT_PON_IP_HOST=y
 TCSUPPORT_XPON_LED=y
-# TCSUPPORT_XPON_LED_UPGRADE is not set
-# TCSUPPORT_PON_TEST is not set
-# TCSUPPORT_PON_FH is not set
-# TCSUPPORT_EPON_DUMMY is not set
-# TCSUPPORT_GPON_GREENDROP_OPEN is not set
-# TCSUPPORT_PON_SFU_HGU_HYBRID is not set
-# TCSUPPORT_TCAPI_ENHANCE is not set
-# TCSUPPORT_UBIFS is not set
-# TCSUPPORT_L2OGRE is not set
-# TCSUPPORT_STATICNAT is not set
-# TCSUPPORT_MACDUPDETECT is not set
 TCSUPPORT_IPV6=y
 TCSUPPORT_IPV6_ENHANCEMENT=y
-# TCSUPPORT_IPV6_CEROUTER is not set
 TCSUPPORT_DSLITE=y
 # TCSUPPORT_6RD is not set
 TCSUPPORT_IPV6_ADVANCE=y
-# TCSUPPORT_IPV6_ACL is not set
-TCSUPPORT_IPV6_FIREWALL=y
-# TCSUPPORT_IPV6_FIREWALL_RFC2827 is not set
-# TCSUPPORT_IPV6_RIPNG is not set
-# TCSUPPORT_IPV6_PRIVACYADDRS is not set
-# TCSUPPORT_IPV6_STATIC_ROUTE is not set
 TCSUPPORT_TSO_ENABLE=y
-TCSUPPORT_TSO_V2_ENABLE=y
+TCSUPPORT_TSO_V2_ENABLE=y 
 # TCSUPPORT_LRO_ENABLE is not set
 TCSUPPORT_ACTIVE_ETHERNET_WAN=y
 TCSUPPORT_HSGMII_LAN=y
@@ -337,449 +140,54 @@ TCSUPPORT_VOIP=y
 #
 # CUSTOMIZE VOIP menu
 #
-TCSUPPORT_ZARLINK_LE89156A=y
-# TCSUPPORT_ZARLINK_LE89156B is not set
 TCSUPPORT_ECN_SIP=y
 TCSUPPORT_ECN_MEGACO=y
-# TCSUPPORT_VOIP_SIP_DNS is not set
-# TCSUPPORT_VOIP_DUAL_SIP is not set
-# TCSUPPORT_VOIP_LED_APPCTRL is not set
-# TCSUPPORT_VOIP_FLASH2_HOLD is not set
-TCSUPPORT_BOTH_SIPH248=y
 VOIP_MAX_CHAN=2
-# TCSUPPORT_VOIP_4FXS is not set
-# CUSTOMIZE_DSP_SUPPORT is not set
-# TCSUPPORT_CT_VOIP_JOYME4 is not set
-TCSUPPORT_CWMP=y
-# TCSUPPORT_CWMP_CRPORTCHANGE is not set
-# TCSUPPORT_CWMP_PRECISE_TIME is not set
-# TCSUPPORT_CWMP_CS_BSNL is not set
-# TCSUPPORT_CWMP_FAST_GET is not set
-TCSUPPORT_RANDOM_INFORM=y
-TCSUPPORT_TRACEROUTE=y
-# TCSUPPORT_TRACEROUTE_GUI is not set
-TCSUPPORT_CWMP_XPON=y
-# TCSUPPORT_CWMP_ACL is not set
-# TCSUPPORT_CWMP_NO_HOST is not set
-# TCSUPPORT_DOWNSTREAM_QOS is not set
 TCSUPPORT_QOS=y
 TCSUPPORT_IGMP_QOS=y
-# TCSUPPORT_QOS_QUEUE_MODIFY is not set
-TCSUPPORT_QOS_EIGHT_QUEUE=y
-# TCSUPPORT_PORTBIND is not set
 TCSUPPORT_SWNAT=y
-# TCSUPPORT_TLS is not set
-# TCSUPPORT_SOFT_RATELIMIT is not set
-# TCSUPPORT_ASYM_VOD is not set
-# TCSUPPORT_VLAN_TAG is not set
-TCSUPPORT_CWMP_SSL=y
-# TCSUPPORT_CWMP_SSL_MULTICA is not set
-# TCSUPPORT_CWMP_TR181 is not set
-# TCSUPPORT_CWMP_TR111 is not set
-TCSUPPORT_CWMP_TR143=y
-TCSUPPORT_TR143_CURL_UPLOAD=y
-# TCSUPPORT_LAYER2BRIDGING is not set
-# TCSUPPORT_WEBSERVER_SSL is not set
-# TCSUPPORT_SSH is not set
-TCSUPPORT_SNMP=y
-# TCSUPPORT_SNMP_5_7_3 is not set
-TCSUPPORT_SNMP_FULL=y
-# TCSUPPORT_START_TRAP is not set
-# TCSUPPORT_SNMP_CHT is not set
-TCSUPPORT_SNMP_V3=y
-TCSUPPORT_IPV6_SNMP=y
-# TCSUPPORT_SNMP_REDUCED is not set
-TCSUPPORT_SNMP_TRUSTIP=y
-# TCSUPPORT_SNMP_ATMADSL is not set
-# TCSUPPORT_ALIASIP is not set
-TCSUPPORT_DHCP_STATIC=y
-TCSUPPORT_DHCP_PROFILE=y
-# TCSUPPORT_BRIDGE_MAC_LIMIT is not set
-# TCSUPPORT_CDS is not set
-# TCSUPPORT_TW_BOARD_CDS is not set
-# TCSUPPORT_TW_BOARD_CJ is not set
-# TCSUPPORT_NOT_CARE_VER_DY_STALIST is not set
-# TCSUPPORT_GPON_ATTACK_ENHANCE is not set
-# TCSUPPORT_CPU_PERFORMANCE_TEST is not set
 TCSUPPORT_SEPERATED_ETH_ITF=y
-# TCSUPPORT_WAN2LAN_EXT is not set
-# TCSUPPORT_XPON_HAL_API is not set
-# TCSUPPORT_ORN_EBTABLES is not set
-# TCSUPPORT_XPON_HAL_API_EXT is not set
-# TCSUPPORT_XPON_HAL_API_QOS is not set
-# TCSUPPORT_XPON_HAL_API_MCST is not set
-# TCSUPPORT_IS_FH_PON is not set
-# TCSUPPORT_FH_ENV is not set
-TCSUPPORT_E8B=y
-# TCSUPPORT_GPIO40 is not set
-# TCSUPPORT_GPIO25 is not set
-TCSUPPORT_DNSEACHPVC=y
 TCSUPPORT_MLD_SNOOPING=y
 TCSUPPORT_MLD_PROXY=y
 TCSUPPORT_IGMP_PROXY_V3=y
 TCSUPPORT_IGMP_SNOOPING=y
 TCSUPPORT_IGMPSNOOPING_ENHANCE=y
-# TCSUPPORT_SNOOPING_SEPERATION is not set
 TCSUPPORT_MULTICAST_SPEED=y
-# TCSUPPORT_L2_PPP_MCAST_SHORTCUT is not set
-# TCSUPPORT_IGMP_SNOOPING_V3 is not set
-TCSUPPORT_SMUX=y
-# TCSUPPORT_MULIF_WAN_SAME_MAC is not set
 # 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
 TCSUPPORT_QDMA_WAN_DSCP_NUM=4
 TCSUPPORT_QDMA_LAN_DSCP_NUM=1
-TCSUPPORT_BACKUPROMFILE=y
-# TCSUPPORT_NOTDEFAULTROMFILEAREA is not set
-# TCSUPPORT_CT_2PWIFI is not set
-TCSUPPORT_PRODUCTIONLINE=y
-# TCSUPPORT_UNIQUEMAC is not set
-TCSUPPORT_SYSLOG=y
-TCSUPPORT_SYSLOG_ENHANCE=y
-# TCSUPPORT_REMOTE_SYSLOG is not set
-# TCSUPPORT_AUTO_IP is not set
-TCSUPPORT_DMS=y
-TCSUPPORT_DMS_FULL_FORMAT=y
-# TCSUPPORT_WEB_SAVE is not set
-# TCSUPPORT_FW_UPGRADE_16M is not set
-# TCSUPPORT_BRIDGE_FASTPATH is not set
-RA_PARENTALCONTROL=y
-# TCSUPPORT_PARENTAL_URLBLOCK is not set
-# TCSUPPORT_AUTO_DEFAULT_ROUTER is not set
-# TCSUPPORT_RA_MENU is not set
-# TCSUPPORT_NEW_SHELL is not set
-# TCSUPPORT_SIPROXD is not set
-TCSUPPORT_SAMBA_V4=y
-# TCSUPPORT_SAMBA_IPv6 is not set
-# TCSUPPORT_SAMBA_NONE is not set
-TCSUPPORT_SAMBA=y
-# TCSUPPORT_TEST_SAMBA_SHORTCUT is not set
-# TCSUPPORT_MULTICAST_BSP_GENERAL is not set
-# TCSUPPORT_CODE_SHRINK is not set
-# RA_ETHERMEDIATYPE is not set
-# TCSUPPORT_MODEL_CHECK is not set
-# TCSUPPORT_PORT_TRIGGER is not set
-# TCSUPPORT_RA_GUI is not set
-# TCSUPPORT_FILTER_DSCP is not set
-# TCSUPPORT_2PORTS is not set
-# TCSUPPORT_DHCP_PORT_FLT is not set
-TCSUPPORT_1NTP_SERVER=y
-# TCSUPPORT_2NTP_SERVER is not set
-# TCSUPPORT_3NTP_SERVER is not set
-# TCSUPPORT_UPNP_CERT is not set
-# TCSUPPORT_PPP_AUTHEN is not set
-# TCSUPPORT_TFTP_UPGRADE_PROTECT is not set
-# TCSUPPORT_TR069_OPT43 is not set
-TCSUPPORT_GENERAL_MULTILANGUAGE=y
-# TCSUPPORT_CHINESE_ONLY is not set
-# TCSUPPORT_ENGLISH_ONLY is not set
-# TCSUPPORT_FWNAME_NOCHK is not set
-# TCSUPPORT_MODEL_NAME_CUSKIT is not set
-TCSUPPORT_MEMORY_CONTROL=y
-# TCSUPPORT_SBTHROUGHPUT_ENHANCE is not set
-# TCSUPPORT_VPN_SWITCH_GUI is not set
-# TCSUPPORT_LAYER3FORWARD_ENHANCEMENT is not set
-# TCSUPPORT_UPGRADE_WDOGREBOOT is not set
 TCSUPPORT_LED_BTN_CHECK=y
-# TCSUPPORT_LED_CHECK is not set
 TCSUPPORT_BTN_CHECK=y
-# TCSUPPORT_WPA_SUPPLICANT is not set
-# TCSUPPORT_SUPPORT_FLASH is not set
 TCSUPPORT_TEST_LED_ALL=y
-# TCSUPPORT_CMDPROMPT is not set
-# TCSUPPORT_WLAN_MAXSTANUM_GUI is not set
-# TCSUPPORT_MULTISERVICE_ON_WAN is not set
-# TCSUPPORT_AGEOUT_MAC is not set
-# TCSUPPORT_POWERSAVE_ENABLE is not set
-# TCSUPPORT_FON is not set
-# TCSUPPORT_FON_V2 is not set
-# TCSUPPORT_MULTI_UPGRADE_LIONS is not set
-# TCSUPPORT_ETHER_ALL_LED is not set
-# TCSUPPORT_FW_INTERNET_LED is not set
-# TCSUPPORT_WAN_ETHER_LED is not set
-# TCSUPPORT_USB_FTP_SERVER is not set
-TCSUPPORT_FTP_CMD=y
-# TCSUPPORT_CWMP_FAULT_RESPONSE is not set
-# TCSUPPORT_DHCP_NOFORWARD is not set
 TCSUPPORT_NEW_SPIFLASH=y
-# TCSUPPORT_NEW_SPIFLASH_DEBUG is not set
-# TCSUPPORT_WPS_BTN_NEWSPEC is not set
-# TCSUPPORT_WAN_UPSTREAM_REMARK is not set
-# TCSUPPORT_ZEBRA_WORKAROUND is not set
-# TCSUPPORT_2DNS is not set
-# TCSUPPORT_UPGRADE_NO_REBOOT is not set
-TCSUPPORT_CLMP=y
-TCSUPPORT_CLMP_NG=y
-# TCSUPPORT_STARTUP_OPTIMIZATION is not set
 
 #
 # Ethernet Port Mapping to Switch Port
 #
-# TCSUPPORT_MANUAL_ETHERNET_PORTMAP is not set
-# TCSUPPORT_GUI_ALG_CONTROL is not set
 TCSUPPORT_EPON_ATTACK_ENHANCE=y
-# TCSUPPORT_L2TP_VPN_HWNAT is not set
-TCSUPPORT_TR64_DIGEST_AUTH=y
-# TCSUPPORT_MEMORY_SHRINK is not set
 # TCSUPPORT_DNSBIND_DEV is not set
-TCSUPPORT_IPV6_CWMP=y
-TCSUPPORT_CWMP_OPENSSL=y
-TCSUPPORT_CWMP_NG=y
-# TCSUPPORT_GOOGLE_FIBER_DHCPv6C is not set
 TCSUPPORT_NEW_WDOG=y
-TCSUPPORT_CFG_NG=y
-TCSUPPORT_CFG_NG_UNION=y
-# TCSUPPORT_HWNAT_ADD_DEL_API is not set
 TCSUPPORT_HIGHMEM=y
-# TCSUPPORT_CWMP_LAYER2INTERFACE is not set
 TCSUPPORT_IFC_EN=y
 TCSUPPORT_ECNT_SKBMGR=y
-# TCSUPPORT_VLAN_ACCESS_TRUNK is not set
 TCSUPPORT_USER_DEFINE_FIRST_MAC=-1
-# TCSUPPORT_SECURE_BOOT is not set
-# TCSUPPORT_EXTENDED_VLAN is not set
-# TCSUPPORT_CDS_CT is not set
-# TCSUPPORT_CGNX is not set
 TCSUPPORT_WLAN_AC=y
 TCSUPPORT_NPTv6=y
-# TCSUPPORT_VXLAN is not set
-# TCSUPPORT_UDP_PROXY is not set
-# TCSUPPORT_QDMA_OPENSOURCE is not set
+# TCSUPPORT_ORN_EBTABLES is not set
 #
 # Customer feature
 #
-TCSUPPORT_CT=y
-# TCSUPPORT_C1_CUC is not set
-TCSUPPORT_CT_PORT_BIND=y
-# TCSUPPORT_CT_SWQOS is not set
-TCSUPPORT_CT_URL_FILTER=y
-# TCSUPPORT_PPPOE_SIMULATE is not set
-# TCSUPPORT_CT_PPPOEPROXY is not set
-TCSUPPORT_CT_ACCESSLIMIT=y
-TCSUPPORT_CT_NETWORKMANAGESERVICE=y
-TCSUPPORT_CT_QOS=y
-# TCSUPPORT_CT_MIDWARE is not set
-TCSUPPORT_CT_LOOPDETECT=y
-TCSUPPORT_CT_BUTTONDETECT=y
-TCSUPPORT_CT_RATE_PRIOR_SUPPORT=y
-TCSUPPORT_CT_BACKUPROMFILEENCHANCEMENT=y
-TCSUPPORT_CT_BOOTLOADER_UPGRADE=y
-TCSUPPORT_CT_E8DDNS=y
-TCSUPPORT_CT_E8GUI=y
-# TCSUPPORT_CT_GUIPSWSHOW is not set
-TCSUPPORT_CT_FW_UPGRADE_16M=y
-TCSUPPORT_CT_E8GUI_ONLY=y
-# TCSUPPORT_CT_E8BGUI is not set
-# TCSUPPORT_CT_E8CGUI is not set
-# TCSUPPORT_CT_GUI_ENGLISH is not set
-# TCSUPPORT_RIPD is not set
-TCSUPPORT_CT_PORTAL_MANAGEMENT=y
-TCSUPPORT_CT_IPPINGDIAGNOSTIC=y
-TCSUPPORT_CT_ADSLSETTING=y
-TCSUPPORT_CT_WLAN_NODE=y
-TCSUPPORT_CT_RECONNECT_NODE=y
-TCSUPPORT_CT_IPTV_NODE=y
-TCSUPPORT_CT_INFORM_NODE=y
-TCSUPPORT_CT_ALARMMONITOR=y
-TCSUPPORT_CT_ALGABILITY=y
-# TCSUPPORT_CT_DEVICEREG is not set
-TCSUPPORT_CT_DNSBIND=y
-TCSUPPORT_CT_DEFAULTPARA_STORE=y
-TCSUPPORT_CT_PPPCONN_ERROR=y
-TCSUPPORT_CT_FTP_DOWNLOADCLIENT=y
-TCSUPPORT_CT_USB_BACKUPRESTORE=y
-TCSUPPORT_CT_DHCPC_OPTION60=y
-TCSUPPORT_CT_DHCPC_OPTION125=y
-TCSUPPORT_CT_DHCP6_OPTION=y
-# TCSUPPORT_AUTO_DMZ is not set
-# TCSUPPORT_WEB_INTERCEPTION is not set
-# TCSUPPORT_TRUE_LANDING_PAGE is not set
-TCSUPPORT_UPNP=y
-# TCSUPPORT_SIMPLE_UPNP is not set
 TCSUPPORT_IGMP_PROXY=y
 TCSUPPORT_IGMP_QUICK_LEAVE=y
-# TCSUPPORT_KEYPARA_STORE is not set
 TCSUPPORT_VIR_SERVER=y
-TCSUPPORT_CT_USB=y
-TCSUPPORT_CT_DNSMASQ_MONITOR=y
-# TCSUPPORT_CT_BLOCK_PROCESS is not set
-# TCSUPPORT_CT_SIMCARD_SEPARATION is not set
-# TCSUPPORT_CT_E8GUI_TY is not set
-TCSUPPORT_CT_PON=y
-# TCSUPPORT_CT_PON_SLAVEIMAGE is not set
-TCSUPPORT_CT_CWMP_E8BPARAMETER=y
-# TCSUPPORT_CT_CWMP_WORK_COMPATIBLE is not set
-TCSUPPORT_CT_2NTP=y
-TCSUPPORT_CT_5NTP=y
-TCSUPPORT_CT_NTPSERVERTYPE=y
-TCSUPPORT_CT_GUIACCESSLIMIT=y
-TCSUPPORT_CT_ZIPROMFILE=y
-TCSUPPORT_CT_CWMP_ZIPROMFILE=y
-# TCSUPPORT_CT_WAN_PTM is not set
 TCSUPPORT_IMPROVE_GUI_PERFM=y
-TCSUPPORT_CT_VLAN_TAG=y
-# TCSUPPORT_CT_STANDARD_E8B is not set
-TCSUPPORT_CT_STANDARD_E8C=y
-# TCSUPPORT_CT_WANNODE_MAPPING is not set
-# TCSUPPORT_CT_POPLUARIZE_E8B is not set
-# TCSUPPORT_CT_VLAN_BIND is not set
-TCSUPPORT_CT_FULL_ROUTE=y
-TCSUPPORT_CT_WAN_STAT=y
-TCSUPPORT_CT_DUAL_IMAGE=y
-TCSUPPORT_CT_WAN_CHILD_PREFIX=y
-TCSUPPORT_CT_DHCP6C_STATUS_CODE=y
-# TCSUPPORT_CT_E8B_ADSL is not set
-TCSUPPORT_CT_IPV4_RADIO=y
-TCSUPPORT_CT_SYSTEM_EX=y
-TCSUPPORT_CT_DSLITE=y
-TCSUPPORT_CT_BRIDGEARP_NOFWD_LAN=y
-# TCSUPPORT_CT_DSL_EX is not set
-# TCSUPPORT_CT_UPNP_DM is not set
-TCSUPPORT_CT_SERVICELIST_E8C=y
-TCSUPPORT_CT_VOIP_H248=y
-# VP_MEGACO is not set
-TCSUPPORT_CT_VOIP_SIP=y
-TCSUPPORT_VOIP_IMSSIP=y
-TCSUPPORT_CT_VOIP_QOS=y
-# TCSUPPORT_CT_FTP_BACKDOOR is not set
-# TCSUPPORT_CUC is not set
-# TCSUPPORT_TXPOWER_INVERSE is not set
-# TCSUPPORT_VOIP_1FXSPORT is not set
-TCSUPPORT_CT_DHCP_PORT_FILTER=y
-# TCSUPPORT_CT_ITMS_TMOUT is not set
-# TCSUPPORT_CY is not set
-# TCSUPPORT_CT_PON_CY is not set
-# TCSUPPORT_CT_PON_CJZ is not set
-# TCSUPPORT_CT_PON_CJ is not set
-# TCSUPPORT_CT_PON_CN is not set
-# TCSUPPORT_CT_PON_CN_CN is not set
-# TCSUPPORT_CT_PON_CN_JS is not set
-# TCSUPPORT_CT_SFU_SK is not set
-# TCSUPPORT_CT_SFU_SX is not set
-# TCSUPPORT_CT_PON_SK is not set
-# TCSUPPORT_CT_PON_C9 is not set
-# TCSUPPORT_PON_ROSTELECOM is not set
-# TCSUPPORT_C9_ROST_LED is not set
-# TCSUPPORT_CT_OMCI_CFG_SHRINK is not set
-# TCSUPPORT_CT_PON_C5 is not set
-# TCSUPPORT_CT_PON_C7 is not set
-# TCSUPPORT_ALPHION_PON is not set
-# TCSUPPORT_CT_PON_SMALLSYSTEM is not set
-# TCSUPPORT_CT_PON_BIGSYSTEM is not set
-# TCSUPPORT_C7 is not set
-# TCSUPPORT_CT_PROLINE_SUPPORT is not set
-# TCSUPPORT_CT_WLAN_WAPI is not set
-# TCSUPPORT_CT_FJ is not set
-TCSUPPORT_CT_LONG_RESETBTN=y
-TCSUPPORT_CT_PPP_ONDEMAND=y
-# TCSUPPORT_CT_PPP_MANUALLY is not set
-TCSUPPORT_CT_ADV_DNSPROXY=y
-# TCSUPPORT_CY_E8_SFU is not set
 TCSUPPORT_RESERVEAREA_EXTEND=y
-# TCSUPPORT_CT_ECN_GZ is not set
-# TCSUPPORT_CT_NEWGUI is not set
-# TCSUPPORT_CT_2PORTS is not set
-# TCSUPPORT_CT_1PORT is not set
-# TCSUPPORT_CT_1FXS is not set
-TCSUPPORT_LED_SWITCH_BUTTON=y
-# TCSUPPORT_CT_DIAG_MICROSECOND is not set
-# TCSUPPORT_CT_MONITORCOLLECTOR is not set
-# TCSUPPORT_CT_PPPOE_EMULATOR is not set
-# TCSUPPORT_CY_PON is not set
-# TCSUPPORT_HW_SW_FWVER is not set
-# TCSUPPORT_CT_PON_GD is not set
-# TCSUPPORT_CT_PON_GDV20 is not set
-# TCSUPPORT_CT_PON_SC is not set
-# TCSUPPORT_CT_PON_CQ is not set
-TCSUPPORT_CT_UPG_PINGPONG=y
-# TCSUPPORT_CT_REMOTE_UPG_WEBREDIRECT is not set
-# TCSUPPORT_CT_DEV_ACCESS_TYPE is not set
-# TCSUPPORT_CT_PON_YN is not set
-# TCSUPPORT_CT_PON_NX is not set
-# TCSUPPORT_CT_PON_GS is not set
-# TCSUPPORT_CT_DEVREG_PROV_CODE is not set
-# TCSUPPORT_ASB_VECTOR is not set
-# TCSUPPORT_CT_UPLOAD_ALLINONE is not set
-# TCSUPPORT_CT_WANNINDEX_INCREASE is not set
-# TCSUPPORT_CT_PON_NMG is not set
-# TCSUPPORT_CT_PON_SN is not set
-# TCSUPPORT_CT_PHONEAPP is not set
-# TCSUPPORT_CT_JOYME is not set
-# TCSUPPORT_CT_JOYME2 is not set
-# TCSUPPORT_CT_JOYME4 is not set
-# TCSUPPORT_CT_JOYME_BANDWIDTH is not set
-# TCSUPPORT_CT_DHCP_FORCERENEW is not set
-# TCSUPPORT_CT_DHCP_ARPPING is not set
-# TCSUPPORT_CT_PON_BIND2 is not set
-# TCSUPPORT_CT_PON_JS is not set
-# TCSUPPORT_CT_VOIP_CRYPT is not set
-# TCSUPPORT_CT_PON_GX is not set
-# TCSUPPORT_CT_SFU_C9 is not set
-# TCSUPPORT_CT_C9 is not set
-# TCSUPPORT_CT_PORTSLIMIT is not set
-# TCSUPPORT_CT_IPOE_EMULATOR is not set
-# TCSUPPORT_TR69_IP_HOST is not set
-# TCSUPPORT_CT_PPPINFORM is not set
-# TCSUPPORT_CT_AUTOREGISTER is not set
-# TCSUPPORT_CT_C5_HEN_SFU is not set
-# TCSUPPORT_FWC_ENV is not set
-# TCSUPPORT_FWC_QOS is not set
-# TCSUPPORT_FWC_TRAFFIC_CLASSIFY is not set
-# TCSUPPORT_FWC_MCST is not set
-# TCSUPPORT_CT_PON_JX is not set
-# TCSUPPORT_CT_PON_QH is not set
-# TCSUPPORT_CT_PON_CZ_QH is not set
-# TCSUPPORT_CT_STBMAC_REPORT is not set
-# TCSUPPORT_CT_PMINFORM is not set
-# TCSUPPORT_CT_PON_ONUCONFIG is not set
-# TCSUPPORT_CT_PON_HUB is not set
-# TCSUPPORT_CT_PPP_ONDEMAND_WEBUI is not set
-# TCSUPPORT_CT_PON_FHT is not set
-TCSUPPORT_CT_TR143_WGET_DOWNLOAD=y
-# TCSUPPORT_CT_STB_TEST is not set
-# TCSUPPORT_CT_NAMECHGNOTIFY is not set
-# TCSUPPORT_CT_PON_CA is not set
-# TCSUPPORT_CATV_GD is not set
-# TCSUPPORT_CMCC is not set
-# TCSUPPORT_CSC_EEUROPE is not set
-# TCSUPPORT_CT_PON_HLJ is not set
-# TCSUPPORT_PON_IP_HOST_AUTOWAN_VOICE is not set
-# TCSUPPORT_CT_DS_LIMIT is not set
-# TCSUPPORT_CT_TRACEROUTEIPV6 is not set
-# TCSUPPORT_CT_PON_CAU is not set
-# TCSUPPORT_CT_PPPERRCODE_ENHANCE is not set
-# TCSUPPORT_CT_BRIDGE_PPPSTATUS is not set
-# TCSUPPORT_CT_MAXNET_DPI is not set
-# TCSUPPORT_CT_PON_CZ_GD is not set
-# TCSUPPORT_CT_LAN_BYPASS is not set
-# TCSUPPORT_CT_PON_CZ_GX is not set
-# TCSUPPORT_CT_PON_CZ_NX is not set
-# TCSUPPORT_CT_PON_CZ_GZ is not set
-# TCSUPPORT_CT_TY_LOGO is not set
-# TCSUPPORT_CT_PON_CZ_GDCS is not set
-TCSUPPORT_CT_L2TP_VPN=y
-# TCSUPPORT_CT_PON_CZ_CQ is not set
-# TCSUPPORT_CT_PON_CZ_HN is not set
-# TCSUPPORT_XPON_HYBIRD is not set
-# TCSUPPORT_CMCC_WLAN_ENHANCE is not set
-# TCSUPPORT_CMCC_WLAN_FORCEROAM is not set
-# TCSUPPORT_CT_WLAN_JOYME3 is not set
-# TCSUPPORT_XPON_HAL_API_NG is not set
 TCSUPPORT_MULTI_USER_ITF=y
-# TCSUPPORT_CT_DBUS is not set
-# TCSUPPORT_CT_VPN_ONDEMAND is not set
-# TCSUPPORT_CT_VPN_PPTP is not set
-# TCSUPPORT_CT_MAP_INSIDE_AGENT is not set
-# TCSUPPORT_CT_SDN is not set
-# TCSUPPORT_CT_MULTI_LAN_PD is not set
-# TCSUPPORT_CT_UBUS is not set
 TCSUPPORT_BLAPI=y
-# TCSUPPORT_CHARSET_CHANGE is not set
 
 #
 # Beta feature: Parallel Build
@@ -788,5 +196,10 @@ TCSUPPORT_BLAPI=y
 # TCSUPPORT_PARALLEL_BUILD_CUSTOM_JOB_NUM_ENABLE is not set
 BSP=y
 TCSUPPORT_OPENWRT=y
-TCSUPPORT_IOPSYS_DISABLE_IPV6_DEV_CONFIG_ECNT_HOOK=y
+TCSUPPORT_ARM_SECURE_BOOT=y
+
+# iopsys changes
+TCSUPPORT_NP=y
 TCSUPPORT_NPU_WIFI_OFFLOAD=y
+TCSUPPORT_QOS_EIGHT_QUEUE=y
+TCSUPPORT_IOPSYS_DISABLE_IPV6_DEV_CONFIG_ECNT_HOOK=y
diff --git a/airoha/en7562/UNION_EN7562_7915D_ActiveEthWan_KERNEL_5_4_demo.mak b/airoha/en7562/UNION_EN7562_7915D_ActiveEthWan_KERNEL_5_4_demo.mak
index dde6224e58d95ce0cb478619ce0fb73abd146ff7..bbbbdb4a38424dc15771036ecfb1dce6e643ce92 100755
--- a/airoha/en7562/UNION_EN7562_7915D_ActiveEthWan_KERNEL_5_4_demo.mak
+++ b/airoha/en7562/UNION_EN7562_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
@@ -132,7 +132,7 @@ TCSUPPORT_DSLITE=y
 # TCSUPPORT_6RD is not set
 TCSUPPORT_IPV6_ADVANCE=y
 TCSUPPORT_TSO_ENABLE=y
-TCSUPPORT_TSO_V2_ENABLE=y 
+TCSUPPORT_TSO_V2_ENABLE=y
 # TCSUPPORT_LRO_ENABLE is not set
 TCSUPPORT_ACTIVE_ETHERNET_WAN=y
 TCSUPPORT_HSGMII_LAN=y
@@ -154,8 +154,8 @@ 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_PARTITIONS_CMDLINE_STR is not set
 TCSUPPORT_MTD_PARTITION_NUM=9
 TCSUPPORT_MTD_ENCHANCEMENT=y
 TCSUPPORT_RESERVEAREA_BLOCK=6
@@ -178,7 +178,7 @@ 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
 #
@@ -195,5 +195,10 @@ TCSUPPORT_BLAPI=y
 #
 # TCSUPPORT_PARALLEL_BUILD_KERNEL_OFF is not set
 # TCSUPPORT_PARALLEL_BUILD_CUSTOM_JOB_NUM_ENABLE is not set
-BSP =y
+BSP=y
 TCSUPPORT_OPENWRT=y
+
+# iopsys changes
+TCSUPPORT_IOPSYS_DISABLE_IPV6_DEV_CONFIG_ECNT_HOOK=y
+TCSUPPORT_QOS_EIGHT_QUEUE=y
+TCSUPPORT_NPU_WIFI_OFFLOAD=y
diff --git a/airoha/en7581/UNION_EN7581_GLIBC_7915_7915_KERNEL_5_4_GCC_1030_demo.mak b/airoha/en7581/UNION_EN7581_GLIBC_7915_7915_KERNEL_5_4_GCC_1030_demo.mak
index e8a6241c4b8ed1e74b973f10aceadefc30d23f72..5374297d68b3a20444f5e5f34ba4e5a3aaf470ef 100755
--- a/airoha/en7581/UNION_EN7581_GLIBC_7915_7915_KERNEL_5_4_GCC_1030_demo.mak
+++ b/airoha/en7581/UNION_EN7581_GLIBC_7915_7915_KERNEL_5_4_GCC_1030_demo.mak
@@ -227,7 +227,7 @@ TCSUPPORT_MT7570=y
 NOT_SUPPORT_BADBLOCK_CHECK=y
 # TCSUPPORT_NAND_BADBLOCK_CHECK is not set
 # TCSUPPORT_NAND_RT63368 is not set
-TCSUPPORT_NAND_BMT=y
+# TCSUPPORT_NAND_BMT is not set
 # TCSUPPORT_SQUASHFS_ADD_YAFFS is not set
 TCSUPPORT_RA_HWNAT=y
 TCSUPPORT_HWNAT_V3=y
@@ -259,7 +259,7 @@ TCSUPPORT_EPON_OAM_LAN_DBG=y
 # TCSUPPORT_UART_DISABLE is not set
 # TCSUPPORT_UART2 is not set
 # TCSUPPORT_FE_VIP_ENHANCEMENT is not set
-TCSUPPORT_SPI_CONTROLLER_ECC=y
+# TCSUPPORT_SPI_CONTROLLER_ECC is not set
 # TCSUPPORT_NAND_FLASH_OTP is not set
 # TCSUPPORT_GRE_TUNNEL_HWNAT is not set
 
@@ -407,8 +407,8 @@ TCSUPPORT_MULTICAST_SPEED=y
 # TCSUPPORT_IGMP_SNOOPING_V3 is not set
 TCSUPPORT_SMUX=y
 # TCSUPPORT_MULIF_WAN_SAME_MAC is not set
-TCSUPPORT_MTD_PARTITIONS_CMDLINE=y
-TCSUPPORT_PARTITIONS_CMDLINE_STR="40m[tclinux],40m[tclinux_slave],16m[rootfs_data]"
+# TCSUPPORT_MTD_PARTITIONS_CMDLINE is not set
+# TCSUPPORT_PARTITIONS_CMDLINE_STR is not set
 TCSUPPORT_MTD_PARTITION_NUM=9
 TCSUPPORT_MTD_ENCHANCEMENT=y
 TCSUPPORT_RESERVEAREA_BLOCK=6
@@ -530,7 +530,7 @@ TCSUPPORT_USER_DEFINE_FIRST_MAC=-1
 # TCSUPPORT_CGNX is not set
 TCSUPPORT_WLAN_AC=y
 TCSUPPORT_NPTv6=y
-TCSUPPORT_ORN_EBTABLES=y
+# TCSUPPORT_ORN_EBTABLES is not set
 # TCSUPPORT_VXLAN is not set
 # TCSUPPORT_UDP_PROXY is not set
 # TCSUPPORT_APPS_NOROOT_PERM is not set
@@ -567,5 +567,10 @@ TCSUPPORT_BLAPI=y
 #
 # TCSUPPORT_PARALLEL_BUILD_KERNEL_OFF is not set
 # TCSUPPORT_PARALLEL_BUILD_CUSTOM_JOB_NUM_ENABLE is not set
-BSP =y
+BSP=y
 TCSUPPORT_OPENWRT=y
+
+# iopsys changes
+TCSUPPORT_IOPSYS_DISABLE_IPV6_DEV_CONFIG_ECNT_HOOK=y
+TCSUPPORT_QOS_EIGHT_QUEUE=y
+TCSUPPORT_NPU_WIFI_OFFLOAD=y