From 4d6be7d0513d23566e5623830b8bb39dd6bf93d2 Mon Sep 17 00:00:00 2001 From: Josef Schlehofer <josef.schlehofer@nic.cz> Date: Thu, 13 Oct 2022 22:26:31 +0200 Subject: [PATCH] patches/openwrt: Turris 1.x support patch: add kernel 5.10 --- ...02-Add-Turris-1.X-support-kernel-5.4.patch | 69 ++++++++++--------- 1 file changed, 37 insertions(+), 32 deletions(-) diff --git a/patches/openwrt/wip/0002-Add-Turris-1.X-support-kernel-5.4.patch b/patches/openwrt/wip/0002-Add-Turris-1.X-support-kernel-5.4.patch index c93b3ab14..ed3478a42 100644 --- a/patches/openwrt/wip/0002-Add-Turris-1.X-support-kernel-5.4.patch +++ b/patches/openwrt/wip/0002-Add-Turris-1.X-support-kernel-5.4.patch @@ -46,10 +46,10 @@ index aa33a4af96..b24bcb68ae 100755 *) ucidef_set_interfaces_lan_wan "eth0" "eth1" ;; -diff --git a/target/linux/mpc85xx/config-5.4 b/target/linux/mpc85xx/config-5.4 -index d6683dab35..0c177d5e8f 100644 ---- a/target/linux/mpc85xx/config-5.4 -+++ b/target/linux/mpc85xx/config-5.4 +diff --git a/target/linux/mpc85xx/config-5.10 b/target/linux/mpc85xx/config-5.10 +index 2668a729e8..5258d3e97e 100644 +--- a/target/linux/mpc85xx/config-5.10 ++++ b/target/linux/mpc85xx/config-5.10 @@ -24,6 +24,15 @@ CONFIG_BOOKE=y CONFIG_BOOKE_WDT=y # CONFIG_BSC9131_RDB is not set @@ -66,16 +66,15 @@ index d6683dab35..0c177d5e8f 100644 # CONFIG_C293_PCIE is not set CONFIG_CLONE_BACKWARDS=y CONFIG_CLZ_TAB=y -@@ -43,6 +52,8 @@ CONFIG_CRYPTO_AUTHENC=y - CONFIG_CRYPTO_HASH=y - CONFIG_CRYPTO_HASH2=y +@@ -41,6 +50,7 @@ CONFIG_CRYPTO_AKCIPHER2=y + CONFIG_CRYPTO_AUTHENC=y + CONFIG_CRYPTO_BLAKE2S=y CONFIG_CRYPTO_HW=y +CONFIG_CRYPTO_LZO=y -+CONFIG_CRYPTO_XZ=y - CONFIG_CRYPTO_MANAGER=y - CONFIG_CRYPTO_MANAGER2=y + CONFIG_CRYPTO_LIB_BLAKE2S_GENERIC=y + CONFIG_CRYPTO_LIB_POLY1305_RSIZE=1 # CONFIG_CRYPTO_MD5_PPC is not set -@@ -119,6 +130,10 @@ CONFIG_IRQ_DOMAIN=y +@@ -118,6 +128,10 @@ CONFIG_IRQ_DOMAIN=y CONFIG_IRQ_FORCED_THREADING=y CONFIG_IRQ_WORK=y CONFIG_ISA_DMA_API=y @@ -86,11 +85,10 @@ index d6683dab35..0c177d5e8f 100644 CONFIG_KERNEL_START=0xc0000000 # CONFIG_KSI8560 is not set CONFIG_LEGACY_PTYS=y -@@ -128,7 +143,13 @@ CONFIG_LOCK_DEBUGGING_SUPPORT=y - CONFIG_LOWMEM_CAM_NUM=3 +@@ -128,6 +142,13 @@ CONFIG_LOWMEM_CAM_NUM=3 CONFIG_LOWMEM_SIZE=0x30000000 CONFIG_LXT_PHY=y --# CONFIG_MATH_EMULATION is not set + # CONFIG_MATH_EMULATION is not set +CONFIG_LZO_COMPRESS=y +CONFIG_LZO_DECOMPRESS=y +CONFIG_HIGHMEM=y @@ -101,7 +99,7 @@ index d6683dab35..0c177d5e8f 100644 CONFIG_MDIO_BUS=y CONFIG_MDIO_DEVICE=y CONFIG_MEMFD_CREATE=y -@@ -137,19 +158,30 @@ CONFIG_MODULES_USE_ELF_RELA=y +@@ -138,20 +159,30 @@ CONFIG_MODULES_USE_ELF_RELA=y # CONFIG_MPC8536_DS is not set # CONFIG_MPC8540_ADS is not set # CONFIG_MPC8560_ADS is not set @@ -117,10 +115,10 @@ index d6683dab35..0c177d5e8f 100644 CONFIG_MPIC_TIMER=y CONFIG_MPILIB=y -# CONFIG_MTD_CFI is not set -+# CONFIG_MTD_CFI_NOSWAP is not set +CONFIG_MTD_CFI_STAA=y +CONFIG_MTD_JEDECPROBE=y CONFIG_MTD_NAND_CORE=y + CONFIG_MTD_NAND_ECC=y CONFIG_MTD_NAND_ECC_SW_HAMMING=y CONFIG_MTD_RAW_NAND=y CONFIG_MTD_SPI_NOR=y @@ -136,7 +134,7 @@ index d6683dab35..0c177d5e8f 100644 # CONFIG_MVME2500 is not set CONFIG_NEED_PER_CPU_KM=y CONFIG_NEED_SG_DMA_LENGTH=y -@@ -165,10 +197,11 @@ CONFIG_OF_GPIO=y +@@ -167,10 +198,11 @@ CONFIG_OF_GPIO=y CONFIG_OF_IRQ=y CONFIG_OF_KOBJ=y CONFIG_OF_MDIO=y @@ -149,34 +147,31 @@ index d6683dab35..0c177d5e8f 100644 # CONFIG_P1022_DS is not set # CONFIG_P1022_RDK is not set # CONFIG_P1023_RDB is not set -@@ -190,6 +223,8 @@ CONFIG_PHYSICAL_ALIGN=0x04000000 - CONFIG_PHYSICAL_START=0x00000000 +@@ -192,6 +224,8 @@ CONFIG_PHYSICAL_START=0x00000000 # CONFIG_PHYS_64BIT is not set + # CONFIG_PMU_SYSFS is not set # CONFIG_PPA8548 is not set +CONFIG_NET_DSA=y +CONFIG_NET_DSA_QCA8K=y CONFIG_PPC=y CONFIG_PPC32=y # CONFIG_PPC64 is not set -@@ -207,7 +242,9 @@ CONFIG_PPC_DOORBELL=y +@@ -203,12 +237,14 @@ CONFIG_PPC_ADV_DEBUG_IACS=2 + CONFIG_PPC_ADV_DEBUG_REGS=y + CONFIG_PPC_BARRIER_NOSPEC=y + CONFIG_PPC_BOOK3E_MMU=y ++CONFIG_PPC_I8259=y + # CONFIG_PPC_BOOK3S_6xx is not set + CONFIG_PPC_DOORBELL=y # CONFIG_PPC_E500MC is not set # CONFIG_PPC_EARLY_DEBUG is not set CONFIG_PPC_FSL_BOOK3E=y -+CONFIG_PPC_I8259=y CONFIG_PPC_INDIRECT_PCI=y +CONFIG_PPC_LIB_RHEAP=y # CONFIG_PPC_IRQ_SOFT_MASK_DEBUG is not set CONFIG_PPC_MMU_NOHASH=y CONFIG_PPC_MMU_NOHASH_32=y -@@ -223,6 +260,7 @@ CONFIG_RAS=y - # CONFIG_RED_15W_REV1 is not set - CONFIG_RTC_CLASS=y - CONFIG_RTC_DRV_GENERIC=y -+CONFIG_RTC_DRV_DS1307=y - CONFIG_RTC_I2C_AND_SPI=y - CONFIG_RTC_MC146818_LIB=y - # CONFIG_SBC8548 is not set -@@ -240,6 +278,7 @@ CONFIG_SPE=y +@@ -241,6 +277,7 @@ CONFIG_SPE=y CONFIG_SPE_POSSIBLE=y CONFIG_SPI=y CONFIG_SPI_FSL_ESPI=y @@ -184,7 +179,16 @@ index d6683dab35..0c177d5e8f 100644 CONFIG_SPI_MASTER=y CONFIG_SPI_MEM=y CONFIG_SRCU=y -@@ -264,6 +303,13 @@ CONFIG_UCC=y +@@ -248,6 +285,8 @@ CONFIG_SRCU=y + # CONFIG_STX_GP3 is not set + CONFIG_SWCONFIG=y + CONFIG_SWPHY=y ++CONFIG_MICREL_PHY=y ++CONFIG_AT803X_PHY=y + CONFIG_SYSCTL_EXCEPTION_TRACE=y + CONFIG_TASK_SIZE=0xc0000000 + CONFIG_THREAD_INFO_IN_TASK=y +@@ -265,6 +304,14 @@ CONFIG_UCC=y CONFIG_UCC_FAST=y CONFIG_UCC_GETH=y # CONFIG_UGETH_TX_ON_DEMAND is not set @@ -195,10 +199,11 @@ index d6683dab35..0c177d5e8f 100644 +# CONFIG_USB_EHCI_HCD_PLATFORM is not set +CONFIG_USB_EHCI_HCD_PPC_OF=y +CONFIG_USB_FHCI_HCD=y ++CONFIG_FHCI_DEBUG=n CONFIG_USB_SUPPORT=y CONFIG_VDSO32=y # CONFIG_VIRT_CPU_ACCOUNTING_NATIVE is not set -@@ -273,3 +319,10 @@ CONFIG_WATCHDOG_CORE=y +@@ -275,3 +322,10 @@ CONFIG_WATCHDOG_CORE=y # CONFIG_XES_MPC85xx is not set CONFIG_XZ_DEC_BCJ=y CONFIG_XZ_DEC_POWERPC=y -- GitLab