From b920b0be5b8aae5e56d4e3ec935d7c58d86b0aec Mon Sep 17 00:00:00 2001
From: Lukasz Kotasa <lukasz.kotasa@iopsys.eu>
Date: Thu, 8 Sep 2022 11:51:33 +0200
Subject: [PATCH] iopsys-econet: port flags from old en7562 to en7523

Ported changes from commits:

econet: switch to new spi/spi-nand drivers
8c2aa1efe7e74f30f00159ddfa0acb25e55bef76

econet: set MTD_UBI_GLUEBI=y to have an mtd emulation for ubi 'art' volume
96ab5ac539b0ccd6a873ba1a31422be61a4383a1
---
 ...IBC_7915D_ActiveEthWan_KERNEL_5_4_demo.mak | 16 +++++++++-----
 iopsys-econet/en7523/config-5.4               | 22 +++++++++++++++----
 2 files changed, 29 insertions(+), 9 deletions(-)

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 924bb1a13..50eff8741 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 cd17396f6..f8744ba5a 100755
--- a/iopsys-econet/en7523/config-5.4
+++ b/iopsys-econet/en7523/config-5.4
@@ -396,12 +396,26 @@ 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_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
-- 
GitLab