From 3d6d2e0ac990f4be0ccec805005d4b6a4df3bae1 Mon Sep 17 00:00:00 2001 From: Aleksander Jan Bajkowski Date: Tue, 10 Mar 2020 22:39:59 +0100 Subject: [PATCH] sunxi: remove old symbols from 5.4 kconfig These options only exist earlier kernel versions. Signed-off-by: Aleksander Jan Bajkowski --- target/linux/sunxi/config-5.4 | 13 ------------- target/linux/sunxi/cortexa53/config-5.4 | 1 - 2 files changed, 14 deletions(-) diff --git a/target/linux/sunxi/config-5.4 b/target/linux/sunxi/config-5.4 index c2d5260bb3..45ed10f828 100644 --- a/target/linux/sunxi/config-5.4 +++ b/target/linux/sunxi/config-5.4 @@ -12,7 +12,6 @@ CONFIG_ARCH_HAS_PHYS_TO_DMA=y CONFIG_ARCH_HAS_PTE_SPECIAL=y CONFIG_ARCH_HAS_RESET_CONTROLLER=y CONFIG_ARCH_HAS_SET_MEMORY=y -CONFIG_ARCH_HAS_SG_CHAIN=y CONFIG_ARCH_HAS_STRICT_KERNEL_RWX=y CONFIG_ARCH_HAS_STRICT_MODULE_RWX=y CONFIG_ARCH_HAS_TICK_BROADCAST=y @@ -67,7 +66,6 @@ CONFIG_ATAGS=y CONFIG_AUTO_ZRELADDR=y CONFIG_AXP20X_POWER=y CONFIG_BACKLIGHT_CLASS_DEVICE=y -CONFIG_BACKLIGHT_LCD_SUPPORT=y CONFIG_BACKLIGHT_PWM=y CONFIG_BLK_DEV_LOOP=y CONFIG_BLK_DEV_SD=y @@ -133,13 +131,10 @@ CONFIG_CRYPTO_NULL2=y CONFIG_CRYPTO_RNG=y CONFIG_CRYPTO_RNG2=y CONFIG_CRYPTO_SHA1=y -CONFIG_CRYPTO_WORKQUEUE=y CONFIG_DCACHE_WORD_ACCESS=y CONFIG_DEBUG_BUGVERBOSE=y CONFIG_DEBUG_LL_INCLUDE="mach/debug-macro.S" CONFIG_DEBUG_MEMORY_INIT=y -CONFIG_DEFAULT_CFQ=y -CONFIG_DEFAULT_IOSCHED="cfq" CONFIG_DMADEVICES=y CONFIG_DMA_ENGINE=y CONFIG_DMA_OF=y @@ -243,8 +238,6 @@ CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y CONFIG_HAVE_FUNCTION_TRACER=y -CONFIG_HAVE_GENERIC_DMA_COHERENT=y -CONFIG_HAVE_GENERIC_GUP=y CONFIG_HAVE_HW_BREAKPOINT=y CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y CONFIG_HAVE_KVM_ARCH_TLB_FLUSH_ALL=y @@ -256,7 +249,6 @@ CONFIG_HAVE_KVM_IRQ_BYPASS=y CONFIG_HAVE_KVM_IRQ_ROUTING=y CONFIG_HAVE_KVM_MSI=y CONFIG_HAVE_LD_DEAD_CODE_DATA_ELIMINATION=y -CONFIG_HAVE_MEMBLOCK=y CONFIG_HAVE_MOD_ARCH_SPECIFIC=y CONFIG_HAVE_NET_DSA=y CONFIG_HAVE_OPROFILE=y @@ -297,7 +289,6 @@ CONFIG_INPUT_MOUSEDEV_PSAUX=y CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 CONFIG_INPUT_TOUCHSCREEN=y -CONFIG_IOSCHED_CFQ=y CONFIG_IRQCHIP=y CONFIG_IRQ_BYPASS_MANAGER=y CONFIG_IRQ_DOMAIN=y @@ -342,7 +333,6 @@ CONFIG_MFD_CORE=y CONFIG_MFD_SUN6I_PRCM=y CONFIG_MFD_SYSCON=y CONFIG_MIGHT_HAVE_CACHE_L2X0=y -CONFIG_MIGHT_HAVE_PCI=y CONFIG_MIGRATION=y CONFIG_MMC=y CONFIG_MMC_BLOCK=y @@ -351,7 +341,6 @@ CONFIG_MMU_NOTIFIER=y CONFIG_MODULES_TREE_LOOKUP=y CONFIG_MODULES_USE_ELF_REL=y CONFIG_MTD_JEDECPROBE=y -CONFIG_MTD_M25P80=y CONFIG_MTD_SPI_NOR=y CONFIG_MTD_SPLIT_FIT_FW=y CONFIG_MUTEX_SPIN_ON_OWNER=y @@ -363,7 +352,6 @@ CONFIG_NET_VENDOR_ALLWINNER=y CONFIG_NLS=y CONFIG_NLS_CODEPAGE_437=y CONFIG_NLS_ISO8859_1=y -CONFIG_NO_BOOTMEM=y CONFIG_NO_HZ=y CONFIG_NO_HZ_COMMON=y CONFIG_NO_HZ_IDLE=y @@ -451,7 +439,6 @@ CONFIG_RESET_SUNXI=y CONFIG_RFS_ACCEL=y CONFIG_RPS=y CONFIG_RWSEM_SPIN_ON_OWNER=y -CONFIG_RWSEM_XCHGADD_ALGORITHM=y CONFIG_SATA_PMP=y CONFIG_SCSI=y CONFIG_SDIO_UART=y diff --git a/target/linux/sunxi/cortexa53/config-5.4 b/target/linux/sunxi/cortexa53/config-5.4 index 96afdaae73..cb5a4d2455 100644 --- a/target/linux/sunxi/cortexa53/config-5.4 +++ b/target/linux/sunxi/cortexa53/config-5.4 @@ -32,7 +32,6 @@ CONFIG_ARM64_VA_BITS=39 CONFIG_ARM64_VA_BITS_39=y CONFIG_ARM_AMBA=y CONFIG_AUDIT_ARCH_COMPAT_GENERIC=y -CONFIG_DMA_DIRECT_OPS=y CONFIG_DWMAC_SUN8I=y # CONFIG_FLATMEM_MANUAL is not set CONFIG_FRAME_POINTER=y