Commit ed6a627d authored by Ben Hutchings's avatar Ben Hutchings

debian/config: Clean up with the help of kconfigeditor2

* Drop various obsolete symbols
* Various platform-specific camera drivers that we disabled by default
  have been replaced; disable their replacements now
parent a256313b
......@@ -19,11 +19,6 @@
# CONFIG_ISA is not set
# CONFIG_X86_X32 is not set
##
## file: arch/x86/Kconfig.debug
##
# CONFIG_EARLY_PRINTK_EFI is not set
##
## file: arch/x86/xen/Kconfig
##
......@@ -1044,12 +1039,6 @@ CONFIG_HYPERV_STORAGE=m
##
# CONFIG_SCSI_MVSAS is not set
##
## file: drivers/scsi/osd/Kconfig
##
# CONFIG_SCSI_OSD_INITIATOR is not set
# CONFIG_SCSI_OSD_ULD is not set
##
## file: drivers/scsi/qla2xxx/Kconfig
##
......
......@@ -79,7 +79,6 @@ CONFIG_ACPI_BGRT=y
CONFIG_ACPI_APEI=y
CONFIG_ACPI_APEI_GHES=y
CONFIG_ACPI_APEI_PCIEAER=y
CONFIG_ACPI_APEI_SEA=y
CONFIG_ACPI_APEI_MEMORY_FAILURE=y
CONFIG_ACPI_APEI_EINJ=m
......@@ -98,12 +97,6 @@ CONFIG_AHCI_TEGRA=m
CONFIG_AHCI_XGENE=m
CONFIG_SATA_AHCI_SEATTLE=m
##
## file: drivers/base/Kconfig
##
CONFIG_DMA_CMA=y
CONFIG_CMA_SIZE_MBYTES=64
##
## file: drivers/bluetooth/Kconfig
##
......@@ -1250,6 +1243,12 @@ CONFIG_MESON_GXBB_WATCHDOG=m
CONFIG_MESON_WATCHDOG=m
CONFIG_BCM2835_WDT=m
##
## file: kernel/dma/Kconfig
##
CONFIG_DMA_CMA=y
CONFIG_CMA_SIZE_MBYTES=64
##
## file: mm/Kconfig
##
......
......@@ -632,11 +632,6 @@ CONFIG_SPI_ORION=m
##
# CONFIG_SSB is not set
##
## file: drivers/staging/xgifb/Kconfig
##
CONFIG_FB_XGI=m
##
## file: drivers/thermal/Kconfig
##
......
......@@ -11,12 +11,6 @@ CONFIG_VFP=y
CONFIG_ARCH_BCM=y
CONFIG_ARCH_BCM2835=y
##
## file: drivers/base/Kconfig
##
CONFIG_DMA_CMA=y
CONFIG_CMA_SIZE_MBYTES=32
##
## file: drivers/bluetooth/Kconfig
##
......@@ -158,6 +152,12 @@ CONFIG_FB_SIMPLE=y
##
CONFIG_BCM2835_WDT=y
##
## file: kernel/dma/Kconfig
##
CONFIG_DMA_CMA=y
CONFIG_CMA_SIZE_MBYTES=32
##
## file: kernel/power/Kconfig
##
......
......@@ -170,11 +170,6 @@ CONFIG_PATA_OF_PLATFORM=m
##
CONFIG_ARM_CHARLCD=y
##
## file: drivers/base/Kconfig
##
CONFIG_DMA_CMA=y
##
## file: drivers/bluetooth/Kconfig
##
......@@ -1003,7 +998,7 @@ CONFIG_CHARGER_BQ2415X=m
##
CONFIG_PWM=y
CONFIG_PWM_BCM2835=m
CONFIG_PWM_IMX=m
CONFIG_PWM_IMX27=m
CONFIG_PWM_MESON=m
CONFIG_PWM_OMAP_DMTIMER=m
CONFIG_PWM_ROCKCHIP=m
......@@ -1320,6 +1315,11 @@ CONFIG_TEGRA_WATCHDOG=m
CONFIG_MESON_WATCHDOG=m
CONFIG_BCM2835_WDT=m
##
## file: kernel/dma/Kconfig
##
CONFIG_DMA_CMA=y
##
## file: kernel/power/Kconfig
##
......
......@@ -1160,6 +1160,8 @@ CONFIG_HID_SENSOR_ACCEL_3D=m
# CONFIG_AD7291 is not set
# CONFIG_AD7298 is not set
# CONFIG_AD7476 is not set
# CONFIG_AD7606_IFACE_PARALLEL is not set
# CONFIG_AD7606_IFACE_SPI is not set
# CONFIG_AD7791 is not set
# CONFIG_AD7793 is not set
# CONFIG_AD7887 is not set
......@@ -2054,15 +2056,21 @@ CONFIG_VIDEO_KS0127=m
CONFIG_VIDEO_SAA7110=m
CONFIG_VIDEO_SAA711X=m
CONFIG_VIDEO_TVP5150=m
# CONFIG_VIDEO_TW9910 is not set
CONFIG_VIDEO_VPX3220=m
CONFIG_VIDEO_SAA7127=m
CONFIG_VIDEO_SAA7185=m
CONFIG_VIDEO_ADV7170=m
CONFIG_VIDEO_ADV7175=m
# CONFIG_VIDEO_OV2640 is not set
# CONFIG_VIDEO_OV772X is not set
CONFIG_VIDEO_OV7670=m
# CONFIG_VIDEO_OV9640 is not set
# CONFIG_VIDEO_MT9M001 is not set
# CONFIG_VIDEO_MT9T112 is not set
CONFIG_VIDEO_SR030PC30=m
CONFIG_VIDEO_NOON010PC30=m
# CONFIG_VIDEO_RJ54N1 is not set
CONFIG_VIDEO_UPD64031A=m
CONFIG_VIDEO_UPD64083=m
......@@ -2071,19 +2079,6 @@ CONFIG_VIDEO_UPD64083=m
##
CONFIG_VIDEO_CX25840=m
##
## file: drivers/media/i2c/soc_camera/Kconfig
##
# CONFIG_SOC_CAMERA_MT9M001 is not set
# CONFIG_SOC_CAMERA_MT9M111 is not set
# CONFIG_SOC_CAMERA_MT9T112 is not set
# CONFIG_SOC_CAMERA_MT9V022 is not set
# CONFIG_SOC_CAMERA_OV772X is not set
# CONFIG_SOC_CAMERA_OV9640 is not set
# CONFIG_SOC_CAMERA_OV9740 is not set
# CONFIG_SOC_CAMERA_RJ54N1 is not set
# CONFIG_SOC_CAMERA_TW9910 is not set
##
## file: drivers/media/mmc/siano/Kconfig
##
......@@ -2253,6 +2248,7 @@ CONFIG_VIDEO_TW686X=m
## file: drivers/media/platform/Kconfig
##
CONFIG_V4L_PLATFORM_DRIVERS=y
# CONFIG_VIDEO_RENESAS_CEU is not set
CONFIG_V4L_MEM2MEM_DRIVERS=y
# CONFIG_VIDEO_MEM2MEM_DEINTERLACE is not set
# CONFIG_VIDEO_SH_VEU is not set
......@@ -2272,13 +2268,6 @@ CONFIG_V4L_TEST_DRIVERS=y
##
CONFIG_VIDEO_CAFE_CCIC=m
##
## file: drivers/media/platform/soc_camera/Kconfig
##
# CONFIG_SOC_CAMERA is not set
# CONFIG_SOC_CAMERA_PLATFORM is not set
# CONFIG_VIDEO_SH_MOBILE_CEU is not set
##
## file: drivers/media/platform/vivid/Kconfig
##
......@@ -2980,8 +2969,8 @@ CONFIG_MTD_NAND_NANDSIM=m
## file: drivers/mtd/spi-nor/Kconfig
##
CONFIG_MTD_SPI_NOR=m
# CONFIG_MTD_MT81xx_NOR is not set
CONFIG_MTD_SPI_NOR_USE_4K_SECTORS=y
# CONFIG_SPI_MTK_QUADSPI is not set
##
## file: drivers/mtd/ubi/Kconfig
......@@ -4738,14 +4727,6 @@ CONFIG_SCSI_MVSAS=m
# CONFIG_SCSI_MVSAS_DEBUG is not set
# CONFIG_SCSI_MVSAS_TASKLET is not set
##
## file: drivers/scsi/osd/Kconfig
##
CONFIG_SCSI_OSD_INITIATOR=m
CONFIG_SCSI_OSD_ULD=m
CONFIG_SCSI_OSD_DPRINT_SENSE=1
# CONFIG_SCSI_OSD_DEBUG is not set
##
## file: drivers/scsi/pcmcia/Kconfig
##
......@@ -4891,7 +4872,6 @@ CONFIG_ASHMEM=m
##
## file: drivers/staging/iio/adc/Kconfig
##
# CONFIG_AD7606 is not set
# CONFIG_AD7780 is not set
# CONFIG_AD7816 is not set
# CONFIG_AD7192 is not set
......@@ -4906,7 +4886,6 @@ CONFIG_ASHMEM=m
## file: drivers/staging/iio/cdc/Kconfig
##
# CONFIG_AD7150 is not set
# CONFIG_AD7152 is not set
# CONFIG_AD7746 is not set
##
......@@ -4936,13 +4915,13 @@ CONFIG_ASHMEM=m
# CONFIG_STAGING_MEDIA is not set
##
## file: drivers/staging/media/imx074/Kconfig
## file: drivers/staging/media/soc_camera/Kconfig
##
# CONFIG_SOC_CAMERA is not set
# CONFIG_SOC_CAMERA_MT9M111 is not set
# CONFIG_SOC_CAMERA_MT9V022 is not set
# CONFIG_SOC_CAMERA_OV9740 is not set
# CONFIG_SOC_CAMERA_IMX074 is not set
##
## file: drivers/staging/media/mt9t031/Kconfig
##
# CONFIG_SOC_CAMERA_MT9T031 is not set
##
......@@ -5032,11 +5011,6 @@ CONFIG_SPEAKUP_SYNTH_DUMMY=m
##
# CONFIG_PRISM2_USB is not set
##
## file: drivers/staging/xgifb/Kconfig
##
# CONFIG_FB_XGI is not set
##
## file: drivers/target/Kconfig
##
......@@ -5845,12 +5819,6 @@ CONFIG_EFIVAR_FS=m
##
CONFIG_EFS_FS=m
##
## file: fs/exofs/Kconfig
##
CONFIG_EXOFS_FS=m
# CONFIG_EXOFS_DEBUG is not set
##
## file: fs/ext2/Kconfig
##
......@@ -6368,6 +6336,11 @@ CONFIG_MODULE_SIG_SHA256=y
# CONFIG_MODULE_COMPRESS is not set
# CONFIG_TRIM_UNUSED_KSYMS is not set
##
## file: kernel/dma/Kconfig
##
# CONFIG_DMA_API_DEBUG is not set
##
## file: kernel/gcov/Kconfig
##
......@@ -6504,7 +6477,6 @@ CONFIG_ENABLE_MUST_CHECK=y
CONFIG_STRIP_ASM_SYMS=y
# CONFIG_READABLE_ASM is not set
# CONFIG_UNUSED_SYMBOLS is not set
# CONFIG_PAGE_OWNER is not set
CONFIG_DEBUG_FS=y
# CONFIG_HEADERS_CHECK is not set
# CONFIG_DEBUG_SECTION_MISMATCH is not set
......@@ -6564,7 +6536,6 @@ CONFIG_PM_NOTIFIER_ERROR_INJECT=m
# CONFIG_NETDEV_NOTIFIER_ERROR_INJECT is not set
# CONFIG_FAULT_INJECTION is not set
# CONFIG_LATENCYTOP is not set
# CONFIG_DMA_API_DEBUG is not set
# CONFIG_LKDTM is not set
# CONFIG_TEST_LIST_SORT is not set
# CONFIG_KPROBES_SANITY_TEST is not set
......@@ -6664,6 +6635,7 @@ CONFIG_ZSMALLOC=m
## file: mm/Kconfig.debug
##
CONFIG_PAGE_EXTENSION=y
# CONFIG_PAGE_OWNER is not set
CONFIG_PAGE_POISONING=y
CONFIG_PAGE_POISONING_NO_SANITY=y
# CONFIG_PAGE_POISONING_ZERO is not set
......@@ -6974,9 +6946,6 @@ CONFIG_NF_FLOW_TABLE_IPV4=m
CONFIG_NF_LOG_ARP=m
CONFIG_NF_LOG_IPV4=m
CONFIG_NF_REJECT_IPV4=m
CONFIG_NFT_CHAIN_NAT_IPV4=m
CONFIG_NFT_MASQ_IPV4=m
CONFIG_NFT_REDIR_IPV4=m
CONFIG_NF_NAT_SNMP_BASIC=m
CONFIG_IP_NF_IPTABLES=m
CONFIG_IP_NF_MATCH_AH=m
......@@ -7037,15 +7006,11 @@ CONFIG_NF_SOCKET_IPV6=m
CONFIG_NF_TPROXY_IPV6=m
CONFIG_NF_TABLES_IPV6=y
CONFIG_NFT_CHAIN_ROUTE_IPV6=m
CONFIG_NFT_CHAIN_NAT_IPV6=m
CONFIG_NFT_MASQ_IPV6=m
CONFIG_NFT_REDIR_IPV6=m
CONFIG_NFT_DUP_IPV6=m
CONFIG_NFT_FIB_IPV6=m
CONFIG_NF_FLOW_TABLE_IPV6=m
CONFIG_NF_REJECT_IPV6=m
CONFIG_NF_LOG_IPV6=m
CONFIG_NF_NAT_IPV6=m
CONFIG_IP6_NF_IPTABLES=m
CONFIG_IP6_NF_MATCH_AH=m
CONFIG_IP6_NF_MATCH_EUI64=m
......@@ -7157,6 +7122,7 @@ CONFIG_NF_CT_NETLINK=m
CONFIG_NF_CT_NETLINK_TIMEOUT=y
CONFIG_NF_CT_NETLINK_HELPER=m
CONFIG_NETFILTER_NETLINK_GLUE_CT=y
CONFIG_NF_NAT=m
CONFIG_NF_TABLES=m
CONFIG_NF_TABLES_SET=m
CONFIG_NF_TABLES_INET=y
......@@ -7600,7 +7566,7 @@ CONFIG_HARDENED_USERCOPY=y
CONFIG_FORTIFY_SOURCE=y
CONFIG_LOCK_DOWN_KERNEL=y
CONFIG_LOCK_DOWN_IN_EFI_SECURE_BOOT=y
## choice: Default security module
## choice: First legacy 'major LSM' to be initialized
CONFIG_DEFAULT_SECURITY_APPARMOR=y
## end choice
......@@ -7608,7 +7574,6 @@ CONFIG_DEFAULT_SECURITY_APPARMOR=y
## file: security/apparmor/Kconfig
##
CONFIG_SECURITY_APPARMOR=y
CONFIG_SECURITY_APPARMOR_BOOTPARAM_VALUE=1
CONFIG_SECURITY_APPARMOR_HASH=y
CONFIG_SECURITY_APPARMOR_HASH_DEFAULT=y
......
......@@ -116,7 +116,6 @@ CONFIG_IBM_EMAC_RXB=128
CONFIG_IBM_EMAC_TXB=64
CONFIG_IBM_EMAC_POLL_WEIGHT=32
CONFIG_IBM_EMAC_RX_COPY_THRESHOLD=256
CONFIG_IBM_EMAC_RX_SKB_HEADROOM=0
# CONFIG_IBM_EMAC_DEBUG is not set
##
......
......@@ -88,7 +88,6 @@ CONFIG_IA32_EMULATION=y
# CONFIG_X86_VERBOSE_BOOTUP is not set
CONFIG_EARLY_PRINTK=y
# CONFIG_EARLY_PRINTK_DBGP is not set
CONFIG_EARLY_PRINTK_EFI=y
# CONFIG_X86_PTDUMP is not set
# CONFIG_EFI_PGT_DUMP is not set
CONFIG_DEBUG_WX=y
......
......@@ -645,11 +645,6 @@ CONFIG_BINFMT_MISC=m
##
# CONFIG_EFS_FS is not set
##
## file: fs/exofs/Kconfig
##
# CONFIG_EXOFS_FS is not set
##
## file: fs/f2fs/Kconfig
##
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment