diff --git a/target/linux/generic/config-6.6 b/target/linux/generic/config-6.6 index 20fe98099f286b..2fbaa6aa14212b 100644 --- a/target/linux/generic/config-6.6 +++ b/target/linux/generic/config-6.6 @@ -4186,7 +4186,12 @@ CONFIG_NFS_V3=y # CONFIG_NF_CONNTRACK is not set # CONFIG_NF_CONNTRACK_AMANDA is not set # CONFIG_NF_CONNTRACK_BRIDGE is not set -# CONFIG_NF_CONNTRACK_EVENTS is not set +CONFIG_NF_CONNTRACK_EVENTS=y +CONFIG_NF_CONNTRACK_CHAIN_EVENTS=y +CONFIG_NF_CONNTRACK_TIMEOUT=y +CONFIG_NF_CONNTRACK_TIMESTAMP=y +CONFIG_NF_CONNTRACK_LABELS=y +CONFIG_NF_CONNTRACK_OVS=y # CONFIG_NF_CONNTRACK_FTP is not set # CONFIG_NF_CONNTRACK_H323 is not set # CONFIG_NF_CONNTRACK_IRC is not set @@ -4201,7 +4206,6 @@ CONFIG_NF_CONNTRACK_PROCFS=y # CONFIG_NF_CONNTRACK_SNMP is not set # CONFIG_NF_CONNTRACK_TFTP is not set # CONFIG_NF_CONNTRACK_TIMEOUT is not set -# CONFIG_NF_CONNTRACK_TIMESTAMP is not set # CONFIG_NF_CONNTRACK_ZONES is not set # CONFIG_NF_CT_NETLINK is not set # CONFIG_NF_CT_NETLINK_HELPER is not set diff --git a/target/linux/generic/hack-6.6/781-usb-net-rndis-support-asr.patch b/target/linux/generic/hack-6.6/781-usb-net-rndis-support-asr.patch deleted file mode 100644 index 47339b6c22f7b2..00000000000000 --- a/target/linux/generic/hack-6.6/781-usb-net-rndis-support-asr.patch +++ /dev/null @@ -1,69 +0,0 @@ -From 9fabf60187f1fa19e6f6bb5441587d485bd534b0 Mon Sep 17 00:00:00 2001 -From: Daniel Golle -Date: Tue, 9 Apr 2024 17:06:38 +0100 -Subject: [PATCH] rndis_host: add a bunch of USB IDs - -Add a bunch of USB IDs found in various places online to the -RNDIS USB network driver. - -Signed-off-by: Daniel Golle ---- - drivers/net/usb/rndis_host.c | 40 ++++++++++++++++++++++ - 1 file changed, 40 insertions(+) - ---- a/drivers/net/usb/rndis_host.c -+++ b/drivers/net/usb/rndis_host.c -@@ -630,6 +630,16 @@ static const struct driver_info zte_rndi - .tx_fixup = rndis_tx_fixup, - }; - -+static const struct driver_info asr_rndis_info = { -+ .description = "Asr RNDIS device", -+ .flags = FLAG_WWAN | FLAG_POINTTOPOINT | FLAG_FRAMING_RN | FLAG_NO_SETINT | FLAG_NOARP, -+ .bind = rndis_bind, -+ .unbind = rndis_unbind, -+ .status = rndis_status, -+ .rx_fixup = rndis_rx_fixup, -+ .tx_fixup = rndis_tx_fixup, -+}; -+ - /*-------------------------------------------------------------------------*/ - - static const struct usb_device_id products [] = { -@@ -666,6 +676,36 @@ static const struct usb_device_id produc - USB_INTERFACE_INFO(USB_CLASS_WIRELESS_CONTROLLER, 1, 3), - .driver_info = (unsigned long) &rndis_info, - }, { -+ /* Quectel EG060V rndis device */ -+ USB_DEVICE_AND_INTERFACE_INFO(0x2c7c, 0x6004, -+ USB_CLASS_WIRELESS_CONTROLLER, 1, 3), -+ .driver_info = (unsigned long) &asr_rndis_info, -+}, { -+ /* Quectel EC200A rndis device */ -+ USB_DEVICE_AND_INTERFACE_INFO(0x2c7c, 0x6005, -+ USB_CLASS_WIRELESS_CONTROLLER, 1, 3), -+ .driver_info = (unsigned long) &asr_rndis_info, -+}, { -+ /* Quectel EC200T rndis device */ -+ USB_DEVICE_AND_INTERFACE_INFO(0x2c7c, 0x6026, -+ USB_CLASS_WIRELESS_CONTROLLER, 1, 3), -+ .driver_info = (unsigned long) &asr_rndis_info, -+}, { -+ /* Simcom A7906E rndis device */ -+ USB_DEVICE_AND_INTERFACE_INFO(0x1e0e, 0x9011, -+ USB_CLASS_WIRELESS_CONTROLLER, 1, 3), -+ .driver_info = (unsigned long) &asr_rndis_info, -+}, { -+ /* Meig SLM770A */ -+ USB_DEVICE_AND_INTERFACE_INFO(0x2dee, 0x4d57, -+ USB_CLASS_WIRELESS_CONTROLLER, 1, 3), -+ .driver_info = (unsigned long) &asr_rndis_info, -+}, { -+ /* Meig SLM828 */ -+ USB_DEVICE_AND_INTERFACE_INFO(0x2dee, 0x4d49, -+ USB_CLASS_WIRELESS_CONTROLLER, 1, 3), -+ .driver_info = (unsigned long) &asr_rndis_info, -+}, { - /* Novatel Verizon USB730L */ - USB_INTERFACE_INFO(USB_CLASS_MISC, 4, 1), - .driver_info = (unsigned long) &rndis_info, diff --git a/target/linux/rockchip/armv8/config-6.6 b/target/linux/rockchip/armv8/config-6.6 index fb57fc62604f1d..ac5f90cfac821a 100644 --- a/target/linux/rockchip/armv8/config-6.6 +++ b/target/linux/rockchip/armv8/config-6.6 @@ -185,7 +185,7 @@ CONFIG_CRYPTO_CRC64_ROCKSOFT=y CONFIG_CRYPTO_CRCT10DIF=y CONFIG_CRYPTO_CRCT10DIF_ARM64_CE=y CONFIG_CRYPTO_CRYPTD=y -# CONFIG_CRYPTO_DEV_ROCKCHIP is not set +CONFIG_CRYPTO_DEV_ROCKCHIP=n CONFIG_CRYPTO_GHASH_ARM64_CE=y CONFIG_CRYPTO_HW=y CONFIG_CRYPTO_LIB_BLAKE2S_GENERIC=y @@ -342,6 +342,7 @@ CONFIG_IOMMU_IO_PGTABLE_LPAE=y # CONFIG_IOMMU_IO_PGTABLE_LPAE_SELFTEST is not set CONFIG_IOMMU_SUPPORT=y # CONFIG_IO_STRICT_DEVMEM is not set +CONFIG_IP_NF_TARGET_FULLCONENAT=m CONFIG_IRQCHIP=y CONFIG_IRQ_DOMAIN=y CONFIG_IRQ_DOMAIN_HIERARCHY=y @@ -433,6 +434,8 @@ CONFIG_NET_PTP_CLASSIFY=y CONFIG_NET_SELFTESTS=y CONFIG_NET_SWITCHDEV=y CONFIG_NET_XGRESS=y +CONFIG_NF_CONNTRACK_CHAIN_EVENTS=y +CONFIG_NETFILTER_XT_TARGET_FULLCONENAT=m CONFIG_NLS=y CONFIG_NLS_ISO8859_1=y CONFIG_NOP_USB_XCEIV=y @@ -544,6 +547,38 @@ CONFIG_QUEUED_RWLOCKS=y CONFIG_QUEUED_SPINLOCKS=y CONFIG_QUOTA=y CONFIG_QUOTACTL=y +CONFIG_R8125=m +CONFIG_R8125_SOC_LAN=y +# CONFIG_R8125_REALWOW_SUPPORT is not set +# CONFIG_R8125_DASH_SUPPORT is not set +# CONFIG_R8125_DOWN_SPEED_100 is not set +# CONFIG_R8125_ASPM is not set +CONFIG_R8125_WOL_SUPPORT=y +CONFIG_R8125_S5WOL=y +# CONFIG_R8125_S5_KEEP_CURR_MAC is not set +# CONFIG_R8125_EEE is not set +# CONFIG_R8125_S0_MAGIC_PACKET is not set +CONFIG_R8125_TX_NO_CLOSE=y +CONFIG_R8125_MULTI_MSIX_VECTOR=y +CONFIG_R8125_MULTIPLE_TX_QUEUE=y +CONFIG_R8125_RSS_SUPPORT=y +CONFIG_R8125_PTP_SUPPORT=y +CONFIG_R8125_PTP_MASTER_MODE=y +CONFIG_R8125_USE_FIRMWARE_FILE=y +# CONFIG_R8125_DOUBLE_VLAN is not set +# CONFIG_R8125_PAGE_REUSE is not set +CONFIG_R8126=n +CONFIG_R8168=n +CONFIG_JLSEMI_PHY=y +CONFIG_HW_RANDOM_ROCKCHIP_RK3568=y +CONFIG_HW_RANDOM_ROCKCHIP_RK3568=y +CONFIG_ARM_RK3328_DMC_DEVFREQ=m +CONFIG_DEVFREQ_EVENT_ROCKCHIP_DFI=y +CONFIG_PHY_ROCKCHIP_SAMSUNG_HDPTX=n +CONFIG_PHY_ROCKCHIP_USBDP=n +CONFIG_CRYPTO_DEV_ROCKCHIP2=n +CONFIG_CRYPTO_DEV_ROCKCHIP2_DEBUG=n +CONFIG_CRYPTO_DEV_CRYPTODEV_LINUX=n CONFIG_RAID_ATTRS=y CONFIG_RANDSTRUCT_NONE=y CONFIG_RAS=y @@ -567,6 +602,7 @@ CONFIG_RELOCATABLE=y CONFIG_RESET_CONTROLLER=y CONFIG_RESET_SCMI=y CONFIG_RFS_ACCEL=y +CONFIG_ROCKCHIP_ERRATUM_114514=y CONFIG_ROCKCHIP_GRF=y CONFIG_ROCKCHIP_IODOMAIN=y CONFIG_ROCKCHIP_IOMMU=y @@ -617,7 +653,11 @@ CONFIG_SERIAL_OF_PLATFORM=y CONFIG_SERIO=y CONFIG_SERIO_AMBAKMI=y CONFIG_SERIO_LIBPS2=y +CONFIG_SFE_SUPPORT_IPV6=y +CONFIG_SFE_ECM=y +CONFIG_FAST_CLASSIFIER=y CONFIG_SG_POOL=y +CONFIG_SHORTCUT_FE=y CONFIG_SMP=y CONFIG_SOCK_RX_QUEUE_MAPPING=y CONFIG_SOFTIRQ_ON_OWN_STACK=y