From 2bd73559c847cd27f996f698673d216c7805da8d 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 iopsys-econet: disable ipv6 static address hook d16e0a9c2240a81149ca8a3cffade8ea41f19bb3 iopsys-econet: Add loopdev and mtd_cmd to kernel 79e4b91455a4b9379cb431b177e04db51c1a862c iopsys-econet: Enable CONFIG_GPIO_EN7523 22c0d5d5c8be943c248e31723bfaf09c8300e286 iopsys-econet: extend dmesg buffer 76ae5cd9bbac4c67006b1e4ab19b0f5ac177af0d iopsys-econet: pstore: Enable PSTORE support 04ce5f95f9e0583a37d0692ecb78348394b57df2 iopsys-econet: enable BRIDGE_VLAN_FILTERING flag c9661aecee43b282bfa242c24225cb159f8511c7 iopsys-econet: add iptables nflog module 06baedf7be73a9da3afb2ed75a74c70f0d1c36e2 iopsys-econet: Device target model build e4a1a86d135864b57a809a3bb89126c4cb3a6bd7 --- ...IBC_7915D_ActiveEthWan_KERNEL_5_4_demo.mak | 16 ++++-- iopsys-econet/en7523/config-5.4 | 51 ++++++++++++++++--- iopsys-econet/en7523/target.mk | 5 +- 3 files changed, 56 insertions(+), 16 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..a590fb874 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 ae6edd0c1..a381fd3d8 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. -- GitLab