debian/config: Clean up with the help of kconfigeditor2

Various kconfig symbols have been renamed, removed, split or combined.
Update these files accordingly.

debian/config/amd64/config.cloud-amd64

@@ -596,7 +596,7 @@ CONFIG_XEN_NETDEV_FRONTEND=m
 ##
 ## file: drivers/net/ethernet/cadence/Kconfig
 ##
-# CONFIG_NET_CADENCE is not set
+# CONFIG_NET_VENDOR_CADENCE is not set
 
 ##
 ## file: drivers/net/ethernet/cavium/Kconfig
@@ -688,7 +688,7 @@ CONFIG_NET_VENDOR_MELLANOX=y
 ##
 ## file: drivers/net/ethernet/neterion/Kconfig
 ##
-# CONFIG_NET_VENDOR_EXAR is not set
+# CONFIG_NET_VENDOR_NETERION is not set
 
 ##
 ## file: drivers/net/ethernet/netronome/Kconfig
@@ -708,7 +708,7 @@ CONFIG_NET_VENDOR_MELLANOX=y
 ##
 ## file: drivers/net/ethernet/packetengines/Kconfig
 ##
-# CONFIG_NET_PACKET_ENGINE is not set
+# CONFIG_NET_VENDOR_PACKET_ENGINES is not set
 
 ##
 ## file: drivers/net/ethernet/qlogic/Kconfig

debian/config/arm64/config

@@ -111,7 +111,6 @@ CONFIG_TEGRA_ACONNECT=y
 CONFIG_HW_RANDOM_BCM2835=m
 # CONFIG_HW_RANDOM_OMAP is not set
 CONFIG_HW_RANDOM_HISI=m
-CONFIG_HW_RANDOM_MSM=m
 CONFIG_HW_RANDOM_XGENE=m
 CONFIG_HW_RANDOM_MESON=m
 CONFIG_HW_RANDOM_CAVIUM=m
@@ -170,6 +169,7 @@ CONFIG_ARM_CPUIDLE=y
 ##
 CONFIG_CRYPTO_DEV_MARVELL_CESA=m
 CONFIG_CRYPTO_DEV_QCE=m
+CONFIG_CRYPTO_DEV_QCOM_RNG=m
 CONFIG_CRYPTO_DEV_SAFEXCEL=m
 
 ##
@@ -421,8 +421,6 @@ CONFIG_TEGRA_MC=y
 ##
 CONFIG_MFD_AXP20X_RSB=m
 CONFIG_MFD_CROS_EC=y
-CONFIG_MFD_CROS_EC_I2C=m
-CONFIG_MFD_CROS_EC_SPI=m
 CONFIG_MFD_HI655X_PMIC=m
 CONFIG_MFD_MAX77620=y
 CONFIG_MFD_QCOM_RPM=m
@@ -773,6 +771,8 @@ CONFIG_PINCTRL_QCOM_SSBI_PMIC=y
 ## file: drivers/platform/chrome/Kconfig
 ##
 CONFIG_CHROME_PLATFORMS=y
+CONFIG_CROS_EC_I2C=m
+CONFIG_CROS_EC_SPI=m
 CONFIG_CROS_KBD_LED_BACKLIGHT=m
 
 ##

debian/config/armel/config.marvell

@@ -734,10 +734,10 @@ CONFIG_NLS=m
 # CONFIG_MEMCG is not set
 # CONFIG_CFS_BANDWIDTH is not set
 # CONFIG_CGROUP_BPF is not set
+# CONFIG_CHECKPOINT_RESTORE is not set
 ## choice: Compiler optimization level
 CONFIG_CC_OPTIMIZE_FOR_SIZE=y
 ## end choice
-# CONFIG_CHECKPOINT_RESTORE is not set
 # CONFIG_USERFAULTFD is not set
 # CONFIG_SLUB_DEBUG is not set
 # CONFIG_SLAB_FREELIST_HARDENED is not set

debian/config/armhf/config

@@ -612,7 +612,6 @@ CONFIG_MFD_AS3722=y
 CONFIG_MFD_AC100=y
 CONFIG_MFD_AXP20X_I2C=y
 CONFIG_MFD_CROS_EC=m
-CONFIG_MFD_CROS_EC_SPI=m
 CONFIG_MFD_DA9052_SPI=y
 CONFIG_MFD_DA9052_I2C=y
 CONFIG_MFD_MC13XXX_SPI=m
@@ -944,6 +943,11 @@ CONFIG_PINCTRL_PALMAS=y
 ##
 CONFIG_PINCTRL_WM8850=y
 
+##
+## file: drivers/platform/chrome/Kconfig
+##
+CONFIG_CROS_EC_SPI=m
+
 ##
 ## file: drivers/power/avs/Kconfig
 ##

debian/config/config

@@ -5,8 +5,6 @@ CONFIG_OPROFILE=m
 CONFIG_KPROBES=y
 CONFIG_JUMP_LABEL=y
 # CONFIG_STATIC_KEYS_SELFTEST is not set
-#. Until we work out how to package them
-# CONFIG_GCC_PLUGINS is not set
 CONFIG_STACKPROTECTOR=y
 CONFIG_STACKPROTECTOR_STRONG=y
 CONFIG_VMAP_STACK=y
@@ -1864,6 +1862,7 @@ CONFIG_DVB_BCM3510=m
 CONFIG_DVB_LGDT330X=m
 CONFIG_DVB_S5H1409=m
 CONFIG_DVB_S921=m
+CONFIG_DVB_TC90522=m
 CONFIG_DVB_PLL=m
 CONFIG_DVB_LNBP21=m
 CONFIG_DVB_ISL6405=m
@@ -2269,7 +2268,6 @@ CONFIG_DVB_USB_PCTV452E=m
 CONFIG_DVB_USB_DW2102=m
 CONFIG_DVB_USB_CINERGY_T2=m
 CONFIG_DVB_USB_DTV5100=m
-CONFIG_DVB_USB_FRIIO=m
 CONFIG_DVB_USB_AZ6027=m
 CONFIG_DVB_USB_TECHNISAT_USB2=m
 
@@ -2907,12 +2905,12 @@ CONFIG_CAN_SOFTING_CS=m
 ##
 ## file: drivers/net/can/usb/Kconfig
 ##
+CONFIG_CAN_8DEV_USB=m
 CONFIG_CAN_EMS_USB=m
 CONFIG_CAN_ESD_USB2=m
 CONFIG_CAN_GS_USB=m
 CONFIG_CAN_KVASER_USB=m
 CONFIG_CAN_PEAK_USB=m
-CONFIG_CAN_8DEV_USB=m
 
 ##
 ## file: drivers/net/dsa/Kconfig
@@ -3021,7 +3019,7 @@ CONFIG_BNA=m
 ##
 ## file: drivers/net/ethernet/cadence/Kconfig
 ##
-CONFIG_NET_CADENCE=y
+CONFIG_NET_VENDOR_CADENCE=y
 # CONFIG_MACB is not set
 
 ##
@@ -3198,7 +3196,7 @@ CONFIG_NS83820=m
 ##
 ## file: drivers/net/ethernet/neterion/Kconfig
 ##
-CONFIG_NET_VENDOR_EXAR=y
+CONFIG_NET_VENDOR_NETERION=y
 CONFIG_S2IO=m
 CONFIG_VXGE=m
 # CONFIG_VXGE_DEBUG_TRACE_ALL is not set
@@ -3217,7 +3215,7 @@ CONFIG_NET_VENDOR_OKI=y
 ##
 ## file: drivers/net/ethernet/packetengines/Kconfig
 ##
-CONFIG_NET_PACKET_ENGINE=y
+CONFIG_NET_VENDOR_PACKET_ENGINES=y
 CONFIG_HAMACHI=m
 CONFIG_YELLOWFIN=m
 
@@ -4070,7 +4068,7 @@ CONFIG_POWER_SUPPLY=y
 CONFIG_WM831X_POWER=m
 CONFIG_WM8350_POWER=m
 # CONFIG_TEST_POWER is not set
-# CONFIG_BATTERY_DS2760 is not set
+CONFIG_BATTERY_DS2760=m
 # CONFIG_BATTERY_DS2780 is not set
 # CONFIG_BATTERY_DS2781 is not set
 # CONFIG_BATTERY_DS2782 is not set
@@ -4451,8 +4449,6 @@ CONFIG_SPI_SPIDEV=y
 CONFIG_SSB=m
 CONFIG_SSB_PCMCIAHOST=y
 # CONFIG_SSB_HOST_SOC is not set
-# CONFIG_SSB_SILENT is not set
-# CONFIG_SSB_DEBUG is not set
 # CONFIG_SSB_DRIVER_GPIO is not set
 
 ##
@@ -4543,11 +4539,6 @@ CONFIG_ASHMEM=m
 # CONFIG_AD9832 is not set
 # CONFIG_AD9834 is not set
 
-##
-## file: drivers/staging/iio/gyro/Kconfig
-##
-# CONFIG_ADIS16060 is not set
-
 ##
 ## file: drivers/staging/iio/impedance-analyzer/Kconfig
 ##
@@ -4632,11 +4623,6 @@ CONFIG_R8712U=m
 ##
 # CONFIG_RTS5208 is not set
 
-##
-## file: drivers/staging/skein/Kconfig
-##
-# CONFIG_CRYPTO_SKEIN is not set
-
 ##
 ## file: drivers/staging/sm750fb/Kconfig
 ##
@@ -5269,7 +5255,6 @@ CONFIG_W1_SLAVE_DS2431=m
 CONFIG_W1_SLAVE_DS2433=m
 # CONFIG_W1_SLAVE_DS2433_CRC is not set
 CONFIG_W1_SLAVE_DS2438=m
-CONFIG_W1_SLAVE_DS2760=m
 CONFIG_W1_SLAVE_DS2780=m
 CONFIG_W1_SLAVE_DS2781=m
 CONFIG_W1_SLAVE_DS28E04=m
@@ -5410,7 +5395,6 @@ CONFIG_CEPH_FS_POSIX_ACL=y
 ## file: fs/cifs/Kconfig
 ##
 CONFIG_CIFS=m
-# CONFIG_CIFS_STATS is not set
 CONFIG_CIFS_WEAK_PW_HASH=y
 CONFIG_CIFS_UPCALL=y
 CONFIG_CIFS_XATTR=y
@@ -5545,7 +5529,6 @@ CONFIG_HFS_FS=m
 ## file: fs/hfsplus/Kconfig
 ##
 CONFIG_HFSPLUS_FS=m
-# CONFIG_HFSPLUS_FS_POSIX_ACL is not set
 
 ##
 ## file: fs/hpfs/Kconfig
@@ -5899,6 +5882,7 @@ CONFIG_IPC_NS=y
 CONFIG_USER_NS=y
 CONFIG_PID_NS=y
 CONFIG_NET_NS=y
+CONFIG_CHECKPOINT_RESTORE=y
 CONFIG_SCHED_AUTOGROUP=y
 # CONFIG_SYSFS_DEPRECATED is not set
 # CONFIG_SYSFS_DEPRECATED_V2 is not set
@@ -5928,7 +5912,6 @@ CONFIG_SHMEM=y
 CONFIG_AIO=y
 CONFIG_ADVISE_SYSCALLS=y
 CONFIG_MEMBARRIER=y
-CONFIG_CHECKPOINT_RESTORE=y
 CONFIG_KALLSYMS=y
 # CONFIG_KALLSYMS_ALL is not set
 CONFIG_BPF_SYSCALL=y
@@ -6092,7 +6075,6 @@ CONFIG_DYNAMIC_DEBUG=y
 # CONFIG_DEBUG_INFO_REDUCED is not set
 # CONFIG_DEBUG_INFO_SPLIT is not set
 # CONFIG_GDB_SCRIPTS is not set
-CONFIG_ENABLE_WARN_DEPRECATED=y
 CONFIG_ENABLE_MUST_CHECK=y
 CONFIG_STRIP_ASM_SYMS=y
 # CONFIG_READABLE_ASM is not set
@@ -6531,7 +6513,6 @@ CONFIG_TCP_MD5SIG=y
 ##
 ## file: net/ipv4/netfilter/Kconfig
 ##
-CONFIG_NF_CONNTRACK_IPV4=m
 CONFIG_NF_SOCKET_IPV4=m
 CONFIG_NF_TABLES_IPV4=y
 CONFIG_NFT_CHAIN_ROUTE_IPV4=m
@@ -6600,7 +6581,6 @@ CONFIG_IPV6_SEG6_HMAC=y
 ##
 ## file: net/ipv6/netfilter/Kconfig
 ##
-CONFIG_NF_CONNTRACK_IPV6=m
 CONFIG_NF_SOCKET_IPV6=m
 CONFIG_NF_TABLES_IPV6=y
 CONFIG_NFT_CHAIN_ROUTE_IPV6=m
@@ -7099,6 +7079,12 @@ CONFIG_NET_KEY_MIGRATE=y
 ##
 # CONFIG_SAMPLES is not set
 
+##
+## file: scripts/gcc-plugins/Kconfig
+##
+#. Until we work out how to package them
+# CONFIG_GCC_PLUGINS is not set
+
 ##
 ## file: security/Kconfig
 ##

debian/config/kernelarch-x86/config

@@ -511,11 +511,6 @@ CONFIG_DRM_AMD_ACP=y
 ##
 CONFIG_HSA_AMD=m
 
-##
-## file: drivers/gpu/drm/amd/display/Kconfig
-##
-CONFIG_DRM_AMD_DC_DCN1_0=y
-
 ##
 ## file: drivers/gpu/drm/ast/Kconfig
 ##
@@ -1513,7 +1508,6 @@ CONFIG_COMEDI_MISC_DRIVERS=y
 CONFIG_COMEDI_BOND=m
 CONFIG_COMEDI_TEST=m
 CONFIG_COMEDI_PARPORT=m
-CONFIG_COMEDI_SERIAL2002=m
 CONFIG_COMEDI_SSV_DNP=m
 # CONFIG_COMEDI_ISA_DRIVERS is not set
 CONFIG_COMEDI_II_PCI20KC=m

debian/config/m68k/config

@@ -311,8 +311,8 @@ CONFIG_ADB=y
 CONFIG_ADB_MACII=y
 #. switched on for the benefit of IIfx, Q900, Q950
 CONFIG_ADB_IOP=y
-CONFIG_ADB_PMU68K=y
 CONFIG_ADB_CUDA=y
+CONFIG_ADB_PMU=y
 CONFIG_INPUT_ADBHID=y
 CONFIG_MAC_EMUMOUSEBTN=m