From 81d6f91e2547635debf9a6a63b028667a2004ce6 Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Fri, 20 Apr 2018 01:34:41 +0100 Subject: [PATCH] Clean up kconfig for 4.17 - Various ancient SCSI drivers were removed - BT_HCIBTUART and INFINIBAND_CXGB3_DEBUG were removed - OMAP_DM_TIMER is now an automatic symbol - Marvell NAND driver was rewritten, so we enable MTD_NAND_MARVELL instead of MTD_NAND_PXA3xx - Various netfilter symbols are now boolean instead of tristate --- debian/changelog | 1 + debian/config/alpha/config | 10 +--- debian/config/amd64/config.cloud-amd64 | 1 - debian/config/armel/config.marvell | 13 +++-- debian/config/armhf/config | 17 +++---- debian/config/config | 57 +++++++++++----------- debian/config/hppa/config | 5 -- debian/config/i386/config | 3 -- debian/config/ia64/config | 1 - debian/config/kernelarch-mips/config.malta | 3 +- debian/config/kernelarch-powerpc/config | 6 --- debian/config/kernelarch-sparc/config | 1 - debian/config/kernelarch-x86/config | 8 +-- 13 files changed, 47 insertions(+), 79 deletions(-) diff --git a/debian/changelog b/debian/changelog index e13ae85c7..53517327f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,6 +10,7 @@ linux (4.17~rc1-1~exp1) UNRELEASED; urgency=medium * debian/rules.real: Stop enabling verbose output for listnewconfig target * Documentation: typec.rst: Use literal-block element with ascii art * Documentation: Update references to drivers/base/firmware_class.c + * [armhf] Enable MTD_NAND_MARVELL as module, replacing MTD_NAND_PXA3xx -- Ben Hutchings Thu, 19 Apr 2018 21:37:24 +0100 diff --git a/debian/config/alpha/config b/debian/config/alpha/config index 22224c0f4..aee7a317c 100644 --- a/debian/config/alpha/config +++ b/debian/config/alpha/config @@ -469,7 +469,7 @@ CONFIG_MTD_PHYSMAP_BANKWIDTH=2 CONFIG_MTD_PCI=m ## -## file: drivers/mtd/nand/Kconfig +## file: drivers/mtd/nand/raw/Kconfig ## CONFIG_MTD_NAND=m # CONFIG_MTD_NAND_DISKONCHIP is not set @@ -748,11 +748,6 @@ CONFIG_RTC_DRV_ALPHA=y CONFIG_SCSI_ARCMSR=m CONFIG_SCSI_BUSLOGIC=m CONFIG_SCSI_DMX3191D=m -CONFIG_SCSI_EATA=m -CONFIG_SCSI_EATA_TAGGED_QUEUE=y -CONFIG_SCSI_EATA_LINKED_COMMANDS=y -CONFIG_SCSI_EATA_MAX_TAGS=16 -CONFIG_SCSI_FUTURE_DOMAIN=m CONFIG_SCSI_GDTH=m CONFIG_SCSI_GENERIC_NCR5380=m CONFIG_SCSI_IPS=m @@ -760,7 +755,6 @@ CONFIG_SCSI_INITIO=m CONFIG_SCSI_INIA100=m CONFIG_SCSI_IZIP_EPP16=y CONFIG_SCSI_IZIP_SLOW_CTR=y -CONFIG_SCSI_NCR53C406A=m CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=1 CONFIG_SCSI_SYM53C8XX_DEFAULT_TAGS=16 CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64 @@ -770,7 +764,6 @@ CONFIG_SCSI_IPR_DUMP=y CONFIG_SCSI_QLOGIC_FAS=m CONFIG_SCSI_QLOGIC_1280=m CONFIG_SCSI_SIM710=m -CONFIG_SCSI_SYM53C416=m CONFIG_SCSI_DC395x=m CONFIG_SCSI_AM53C974=m CONFIG_SCSI_DEBUG=m @@ -791,7 +784,6 @@ CONFIG_MEGARAID_LEGACY=m ## ## file: drivers/scsi/pcmcia/Kconfig ## -CONFIG_PCMCIA_FDOMAIN=m CONFIG_PCMCIA_QLOGIC=m CONFIG_PCMCIA_SYM53C500=m diff --git a/debian/config/amd64/config.cloud-amd64 b/debian/config/amd64/config.cloud-amd64 index 68d981fe7..2e0db84a3 100644 --- a/debian/config/amd64/config.cloud-amd64 +++ b/debian/config/amd64/config.cloud-amd64 @@ -961,7 +961,6 @@ CONFIG_HYPERV_STORAGE=m # CONFIG_LIBFC is not set # CONFIG_SCSI_SNIC is not set # CONFIG_SCSI_DMX3191D is not set -# CONFIG_SCSI_FUTURE_DOMAIN is not set # CONFIG_SCSI_ISCI is not set # CONFIG_SCSI_IPS is not set # CONFIG_SCSI_INITIO is not set diff --git a/debian/config/armel/config.marvell b/debian/config/armel/config.marvell index 33b507efb..53ecd023e 100644 --- a/debian/config/armel/config.marvell +++ b/debian/config/armel/config.marvell @@ -423,18 +423,18 @@ CONFIG_MTD_PHYSMAP_OF=m # CONFIG_MTD_PLATRAM is not set ## -## file: drivers/mtd/nand/Kconfig +## file: drivers/mtd/nand/onenand/Kconfig +## +# CONFIG_MTD_ONENAND is not set + +## +## file: drivers/mtd/nand/raw/Kconfig ## CONFIG_MTD_NAND=m # CONFIG_MTD_NAND_DISKONCHIP is not set # CONFIG_MTD_NAND_CAFE is not set CONFIG_MTD_NAND_ORION=m -## -## file: drivers/mtd/onenand/Kconfig -## -# CONFIG_MTD_ONENAND is not set - ## ## file: drivers/mtd/spi-nor/Kconfig ## @@ -571,7 +571,6 @@ CONFIG_RTC_DRV_MV=m # CONFIG_SCSI_ARCMSR is not set # CONFIG_SCSI_HPTIOP is not set # CONFIG_SCSI_DMX3191D is not set -# CONFIG_SCSI_FUTURE_DOMAIN is not set # CONFIG_SCSI_IPS is not set # CONFIG_SCSI_INITIO is not set # CONFIG_SCSI_INIA100 is not set diff --git a/debian/config/armhf/config b/debian/config/armhf/config index 875f20d4c..9d1141196 100644 --- a/debian/config/armhf/config +++ b/debian/config/armhf/config @@ -146,7 +146,6 @@ CONFIG_OMAP_RESET_CLOCKS=y # CONFIG_OMAP_MPU_TIMER is not set CONFIG_OMAP_32K_TIMER=y # CONFIG_OMAP3_L2_AUX_SECURE_SAVE_RESTORE is not set -CONFIG_OMAP_DM_TIMER=y CONFIG_OMAP_SERIAL_WAKE=y ## choice: OMAP PM layer selection CONFIG_OMAP_PM_NOOP=y @@ -653,22 +652,22 @@ CONFIG_MMC_BCM2835=m CONFIG_MTD=y ## -## file: drivers/mtd/nand/Kconfig +## file: drivers/mtd/nand/onenand/Kconfig +## +CONFIG_MTD_ONENAND=y +CONFIG_MTD_ONENAND_OMAP2=m + +## +## file: drivers/mtd/nand/raw/Kconfig ## CONFIG_MTD_NAND=y CONFIG_MTD_NAND_OMAP2=m -CONFIG_MTD_NAND_PXA3xx=m +CONFIG_MTD_NAND_MARVELL=m CONFIG_MTD_NAND_GPMI_NAND=m CONFIG_MTD_NAND_ORION=m CONFIG_MTD_NAND_MXC=m CONFIG_MTD_NAND_SUNXI=m -## -## file: drivers/mtd/onenand/Kconfig -## -CONFIG_MTD_ONENAND=y -CONFIG_MTD_ONENAND_OMAP2=m - ## ## file: drivers/net/can/Kconfig ## diff --git a/debian/config/config b/debian/config/config index c410470ab..f90c87932 100644 --- a/debian/config/config +++ b/debian/config/config @@ -371,7 +371,6 @@ CONFIG_BT_HCIUART_BCM=y CONFIG_BT_HCIUART_QCA=y CONFIG_BT_HCIUART_AG6XX=y CONFIG_BT_HCIUART_MRVL=y -# CONFIG_BT_HCIBTUART is not set CONFIG_BT_MRVL=m CONFIG_BT_MRVL_SDIO=m CONFIG_BT_ATH3K=m @@ -1285,7 +1284,6 @@ CONFIG_INFINIBAND_ON_DEMAND_PAGING=y ## file: drivers/infiniband/hw/cxgb3/Kconfig ## CONFIG_INFINIBAND_CXGB3=m -# CONFIG_INFINIBAND_CXGB3_DEBUG is not set ## ## file: drivers/infiniband/hw/cxgb4/Kconfig @@ -1898,10 +1896,8 @@ CONFIG_VIDEO_CX25840=m ## ## file: drivers/media/i2c/soc_camera/Kconfig ## -# CONFIG_SOC_CAMERA_IMX074 is not set # CONFIG_SOC_CAMERA_MT9M001 is not set # CONFIG_SOC_CAMERA_MT9M111 is not set -# CONFIG_SOC_CAMERA_MT9T031 is not set # CONFIG_SOC_CAMERA_MT9T112 is not set # CONFIG_SOC_CAMERA_MT9V022 is not set # CONFIG_SOC_CAMERA_OV772X is not set @@ -2762,7 +2758,16 @@ CONFIG_MTD_PLATRAM=m # CONFIG_MTD_LATCH_ADDR is not set ## -## file: drivers/mtd/nand/Kconfig +## file: drivers/mtd/nand/onenand/Kconfig +## +CONFIG_MTD_ONENAND=m +CONFIG_MTD_ONENAND_VERIFY_WRITE=y +# CONFIG_MTD_ONENAND_GENERIC is not set +# CONFIG_MTD_ONENAND_OTP is not set +CONFIG_MTD_ONENAND_2X_PROGRAM=y + +## +## file: drivers/mtd/nand/raw/Kconfig ## # CONFIG_MTD_NAND_ECC_SMC is not set CONFIG_MTD_NAND_ECC_BCH=y @@ -2778,15 +2783,6 @@ CONFIG_MTD_NAND_NANDSIM=m # CONFIG_MTD_NAND_HISI504 is not set # CONFIG_MTD_NAND_MTK is not set -## -## file: drivers/mtd/onenand/Kconfig -## -CONFIG_MTD_ONENAND=m -CONFIG_MTD_ONENAND_VERIFY_WRITE=y -# CONFIG_MTD_ONENAND_GENERIC is not set -# CONFIG_MTD_ONENAND_OTP is not set -CONFIG_MTD_ONENAND_2X_PROGRAM=y - ## ## file: drivers/mtd/spi-nor/Kconfig ## @@ -4568,11 +4564,6 @@ CONFIG_STAGING=y # CONFIG_AD2S1200 is not set # CONFIG_AD2S1210 is not set -## -## file: drivers/staging/irda/net/Kconfig -## -# CONFIG_IRDA is not set - ## ## file: drivers/staging/lustre/lustre/Kconfig ## @@ -4583,6 +4574,16 @@ CONFIG_STAGING=y ## # CONFIG_STAGING_MEDIA is not set +## +## file: drivers/staging/media/imx074/Kconfig +## +# CONFIG_SOC_CAMERA_IMX074 is not set + +## +## file: drivers/staging/media/mt9t031/Kconfig +## +# CONFIG_SOC_CAMERA_MT9T031 is not set + ## ## file: drivers/staging/most/Kconfig ## @@ -6119,9 +6120,9 @@ CONFIG_MEMORY_NOTIFIER_ERROR_INJECT=m # CONFIG_DEBUG_HIGHMEM is not set # CONFIG_KCOV is not set CONFIG_SOFTLOCKUP_DETECTOR=y +# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set CONFIG_HARDLOCKUP_DETECTOR=y # CONFIG_BOOTPARAM_HARDLOCKUP_PANIC is not set -# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set CONFIG_DETECT_HUNG_TASK=y CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=120 # CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set @@ -6132,13 +6133,13 @@ CONFIG_SCHEDSTATS=y CONFIG_SCHED_STACK_END_CHECK=y # CONFIG_DEBUG_TIMEKEEPING is not set CONFIG_DEBUG_PREEMPT=y +# CONFIG_PROVE_LOCKING is not set +# CONFIG_LOCK_STAT is not set # CONFIG_DEBUG_RT_MUTEXES is not set # CONFIG_DEBUG_SPINLOCK is not set # CONFIG_DEBUG_MUTEXES is not set # CONFIG_DEBUG_WW_MUTEX_SLOWPATH is not set # CONFIG_DEBUG_LOCK_ALLOC is not set -# CONFIG_PROVE_LOCKING is not set -# CONFIG_LOCK_STAT is not set # CONFIG_DEBUG_ATOMIC_SLEEP is not set # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set # CONFIG_LOCK_TORTURE_TEST is not set @@ -6379,7 +6380,7 @@ CONFIG_BRIDGE_VLAN_FILTERING=y ## ## file: net/bridge/netfilter/Kconfig ## -CONFIG_NF_TABLES_BRIDGE=m +CONFIG_NF_TABLES_BRIDGE=y CONFIG_NFT_BRIDGE_META=m CONFIG_NFT_BRIDGE_REJECT=m CONFIG_NF_LOG_BRIDGE=m @@ -6535,11 +6536,11 @@ CONFIG_TCP_MD5SIG=y ## CONFIG_NF_CONNTRACK_IPV4=m CONFIG_NF_SOCKET_IPV4=m -CONFIG_NF_TABLES_IPV4=m +CONFIG_NF_TABLES_IPV4=y CONFIG_NFT_CHAIN_ROUTE_IPV4=m CONFIG_NFT_DUP_IPV4=m CONFIG_NFT_FIB_IPV4=m -CONFIG_NF_TABLES_ARP=m +CONFIG_NF_TABLES_ARP=y CONFIG_NF_LOG_ARP=m CONFIG_NF_LOG_IPV4=m CONFIG_NF_REJECT_IPV4=m @@ -6604,7 +6605,7 @@ CONFIG_IPV6_SEG6_HMAC=y ## CONFIG_NF_CONNTRACK_IPV6=m CONFIG_NF_SOCKET_IPV6=m -CONFIG_NF_TABLES_IPV6=m +CONFIG_NF_TABLES_IPV6=y CONFIG_NFT_CHAIN_ROUTE_IPV6=m CONFIG_NFT_DUP_IPV6=m CONFIG_NFT_FIB_IPV6=m @@ -6727,8 +6728,8 @@ CONFIG_NF_CT_NETLINK_TIMEOUT=y CONFIG_NF_CT_NETLINK_HELPER=m CONFIG_NETFILTER_NETLINK_GLUE_CT=y CONFIG_NF_TABLES=m -CONFIG_NF_TABLES_INET=m -CONFIG_NF_TABLES_NETDEV=m +CONFIG_NF_TABLES_INET=y +CONFIG_NF_TABLES_NETDEV=y CONFIG_NFT_EXTHDR=m CONFIG_NFT_META=m CONFIG_NFT_RT=m diff --git a/debian/config/hppa/config b/debian/config/hppa/config index cb5732742..0192e2764 100644 --- a/debian/config/hppa/config +++ b/debian/config/hppa/config @@ -409,14 +409,11 @@ CONFIG_RTC_DRV_GENERIC=y ## # CONFIG_SCSI_BUSLOGIC is not set # CONFIG_SCSI_DMX3191D is not set -# CONFIG_SCSI_EATA is not set -# CONFIG_SCSI_FUTURE_DOMAIN is not set # CONFIG_SCSI_GDTH is not set # CONFIG_SCSI_GENERIC_NCR5380 is not set # CONFIG_SCSI_IPS is not set CONFIG_SCSI_INITIO=m # CONFIG_SCSI_INIA100 is not set -# CONFIG_SCSI_NCR53C406A is not set CONFIG_SCSI_LASI700=m CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=1 CONFIG_SCSI_SYM53C8XX_DEFAULT_TAGS=16 @@ -429,7 +426,6 @@ CONFIG_SCSI_NCR53C8XX_SYNC=20 # CONFIG_SCSI_QLOGIC_FAS is not set # CONFIG_SCSI_QLOGIC_1280 is not set # CONFIG_SCSI_SIM710 is not set -# CONFIG_SCSI_SYM53C416 is not set # CONFIG_SCSI_DC395x is not set ## @@ -443,7 +439,6 @@ CONFIG_MEGARAID_MAILBOX=m ## ## file: drivers/scsi/pcmcia/Kconfig ## -CONFIG_PCMCIA_FDOMAIN=m CONFIG_PCMCIA_QLOGIC=m CONFIG_PCMCIA_SYM53C500=m diff --git a/debian/config/i386/config b/debian/config/i386/config index 9a5366da4..054b03c6b 100644 --- a/debian/config/i386/config +++ b/debian/config/i386/config @@ -340,12 +340,9 @@ CONFIG_PNPBIOS=y ## ## file: drivers/scsi/Kconfig ## -CONFIG_SCSI_EATA_PIO=m # CONFIG_SCSI_GENERIC_NCR5380 is not set # CONFIG_SCSI_INIA100 is not set -CONFIG_SCSI_NCR53C406A=m CONFIG_SCSI_QLOGIC_FAS=m -CONFIG_SCSI_SYM53C416=m CONFIG_SCSI_NSP32=m ## diff --git a/debian/config/ia64/config b/debian/config/ia64/config index 4828b5163..9fec63021 100644 --- a/debian/config/ia64/config +++ b/debian/config/ia64/config @@ -644,7 +644,6 @@ CONFIG_MEGARAID_LEGACY=m ## ## file: drivers/scsi/pcmcia/Kconfig ## -CONFIG_PCMCIA_FDOMAIN=m CONFIG_PCMCIA_QLOGIC=m CONFIG_PCMCIA_SYM53C500=m diff --git a/debian/config/kernelarch-mips/config.malta b/debian/config/kernelarch-mips/config.malta index fa17325ca..ba0e6d06a 100644 --- a/debian/config/kernelarch-mips/config.malta +++ b/debian/config/kernelarch-mips/config.malta @@ -189,7 +189,7 @@ CONFIG_MTD_PHYSMAP=m CONFIG_MTD_PCI=m ## -## file: drivers/mtd/nand/Kconfig +## file: drivers/mtd/nand/raw/Kconfig ## CONFIG_MTD_NAND=m CONFIG_MTD_NAND_DISKONCHIP=m @@ -326,7 +326,6 @@ CONFIG_RTC_DRV_M48T86=m ## CONFIG_SCSI_ARCMSR=m CONFIG_SCSI_DMX3191D=m -CONFIG_SCSI_FUTURE_DOMAIN=m CONFIG_SCSI_IPS=m CONFIG_SCSI_INITIO=m CONFIG_SCSI_INIA100=m diff --git a/debian/config/kernelarch-powerpc/config b/debian/config/kernelarch-powerpc/config index 74c90abfe..474b7a930 100644 --- a/debian/config/kernelarch-powerpc/config +++ b/debian/config/kernelarch-powerpc/config @@ -678,11 +678,6 @@ CONFIG_SCSI_DPT_I2O=m CONFIG_SCSI_ARCMSR=m CONFIG_SCSI_BUSLOGIC=m CONFIG_SCSI_DMX3191D=m -CONFIG_SCSI_EATA=m -# CONFIG_SCSI_EATA_TAGGED_QUEUE is not set -# CONFIG_SCSI_EATA_LINKED_COMMANDS is not set -CONFIG_SCSI_EATA_MAX_TAGS=16 -# CONFIG_SCSI_FUTURE_DOMAIN is not set # CONFIG_SCSI_GDTH is not set CONFIG_SCSI_IPS=m # CONFIG_SCSI_INITIO is not set @@ -714,7 +709,6 @@ CONFIG_MEGARAID_MAILBOX=m ## file: drivers/scsi/pcmcia/Kconfig ## CONFIG_PCMCIA_AHA152X=m -# CONFIG_PCMCIA_FDOMAIN is not set CONFIG_PCMCIA_NINJA_SCSI=m CONFIG_PCMCIA_QLOGIC=m CONFIG_PCMCIA_SYM53C500=m diff --git a/debian/config/kernelarch-sparc/config b/debian/config/kernelarch-sparc/config index 358dd221d..d380a485a 100644 --- a/debian/config/kernelarch-sparc/config +++ b/debian/config/kernelarch-sparc/config @@ -401,7 +401,6 @@ CONFIG_DISPLAY7SEG=m ## CONFIG_SCSI_ARCMSR=m CONFIG_SCSI_DMX3191D=m -# CONFIG_SCSI_FUTURE_DOMAIN is not set # CONFIG_SCSI_IPS is not set CONFIG_SCSI_INITIO=m # CONFIG_SCSI_INIA100 is not set diff --git a/debian/config/kernelarch-x86/config b/debian/config/kernelarch-x86/config index ad64314e2..e87c9db9f 100644 --- a/debian/config/kernelarch-x86/config +++ b/debian/config/kernelarch-x86/config @@ -1019,7 +1019,7 @@ CONFIG_MTD_NETtel=m CONFIG_MTD_PCI=m ## -## file: drivers/mtd/nand/Kconfig +## file: drivers/mtd/nand/raw/Kconfig ## CONFIG_MTD_NAND=m CONFIG_MTD_NAND_DISKONCHIP=m @@ -1456,11 +1456,6 @@ CONFIG_SCSI_BUSLOGIC=m CONFIG_VMWARE_PVSCSI=m CONFIG_HYPERV_STORAGE=m CONFIG_SCSI_DMX3191D=m -CONFIG_SCSI_EATA=m -CONFIG_SCSI_EATA_TAGGED_QUEUE=y -CONFIG_SCSI_EATA_LINKED_COMMANDS=y -CONFIG_SCSI_EATA_MAX_TAGS=16 -CONFIG_SCSI_FUTURE_DOMAIN=m CONFIG_SCSI_GDTH=m CONFIG_SCSI_ISCI=m CONFIG_SCSI_IPS=m @@ -1493,7 +1488,6 @@ CONFIG_MEGARAID_LEGACY=m ## file: drivers/scsi/pcmcia/Kconfig ## CONFIG_PCMCIA_AHA152X=m -CONFIG_PCMCIA_FDOMAIN=m CONFIG_PCMCIA_QLOGIC=m CONFIG_PCMCIA_SYM53C500=m