From 2ecff5c87a1ef06dd3dfa0d774ac0dc709fcfbb4 Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Thu, 28 Nov 2019 05:18:11 +0000 Subject: [PATCH] debian/config: Clean up with the help of kconfigeditor2 * Drop settings for symbols that were removed or made automatic * Drop settings for DSCC4_PCISYNC and DSCC4_PCI_RST, which should have been removed along with DSCC4 * Disable CHROME_PLATFORMS at top level, since it will replace MFD_CROS_EC in the near future --- debian/config/alpha/config | 5 +- debian/config/amd64/config | 6 -- debian/config/amd64/config.cloud-amd64 | 11 ++- debian/config/armel/config.marvell | 4 +- debian/config/config | 97 ++++++++++++++----------- debian/config/i386/config | 1 - debian/config/ia64/config | 3 - debian/config/kernelarch-powerpc/config | 3 - debian/config/kernelarch-x86/config | 11 +-- debian/config/m68k/config | 2 +- 10 files changed, 63 insertions(+), 80 deletions(-) diff --git a/debian/config/alpha/config b/debian/config/alpha/config index e3684c044678..25376b0d3ecf 100644 --- a/debian/config/alpha/config +++ b/debian/config/alpha/config @@ -378,7 +378,6 @@ CONFIG_MMC_BLOCK=m ## ## file: drivers/mtd/Kconfig ## -CONFIG_MTD_CMDLINE_PARTS=y CONFIG_FTL=m CONFIG_NFTL=m CONFIG_NFTL_RW=y @@ -446,6 +445,7 @@ CONFIG_MTD_RAW_NAND=m ## ## file: drivers/mtd/parsers/Kconfig ## +CONFIG_MTD_CMDLINE_PARTS=y CONFIG_MTD_REDBOOT_PARTS=y CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1 CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED=y @@ -632,9 +632,6 @@ CONFIG_WANXL=m CONFIG_N2=m CONFIG_C101=m CONFIG_FARSYNC=m -CONFIG_DSCC4=m -CONFIG_DSCC4_PCISYNC=y -CONFIG_DSCC4_PCI_RST=y CONFIG_DLCI=m CONFIG_DLCI_MAX=8 CONFIG_SDLA=m diff --git a/debian/config/amd64/config b/debian/config/amd64/config index 8abf3f6e9969..1e354915b61e 100644 --- a/debian/config/amd64/config +++ b/debian/config/amd64/config @@ -57,18 +57,12 @@ CONFIG_XEN_512GB=y ## file: crypto/Kconfig ## CONFIG_CRYPTO_AEGIS128_AESNI_SSE2=m -CONFIG_CRYPTO_AEGIS128L_AESNI_SSE2=m -CONFIG_CRYPTO_AEGIS256_AESNI_SSE2=m -CONFIG_CRYPTO_MORUS640_SSE2=m -CONFIG_CRYPTO_MORUS1280_SSE2=m -CONFIG_CRYPTO_MORUS1280_AVX2=m CONFIG_CRYPTO_CRCT10DIF_PCLMUL=m CONFIG_CRYPTO_POLY1305_X86_64=m CONFIG_CRYPTO_SHA1_SSSE3=m CONFIG_CRYPTO_SHA256_SSSE3=m CONFIG_CRYPTO_SHA512_SSSE3=m CONFIG_CRYPTO_GHASH_CLMUL_NI_INTEL=m -CONFIG_CRYPTO_AES_X86_64=m CONFIG_CRYPTO_BLOWFISH_X86_64=m CONFIG_CRYPTO_CAMELLIA_X86_64=m CONFIG_CRYPTO_CAMELLIA_AESNI_AVX_X86_64=m diff --git a/debian/config/amd64/config.cloud-amd64 b/debian/config/amd64/config.cloud-amd64 index 327890e0fbf7..b71225db1971 100644 --- a/debian/config/amd64/config.cloud-amd64 +++ b/debian/config/amd64/config.cloud-amd64 @@ -1147,6 +1147,11 @@ CONFIG_HYPERV_STORAGE=m ## # CONFIG_STAGING is not set +## +## file: drivers/staging/uwb/Kconfig +## +# CONFIG_UWB is not set + ## ## file: drivers/target/Kconfig ## @@ -1189,18 +1194,12 @@ CONFIG_HYPERV_STORAGE=m # CONFIG_SERIAL_8250_EXAR is not set # CONFIG_SERIAL_8250_RSA is not set # CONFIG_SERIAL_8250_MID is not set -# CONFIG_SERIAL_8250_MOXA is not set ## ## file: drivers/usb/Kconfig ## # CONFIG_USB_SUPPORT is not set -## -## file: drivers/uwb/Kconfig -## -# CONFIG_UWB is not set - ## ## file: drivers/video/backlight/Kconfig ## diff --git a/debian/config/armel/config.marvell b/debian/config/armel/config.marvell index 37f41afbfb54..ee5b545843e5 100644 --- a/debian/config/armel/config.marvell +++ b/debian/config/armel/config.marvell @@ -344,8 +344,6 @@ CONFIG_MMC_MVSDIO=m ## file: drivers/mtd/Kconfig ## CONFIG_MTD=m -CONFIG_MTD_CMDLINE_PARTS=m -CONFIG_MTD_OF_PARTS=m CONFIG_MTD_BLOCK=m CONFIG_FTL=m CONFIG_NFTL=m @@ -422,6 +420,8 @@ CONFIG_MTD_NAND_ORION=m ## ## file: drivers/mtd/parsers/Kconfig ## +CONFIG_MTD_CMDLINE_PARTS=m +CONFIG_MTD_OF_PARTS=m # CONFIG_MTD_AFS_PARTS is not set # CONFIG_MTD_REDBOOT_PARTS is not set diff --git a/debian/config/config b/debian/config/config index 624d75e4f2a3..a43887f5f152 100644 --- a/debian/config/config +++ b/debian/config/config @@ -93,10 +93,6 @@ CONFIG_CRYPTO_CCM=m CONFIG_CRYPTO_GCM=m CONFIG_CRYPTO_CHACHA20POLY1305=m CONFIG_CRYPTO_AEGIS128=m -CONFIG_CRYPTO_AEGIS128L=m -CONFIG_CRYPTO_AEGIS256=m -CONFIG_CRYPTO_MORUS640=m -CONFIG_CRYPTO_MORUS1280=m CONFIG_CRYPTO_SEQIV=m CONFIG_CRYPTO_ECHAINIV=m CONFIG_CRYPTO_CBC=m @@ -788,11 +784,6 @@ CONFIG_DRM_QXL=m ## # CONFIG_DRM_RADEON_USERPTR is not set -## -## file: drivers/gpu/drm/tinydrm/Kconfig -## -# CONFIG_DRM_TINYDRM is not set - ## ## file: drivers/gpu/drm/udl/Kconfig ## @@ -813,6 +804,11 @@ CONFIG_DRM_VIRTIO_GPU=m ## CONFIG_VGA_ARB=y +## +## file: drivers/greybus/Kconfig +## +# CONFIG_GREYBUS is not set + ## ## file: drivers/hid/Kconfig ## @@ -2665,7 +2661,6 @@ CONFIG_FUSION_LAN=m # CONFIG_MFD_BCM590XX is not set # CONFIG_MFD_BD9571MWV is not set # CONFIG_MFD_AXP20X_I2C is not set -# CONFIG_MFD_CROS_EC is not set # CONFIG_MFD_MADERA is not set # CONFIG_PMIC_DA903X is not set # CONFIG_MFD_DA9052_SPI is not set @@ -2873,8 +2868,6 @@ CONFIG_MMC_TOSHIBA_PCI=m ## CONFIG_MTD=m # CONFIG_MTD_TESTS is not set -CONFIG_MTD_OF_PARTS=m -CONFIG_MTD_AR7_PARTS=m CONFIG_MTD_BLOCK=m CONFIG_MTD_BLOCK_RO=m CONFIG_RFD_FTL=m @@ -2890,7 +2883,6 @@ CONFIG_MTD_SWAP=m CONFIG_MTD_DATAFLASH=m # CONFIG_MTD_DATAFLASH_WRITE_VERIFY is not set # CONFIG_MTD_DATAFLASH_OTP is not set -CONFIG_MTD_M25P80=m # CONFIG_MTD_MCHP23K256 is not set CONFIG_MTD_SST25L=m # CONFIG_MTD_DOCG3 is not set @@ -2942,6 +2934,12 @@ CONFIG_MTD_NAND_RICOH=m ## # CONFIG_MTD_SPI_NAND is not set +## +## file: drivers/mtd/parsers/Kconfig +## +CONFIG_MTD_AR7_PARTS=m +CONFIG_MTD_OF_PARTS=m + ## ## file: drivers/mtd/spi-nor/Kconfig ## @@ -3042,15 +3040,15 @@ CONFIG_CAN_PEAK_PCIEFD=m ## file: drivers/net/can/sja1000/Kconfig ## CONFIG_CAN_SJA1000=m -CONFIG_CAN_SJA1000_ISA=m -# CONFIG_CAN_SJA1000_PLATFORM is not set -CONFIG_CAN_EMS_PCMCIA=m CONFIG_CAN_EMS_PCI=m -CONFIG_CAN_PEAK_PCMCIA=m +CONFIG_CAN_EMS_PCMCIA=m +CONFIG_CAN_KVASER_PCI=m CONFIG_CAN_PEAK_PCI=m CONFIG_CAN_PEAK_PCIEC=y -CONFIG_CAN_KVASER_PCI=m +CONFIG_CAN_PEAK_PCMCIA=m CONFIG_CAN_PLX_PCI=m +CONFIG_CAN_SJA1000_ISA=m +# CONFIG_CAN_SJA1000_PLATFORM is not set CONFIG_CAN_TSCAN1=m ## @@ -3444,7 +3442,6 @@ CONFIG_QLCNIC=m CONFIG_QLCNIC_SRIOV=y CONFIG_QLCNIC_DCB=y CONFIG_QLCNIC_HWMON=y -CONFIG_QLGE=m CONFIG_NETXEN_NIC=m CONFIG_QED=m CONFIG_QED_SRIOV=y @@ -3957,7 +3954,6 @@ CONFIG_IWLWIFI=m CONFIG_IWLDVM=m CONFIG_IWLMVM=m # CONFIG_IWLWIFI_BCAST_FILTERING is not set -# CONFIG_IWLWIFI_PCIE_RTPM is not set # CONFIG_IWLWIFI_DEBUG is not set # CONFIG_IWLWIFI_DEVICE_TRACING is not set @@ -4335,6 +4331,12 @@ CONFIG_YENTA_TOSHIBA=y # CONFIG_PINCTRL_BROXTON is not set # CONFIG_PINCTRL_SUNRISEPOINT is not set +## +## file: drivers/platform/chrome/Kconfig +## +# CONFIG_MFD_CROS_EC is not set +# CONFIG_CHROME_PLATFORMS is not set + ## ## file: drivers/platform/goldfish/Kconfig ## @@ -4831,11 +4833,6 @@ CONFIG_ASHMEM=m ## # CONFIG_LTE_GDM724X is not set -## -## file: drivers/staging/greybus/Kconfig -## -# CONFIG_GREYBUS is not set - ## ## file: drivers/staging/gs_fpgaboot/Kconfig ## @@ -4922,6 +4919,11 @@ CONFIG_HYSDN_CAPI=y ## # CONFIG_MOST is not set +## +## file: drivers/staging/qlge/Kconfig +## +CONFIG_QLGE=m + ## ## file: drivers/staging/rtl8188eu/Kconfig ## @@ -4977,6 +4979,12 @@ CONFIG_SPEAKUP_SYNTH_SPKOUT=m CONFIG_SPEAKUP_SYNTH_TXPRT=m CONFIG_SPEAKUP_SYNTH_DUMMY=m +## +## file: drivers/staging/uwb/Kconfig +## +CONFIG_UWB=m +CONFIG_UWB_I1480U=m + ## ## file: drivers/staging/vt6655/Kconfig ## @@ -4992,6 +5000,19 @@ CONFIG_SPEAKUP_SYNTH_DUMMY=m ## # CONFIG_PRISM2_USB is not set +## +## file: drivers/staging/wusbcore/Kconfig +## +CONFIG_USB_WUSB=m +CONFIG_USB_WUSB_CBAF=m +# CONFIG_USB_WUSB_CBAF_DEBUG is not set + +## +## file: drivers/staging/wusbcore/host/Kconfig +## +CONFIG_USB_WHCI_HCD=m +CONFIG_USB_HWA_HCD=m + ## ## file: drivers/target/Kconfig ## @@ -5111,7 +5132,6 @@ CONFIG_SERIAL_8250_HUB6=m # CONFIG_SERIAL_8250_DW is not set # CONFIG_SERIAL_8250_RT288X is not set # CONFIG_SERIAL_8250_MID is not set -CONFIG_SERIAL_8250_MOXA=m CONFIG_SERIAL_OF_PLATFORM=m ## @@ -5133,8 +5153,6 @@ CONFIG_UIO_MF624=m ## CONFIG_USB_SUPPORT=y CONFIG_USB_PCI=y -CONFIG_USB_LED_TRIG=y -# CONFIG_USB_ULPI_BUS is not set ## ## file: drivers/usb/atm/Kconfig @@ -5156,6 +5174,12 @@ CONFIG_USB_PRINTER=m CONFIG_USB_WDM=m CONFIG_USB_TMC=m +## +## file: drivers/usb/common/Kconfig +## +CONFIG_USB_LED_TRIG=y +# CONFIG_USB_ULPI_BUS is not set + ## ## file: drivers/usb/core/Kconfig ## @@ -5260,8 +5284,6 @@ CONFIG_USB_OHCI_HCD_PCI=y # CONFIG_USB_OHCI_HCD_PLATFORM is not set CONFIG_USB_U132_HCD=m # CONFIG_USB_R8A66597_HCD is not set -CONFIG_USB_WHCI_HCD=m -CONFIG_USB_HWA_HCD=m # CONFIG_USB_HCD_BCMA is not set # CONFIG_USB_HCD_SSB is not set # CONFIG_USB_HCD_TEST_MODE is not set @@ -5442,19 +5464,6 @@ CONFIG_USBIP_HOST=m CONFIG_USBIP_VUDC=m # CONFIG_USBIP_DEBUG is not set -## -## file: drivers/usb/wusbcore/Kconfig -## -CONFIG_USB_WUSB=m -CONFIG_USB_WUSB_CBAF=m -# CONFIG_USB_WUSB_CBAF_DEBUG is not set - -## -## file: drivers/uwb/Kconfig -## -CONFIG_UWB=m -CONFIG_UWB_I1480U=m - ## ## file: drivers/vfio/Kconfig ## @@ -6319,6 +6328,7 @@ CONFIG_MODULE_SIG_SHA256=y # CONFIG_MODULE_SIG_SHA512 is not set ## end choice # CONFIG_MODULE_COMPRESS is not set +# CONFIG_UNUSED_SYMBOLS is not set # CONFIG_TRIM_UNUSED_KSYMS is not set ## @@ -6458,7 +6468,6 @@ CONFIG_DYNAMIC_DEBUG=y CONFIG_ENABLE_MUST_CHECK=y CONFIG_STRIP_ASM_SYMS=y # CONFIG_READABLE_ASM is not set -# CONFIG_UNUSED_SYMBOLS is not set CONFIG_DEBUG_FS=y # CONFIG_HEADERS_CHECK is not set # CONFIG_DEBUG_SECTION_MISMATCH is not set diff --git a/debian/config/i386/config b/debian/config/i386/config index 24c60064df46..4d79e8e75c1f 100644 --- a/debian/config/i386/config +++ b/debian/config/i386/config @@ -56,7 +56,6 @@ CONFIG_X86_GENERIC=y ## ## file: crypto/Kconfig ## -CONFIG_CRYPTO_AES_586=m CONFIG_CRYPTO_SERPENT_SSE2_586=m CONFIG_CRYPTO_TWOFISH_586=m diff --git a/debian/config/ia64/config b/debian/config/ia64/config index 5ceb05be4566..e7581f7f47e0 100644 --- a/debian/config/ia64/config +++ b/debian/config/ia64/config @@ -505,9 +505,6 @@ CONFIG_LANMEDIA=m CONFIG_PCI200SYN=m CONFIG_WANXL=m CONFIG_FARSYNC=m -CONFIG_DSCC4=m -# CONFIG_DSCC4_PCISYNC is not set -# CONFIG_DSCC4_PCI_RST is not set CONFIG_DLCI=m CONFIG_DLCI_MAX=8 diff --git a/debian/config/kernelarch-powerpc/config b/debian/config/kernelarch-powerpc/config index 2883988bca4a..6e568c388c3a 100644 --- a/debian/config/kernelarch-powerpc/config +++ b/debian/config/kernelarch-powerpc/config @@ -574,9 +574,6 @@ CONFIG_LANMEDIA=m CONFIG_PCI200SYN=m CONFIG_WANXL=m CONFIG_FARSYNC=m -CONFIG_DSCC4=m -# CONFIG_DSCC4_PCISYNC is not set -# CONFIG_DSCC4_PCI_RST is not set CONFIG_DLCI=m CONFIG_DLCI_MAX=8 diff --git a/debian/config/kernelarch-x86/config b/debian/config/kernelarch-x86/config index 206b458456b5..b10f483d7a40 100644 --- a/debian/config/kernelarch-x86/config +++ b/debian/config/kernelarch-x86/config @@ -960,7 +960,6 @@ CONFIG_MMC_SDHCI_ACPI=m ## ## file: drivers/mtd/Kconfig ## -# CONFIG_MTD_CMDLINE_PARTS is not set CONFIG_FTL=m CONFIG_NFTL=m CONFIG_NFTL_RW=y @@ -1031,6 +1030,7 @@ CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADDRESS=0 ## ## file: drivers/mtd/parsers/Kconfig ## +# CONFIG_MTD_CMDLINE_PARTS is not set CONFIG_MTD_REDBOOT_PARTS=y CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1 # CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED is not set @@ -1234,9 +1234,6 @@ CONFIG_LANMEDIA=m CONFIG_PCI200SYN=m CONFIG_WANXL=m CONFIG_FARSYNC=m -CONFIG_DSCC4=m -CONFIG_DSCC4_PCISYNC=y -CONFIG_DSCC4_PCI_RST=y CONFIG_DLCI=m CONFIG_DLCI_MAX=8 # CONFIG_SBNI is not set @@ -1646,11 +1643,6 @@ CONFIG_ISDN_DRV_AVMB1_C4=m ## CONFIG_STAGING_MEDIA=y -## -## file: drivers/staging/media/bcm2048/Kconfig -## -# CONFIG_I2C_BCM2048 is not set - ## ## file: drivers/staging/rtl8192e/Kconfig ## @@ -1956,7 +1948,6 @@ CONFIG_MMIOTRACE=y ## ## file: lib/Kconfig.debug ## -CONFIG_OPTIMIZE_INLINING=y # CONFIG_FRAME_POINTER is not set # CONFIG_DEBUG_STACK_USAGE is not set # CONFIG_DEBUG_PER_CPU_MAPS is not set diff --git a/debian/config/m68k/config b/debian/config/m68k/config index ebc1c62b3064..6064bb307c90 100644 --- a/debian/config/m68k/config +++ b/debian/config/m68k/config @@ -97,9 +97,9 @@ CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=y ## ## file: drivers/ata/Kconfig ## -CONFIG_PATA_BUDDHA=m CONFIG_PATA_FALCON=m CONFIG_PATA_GAYLE=m +CONFIG_PATA_BUDDHA=m ## ## file: drivers/bcma/Kconfig