From e3dd49809be7a3f0445467c139a25503f4625d95 Mon Sep 17 00:00:00 2001 From: "Ycarus (Yannick Chabanois)" Date: Wed, 29 Sep 2021 19:28:25 +0200 Subject: [PATCH] Update config 5.4 and remove some patches --- build.sh | 12 ++++++++++++ root/target/linux/generic/config-5.4 | 22 ++++++++++++++++++++++ 2 files changed, 34 insertions(+) diff --git a/build.sh b/build.sh index d04e3e5b..08ef375c 100755 --- a/build.sh +++ b/build.sh @@ -446,6 +446,12 @@ fi if [ -f target/linux/generic/pending-5.4/641-netfilter-nf_flow_table-support-hw-offload-through-v.patch ]; then rm -f target/linux/generic/pending-5.4/641-netfilter-nf_flow_table-support-hw-offload-through-v.patch fi +if [ -f target/linux/generic/pending-5.4/642-net-8021q-support-hardware-flow-table-offload.patch ]; then + rm -f target/linux/generic/pending-5.4/642-net-8021q-support-hardware-flow-table-offload.patch +fi +if [ -f target/linux/generic/pending-5.4/643-net-bridge-support-hardware-flow-table-offload.patch ]; then + rm -f target/linux/generic/pending-5.4/643-net-bridge-support-hardware-flow-table-offload.patch +fi if [ -f target/linux/generic/pending-5.4/644-net-pppoe-support-hardware-flow-table-offload.patch ]; then rm -f target/linux/generic/pending-5.4/644-net-pppoe-support-hardware-flow-table-offload.patch fi @@ -455,6 +461,9 @@ fi if [ -f target/linux/generic/pending-5.4/647-net-dsa-support-hardware-flow-table-offload.patch ]; then rm -f target/linux/generic/pending-5.4/647-net-dsa-support-hardware-flow-table-offload.patch fi +if [ -f target/linux/generic/hack-5.4/650-netfilter-add-xt_OFFLOAD-target.patch ]; then + rm -f target/linux/generic/hack-5.4/650-netfilter-add-xt_OFFLOAD-target.patch +fi if [ -f target/linux/generic/pending-5.4/690-net-add-support-for-threaded-NAPI-polling.patch ]; then rm -f target/linux/generic/pending-5.4/690-net-add-support-for-threaded-NAPI-polling.patch fi @@ -467,6 +476,9 @@ fi if [ -f target/linux/bcm27xx/patches-5.4/950-1031-net-lan78xx-Ack-pending-PHY-ints-when-resetting.patch ]; then rm -f target/linux/bcm27xx/patches-5.4/950-1031-net-lan78xx-Ack-pending-PHY-ints-when-resetting.patch fi +if [ -f target/linux/generic/pending-5.4/770-16-net-ethernet-mediatek-mtk_eth_soc-add-flow-offloadin.patch ]; then + rm -f target/linux/generic/pending-5.4/770-16-net-ethernet-mediatek-mtk_eth_soc-add-flow-offloadin.patch +fi if [ "$OMR_KERNEL" = "5.4" ]; then echo "Set to kernel 5.4 for rpi arch" diff --git a/root/target/linux/generic/config-5.4 b/root/target/linux/generic/config-5.4 index fc63ff1b..3b8f5217 100644 --- a/root/target/linux/generic/config-5.4 +++ b/root/target/linux/generic/config-5.4 @@ -974,6 +974,8 @@ CONFIG_CRYPTO_ALGAPI2=y # CONFIG_CRYPTO_ANUBIS is not set # CONFIG_CRYPTO_ARC4 is not set # CONFIG_CRYPTO_AUTHENC is not set +# CONFIG_CRYPTO_BLAKE2S is not set +# CONFIG_CRYPTO_BLAKE2S_X86 is not set CONFIG_CRYPTO_BLKCIPHER=y CONFIG_CRYPTO_BLKCIPHER2=y # CONFIG_CRYPTO_BLOWFISH is not set @@ -995,6 +997,8 @@ CONFIG_CRYPTO_BLKCIPHER2=y # CONFIG_CRYPTO_CRYPTD is not set # CONFIG_CRYPTO_CTR is not set # CONFIG_CRYPTO_CTS is not set +# CONFIG_CRYPTO_CURVE25519 is not set +# CONFIG_CRYPTO_CURVE25519_X86 is not set # CONFIG_CRYPTO_DEFLATE is not set # CONFIG_CRYPTO_DES is not set # CONFIG_CRYPTO_DEV_ATMEL_AES is not set @@ -1481,7 +1485,13 @@ CONFIG_EPOLL=y CONFIG_ETHERNET=y # CONFIG_ETHOC is not set CONFIG_EVENTFD=y +# CONFIG_EXFAT_DEBUG_MSG is not set +# CONFIG_EXFAT_DEFAULT_CODEPAGE is not set +# CONFIG_EXFAT_DELAYED_SYNC is not set +# CONFIG_EXFAT_DISCARD is not set +# CONFIG_EXFAT_DONT_MOUNT_VFAT is not set # CONFIG_EXFAT_FS is not set +# CONFIG_EXFAT_KERNEL_DEBUG is not set CONFIG_EXPERT=y CONFIG_EXPORTFS=y # CONFIG_EXPORTFS_BLOCK_OPS is not set @@ -1519,6 +1529,8 @@ CONFIG_EXTRA_TARGETS="" # CONFIG_F2FS_FS_ENCRYPTION is not set # CONFIG_F2FS_FS_POSIX_ACL is not set # CONFIG_F2FS_FS_SECURITY is not set +# CONFIG_F2FS_STAT_FS is not set +# CONFIG_F2FS_FS_XATTR is not set # CONFIG_F2FS_IO_TRACE is not set # CONFIG_FAILOVER is not set # CONFIG_FAIR_GROUP_SCHED is not set @@ -2343,6 +2355,7 @@ CONFIG_INPUT_MISC=y # CONFIG_INV_MPU6050_IIO is not set # CONFIG_INV_MPU6050_SPI is not set # CONFIG_IOMMU_SUPPORT is not set +# CONFIG_IONIC is not set # CONFIG_IOSCHED_BFQ is not set # CONFIG_IOSCHED_CFQ is not set CONFIG_IOSCHED_DEADLINE=y @@ -2367,6 +2380,7 @@ CONFIG_IO_STRICT_DEVMEM=y # CONFIG_IP6_NF_RAW is not set # CONFIG_IP6_NF_SECURITY is not set # CONFIG_IP6_NF_TARGET_HL is not set +# CONFIG_IP6_NF_TARGET_MASQUERADE is not set # CONFIG_IP6_NF_TARGET_REJECT is not set # CONFIG_IP6_NF_TARGET_SYNPROXY is not set # CONFIG_IPACK_BUS is not set @@ -2391,6 +2405,7 @@ CONFIG_IPV6_NDISC_NODETYPE=y # CONFIG_IPV6_TUNNEL is not set # CONFIG_IPV6_VTI is not set # CONFIG_IPVLAN is not set +# CONFIG_IPVTAP is not set # CONFIG_IPW2100 is not set # CONFIG_IPW2100_DEBUG is not set CONFIG_IPW2100_MONITOR=y @@ -2974,6 +2989,7 @@ CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4 # CONFIG_MICROSEMI_PHY is not set # CONFIG_MIGRATION is not set CONFIG_MII=y +# CONFIG_MIKROTIK is not set # CONFIG_MIKROTIK_RB532 is not set # CONFIG_MINIX_FS is not set # CONFIG_MINIX_FS_NATIVE_ENDIAN is not set @@ -3648,6 +3664,7 @@ CONFIG_NF_CONNTRACK_PROCFS=y # 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 # CONFIG_NF_CT_NETLINK_TIMEOUT is not set # CONFIG_NF_CT_PROTO_DCCP is not set # CONFIG_NF_CT_PROTO_GRE is not set @@ -3660,6 +3677,7 @@ CONFIG_NF_CONNTRACK_PROCFS=y # CONFIG_NF_LOG_ARP is not set # CONFIG_NF_LOG_BRIDGE is not set # CONFIG_NF_LOG_IPV4 is not set +# CONFIG_NF_LOG_IPV6 is not set # CONFIG_NF_LOG_NETDEV is not set # CONFIG_NF_NAT is not set # CONFIG_NF_NAT_AMANDA is not set @@ -6043,6 +6061,7 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y # CONFIG_USB_RCAR_PHY is not set # CONFIG_USB_RENESAS_USBHS is not set # CONFIG_USB_RIO500 is not set +# CONFIG_USB_ROLES_INTEL_XHCI is not set # CONFIG_USB_ROLE_SWITCH is not set # CONFIG_USB_RTL8150 is not set # CONFIG_USB_RTL8152 is not set @@ -6165,6 +6184,7 @@ CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y # CONFIG_USB_ZR364XX is not set # CONFIG_USELIB is not set # CONFIG_USERFAULTFD is not set +# CONFIG_USERIO is not set # CONFIG_USE_OF is not set # CONFIG_UTS_NS is not set # CONFIG_UWB is not set @@ -6182,6 +6202,7 @@ CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y # CONFIG_VF610_ADC is not set # CONFIG_VF610_DAC is not set # CONFIG_VFAT_FS is not set +# CONFIG_VFIO is not set # CONFIG_VGASTATE is not set # CONFIG_VGA_ARB is not set # CONFIG_VGA_SWITCHEROO is not set @@ -6292,6 +6313,7 @@ CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y # CONFIG_VIRTIO_INPUT is not set CONFIG_VIRTIO_MENU=y # CONFIG_VIRTIO_MMIO is not set +# CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES is not set # CONFIG_VIRTIO_PCI is not set # CONFIG_VIRTUALIZATION is not set # CONFIG_VIRT_CPU_ACCOUNTING_GEN is not set