From 1bb3f593ee73288dcc0471ae038638a50b750ee4 Mon Sep 17 00:00:00 2001 From: Sungbo Eo Date: Wed, 17 Feb 2021 22:27:47 +0900 Subject: [PATCH] kirkwood: update config for kernel 5.10 Update config with make kernel_oldconfig. CONFIG_SATA_PMP=y is added manually as done for 5.4. This should be resolved properly in a separate issue. Signed-off-by: Sungbo Eo [add back CONFIG_SATA_PMP, rebase/refresh] Signed-off-by: Adrian Schmutzler --- target/linux/kirkwood/config-5.10 | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/target/linux/kirkwood/config-5.10 b/target/linux/kirkwood/config-5.10 index 2ef4c05074..ad8cf89182 100644 --- a/target/linux/kirkwood/config-5.10 +++ b/target/linux/kirkwood/config-5.10 @@ -1,6 +1,5 @@ CONFIG_ALIGNMENT_TRAP=y CONFIG_ARCH_32BIT_OFF_T=y -CONFIG_ARCH_CLOCKSOURCE_DATA=y CONFIG_ARCH_HIBERNATION_POSSIBLE=y CONFIG_ARCH_KEEP_MEMBLOCK=y CONFIG_ARCH_MIGHT_HAVE_PC_PARPORT=y @@ -13,6 +12,8 @@ CONFIG_ARCH_MULTI_V5=y CONFIG_ARCH_MVEBU=y CONFIG_ARCH_NR_GPIO=0 CONFIG_ARCH_OPTIONAL_KERNEL_RWX=y +CONFIG_ARCH_SELECT_MEMORY_MODEL=y +CONFIG_ARCH_SPARSEMEM_ENABLE=y CONFIG_ARCH_SUSPEND_POSSIBLE=y CONFIG_ARM=y # CONFIG_ARMADA_37XX_WATCHDOG is not set @@ -54,6 +55,7 @@ CONFIG_CPU_IDLE=y CONFIG_CPU_IDLE_GOV_LADDER=y CONFIG_CPU_PABRT_LEGACY=y CONFIG_CPU_PM=y +CONFIG_CPU_THERMAL=y CONFIG_CPU_THUMB_CAPABLE=y CONFIG_CPU_TLB_FEROCEON=y CONFIG_CPU_USE_DOMAINS=y @@ -64,6 +66,7 @@ CONFIG_CRYPTO_ACOMP2=y CONFIG_CRYPTO_CRC32C=y CONFIG_CRYPTO_DEFLATE=y CONFIG_CRYPTO_DES=y +CONFIG_CRYPTO_DEV_MARVELL=y CONFIG_CRYPTO_DEV_MARVELL_CESA=y CONFIG_CRYPTO_HASH=y CONFIG_CRYPTO_HASH2=y @@ -77,13 +80,12 @@ CONFIG_DEBUG_LL_INCLUDE="debug/8250.S" CONFIG_DEBUG_MVEBU_UART0_ALTERNATE=y # CONFIG_DEBUG_MVEBU_UART1_ALTERNATE is not set CONFIG_DEBUG_UART_8250=y -# CONFIG_DEBUG_UART_8250_FLOW_CONTROL is not set CONFIG_DEBUG_UART_8250_SHIFT=2 -# CONFIG_DEBUG_UART_8250_WORD is not set CONFIG_DEBUG_UART_PHYS=0xf1012000 CONFIG_DEBUG_UART_VIRT=0xfed12000 CONFIG_DEBUG_UNCOMPRESS=y # CONFIG_DLCI is not set +CONFIG_DMA_OPS=y CONFIG_DMA_REMAP=y CONFIG_DNOTIFY=y CONFIG_DTC=y @@ -144,6 +146,7 @@ CONFIG_LEDS_GPIO=y CONFIG_LEDS_NETXBIG=y CONFIG_LEDS_NS2=y CONFIG_LIBFDT=y +CONFIG_LLD_VERSION=0 CONFIG_LOCK_DEBUGGING_SUPPORT=y CONFIG_LZO_COMPRESS=y CONFIG_LZO_DECOMPRESS=y @@ -159,6 +162,7 @@ CONFIG_MODULES_USE_ELF_REL=y # CONFIG_MTD_CFI is not set CONFIG_MTD_CMDLINE_PARTS=y CONFIG_MTD_NAND_CORE=y +CONFIG_MTD_NAND_ECC=y CONFIG_MTD_NAND_ECC_SW_HAMMING=y # CONFIG_MTD_NAND_MARVELL is not set CONFIG_MTD_NAND_ORION=y @@ -180,7 +184,6 @@ CONFIG_NET_DEVLINK=y CONFIG_NET_DSA=y CONFIG_NET_DSA_MV88E6XXX=y CONFIG_NET_DSA_MV88E6XXX_GLOBAL2=y -# CONFIG_NET_DSA_MV88E6XXX_PTP is not set CONFIG_NET_DSA_TAG_DSA=y CONFIG_NET_DSA_TAG_EDSA=y CONFIG_NET_SWITCHDEV=y @@ -225,7 +228,6 @@ CONFIG_POWER_RESET_GPIO=y # CONFIG_POWER_RESET_QNAP is not set CONFIG_POWER_SUPPLY=y CONFIG_RATIONAL=y -CONFIG_REFCOUNT_FULL=y CONFIG_REGMAP=y CONFIG_REGMAP_MMIO=y CONFIG_REGULATOR=y -- 2.30.2