From 18e2626c4da2086547b1a60a66cc41ba7fab81ec Mon Sep 17 00:00:00 2001 From: "Ycarus (Yannick Chabanois)" Date: Wed, 29 Sep 2021 09:04:32 +0200 Subject: [PATCH 1/8] remove again another conflicting patch for now --- build.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/build.sh b/build.sh index 17be301f..bc66cb79 100755 --- a/build.sh +++ b/build.sh @@ -443,6 +443,9 @@ fi if [ -f target/linux/generic/pending-5.4/640-netfilter-nf_flow_table-add-hardware-offload-support.patch ]; then rm -f target/linux/generic/pending-5.4/640-netfilter-nf_flow_table-add-hardware-offload-support.patch 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 [ "$OMR_KERNEL" = "5.4" ]; then echo "Set to kernel 5.4 for rpi arch" From e10f0993586c4ec9ddf0da8712ce112a205879be Mon Sep 17 00:00:00 2001 From: "Ycarus (Yannick Chabanois)" Date: Wed, 29 Sep 2021 09:51:17 +0200 Subject: [PATCH 2/8] remove again another conflicting patch for now --- build.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/build.sh b/build.sh index bc66cb79..a5719d4b 100755 --- a/build.sh +++ b/build.sh @@ -446,6 +446,9 @@ 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/645-netfilter-nf_flow_table-rework-hardware-offload-time.patch ]; then + rm -f target/linux/generic/pending-5.4/645-netfilter-nf_flow_table-rework-hardware-offload-time.patch +fi if [ "$OMR_KERNEL" = "5.4" ]; then echo "Set to kernel 5.4 for rpi arch" From bc12879da3ccb10d0ba773bb36e33969675b340d Mon Sep 17 00:00:00 2001 From: "Ycarus (Yannick Chabanois)" Date: Wed, 29 Sep 2021 10:56:05 +0200 Subject: [PATCH 3/8] Remove all not working patch --- build.sh | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/build.sh b/build.sh index a5719d4b..004b7462 100755 --- a/build.sh +++ b/build.sh @@ -37,7 +37,7 @@ OMR_ALL_PACKAGES=${OMR_ALL_PACKAGES:-no} OMR_TARGET=${OMR_TARGET:-x86_64} OMR_TARGET_CONFIG="config-$OMR_TARGET" UPSTREAM=${UPSTREAM:-no} -OMR_KERNEL=${OMR_KERNEL:-5.14} +OMR_KERNEL=${OMR_KERNEL:-5.4} SHORTCUT_FE=${SHORTCUT_FE:-no} #OMR_RELEASE=${OMR_RELEASE:-$(git describe --tags `git rev-list --tags --max-count=1` | sed 's/^\([0-9.]*\).*/\1/')} #OMR_RELEASE=${OMR_RELEASE:-$(git tag --sort=committerdate | tail -1)} @@ -449,6 +449,18 @@ fi if [ -f target/linux/generic/pending-5.4/645-netfilter-nf_flow_table-rework-hardware-offload-time.patch ]; then rm -f target/linux/generic/pending-5.4/645-netfilter-nf_flow_table-rework-hardware-offload-time.patch 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/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 +if [ -f target/linux/generic/hack-5.4/647-netfilter-flow-acct.patch ]; then + rm -f target/linux/generic/hack-5.4/647-netfilter-flow-acct.patch +fi +if [ -f target/linux/generic/hack-5.4/953-net-patch-linux-kernel-to-support-shortcut-fe.patch ]; then + rm -f target/linux/generic/hack-5.4/953-net-patch-linux-kernel-to-support-shortcut-fe.patch +fi if [ "$OMR_KERNEL" = "5.4" ]; then echo "Set to kernel 5.4 for rpi arch" From 885621939f55b2ee827b2ca101e3be8ac673f459 Mon Sep 17 00:00:00 2001 From: "Ycarus (Yannick Chabanois)" Date: Wed, 29 Sep 2021 11:20:42 +0200 Subject: [PATCH 4/8] remove pppoe patch --- build.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/build.sh b/build.sh index 004b7462..b802bab4 100755 --- a/build.sh +++ b/build.sh @@ -446,6 +446,9 @@ 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/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 if [ -f target/linux/generic/pending-5.4/645-netfilter-nf_flow_table-rework-hardware-offload-time.patch ]; then rm -f target/linux/generic/pending-5.4/645-netfilter-nf_flow_table-rework-hardware-offload-time.patch fi From bcddd9d4babf30cedb9fc295ca0b44472fd26544 Mon Sep 17 00:00:00 2001 From: "Ycarus (Yannick Chabanois)" Date: Wed, 29 Sep 2021 12:42:42 +0200 Subject: [PATCH 5/8] Update config 5.4 --- root/target/linux/generic/config-5.4 | 2 ++ 1 file changed, 2 insertions(+) diff --git a/root/target/linux/generic/config-5.4 b/root/target/linux/generic/config-5.4 index 89e6c3de..5c3e6521 100644 --- a/root/target/linux/generic/config-5.4 +++ b/root/target/linux/generic/config-5.4 @@ -306,6 +306,7 @@ CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MIN=8 # CONFIG_ARM64_ERRATUM_843419 is not set # CONFIG_ARM64_ERRATUM_845719 is not set # CONFIG_ARM64_ERRATUM_858921 is not set +# CONFIG_ARM64_ERRATUM_1542419 is not set # CONFIG_ARM64_HW_AFDBM is not set # CONFIG_ARM64_LSE_ATOMICS is not set # CONFIG_ARM64_MODULE_PLTS is not set @@ -1653,6 +1654,7 @@ CONFIG_FILE_LOCKING=y # CONFIG_FIRMWARE_EDID is not set # CONFIG_FIRMWARE_IN_KERNEL is not set # CONFIG_FIRMWARE_MEMMAP is not set +# CONFIG_FIT_PARTITION is not set # CONFIG_FIXED_PHY is not set CONFIG_FLATMEM=y CONFIG_FLATMEM_MANUAL=y From 19398df667178b4cfcd73184a83d43f9b7a6cc8a Mon Sep 17 00:00:00 2001 From: "Ycarus (Yannick Chabanois)" Date: Wed, 29 Sep 2021 14:12:37 +0200 Subject: [PATCH 6/8] remove patch --- build.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/build.sh b/build.sh index b802bab4..d04e3e5b 100755 --- a/build.sh +++ b/build.sh @@ -464,6 +464,9 @@ fi if [ -f target/linux/generic/hack-5.4/953-net-patch-linux-kernel-to-support-shortcut-fe.patch ]; then rm -f target/linux/generic/hack-5.4/953-net-patch-linux-kernel-to-support-shortcut-fe.patch 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 [ "$OMR_KERNEL" = "5.4" ]; then echo "Set to kernel 5.4 for rpi arch" From c3fd68ddeb4df409e2898b7565b2f19d97e3132a Mon Sep 17 00:00:00 2001 From: "Ycarus (Yannick Chabanois)" Date: Wed, 29 Sep 2021 14:13:55 +0200 Subject: [PATCH 7/8] Update config 5.4 --- root/target/linux/generic/config-5.4 | 1 + 1 file changed, 1 insertion(+) diff --git a/root/target/linux/generic/config-5.4 b/root/target/linux/generic/config-5.4 index 5c3e6521..0b9fa1ca 100644 --- a/root/target/linux/generic/config-5.4 +++ b/root/target/linux/generic/config-5.4 @@ -922,6 +922,7 @@ CONFIG_CONSTRUCTORS=y # CONFIG_CPU_ICACHE_DISABLE is not set # CONFIG_CPU_ICACHE_MISMATCH_WORKAROUND is not set # CONFIG_CPU_IDLE is not set +# CONFIG_CPU_IDLE_GOV_LADDER is not set # CONFIG_CPU_IDLE_GOV_MENU is not set # CONFIG_CPU_IDLE_GOV_TEO is not set # CONFIG_CPU_IDLE_MULTIPLE_DRIVERS is not set From fb7651792e84fa5d29d660f25f94f20b655fcc8a Mon Sep 17 00:00:00 2001 From: "Ycarus (Yannick Chabanois)" Date: Wed, 29 Sep 2021 16:40:05 +0200 Subject: [PATCH 8/8] Update config 5.4 --- root/target/linux/generic/config-5.4 | 2 ++ 1 file changed, 2 insertions(+) diff --git a/root/target/linux/generic/config-5.4 b/root/target/linux/generic/config-5.4 index 0b9fa1ca..fc63ff1b 100644 --- a/root/target/linux/generic/config-5.4 +++ b/root/target/linux/generic/config-5.4 @@ -370,6 +370,7 @@ CONFIG_ARM_GIC_MAX_NR=1 # CONFIG_ARM_PATCH_PHYS_VIRT is not set # CONFIG_ARM_PSCI is not set # CONFIG_ARM_PSCI_CHECKER is not set +# CONFIG_ARM_PSCI_CPUIDLE is not set # CONFIG_ARM_PTDUMP_DEBUGFS is not set # CONFIG_ARM_SBSA_WATCHDOG is not set # CONFIG_ARM_SCPI_PROTOCOL is not set @@ -1077,6 +1078,7 @@ CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=y # CONFIG_CRYPTO_PCOMP is not set # CONFIG_CRYPTO_PCOMP2 is not set CONFIG_CRYPTO_PCRYPT=y +# CONFIG_CRYPTO_POLY1305_ARM is not set # CONFIG_CRYPTO_POLY1305 is not set # CONFIG_CRYPTO_RMD128 is not set # CONFIG_CRYPTO_RMD160 is not set