Adding debian version 6.7.7-1.debian/6.7.7-1

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

71 files changed, 1180 insertions, 1607 deletions

diff --git a/debian/config/alpha/config b/debian/config/alpha/config
index 03cb7bec52..bfd139e541 100644
--- a/debian/config/alpha/config
+++ b/debian/config/alpha/config
@@ -676,7 +676,7 @@ CONFIG_SCSI_GENERIC_NCR5380=m
 CONFIG_SCSI_IPS=m
 CONFIG_SCSI_INITIO=m
 CONFIG_SCSI_INIA100=m
-CONFIG_SCSI_IZIP_EPP16=y
+CONFIG_SCSI_IMM=y
 CONFIG_SCSI_IZIP_SLOW_CTR=y
 CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=1
 CONFIG_SCSI_SYM53C8XX_DEFAULT_TAGS=16
diff --git a/debian/config/alpha/defines b/debian/config/alpha/defines
deleted file mode 100644
index bbe9c6f4ae..0000000000
--- a/debian/config/alpha/defines
+++ /dev/null
@@ -1,22 +0,0 @@
-[base]
-flavours: alpha-generic alpha-smp
-default-flavour: alpha-smp
-kernel-arch: alpha
-
-[build]
-image-file: arch/alpha/boot/vmlinux.gz
-
-[image]
-suggests: aboot, fdutils
-install-stem: vmlinuz
-
-[alpha-generic_description]
-hardware: Alpha
-hardware-long: DEC Alpha systems with extended kernel start address (Wildfire, Titan, Marvel)
-
-[alpha-generic_packages]
-installer: true
-
-[alpha-smp_description]
-hardware: Alpha SMP
-hardware-long: DEC Alpha SMP systems with extended kernel start address (Wildfire, Titan, Marvel)
diff --git a/debian/config/alpha/defines.toml b/debian/config/alpha/defines.toml
new file mode 100644
index 0000000000..2096f19d77
--- /dev/null
+++ b/debian/config/alpha/defines.toml
@@ -0,0 +1,28 @@
+[[flavour]]
+name = 'alpha-generic'
+[flavour.description]
+hardware = 'Alpha'
+hardware_long = 'DEC Alpha systems with extended kernel start address (Wildfire, Titan, Marvel)'
+[flavour.packages]
+installer = true
+
+[[flavour]]
+name = 'alpha-smp'
+[flavour.defs]
+is_default = true
+[flavour.description]
+hardware = 'Alpha SMP'
+hardware_long = 'DEC Alpha SMP systems with extended kernel start address (Wildfire, Titan, Marvel)'
+
+[[featureset]]
+name = 'none'
+
+[build]
+kernel_file = 'arch/alpha/boot/vmlinux.gz'
+kernel_stem = 'vmlinuz'
+
+[relations.image]
+suggests = [
+  'aboot',
+  'fdutils',
+]
diff --git a/debian/config/amd64/config b/debian/config/amd64/config
index 8f4c80a44a..8d321f203b 100644
--- a/debian/config/amd64/config
+++ b/debian/config/amd64/config
@@ -163,8 +163,6 @@ CONFIG_MOUSE_PS2_TRACKPOINT=y
 ## file: drivers/iommu/amd/Kconfig
 ##
 CONFIG_AMD_IOMMU=y
-#. Can be built as a module, but nothing will trigger loading
-CONFIG_AMD_IOMMU_V2=y
 
 ##
 ## file: drivers/macintosh/Kconfig
diff --git a/debian/config/amd64/defines b/debian/config/amd64/defines
deleted file mode 100644
index 42b154d394..0000000000
--- a/debian/config/amd64/defines
+++ /dev/null
@@ -1,22 +0,0 @@
-[base]
-featuresets:
- none
- rt
-kernel-arch: x86
-
-[build]
-image-file: arch/x86/boot/bzImage
-signed-code: true
-vdso: true
-
-[image]
-suggests: grub-pc | grub-efi-amd64 | extlinux
-install-stem: vmlinuz
-
-[amd64_description]
-hardware: 64-bit PCs
-hardware-long: PCs with AMD64, Intel 64 or VIA Nano processors
-
-[cloud-amd64_description]
-hardware: x86-64 cloud
-hardware-long: cloud platforms including Amazon EC2, Microsoft Azure, and Google Compute Engine
diff --git a/debian/config/amd64/defines.toml b/debian/config/amd64/defines.toml
new file mode 100644
index 0000000000..f492bce6da
--- /dev/null
+++ b/debian/config/amd64/defines.toml
@@ -0,0 +1,37 @@
+[[flavour]]
+name = 'amd64'
+[flavour.defs]
+is_default = true
+[flavour.description]
+hardware = '64-bit PCs'
+hardware_long = 'PCs with AMD64, Intel 64 or VIA Nano processors'
+[flavour.packages]
+installer = true
+
+[[flavour]]
+name = 'cloud-amd64'
+[flavour.build]
+config = ['config.cloud']
+[flavour.defs]
+is_quick = true
+[flavour.description]
+hardware = 'x86-64 cloud'
+hardware_long = 'cloud platforms including Amazon EC2, Microsoft Azure, and Google Compute Engine'
+
+[[featureset]]
+name = 'none'
+
+[[featureset]]
+name = 'rt'
+# Override available flavours in rt featureset
+[[featureset.flavour]]
+name = 'amd64'
+
+[build]
+enable_signed = true
+enable_vdso = true
+kernel_file = 'arch/x86/boot/bzImage'
+kernel_stem = 'vmlinuz'
+
+[relations.image]
+suggests = ['grub-pc | grub-efi-amd64 | extlinux']
diff --git a/debian/config/amd64/none/defines b/debian/config/amd64/none/defines
deleted file mode 100644
index eab4471d18..0000000000
--- a/debian/config/amd64/none/defines
+++ /dev/null
@@ -1,14 +0,0 @@
-[base]
-flavours:
- amd64
- cloud-amd64
-default-flavour: amd64
-quick-flavour: cloud-amd64
-
-[amd64_packages]
-installer: true
-
-[cloud-amd64_image]
-configs:
- config.cloud
- amd64/config.cloud-amd64
diff --git a/debian/config/amd64/rt/defines b/debian/config/amd64/rt/defines
deleted file mode 100644
index 090dc41bfb..0000000000
--- a/debian/config/amd64/rt/defines
+++ /dev/null
@@ -1,3 +0,0 @@
-[base]
-flavours:
- amd64
diff --git a/debian/config/arm64/config b/debian/config/arm64/config
index 9f6f49da65..f242e6a42f 100644
--- a/debian/config/arm64/config
+++ b/debian/config/arm64/config
@@ -248,7 +248,20 @@ CONFIG_COMMON_CLK_MT8183_VENCSYS=m
 # CONFIG_COMMON_CLK_MT8186 is not set
 # CONFIG_COMMON_CLK_MT8188 is not set
 # CONFIG_COMMON_CLK_MT8192 is not set
-# CONFIG_COMMON_CLK_MT8195 is not set
+CONFIG_COMMON_CLK_MT8195=y
+CONFIG_COMMON_CLK_MT8195_APUSYS=m
+CONFIG_COMMON_CLK_MT8195_AUDSYS=m
+CONFIG_COMMON_CLK_MT8195_IMP_IIC_WRAP=m
+CONFIG_COMMON_CLK_MT8195_MFGCFG=m
+CONFIG_COMMON_CLK_MT8195_MSDC=m
+CONFIG_COMMON_CLK_MT8195_SCP_ADSP=m
+CONFIG_COMMON_CLK_MT8195_VDOSYS=m
+CONFIG_COMMON_CLK_MT8195_VPPSYS=m
+CONFIG_COMMON_CLK_MT8195_CAMSYS=m
+CONFIG_COMMON_CLK_MT8195_IMGSYS=m
+CONFIG_COMMON_CLK_MT8195_WPESYS=m
+CONFIG_COMMON_CLK_MT8195_VDECSYS=m
+CONFIG_COMMON_CLK_MT8195_VENCSYS=m
 # CONFIG_COMMON_CLK_MT8365 is not set
 # CONFIG_COMMON_CLK_MT8516 is not set
 
@@ -434,6 +447,7 @@ CONFIG_EXTCON_USBC_CROS_EC=m
 ##
 CONFIG_ARM_SCPI_PROTOCOL=m
 CONFIG_RASPBERRYPI_FIRMWARE=y
+CONFIG_MTK_ADSP_IPC=m
 CONFIG_TURRIS_MOX_RWTM=m
 
 ##
@@ -449,6 +463,12 @@ CONFIG_GOOGLE_COREBOOT_TABLE=y
 CONFIG_GOOGLE_FRAMEBUFFER_COREBOOT=y
 
 ##
+## file: drivers/firmware/qcom/Kconfig
+##
+CONFIG_QCOM_QSEECOM=y
+CONFIG_QCOM_QSEECOM_UEFISECAPP=y
+
+##
 ## file: drivers/gpio/Kconfig
 ##
 CONFIG_GPIOLIB=y
@@ -500,6 +520,7 @@ CONFIG_DRM_LVDS_CODEC=m
 CONFIG_DRM_NWL_MIPI_DSI=m
 CONFIG_DRM_NXP_PTN3460=m
 CONFIG_DRM_PARADE_PS8640=m
+CONFIG_DRM_SII902X=m
 CONFIG_DRM_SIMPLE_BRIDGE=m
 CONFIG_DRM_TI_SN65DSI86=m
 
@@ -554,6 +575,7 @@ CONFIG_DRM_LIMA=m
 ## file: drivers/gpu/drm/mediatek/Kconfig
 ##
 CONFIG_DRM_MEDIATEK=m
+CONFIG_DRM_MEDIATEK_DP=m
 CONFIG_DRM_MEDIATEK_HDMI=m
 
 ##
@@ -628,6 +650,11 @@ CONFIG_DRM_TEGRA=m
 CONFIG_DRM_TEGRA_STAGING=y
 
 ##
+## file: drivers/gpu/drm/tidss/Kconfig
+##
+CONFIG_DRM_TIDSS=m
+
+##
 ## file: drivers/gpu/drm/v3d/Kconfig
 ##
 CONFIG_DRM_V3D=m
@@ -863,6 +890,7 @@ CONFIG_BCM2835_MBOX=y
 CONFIG_HI6220_MBOX=y
 CONFIG_QCOM_APCS_IPC=m
 CONFIG_XGENE_SLIMPRO_MBOX=m
+CONFIG_MTK_ADSP_MBOX=m
 CONFIG_MTK_CMDQ_MBOX=m
 CONFIG_QCOM_IPCC=m
 
@@ -909,6 +937,13 @@ CONFIG_VIDEO_MEDIATEK_VCODEC=m
 CONFIG_VIDEO_MEDIATEK_VPU=m
 
 ##
+## file: drivers/media/platform/nxp/Kconfig
+##
+CONFIG_VIDEO_IMX7_CSI=m
+CONFIG_VIDEO_IMX8MQ_MIPI_CSI2=m
+CONFIG_VIDEO_IMX_MIPI_CSIS=m
+
+##
 ## file: drivers/media/platform/qcom/venus/Kconfig
 ##
 CONFIG_VIDEO_QCOM_VENUS=m
@@ -953,10 +988,12 @@ CONFIG_MFD_AXP20X_RSB=m
 CONFIG_MFD_CROS_EC_DEV=m
 CONFIG_MFD_HI655X_PMIC=m
 CONFIG_MFD_MAX77620=y
+CONFIG_MFD_MT6360=m
 CONFIG_MFD_MT6397=m
 CONFIG_MFD_QCOM_RPM=m
 CONFIG_MFD_SPMI_PMIC=m
 CONFIG_MFD_RK8XX_I2C=y
+CONFIG_MFD_RK8XX_SPI=y
 CONFIG_MFD_SL28CPLD=y
 CONFIG_MFD_WM8994=m
 CONFIG_MFD_ROHM_BD718XX=m
@@ -1262,6 +1299,7 @@ CONFIG_MDIO_BUS_MUX_MMIOREG=m
 ## file: drivers/net/phy/Kconfig
 ##
 CONFIG_MESON_GXL_PHY=m
+CONFIG_ADIN_PHY=m
 CONFIG_BCM54140_PHY=m
 CONFIG_MARVELL_PHY=m
 CONFIG_MARVELL_10G_PHY=m
@@ -1364,6 +1402,7 @@ CONFIG_PCIE_BRCMSTB=y
 CONFIG_PCI_HOST_THUNDER_PEM=y
 CONFIG_PCI_HOST_THUNDER_ECAM=y
 CONFIG_PCI_HOST_GENERIC=y
+CONFIG_PCIE_MEDIATEK_GEN3=y
 CONFIG_PCI_TEGRA=y
 CONFIG_PCIE_ROCKCHIP_HOST=y
 CONFIG_PCI_XGENE=y
@@ -1445,6 +1484,7 @@ CONFIG_PHY_MESON8B_USB2=m
 ##
 CONFIG_PHY_FSL_IMX8MQ_USB=m
 CONFIG_PHY_MIXEL_MIPI_DPHY=m
+CONFIG_PHY_FSL_IMX8M_PCIE=m
 
 ##
 ## file: drivers/phy/hisilicon/Kconfig
@@ -1461,9 +1501,12 @@ CONFIG_PHY_MVEBU_CP110_COMPHY=m
 ##
 ## file: drivers/phy/mediatek/Kconfig
 ##
+CONFIG_PHY_MTK_PCIE=m
 CONFIG_PHY_MTK_TPHY=m
+CONFIG_PHY_MTK_UFS=m
 CONFIG_PHY_MTK_HDMI=m
 CONFIG_PHY_MTK_MIPI_DSI=m
+CONFIG_PHY_MTK_DP=m
 
 ##
 ## file: drivers/phy/qualcomm/Kconfig
@@ -1516,7 +1559,7 @@ CONFIG_PINCTRL_AMD=y
 CONFIG_PINCTRL_AXP209=m
 CONFIG_PINCTRL_MAX77620=y
 CONFIG_PINCTRL_RK805=y
-CONFIG_PINCTRL_ROCKCHIP=m
+CONFIG_PINCTRL_ROCKCHIP=y
 CONFIG_PINCTRL_SINGLE=y
 
 ##
@@ -1545,7 +1588,7 @@ CONFIG_PINCTRL_MT8183=y
 # CONFIG_PINCTRL_MT8186 is not set
 # CONFIG_PINCTRL_MT8188 is not set
 # CONFIG_PINCTRL_MT8192 is not set
-# CONFIG_PINCTRL_MT8195 is not set
+CONFIG_PINCTRL_MT8195=y
 # CONFIG_PINCTRL_MT8365 is not set
 # CONFIG_PINCTRL_MT8516 is not set
 # CONFIG_PINCTRL_MT6397 is not set
@@ -1579,6 +1622,33 @@ CONFIG_CROS_EC_SPI=m
 CONFIG_CROS_KBD_LED_BACKLIGHT=m
 
 ##
+## file: drivers/pmdomain/bcm/Kconfig
+##
+CONFIG_RASPBERRYPI_POWER=y
+
+##
+## file: drivers/pmdomain/mediatek/Kconfig
+##
+CONFIG_MTK_SCPSYS=y
+CONFIG_MTK_SCPSYS_PM_DOMAINS=y
+
+##
+## file: drivers/pmdomain/qcom/Kconfig
+##
+CONFIG_QCOM_RPMHPD=y
+CONFIG_QCOM_RPMPD=y
+
+##
+## file: drivers/pmdomain/rockchip/Kconfig
+##
+CONFIG_ROCKCHIP_PM_DOMAINS=y
+
+##
+## file: drivers/pmdomain/ti/Kconfig
+##
+CONFIG_TI_SCI_PM_DOMAINS=y
+
+##
 ## file: drivers/power/reset/Kconfig
 ##
 CONFIG_POWER_RESET_HISI=y
@@ -1635,13 +1705,16 @@ CONFIG_REGULATOR=y
 CONFIG_REGULATOR_FIXED_VOLTAGE=m
 CONFIG_REGULATOR_AXP20X=m
 CONFIG_REGULATOR_BD718XX=m
+CONFIG_REGULATOR_CROS_EC=m
 CONFIG_REGULATOR_DA9211=m
 CONFIG_REGULATOR_FAN53555=m
 CONFIG_REGULATOR_GPIO=m
 CONFIG_REGULATOR_HI655X=m
 CONFIG_REGULATOR_MAX77620=m
 CONFIG_REGULATOR_MP8859=m
+CONFIG_REGULATOR_MT6315=m
 CONFIG_REGULATOR_MT6358=m
+CONFIG_REGULATOR_MT6359=m
 CONFIG_REGULATOR_MT6397=m
 CONFIG_REGULATOR_PCA9450=m
 CONFIG_REGULATOR_PFUZE100=m
@@ -1693,6 +1766,7 @@ CONFIG_RTC_DRV_DS1307=y
 CONFIG_RTC_DRV_HYM8563=m
 CONFIG_RTC_DRV_MAX77686=y
 CONFIG_RTC_DRV_RK808=y
+CONFIG_RTC_DRV_RS5C372=m
 CONFIG_RTC_DRV_PCF8523=m
 CONFIG_RTC_DRV_PCF85063=y
 CONFIG_RTC_DRV_PCF8563=y
@@ -1724,11 +1798,6 @@ CONFIG_SCSI_HISI_SAS=m
 CONFIG_SCSI_HISI_SAS_PCI=m
 
 ##
-## file: drivers/soc/bcm/Kconfig
-##
-CONFIG_RASPBERRYPI_POWER=y
-
-##
 ## file: drivers/soc/fsl/Kconfig
 ##
 CONFIG_FSL_MC_DPIO=m
@@ -1741,8 +1810,6 @@ CONFIG_MTK_CMDQ=m
 CONFIG_MTK_INFRACFG=y
 CONFIG_MTK_PMIC_WRAP=m
 CONFIG_MTK_REGULATOR_COUPLER=y
-CONFIG_MTK_SCPSYS=y
-CONFIG_MTK_SCPSYS_PM_DOMAINS=y
 CONFIG_MTK_MMSYS=m
 CONFIG_MTK_SVS=m
 
@@ -1757,8 +1824,6 @@ CONFIG_QCOM_LLCC=m
 CONFIG_QCOM_OCMEM=m
 CONFIG_QCOM_PMIC_GLINK=m
 CONFIG_QCOM_RPMH=y
-CONFIG_QCOM_RPMHPD=y
-CONFIG_QCOM_RPMPD=y
 CONFIG_QCOM_SMEM=m
 CONFIG_QCOM_SMD_RPM=m
 CONFIG_QCOM_SMP2P=m
@@ -1782,7 +1847,6 @@ CONFIG_ARCH_R9A09G011=y
 ##
 CONFIG_ROCKCHIP_GRF=y
 CONFIG_ROCKCHIP_IODOMAIN=m
-CONFIG_ROCKCHIP_PM_DOMAINS=y
 CONFIG_ROCKCHIP_DTPM=m
 
 ##
@@ -1792,11 +1856,6 @@ CONFIG_ARCH_TEGRA_132_SOC=y
 CONFIG_ARCH_TEGRA_210_SOC=y
 
 ##
-## file: drivers/soc/ti/Kconfig
-##
-CONFIG_TI_SCI_PM_DOMAINS=y
-
-##
 ## file: drivers/spi/Kconfig
 ##
 CONFIG_SPI_ARMADA_3700=m
@@ -1828,6 +1887,7 @@ CONFIG_SPI_XLP=m
 ##
 CONFIG_SPMI=y
 CONFIG_SPMI_MSM_PMIC_ARB=y
+CONFIG_SPMI_MTK_PMIF=y
 
 ##
 ## file: drivers/staging/media/Kconfig
@@ -1898,11 +1958,13 @@ CONFIG_BCM2835_THERMAL=m
 ## file: drivers/thermal/mediatek/Kconfig
 ##
 CONFIG_MTK_THERMAL=m
+CONFIG_MTK_LVTS_THERMAL=m
 
 ##
 ## file: drivers/thermal/qcom/Kconfig
 ##
 CONFIG_QCOM_TSENS=m
+CONFIG_QCOM_SPMI_ADC_TM5=m
 CONFIG_QCOM_SPMI_TEMP_ALARM=m
 
 ##
@@ -2247,6 +2309,8 @@ CONFIG_SND_SOC_MT8173_RT5650=m
 CONFIG_SND_SOC_MT8183=m
 CONFIG_SND_SOC_MT8183_MT6358_TS3A227E_MAX98357A=m
 CONFIG_SND_SOC_MT8183_DA7219_MAX98357A=m
+CONFIG_SND_SOC_MT8195=m
+CONFIG_SND_SOC_MT8195_MT6359=m
 
 ##
 ## file: sound/soc/meson/Kconfig
@@ -2274,6 +2338,18 @@ CONFIG_SND_SOC_ROCKCHIP_RT5645=m
 CONFIG_SND_SOC_RK3399_GRU_SOUND=m
 
 ##
+## file: sound/soc/sof/Kconfig
+##
+CONFIG_SND_SOC_SOF_TOPLEVEL=y
+CONFIG_SND_SOC_SOF_OF=m
+
+##
+## file: sound/soc/sof/mediatek/Kconfig
+##
+CONFIG_SND_SOC_SOF_MTK_TOPLEVEL=y
+CONFIG_SND_SOC_SOF_MT8195=m
+
+##
 ## file: sound/soc/sunxi/Kconfig
 ##
 CONFIG_SND_SUN8I_CODEC=m
diff --git a/debian/config/arm64/defines b/debian/config/arm64/defines
deleted file mode 100644
index 095f75711b..0000000000
--- a/debian/config/arm64/defines
+++ /dev/null
@@ -1,24 +0,0 @@
-[base]
-compat-deb-arch: armhf
-compat-gnu-type: arm-linux-gnueabihf
-kernel-arch: arm64
-featuresets:
- none
- rt
-
-[build]
-image-file: arch/arm64/boot/Image
-signed-code: true
-vdso: true
-
-[image]
-install-stem: vmlinuz
-
-[arm64_description]
-hardware: 64-bit ARMv8 machines
-
-[cloud-arm64_description]
-hardware: arm64 cloud
-hardware-long: cloud platforms supporting arm64 virtual machines
-
-[arm64_image]
diff --git a/debian/config/arm64/defines.toml b/debian/config/arm64/defines.toml
new file mode 100644
index 0000000000..12e9d984fe
--- /dev/null
+++ b/debian/config/arm64/defines.toml
@@ -0,0 +1,34 @@
+[[flavour]]
+name = 'arm64'
+[flavour.defs]
+is_default = true
+[flavour.description]
+hardware = '64-bit ARMv8 machines'
+[flavour.packages]
+installer = true
+
+[[flavour]]
+name = 'cloud-arm64'
+[flavour.build]
+config = ['config.cloud']
+[flavour.defs]
+is_quick = true
+[flavour.description]
+hardware = 'arm64 cloud'
+hardware_long = 'cloud platforms supporting arm64 virtual machines'
+
+[[featureset]]
+name = 'none'
+
+[[featureset]]
+name = 'rt'
+# Override available flavours in rt featureset
+[[featureset.flavour]]
+name = 'arm64'
+
+[build]
+compiler_gnutype_compat = 'arm-linux-gnueabihf'
+enable_signed = true
+enable_vdso = true
+kernel_file = 'arch/arm64/boot/Image'
+kernel_stem = 'vmlinuz'
diff --git a/debian/config/arm64/none/defines b/debian/config/arm64/none/defines
deleted file mode 100644
index 97260a2423..0000000000
--- a/debian/config/arm64/none/defines
+++ /dev/null
@@ -1,14 +0,0 @@
-[base]
-flavours:
- arm64
- cloud-arm64
-default-flavour: arm64
-quick-flavour: cloud-arm64
-
-[arm64_packages]
-installer: true
-
-[cloud-arm64_image]
-configs:
- config.cloud
- arm64/config.cloud-arm64
diff --git a/debian/config/arm64/rt/defines b/debian/config/arm64/rt/defines
deleted file mode 100644
index fdea40cbca..0000000000
--- a/debian/config/arm64/rt/defines
+++ /dev/null
@@ -1,3 +0,0 @@
-[base]
-flavours:
- arm64
diff --git a/debian/config/armel/config.rpi b/debian/config/armel/config.rpi
index 5a6bf6fb48..b87c158fc6 100644
--- a/debian/config/armel/config.rpi
+++ b/debian/config/armel/config.rpi
@@ -107,6 +107,11 @@ CONFIG_BRCMFMAC_SDIO=y
 CONFIG_NVMEM_RMEM=m
 
 ##
+## file: drivers/pmdomain/bcm/Kconfig
+##
+CONFIG_RASPBERRYPI_POWER=y
+
+##
 ## file: drivers/pwm/Kconfig
 ##
 CONFIG_PWM=y
@@ -118,11 +123,6 @@ CONFIG_PWM_BCM2835=y
 CONFIG_RTC_DRV_DS1307=m
 
 ##
-## file: drivers/soc/bcm/Kconfig
-##
-CONFIG_RASPBERRYPI_POWER=y
-
-##
 ## file: drivers/spi/Kconfig
 ##
 CONFIG_SPI_BCM2835=y
diff --git a/debian/config/armel/defines b/debian/config/armel/defines
deleted file mode 100644
index 6a074ca66f..0000000000
--- a/debian/config/armel/defines
+++ /dev/null
@@ -1,16 +0,0 @@
-[base]
-flavours:
- rpi
-kernel-arch: arm
-
-[build]
-image-file: arch/arm/boot/zImage
-# uncompressed-image is just for size checking
-uncompressed-image-file: arch/arm/boot/Image
-
-[image]
-install-stem: vmlinuz
-
-[rpi_description]
-hardware: Raspberry Pi Zero, Zero W and 1
-hardware-long: Raspberry Pi Zero, Zero W and 1 based systems
diff --git a/debian/config/armel/defines.toml b/debian/config/armel/defines.toml
new file mode 100644
index 0000000000..4fd318e6da
--- /dev/null
+++ b/debian/config/armel/defines.toml
@@ -0,0 +1,12 @@
+[[flavour]]
+name = 'rpi'
+[flavour.description]
+hardware = 'Raspberry Pi Zero, Zero W and 1'
+hardware_long = 'Raspberry Pi Zero, Zero W and 1 based systems'
+
+[[featureset]]
+name = 'none'
+
+[build]
+kernel_file = 'arch/arm/boot/zImage'
+kernel_stem = 'vmlinuz'
diff --git a/debian/config/armhf/config b/debian/config/armhf/config
index af51773b95..4ece0c6129 100644
--- a/debian/config/armhf/config
+++ b/debian/config/armhf/config
@@ -516,6 +516,11 @@ CONFIG_DRM_TEGRA_STAGING=y
 CONFIG_DRM_TILCDC=m
 
 ##
+## file: drivers/gpu/drm/tiny/Kconfig
+##
+CONFIG_DRM_PANEL_MIPI_DBI=m
+
+##
 ## file: drivers/gpu/host1x/Kconfig
 ##
 CONFIG_TEGRA_HOST1X=m
@@ -1064,6 +1069,11 @@ CONFIG_MDIO_SUN4I=y
 CONFIG_MDIO_ASPEED=m
 
 ##
+## file: drivers/net/phy/Kconfig
+##
+CONFIG_ADIN_PHY=m
+
+##
 ## file: drivers/net/wireless/broadcom/brcm80211/brcmfmac/Kconfig
 ##
 CONFIG_BRCMFMAC=m
@@ -1207,6 +1217,16 @@ CONFIG_OLPC_XO175=y
 CONFIG_OLPC_XO175_EC=m
 
 ##
+## file: drivers/pmdomain/bcm/Kconfig
+##
+CONFIG_RASPBERRYPI_POWER=y
+
+##
+## file: drivers/pmdomain/rockchip/Kconfig
+##
+CONFIG_ROCKCHIP_PM_DOMAINS=y
+
+##
 ## file: drivers/power/reset/Kconfig
 ##
 CONFIG_POWER_RESET=y
@@ -1345,15 +1365,9 @@ CONFIG_ASPEED_LPC_SNOOP=m
 CONFIG_ASPEED_P2A_CTRL=m
 
 ##
-## file: drivers/soc/bcm/Kconfig
-##
-CONFIG_RASPBERRYPI_POWER=y
-
-##
 ## file: drivers/soc/rockchip/Kconfig
 ##
 CONFIG_ROCKCHIP_IODOMAIN=m
-CONFIG_ROCKCHIP_PM_DOMAINS=y
 
 ##
 ## file: drivers/soc/tegra/Kconfig
diff --git a/debian/config/armhf/defines b/debian/config/armhf/defines
deleted file mode 100644
index 762775239f..0000000000
--- a/debian/config/armhf/defines
+++ /dev/null
@@ -1,24 +0,0 @@
-[base]
-featuresets:
- none
- rt
-kernel-arch: arm
-
-[build]
-image-file: arch/arm/boot/zImage
-vdso: true
-
-[image]
-install-stem: vmlinuz
-
-[armmp_description]
-hardware: ARMv7 multiplatform compatible SoCs
-hardware-long: ARMv7 multiplatform kernel. See
-  https://wiki.debian.org/DebianKernel/ARMMP for details of supported
-  platforms
-
-[armmp-lpae_description]
-hardware: ARMv7 multiplatform compatible SoCs supporting LPAE
-hardware-long: ARMv7 multiplatform kernel supporting LPAE. See
-  https://wiki.debian.org/DebianKernel/ARMMP for details of supported
-  platforms.
diff --git a/debian/config/armhf/defines.toml b/debian/config/armhf/defines.toml
new file mode 100644
index 0000000000..51cd3911a0
--- /dev/null
+++ b/debian/config/armhf/defines.toml
@@ -0,0 +1,29 @@
+[[flavour]]
+name = "armmp"
+[flavour.defs]
+is_default = true
+[flavour.description]
+hardware = 'ARMv7 multiplatform compatible SoCs'
+hardware_long = 'ARMv7 multiplatform kernel. See https://wiki.debian.org/DebianKernel/ARMMP for details of supported platforms'
+[flavour.packages]
+installer = true
+
+[[flavour]]
+name = "armmp-lpae"
+[flavour.description]
+hardware = 'ARMv7 multiplatform compatible SoCs supporting LPAE'
+hardware_long = 'ARMv7 multiplatform kernel supporting LPAE. See https://wiki.debian.org/DebianKernel/ARMMP for details of supported platforms.'
+
+[[featureset]]
+name = 'none'
+
+[[featureset]]
+name = 'rt'
+# Override available flavours in rt featureset
+[[featureset.flavour]]
+name = 'armmp'
+
+[build]
+enable_vdso = true
+kernel_file = 'arch/arm/boot/zImage'
+kernel_stem = 'vmlinuz'
diff --git a/debian/config/armhf/none/defines b/debian/config/armhf/none/defines
deleted file mode 100644
index 3b127c36a1..0000000000
--- a/debian/config/armhf/none/defines
+++ /dev/null
@@ -1,8 +0,0 @@
-[base]
-flavours:
- armmp
- armmp-lpae
-default-flavour: armmp
-
-[armmp_packages]
-installer: true
diff --git a/debian/config/armhf/rt/defines b/debian/config/armhf/rt/defines
deleted file mode 100644
index 897e415f89..0000000000
--- a/debian/config/armhf/rt/defines
+++ /dev/null
@@ -1,3 +0,0 @@
-[base]
-flavours:
- armmp
diff --git a/debian/config/config b/debian/config/config
index f72595fd66..e942fdb5f5 100644
--- a/debian/config/config
+++ b/debian/config/config
@@ -1030,7 +1030,7 @@ CONFIG_SENSORS_G760A=m
 # CONFIG_SENSORS_HIH6130 is not set
 CONFIG_SENSORS_IBMAEM=m
 CONFIG_SENSORS_IBMPEX=m
-# CONFIG_SENSORS_IIO_HWMON is not set
+CONFIG_SENSORS_IIO_HWMON=m
 CONFIG_SENSORS_CORETEMP=m
 # CONFIG_SENSORS_IT87 is not set
 CONFIG_SENSORS_JC42=m
@@ -1522,6 +1522,7 @@ CONFIG_VL53L0X_I2C=m
 ##
 # CONFIG_AD2S90 is not set
 # CONFIG_AD2S1200 is not set
+# CONFIG_AD2S1210 is not set
 
 ##
 ## file: drivers/iio/temperature/Kconfig
@@ -2056,7 +2057,6 @@ CONFIG_DM_ZONED=m
 ##
 CONFIG_BCACHE=m
 # CONFIG_BCACHE_DEBUG is not set
-# CONFIG_BCACHE_CLOSURES_DEBUG is not set
 
 ##
 ## file: drivers/media/Kconfig
@@ -2911,7 +2911,6 @@ CONFIG_CB710_CORE=m
 ##
 CONFIG_EEPROM_AT24=m
 CONFIG_EEPROM_AT25=m
-CONFIG_EEPROM_LEGACY=m
 CONFIG_EEPROM_MAX6875=m
 CONFIG_EEPROM_93CX6=m
 # CONFIG_EEPROM_93XX46 is not set
@@ -3044,7 +3043,6 @@ CONFIG_MTD_NAND_RICOH=m
 ##
 ## file: drivers/mtd/parsers/Kconfig
 ##
-CONFIG_MTD_AR7_PARTS=m
 CONFIG_MTD_OF_PARTS=m
 
 ##
@@ -3100,14 +3098,6 @@ CONFIG_XEN_NETDEV_BACKEND=m
 CONFIG_NET_FAILOVER=m
 
 ##
-## file: drivers/net/appletalk/Kconfig
-##
-CONFIG_ATALK=m
-CONFIG_DEV_APPLETALK=y
-CONFIG_IPDDP=m
-CONFIG_IPDDP_ENCAP=y
-
-##
 ## file: drivers/net/can/Kconfig
 ##
 CONFIG_CAN_DEV=m
@@ -4782,7 +4772,6 @@ CONFIG_SCSI_SNIC=m
 # CONFIG_SCSI_SNIC_DEBUG_FS is not set
 # CONFIG_SCSI_PPA is not set
 # CONFIG_SCSI_IMM is not set
-# CONFIG_SCSI_IZIP_EPP16 is not set
 # CONFIG_SCSI_IZIP_SLOW_CTR is not set
 CONFIG_SCSI_STEX=m
 CONFIG_SCSI_SYM53C8XX_2=m
@@ -5033,11 +5022,6 @@ CONFIG_STAGING=y
 # CONFIG_AD5933 is not set
 
 ##
-## file: drivers/staging/iio/resolver/Kconfig
-##
-# CONFIG_AD2S1210 is not set
-
-##
 ## file: drivers/staging/media/Kconfig
 ##
 # CONFIG_STAGING_MEDIA is not set
@@ -5051,11 +5035,6 @@ CONFIG_DVB_BUDGET_PATCH=m
 CONFIG_DVB_SP8870=m
 
 ##
-## file: drivers/staging/qlge/Kconfig
-##
-CONFIG_QLGE=m
-
-##
 ## file: drivers/staging/rtl8192e/Kconfig
 ##
 # CONFIG_RTLLIB is not set
@@ -5066,11 +5045,6 @@ CONFIG_QLGE=m
 # CONFIG_RTL8192E is not set
 
 ##
-## file: drivers/staging/rtl8192u/Kconfig
-##
-# CONFIG_RTL8192U is not set
-
-##
 ## file: drivers/staging/rtl8712/Kconfig
 ##
 CONFIG_R8712U=m
@@ -5831,6 +5805,13 @@ CONFIG_AFS_FSCACHE=y
 CONFIG_AUTOFS_FS=m
 
 ##
+## file: fs/bcachefs/Kconfig
+##
+CONFIG_BCACHEFS_FS=m
+CONFIG_BCACHEFS_QUOTA=y
+CONFIG_BCACHEFS_POSIX_ACL=y
+
+##
 ## file: fs/befs/Kconfig
 ##
 CONFIG_BEFS_FS=m
@@ -5846,7 +5827,6 @@ CONFIG_BFS_FS=m
 ##
 CONFIG_BTRFS_FS=m
 CONFIG_BTRFS_FS_POSIX_ACL=y
-# CONFIG_BTRFS_FS_CHECK_INTEGRITY is not set
 # CONFIG_BTRFS_FS_RUN_SANITY_TESTS is not set
 # CONFIG_BTRFS_DEBUG is not set
 # CONFIG_BTRFS_ASSERT is not set
@@ -6498,8 +6478,6 @@ CONFIG_MODULE_SIG=y
 # CONFIG_MODULE_SIG_FORCE is not set
 CONFIG_MODULE_SIG_ALL=y
 ## choice: Which hash algorithm should modules be signed with?
-# CONFIG_MODULE_SIG_SHA1 is not set
-# CONFIG_MODULE_SIG_SHA224 is not set
 CONFIG_MODULE_SIG_SHA256=y
 # CONFIG_MODULE_SIG_SHA384 is not set
 # CONFIG_MODULE_SIG_SHA512 is not set
@@ -6507,6 +6485,7 @@ CONFIG_MODULE_SIG_SHA256=y
 ## choice: Module compression mode
 CONFIG_MODULE_COMPRESS_XZ=y
 ## end choice
+CONFIG_MODULE_DECOMPRESS=y
 # CONFIG_TRIM_UNUSED_KSYMS is not set
 
 ##
@@ -6657,6 +6636,7 @@ CONFIG_DEBUG_LIST=y
 # CONFIG_DEBUG_PLIST is not set
 # CONFIG_DEBUG_SG is not set
 # CONFIG_DEBUG_NOTIFIERS is not set
+# CONFIG_DEBUG_CLOSURES is not set
 # CONFIG_DEBUG_WQ_FORCE_RR_CPU is not set
 # CONFIG_CPU_HOTPLUG_STATE_CONTROL is not set
 # CONFIG_LATENCYTOP is not set
@@ -6742,7 +6722,6 @@ CONFIG_CORDIC=m
 #. These are enabled again by arch config, matching the defaults
 # CONFIG_XZ_DEC_X86 is not set
 # CONFIG_XZ_DEC_POWERPC is not set
-# CONFIG_XZ_DEC_IA64 is not set
 # CONFIG_XZ_DEC_ARM is not set
 # CONFIG_XZ_DEC_ARMTHUMB is not set
 # CONFIG_XZ_DEC_SPARC is not set
@@ -6864,6 +6843,11 @@ CONFIG_NET_9P_RDMA=m
 # CONFIG_NET_9P_DEBUG is not set
 
 ##
+## file: net/appletalk/Kconfig
+##
+CONFIG_ATALK=m
+
+##
 ## file: net/atm/Kconfig
 ##
 CONFIG_ATM=m
diff --git a/debian/config/config.cloud b/debian/config/config.cloud
index 0a3638ffb0..01f4afb776 100644
--- a/debian/config/config.cloud
+++ b/debian/config/config.cloud
@@ -566,11 +566,6 @@ CONFIG_XEN_NETDEV_FRONTEND=m
 # CONFIG_FUJITSU_ES is not set
 
 ##
-## file: drivers/net/appletalk/Kconfig
-##
-# CONFIG_ATALK is not set
-
-##
 ## file: drivers/net/arcnet/Kconfig
 ##
 # CONFIG_ARCNET is not set
@@ -1546,6 +1541,11 @@ CONFIG_KERNEL_LZ4=y
 # CONFIG_NET_9P is not set
 
 ##
+## file: net/appletalk/Kconfig
+##
+# CONFIG_ATALK is not set
+
+##
 ## file: net/atm/Kconfig
 ##
 # CONFIG_ATM is not set
diff --git a/debian/config/defines b/debian/config/defines
deleted file mode 100644
index c89aa72a7b..0000000000
--- a/debian/config/defines
+++ /dev/null
@@ -1,44 +0,0 @@
-[base]
-arches:
- alpha
- amd64
- arm64
- armel
- armhf
- hppa
- i386
- ia64
- m68k
- mips
- mips64
- mips64el
- mips64r6el
- mipsel
- powerpc
- ppc64
- ppc64el
- riscv64
- s390x
- sh4
- sparc64
- x32
-compiler: gcc-13
-featuresets:
- none
- rt
-
-[build]
-# Disable code signing by default; this can be overridden per-architecture
-signed-code: false
-
-[featureset-rt_base]
-enabled: true
-
-[description]
-part-long-up: This kernel is not suitable for SMP (multi-processor,
- multi-core or hyper-threaded) systems.
-
-[image]
-depends: initramfs-tools (>= 0.120+deb8u2) | linux-initramfs-tool
-breaks: fwupdate (<< 12-7), wireless-regdb (<< 2019.06.03-1~)
-recommends: apparmor
diff --git a/debian/config/defines.toml b/debian/config/defines.toml
new file mode 100644
index 0000000000..2f70bb9c2c
--- /dev/null
+++ b/debian/config/defines.toml
@@ -0,0 +1,110 @@
+[[kernelarch]]
+name = 'alpha'
+  [[kernelarch.debianarch]]
+  name = 'alpha'
+
+[[kernelarch]]
+name = 'arm'
+  [[kernelarch.debianarch]]
+  name = 'armel'
+  [[kernelarch.debianarch]]
+  name = 'armhf'
+
+[[kernelarch]]
+name = 'arm64'
+  [[kernelarch.debianarch]]
+  name = 'arm64'
+
+[[kernelarch]]
+name = 'parisc'
+  [[kernelarch.debianarch]]
+  name = 'hppa'
+
+[[kernelarch]]
+name = 'loongarch'
+  [[kernelarch.debianarch]]
+  name = 'loong64'
+
+[[kernelarch]]
+name = 'm68k'
+  [[kernelarch.debianarch]]
+  name = 'm68k'
+
+[[kernelarch]]
+name = 'mips'
+  [[kernelarch.debianarch]]
+  name = 'mips'
+  [[kernelarch.debianarch]]
+  name = 'mips64'
+  [[kernelarch.debianarch]]
+  name = 'mips64el'
+  [[kernelarch.debianarch]]
+  name = 'mips64r6el'
+  [[kernelarch.debianarch]]
+  name = 'mipsel'
+
+[[kernelarch]]
+name = 'powerpc'
+  [[kernelarch.debianarch]]
+  name = 'powerpc'
+  [[kernelarch.debianarch]]
+  name = 'ppc64'
+  [[kernelarch.debianarch]]
+  name = 'ppc64el'
+
+[[kernelarch]]
+name = 'riscv'
+  [[kernelarch.debianarch]]
+  name = 'riscv64'
+
+[[kernelarch]]
+name = 's390'
+  [[kernelarch.debianarch]]
+  name = 's390x'
+
+[[kernelarch]]
+name = 'sh'
+  [[kernelarch.debianarch]]
+  name = 'sh4'
+
+[[kernelarch]]
+name = 'sparc'
+  [[kernelarch.debianarch]]
+  name = 'sparc64'
+
+[[kernelarch]]
+name = 'x86'
+  [[kernelarch.debianarch]]
+  name = 'amd64'
+  [[kernelarch.debianarch]]
+  name = 'i386'
+  [[kernelarch.debianarch]]
+  name = 'x32'
+
+[[featureset]]
+name = 'none'
+
+[[featureset]]
+name = 'rt'
+enable = true
+  [featureset.description]
+  parts = ['rt']
+  [featureset.description.long]
+  rt = 'This kernel includes the PREEMPT_RT realtime patch set.'
+  [featureset.description.short]
+  rt = 'PREEMPT_RT'
+
+[build]
+compiler = 'gcc-13'
+
+[relations.image]
+depends = [
+  'initramfs-tools (>= 0.120+deb8u2) | linux-initramfs-tool',
+]
+recommends = [
+  'apparmor',
+]
+breaks = [
+  'fwupdate (<< 12-7)',
+  'wireless-regdb (<< 2019.06.03-1~)',
+]
diff --git a/debian/config/featureset-rt/defines b/debian/config/featureset-rt/defines
deleted file mode 100644
index 44e2f2b030..0000000000
--- a/debian/config/featureset-rt/defines
+++ /dev/null
@@ -1,7 +0,0 @@
-[abi]
-ignore-changes: *
-
-[description]
-part-long-rt: This kernel includes the PREEMPT_RT realtime patch set.
-part-short-rt: PREEMPT_RT
-parts: rt
diff --git a/debian/config/hppa/defines b/debian/config/hppa/defines
deleted file mode 100644
index 4ce559e285..0000000000
--- a/debian/config/hppa/defines
+++ /dev/null
@@ -1,33 +0,0 @@
-[base]
-flavours: parisc parisc64
-default-flavour: parisc
-kernel-arch: parisc
-
-[build]
-image-file: arch/parisc/boot/bzImage
-
-[image]
-suggests: palo
-install-stem: vmlinuz
-
-[parisc_description]
-hardware: 32-bit PA-RISC
-hardware-long: HP PA-RISC 32-bit systems with max 4 GB RAM
-
-[parisc_packages]
-installer: true
-
-[parisc64_base]
-cflags: -fno-cse-follow-jumps
-# no Debian architecture defined; force cross-build
-kernel-deb-arch: undefined
-kernel-gnu-type: hppa64-linux-gnu
-compat-deb-arch: hppa
-compat-gnu-type: hppa-linux-gnu
-
-[parisc64_description]
-hardware: 64-bit PA-RISC
-hardware-long: HP PA-RISC 64-bit systems with support for more than 4 GB RAM
-
-[parisc64_packages]
-installer: true
diff --git a/debian/config/hppa/defines.toml b/debian/config/hppa/defines.toml
new file mode 100644
index 0000000000..b900d437b2
--- /dev/null
+++ b/debian/config/hppa/defines.toml
@@ -0,0 +1,30 @@
+[[flavour]]
+name = 'parisc'
+[flavour.defs]
+is_default = true
+[flavour.description]
+hardware = '32-bit PA-RISC'
+hardware_long = 'HP PA-RISC 32-bit systems with max 4 GB RAM'
+[flavour.packages]
+installer = true
+
+[[flavour]]
+name = 'parisc64'
+[flavour.build]
+compiler_gnutype = 'hppa64-linux-gnu'
+compiler_gnutype_compat = 'hppa-linux-gnu'
+[flavour.description]
+hardware = '64-bit PA-RISC'
+hardware_long = 'HP PA-RISC 64-bit systems with support for more than 4 GB RAM'
+[flavour.packages]
+installer = true
+
+[[featureset]]
+name = 'none'
+
+[build]
+kernel_file = 'arch/parisc/boot/bzImage'
+kernel_stem = 'vmlinuz'
+
+[relations.image]
+suggests = ['palo']
diff --git a/debian/config/i386/defines b/debian/config/i386/defines
deleted file mode 100644
index ed130f0440..0000000000
--- a/debian/config/i386/defines
+++ /dev/null
@@ -1,28 +0,0 @@
-[base]
-featuresets:
- none
- rt
-kernel-arch: x86
-
-[build]
-image-file: arch/x86/boot/bzImage
-vdso: true
-
-[description]
-part-long-pae: This kernel requires PAE (Physical Address Extension).
- This feature is supported by the Intel Pentium Pro/II/III/4/4M/D, Xeon,
- Core and Atom; AMD Geode NX, Athlon (K7), Duron, Opteron, Sempron,
- Turion or Phenom; Transmeta Efficeon; VIA C7; and some other processors.
-
-[image]
-suggests: grub-pc | grub-efi-ia32 | extlinux
-install-stem: vmlinuz
-
-[686_description]
-hardware: older PCs
-hardware-long: PCs with one or more processors not supporting PAE
-
-[686-pae_description]
-hardware: modern PCs
-hardware-long: PCs with one or more processors supporting PAE
-parts: pae
diff --git a/debian/config/i386/defines.toml b/debian/config/i386/defines.toml
new file mode 100644
index 0000000000..f934e009e4
--- /dev/null
+++ b/debian/config/i386/defines.toml
@@ -0,0 +1,44 @@
+[[flavour]]
+name = '686'
+[flavour.description]
+hardware = 'older PCs'
+hardware_long = 'PCs with one or more processors not supporting PAE'
+[flavour.packages]
+installer = true
+
+[[flavour]]
+name = '686-pae'
+[flavour.defs]
+is_default = true
+[flavour.description]
+hardware = 'modern PCs'
+hardware_long = 'PCs with one or more processors supporting PAE'
+parts = ['pae']
+[flavour.packages]
+installer = true
+
+[[featureset]]
+name = 'none'
+
+[[featureset]]
+name = 'rt'
+# Override available flavours in rt featureset
+[[featureset.flavour]]
+name = '686-pae'
+
+[build]
+enable_vdso = true
+kernel_file = 'arch/x86/boot/bzImage'
+kernel_stem = 'vmlinuz'
+
+[description.short]
+pae = ''
+
+[description.long]
+pae = '''This kernel requires PAE (Physical Address Extension).
+This feature is supported by the Intel Pentium Pro/II/III/4/4M/D, Xeon,
+Core and Atom; AMD Geode NX, Athlon (K7), Duron, Opteron, Sempron,
+Turion or Phenom; Transmeta Efficeon; VIA C7; and some other processors.'''
+
+[relations.image]
+suggests = ['grub-pc | grub-efi-ia32 | extlinux']
diff --git a/debian/config/i386/none/defines b/debian/config/i386/none/defines
deleted file mode 100644
index b9add20341..0000000000
--- a/debian/config/i386/none/defines
+++ /dev/null
@@ -1,11 +0,0 @@
-[base]
-flavours:
- 686
- 686-pae
-default-flavour: 686-pae
-
-[686_packages]
-installer: true
-
-[686-pae_packages]
-installer: true
diff --git a/debian/config/i386/rt/defines b/debian/config/i386/rt/defines
deleted file mode 100644
index 358e12d559..0000000000
--- a/debian/config/i386/rt/defines
+++ /dev/null
@@ -1,3 +0,0 @@
-[base]
-flavours:
- 686-pae
diff --git a/debian/config/ia64/config b/debian/config/ia64/config
deleted file mode 100644
index 43907d7e6c..0000000000
--- a/debian/config/ia64/config
+++ /dev/null
@@ -1,740 +0,0 @@
-##
-## file: arch/ia64/Kconfig
-##
-CONFIG_HOTPLUG_CPU=y
-CONFIG_SCHED_SMT=y
-CONFIG_PERMIT_BSP_REMOVE=y
-CONFIG_NODES_SHIFT=8
-CONFIG_IA64_MCA_RECOVERY=y
-CONFIG_IA64_PALINFO=m
-CONFIG_MSPEC=m
-
-##
-## file: arch/ia64/Kconfig.debug
-##
-## choice: Physical memory granularity
-CONFIG_IA64_GRANULE_16MB=y
-# CONFIG_IA64_GRANULE_64MB is not set
-## end choice
-CONFIG_IA64_PRINT_HAZARDS=y
-# CONFIG_DISABLE_VHPT is not set
-# CONFIG_IA64_DEBUG_CMPXCHG is not set
-# CONFIG_IA64_DEBUG_IRQ is not set
-
-##
-## file: block/partitions/Kconfig
-##
-CONFIG_ACORN_PARTITION=y
-# CONFIG_ACORN_PARTITION_CUMANA is not set
-CONFIG_ACORN_PARTITION_EESOX=y
-CONFIG_ACORN_PARTITION_ICS=y
-CONFIG_ACORN_PARTITION_ADFS=y
-CONFIG_ACORN_PARTITION_POWERTEC=y
-CONFIG_ACORN_PARTITION_RISCIX=y
-CONFIG_OSF_PARTITION=y
-CONFIG_AMIGA_PARTITION=y
-CONFIG_ATARI_PARTITION=y
-CONFIG_MAC_PARTITION=y
-CONFIG_BSD_DISKLABEL=y
-CONFIG_MINIX_SUBPARTITION=y
-CONFIG_SOLARIS_X86_PARTITION=y
-CONFIG_UNIXWARE_DISKLABEL=y
-CONFIG_LDM_PARTITION=y
-CONFIG_LDM_DEBUG=y
-CONFIG_SGI_PARTITION=y
-CONFIG_ULTRIX_PARTITION=y
-CONFIG_SUN_PARTITION=y
-
-##
-## file: crypto/Kconfig
-##
-CONFIG_CRYPTO_ZSTD=y
-
-##
-## file: drivers/acpi/Kconfig
-##
-CONFIG_ACPI_DOCK=y
-CONFIG_ACPI_PCI_SLOT=y
-CONFIG_ACPI_CONTAINER=y
-
-##
-## file: drivers/ata/Kconfig
-##
-CONFIG_PATA_ALI=m
-CONFIG_PATA_AMD=m
-CONFIG_PATA_CMD64X=m
-CONFIG_PATA_CS5520=m
-CONFIG_PATA_EFAR=m
-CONFIG_PATA_HPT366=m
-CONFIG_PATA_HPT37X=m
-CONFIG_PATA_NETCELL=m
-CONFIG_PATA_NS87415=m
-CONFIG_PATA_OLDPIIX=m
-CONFIG_PATA_PDC2027X=m
-CONFIG_PATA_PDC_OLD=m
-CONFIG_PATA_SC1200=m
-CONFIG_PATA_SERVERWORKS=m
-CONFIG_PATA_SIL680=m
-CONFIG_PATA_TRIFLEX=m
-CONFIG_PATA_VIA=m
-CONFIG_PATA_MPIIX=m
-CONFIG_PATA_NS87410=m
-CONFIG_PATA_OPTI=m
-CONFIG_PATA_LEGACY=m
-
-##
-## file: drivers/block/Kconfig
-##
-CONFIG_CDROM_PKTCDVD=m
-CONFIG_CDROM_PKTCDVD_BUFFERS=8
-# CONFIG_CDROM_PKTCDVD_WCACHE is not set
-
-##
-## file: drivers/char/Kconfig
-##
-CONFIG_PRINTER=m
-# CONFIG_LP_CONSOLE is not set
-CONFIG_PPDEV=m
-CONFIG_DTLK=m
-CONFIG_APPLICOM=m
-CONFIG_HPET=y
-# CONFIG_HPET_MMAP is not set
-
-##
-## file: drivers/char/agp/Kconfig
-##
-#. Workaround
-CONFIG_AGP=y
-#. Workaround
-CONFIG_AGP_I460=y
-#. Workaround
-CONFIG_AGP_HP_ZX1=y
-
-##
-## file: drivers/char/ipmi/Kconfig
-##
-CONFIG_IPMI_HANDLER=m
-# CONFIG_IPMI_PANIC_EVENT is not set
-CONFIG_IPMI_DEVICE_INTERFACE=m
-CONFIG_IPMI_SI=m
-CONFIG_IPMI_WATCHDOG=m
-CONFIG_IPMI_POWEROFF=m
-
-##
-## file: drivers/cpufreq/Kconfig
-##
-CONFIG_IA64_ACPI_CPUFREQ=m
-
-##
-## file: drivers/firmware/Kconfig
-##
-CONFIG_DMIID=y
-
-##
-## file: drivers/gpu/drm/Kconfig
-##
-CONFIG_DRM=m
-
-##
-## file: drivers/gpu/drm/i2c/Kconfig
-##
-CONFIG_DRM_I2C_CH7006=m
-CONFIG_DRM_I2C_SIL164=m
-
-##
-## file: drivers/gpu/drm/nouveau/Kconfig
-##
-CONFIG_DRM_NOUVEAU=m
-# CONFIG_DRM_NOUVEAU_BACKLIGHT is not set
-
-##
-## file: drivers/gpu/drm/radeon/Kconfig
-##
-CONFIG_DRM_RADEON=m
-
-##
-## file: drivers/hid/usbhid/Kconfig
-##
-CONFIG_USB_HID=m
-# CONFIG_HID_PID is not set
-
-##
-## file: drivers/hwmon/Kconfig
-##
-CONFIG_SENSORS_ADM1021=m
-CONFIG_SENSORS_ADM1025=m
-CONFIG_SENSORS_ADM1026=m
-CONFIG_SENSORS_ADM1031=m
-CONFIG_SENSORS_ASB100=m
-CONFIG_SENSORS_DS1621=m
-CONFIG_SENSORS_F71805F=m
-CONFIG_SENSORS_GL518SM=m
-CONFIG_SENSORS_GL520SM=m
-CONFIG_SENSORS_IT87=m
-CONFIG_SENSORS_MAX1619=m
-CONFIG_SENSORS_LM63=m
-CONFIG_SENSORS_LM75=m
-CONFIG_SENSORS_LM77=m
-CONFIG_SENSORS_LM78=m
-CONFIG_SENSORS_LM80=m
-CONFIG_SENSORS_LM83=m
-CONFIG_SENSORS_LM85=m
-CONFIG_SENSORS_LM87=m
-CONFIG_SENSORS_LM90=m
-CONFIG_SENSORS_LM92=m
-CONFIG_SENSORS_PC87360=m
-CONFIG_SENSORS_PCF8591=m
-CONFIG_SENSORS_SIS5595=m
-CONFIG_SENSORS_SMSC47M1=m
-CONFIG_SENSORS_SMSC47B397=m
-CONFIG_SENSORS_VIA686A=m
-CONFIG_SENSORS_W83781D=m
-CONFIG_SENSORS_W83L785TS=m
-CONFIG_SENSORS_W83627HF=m
-
-##
-## file: drivers/i2c/Kconfig
-##
-CONFIG_I2C=m
-CONFIG_I2C_CHARDEV=m
-CONFIG_I2C_STUB=m
-# CONFIG_I2C_DEBUG_CORE is not set
-# CONFIG_I2C_DEBUG_ALGO is not set
-# CONFIG_I2C_DEBUG_BUS is not set
-
-##
-## file: drivers/i2c/busses/Kconfig
-##
-CONFIG_I2C_ALI1535=m
-CONFIG_I2C_ALI1563=m
-CONFIG_I2C_ALI15X3=m
-CONFIG_I2C_AMD756=m
-CONFIG_I2C_AMD756_S4882=m
-CONFIG_I2C_AMD8111=m
-CONFIG_I2C_I801=m
-CONFIG_I2C_PIIX4=m
-CONFIG_I2C_NFORCE2=m
-CONFIG_I2C_SIS5595=m
-CONFIG_I2C_SIS630=m
-CONFIG_I2C_SIS96X=m
-CONFIG_I2C_VIA=m
-CONFIG_I2C_VIAPRO=m
-CONFIG_I2C_PARPORT=m
-CONFIG_I2C_PCA_ISA=m
-CONFIG_SCx200_ACB=m
-
-##
-## file: drivers/input/gameport/Kconfig
-##
-CONFIG_GAMEPORT=m
-CONFIG_GAMEPORT_NS558=m
-CONFIG_GAMEPORT_L4=m
-CONFIG_GAMEPORT_EMU10K1=m
-CONFIG_GAMEPORT_FM801=m
-
-##
-## file: drivers/input/keyboard/Kconfig
-##
-CONFIG_INPUT_KEYBOARD=y
-CONFIG_KEYBOARD_ATKBD=y
-CONFIG_KEYBOARD_LKKBD=m
-CONFIG_KEYBOARD_NEWTON=m
-CONFIG_KEYBOARD_SUNKBD=m
-CONFIG_KEYBOARD_XTKBD=m
-
-##
-## file: drivers/input/misc/Kconfig
-##
-CONFIG_INPUT_MISC=y
-CONFIG_INPUT_UINPUT=m
-
-##
-## file: drivers/input/mouse/Kconfig
-##
-CONFIG_INPUT_MOUSE=y
-CONFIG_MOUSE_PS2=m
-CONFIG_MOUSE_SERIAL=m
-CONFIG_MOUSE_VSXXXAA=m
-
-##
-## file: drivers/input/serio/Kconfig
-##
-CONFIG_SERIO=y
-CONFIG_SERIO_I8042=y
-CONFIG_SERIO_SERPORT=m
-CONFIG_SERIO_PARKBD=m
-CONFIG_SERIO_PCIPS2=m
-CONFIG_SERIO_LIBPS2=y
-CONFIG_SERIO_RAW=m
-
-##
-## file: drivers/input/touchscreen/Kconfig
-##
-# CONFIG_INPUT_TOUCHSCREEN is not set
-
-##
-## file: drivers/isdn/Kconfig
-##
-CONFIG_ISDN=y
-
-##
-## file: drivers/media/radio/Kconfig
-##
-CONFIG_RADIO_MAXIRADIO=m
-CONFIG_USB_DSBR=m
-
-##
-## file: drivers/mmc/Kconfig
-##
-CONFIG_MMC=m
-
-##
-## file: drivers/mmc/core/Kconfig
-##
-CONFIG_MMC_BLOCK=m
-
-##
-## file: drivers/mmc/host/Kconfig
-##
-# CONFIG_MMC_DEBUG is not set
-
-##
-## file: drivers/net/Kconfig
-##
-CONFIG_NET_FC=y
-CONFIG_NET_SB1000=m
-
-##
-## file: drivers/net/arcnet/Kconfig
-##
-CONFIG_ARCNET=m
-CONFIG_ARCNET_1201=m
-CONFIG_ARCNET_1051=m
-CONFIG_ARCNET_RAW=m
-CONFIG_ARCNET_CAP=m
-CONFIG_ARCNET_COM90xx=m
-CONFIG_ARCNET_COM90xxIO=m
-CONFIG_ARCNET_RIM_I=m
-CONFIG_ARCNET_COM20020=m
-CONFIG_ARCNET_COM20020_PCI=m
-CONFIG_ARCNET_COM20020_CS=m
-
-##
-## file: drivers/net/ethernet/3com/Kconfig
-##
-CONFIG_NET_VENDOR_3COM=y
-CONFIG_PCMCIA_3C574=m
-CONFIG_PCMCIA_3C589=m
-CONFIG_VORTEX=m
-CONFIG_TYPHOON=m
-
-##
-## file: drivers/net/ethernet/8390/Kconfig
-##
-CONFIG_PCMCIA_AXNET=m
-CONFIG_NE2K_PCI=m
-CONFIG_PCMCIA_PCNET=m
-
-##
-## file: drivers/net/ethernet/adaptec/Kconfig
-##
-CONFIG_ADAPTEC_STARFIRE=m
-
-##
-## file: drivers/net/ethernet/amd/Kconfig
-##
-CONFIG_AMD8111_ETH=m
-CONFIG_PCMCIA_NMCLAN=m
-
-##
-## file: drivers/net/ethernet/broadcom/Kconfig
-##
-CONFIG_B44=m
-
-##
-## file: drivers/net/ethernet/dec/tulip/Kconfig
-##
-CONFIG_NET_TULIP=y
-CONFIG_DE2104X=m
-CONFIG_TULIP=m
-# CONFIG_TULIP_MWI is not set
-# CONFIG_TULIP_MMIO is not set
-CONFIG_WINBOND_840=m
-CONFIG_DM9102=m
-CONFIG_PCMCIA_XIRCOM=m
-
-##
-## file: drivers/net/ethernet/dlink/Kconfig
-##
-CONFIG_SUNDANCE=m
-# CONFIG_SUNDANCE_MMIO is not set
-
-##
-## file: drivers/net/ethernet/fujitsu/Kconfig
-##
-CONFIG_PCMCIA_FMVJ18X=m
-
-##
-## file: drivers/net/ethernet/intel/Kconfig
-##
-CONFIG_E100=m
-
-##
-## file: drivers/net/ethernet/natsemi/Kconfig
-##
-CONFIG_NATSEMI=m
-
-##
-## file: drivers/net/ethernet/nvidia/Kconfig
-##
-CONFIG_FORCEDETH=m
-
-##
-## file: drivers/net/ethernet/realtek/Kconfig
-##
-CONFIG_8139CP=m
-CONFIG_8139TOO=m
-# CONFIG_8139TOO_PIO is not set
-# CONFIG_8139TOO_TUNE_TWISTER is not set
-# CONFIG_8139TOO_8129 is not set
-# CONFIG_8139_OLD_RX_RESET is not set
-
-##
-## file: drivers/net/ethernet/sis/Kconfig
-##
-CONFIG_SIS900=m
-
-##
-## file: drivers/net/ethernet/smsc/Kconfig
-##
-CONFIG_PCMCIA_SMC91C92=m
-CONFIG_EPIC100=m
-
-##
-## file: drivers/net/ethernet/via/Kconfig
-##
-CONFIG_VIA_RHINE=m
-# CONFIG_VIA_RHINE_MMIO is not set
-
-##
-## file: drivers/net/ethernet/xircom/Kconfig
-##
-CONFIG_PCMCIA_XIRC2PS=m
-
-##
-## file: drivers/net/fddi/Kconfig
-##
-CONFIG_FDDI=y
-CONFIG_SKFP=m
-
-##
-## file: drivers/net/hippi/Kconfig
-##
-# CONFIG_HIPPI is not set
-
-##
-## file: drivers/net/plip/Kconfig
-##
-CONFIG_PLIP=m
-
-##
-## file: drivers/net/wan/Kconfig
-##
-CONFIG_WAN=y
-CONFIG_PCI200SYN=m
-CONFIG_WANXL=m
-CONFIG_FARSYNC=m
-
-##
-## file: drivers/net/wireless/atmel/Kconfig
-##
-CONFIG_ATMEL=m
-CONFIG_PCI_ATMEL=m
-CONFIG_PCMCIA_ATMEL=m
-
-##
-## file: drivers/net/wireless/cisco/Kconfig
-##
-CONFIG_AIRO_CS=m
-
-##
-## file: drivers/net/wireless/intel/ipw2x00/Kconfig
-##
-CONFIG_IPW2100=m
-CONFIG_IPW2100_MONITOR=y
-
-##
-## file: drivers/net/wireless/intersil/orinoco/Kconfig
-##
-CONFIG_HERMES=m
-CONFIG_PLX_HERMES=m
-CONFIG_TMD_HERMES=m
-CONFIG_PCI_HERMES=m
-CONFIG_PCMCIA_HERMES=m
-CONFIG_PCMCIA_SPECTRUM=m
-
-##
-## file: drivers/net/wireless/legacy/Kconfig
-##
-CONFIG_PCMCIA_RAYCS=m
-CONFIG_PCMCIA_WL3501=m
-
-##
-## file: drivers/net/wireless/marvell/mwifiex/Kconfig
-##
-CONFIG_MWIFIEX=m
-CONFIG_MWIFIEX_SDIO=m
-CONFIG_MWIFIEX_PCIE=m
-
-##
-## file: drivers/net/wireless/zydas/Kconfig
-##
-CONFIG_USB_ZD1201=m
-
-##
-## file: drivers/pci/hotplug/Kconfig
-##
-CONFIG_HOTPLUG_PCI=y
-
-##
-## file: drivers/pcmcia/Kconfig
-##
-CONFIG_PCCARD=m
-CONFIG_PCMCIA=m
-CONFIG_CARDBUS=y
-CONFIG_YENTA=m
-CONFIG_PD6729=m
-CONFIG_I82092=m
-
-##
-## file: drivers/rtc/Kconfig
-##
-CONFIG_RTC_DRV_EFI=y
-
-##
-## file: drivers/scsi/Kconfig
-##
-CONFIG_SCSI_ARCMSR=m
-CONFIG_SCSI_MYRB=m
-CONFIG_SCSI_MYRS=m
-CONFIG_SCSI_DMX3191D=m
-CONFIG_SCSI_IPS=m
-CONFIG_SCSI_INITIO=m
-CONFIG_SCSI_INIA100=m
-CONFIG_SCSI_SYM53C8XX_2=m
-CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=1
-CONFIG_SCSI_SYM53C8XX_DEFAULT_TAGS=16
-CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64
-CONFIG_SCSI_IPR=m
-CONFIG_SCSI_IPR_TRACE=y
-CONFIG_SCSI_IPR_DUMP=y
-CONFIG_SCSI_QLOGIC_1280=m
-CONFIG_SCSI_DC395x=m
-CONFIG_SCSI_AM53C974=m
-
-##
-## file: drivers/scsi/megaraid/Kconfig.megaraid
-##
-CONFIG_MEGARAID_NEWGEN=y
-CONFIG_MEGARAID_MM=m
-CONFIG_MEGARAID_MAILBOX=m
-CONFIG_MEGARAID_LEGACY=m
-
-##
-## file: drivers/scsi/pcmcia/Kconfig
-##
-CONFIG_PCMCIA_QLOGIC=m
-CONFIG_PCMCIA_SYM53C500=m
-
-##
-## file: drivers/staging/wlan-ng/Kconfig
-##
-# CONFIG_PRISM2_USB is not set
-
-##
-## file: drivers/tty/Kconfig
-##
-CONFIG_VT=y
-CONFIG_VT_CONSOLE=y
-CONFIG_SERIAL_NONSTANDARD=y
-CONFIG_MOXA_INTELLIO=m
-# CONFIG_MOXA_SMARTIO is not set
-CONFIG_N_HDLC=m
-
-##
-## file: drivers/tty/serial/Kconfig
-##
-CONFIG_SERIAL_JSM=m
-
-##
-## file: drivers/tty/serial/8250/Kconfig
-##
-CONFIG_SERIAL_8250=y
-CONFIG_SERIAL_8250_CONSOLE=y
-CONFIG_SERIAL_8250_CS=m
-CONFIG_SERIAL_8250_NR_UARTS=32
-CONFIG_SERIAL_8250_RUNTIME_UARTS=4
-CONFIG_SERIAL_8250_EXTENDED=y
-CONFIG_SERIAL_8250_SHARE_IRQ=y
-# CONFIG_SERIAL_8250_DETECT_IRQ is not set
-CONFIG_SERIAL_8250_RSA=y
-
-##
-## file: drivers/usb/Kconfig
-##
-CONFIG_USB=m
-
-##
-## file: drivers/usb/host/Kconfig
-##
-CONFIG_USB_EHCI_HCD=m
-CONFIG_USB_OHCI_HCD=m
-CONFIG_USB_UHCI_HCD=m
-CONFIG_USB_SL811_HCD=m
-CONFIG_USB_SL811_CS=m
-
-##
-## file: drivers/usb/misc/Kconfig
-##
-CONFIG_USB_USS720=m
-
-##
-## file: drivers/video/console/Kconfig
-##
-CONFIG_VGA_CONSOLE=y
-CONFIG_FRAMEBUFFER_CONSOLE=y
-
-##
-## file: drivers/video/fbdev/Kconfig
-##
-CONFIG_FB=y
-CONFIG_FB_CIRRUS=m
-CONFIG_FB_PM2=m
-# CONFIG_FB_PM2_FIFO_DISCONNECT is not set
-CONFIG_FB_CYBER2000=m
-CONFIG_FB_ASILIANT=y
-# CONFIG_FB_IMSTT is not set
-CONFIG_FB_S1D13XXX=m
-CONFIG_FB_MATROX=m
-CONFIG_FB_MATROX_MILLENIUM=y
-CONFIG_FB_MATROX_MYSTIQUE=y
-CONFIG_FB_MATROX_G=y
-CONFIG_FB_MATROX_I2C=m
-CONFIG_FB_MATROX_MAVEN=m
-CONFIG_FB_RADEON=m
-CONFIG_FB_RADEON_I2C=y
-# CONFIG_FB_RADEON_DEBUG is not set
-CONFIG_FB_ATY128=m
-CONFIG_FB_ATY=m
-CONFIG_FB_ATY_CT=y
-CONFIG_FB_ATY_GENERIC_LCD=y
-CONFIG_FB_ATY_GX=y
-CONFIG_FB_SAVAGE=m
-CONFIG_FB_SAVAGE_I2C=y
-# CONFIG_FB_SAVAGE_ACCEL is not set
-CONFIG_FB_SIS=m
-CONFIG_FB_SIS_300=y
-CONFIG_FB_SIS_315=y
-CONFIG_FB_NEOMAGIC=m
-CONFIG_FB_KYRO=m
-CONFIG_FB_VOODOO1=m
-CONFIG_FB_TRIDENT=m
-# CONFIG_FB_VIRTUAL is not set
-
-##
-## file: drivers/video/fbdev/core/Kconfig
-##
-CONFIG_FB_MODE_HELPERS=y
-CONFIG_FB_TILEBLITTING=y
-
-##
-## file: fs/pstore/Kconfig
-##
-CONFIG_PSTORE=y
-
-##
-## file: kernel/Kconfig.kexec
-##
-CONFIG_KEXEC=y
-CONFIG_CRASH_DUMP=y
-
-##
-## file: lib/Kconfig.debug
-##
-#. Broken here (#905461)
-# CONFIG_SCHED_STACK_END_CHECK is not set
-
-##
-## file: lib/xz/Kconfig
-##
-CONFIG_XZ_DEC_IA64=y
-
-##
-## file: net/ipv6/Kconfig
-##
-CONFIG_IPV6=y
-
-##
-## file: security/Kconfig
-##
-CONFIG_LSM_MMAP_MIN_ADDR=65536
-# CONFIG_HARDENED_USERCOPY is not set
-
-##
-## file: sound/drivers/Kconfig
-##
-CONFIG_SND_DUMMY=m
-CONFIG_SND_VIRMIDI=m
-CONFIG_SND_MTPAV=m
-CONFIG_SND_SERIAL_U16550=m
-CONFIG_SND_MPU401=m
-
-##
-## file: sound/pci/Kconfig
-##
-CONFIG_SND_ALS4000=m
-CONFIG_SND_ALI5451=m
-CONFIG_SND_ATIIXP=m
-CONFIG_SND_ATIIXP_MODEM=m
-CONFIG_SND_AU8810=m
-CONFIG_SND_AU8820=m
-CONFIG_SND_AU8830=m
-CONFIG_SND_AZT3328=m
-CONFIG_SND_BT87X=m
-# CONFIG_SND_BT87X_OVERCLOCK is not set
-CONFIG_SND_CA0106=m
-CONFIG_SND_CMIPCI=m
-CONFIG_SND_CS4281=m
-CONFIG_SND_CS46XX=m
-CONFIG_SND_CS46XX_NEW_DSP=y
-CONFIG_SND_EMU10K1=m
-CONFIG_SND_EMU10K1X=m
-CONFIG_SND_ENS1370=m
-CONFIG_SND_ENS1371=m
-CONFIG_SND_ES1938=m
-CONFIG_SND_ES1968=m
-CONFIG_SND_FM801=m
-CONFIG_SND_FM801_TEA575X_BOOL=y
-CONFIG_SND_HDSP=m
-CONFIG_SND_ICE1712=m
-CONFIG_SND_ICE1724=m
-CONFIG_SND_INTEL8X0=m
-CONFIG_SND_INTEL8X0M=m
-CONFIG_SND_KORG1212=m
-CONFIG_SND_MAESTRO3=m
-CONFIG_SND_MIXART=m
-CONFIG_SND_NM256=m
-CONFIG_SND_RME32=m
-CONFIG_SND_RME96=m
-CONFIG_SND_RME9652=m
-CONFIG_SND_SONICVIBES=m
-CONFIG_SND_TRIDENT=m
-CONFIG_SND_VIA82XX=m
-CONFIG_SND_VIA82XX_MODEM=m
-CONFIG_SND_VX222=m
-CONFIG_SND_YMFPCI=m
-
-##
-## file: sound/pci/hda/Kconfig
-##
-CONFIG_SND_HDA_INTEL=m
diff --git a/debian/config/ia64/config.itanium b/debian/config/ia64/config.itanium
deleted file mode 100644
index 1d1da671fb..0000000000
--- a/debian/config/ia64/config.itanium
+++ /dev/null
@@ -1,10 +0,0 @@
-##
-## file: arch/ia64/Kconfig
-##
-## choice: Processor type
-CONFIG_ITANIUM=y
-# CONFIG_MCKINLEY is not set
-## end choice
-CONFIG_SMP=y
-CONFIG_NR_CPUS=64
-# CONFIG_SCHED_SMT is not set
diff --git a/debian/config/ia64/config.mckinley b/debian/config/ia64/config.mckinley
deleted file mode 100644
index 581fcde88c..0000000000
--- a/debian/config/ia64/config.mckinley
+++ /dev/null
@@ -1,10 +0,0 @@
-##
-## file: arch/ia64/Kconfig
-##
-## choice: Processor type
-# CONFIG_ITANIUM is not set
-CONFIG_MCKINLEY=y
-## end choice
-CONFIG_SMP=y
-CONFIG_NR_CPUS=64
-# CONFIG_SCHED_SMT is not set
diff --git a/debian/config/ia64/defines b/debian/config/ia64/defines
deleted file mode 100644
index f4751c65b6..0000000000
--- a/debian/config/ia64/defines
+++ /dev/null
@@ -1,25 +0,0 @@
-[base]
-flavours:
- itanium
- mckinley
-default-flavour: itanium
-kernel-arch: ia64
-compiler: gcc-12
-
-[build]
-image-file: vmlinux.gz
-
-[image]
-suggests: grub-efi-ia64
-install-stem: vmlinuz
-
-[itanium_description]
-hardware: Itanium (Merced)
-hardware-long: systems with original Itanium (Merced) processors
-
-[itanium_packages]
-installer: true
-
-[mckinley_description]
-hardware: Itanium 2+
-hardware-long: systems with Itanium 2 or 9300/9500/9700-series processors
diff --git a/debian/config/kernelarch-powerpc/config-arch-64 b/debian/config/kernelarch-powerpc/config-arch-64
index fdd0fbe89f..97e4e6ac43 100644
--- a/debian/config/kernelarch-powerpc/config-arch-64
+++ b/debian/config/kernelarch-powerpc/config-arch-64
@@ -145,6 +145,7 @@ CONFIG_IBM_EMAC_RX_COPY_THRESHOLD=256
 ## file: drivers/pci/hotplug/Kconfig
 ##
 CONFIG_HOTPLUG_PCI=y
+CONFIG_HOTPLUG_PCI_POWERNV=m
 CONFIG_HOTPLUG_PCI_RPA=m
 CONFIG_HOTPLUG_PCI_RPA_DLPAR=m
 
diff --git a/debian/config/kernelarch-x86/config b/debian/config/kernelarch-x86/config
index fe10477d97..4f3f22fb74 100644
--- a/debian/config/kernelarch-x86/config
+++ b/debian/config/kernelarch-x86/config
@@ -726,6 +726,7 @@ CONFIG_SENSORS_W83627HF=m
 CONFIG_SENSORS_ACPI_POWER=m
 CONFIG_SENSORS_ASUS_WMI=m
 CONFIG_SENSORS_ASUS_EC=m
+CONFIG_SENSORS_HP_WMI=m
 
 ##
 ## file: drivers/hwtracing/intel_th/Kconfig
@@ -1741,11 +1742,6 @@ CONFIG_RTLLIB_CRYPTO_WEP=m
 CONFIG_RTL8192E=m
 
 ##
-## file: drivers/staging/rtl8192u/Kconfig
-##
-CONFIG_RTL8192U=m
-
-##
 ## file: drivers/staging/rts5208/Kconfig
 ##
 CONFIG_RTS5208=m
@@ -2267,7 +2263,7 @@ CONFIG_SND_SOC_INTEL_SOF_ES8336_MACH=m
 CONFIG_SND_SOC_INTEL_SOF_NAU8825_MACH=m
 CONFIG_SND_SOC_INTEL_CML_LP_DA7219_MAX98357A_MACH=m
 CONFIG_SND_SOC_INTEL_SOF_CML_RT1011_RT5682_MACH=m
-CONFIG_SND_SOC_INTEL_SOF_DA7219_MAX98373_MACH=m
+CONFIG_SND_SOC_INTEL_SOF_DA7219_MACH=m
 CONFIG_SND_SOC_INTEL_SOF_SSP_AMP_MACH=m
 CONFIG_SND_SOC_INTEL_SOUNDWIRE_SOF_MACH=m
 
diff --git a/debian/config/loong64/config b/debian/config/loong64/config
new file mode 100644
index 0000000000..6df221b4e0
--- /dev/null
+++ b/debian/config/loong64/config
@@ -0,0 +1,236 @@
+##
+## file: arch/loongarch/Kconfig
+##
+CONFIG_DMI=y
+CONFIG_EFI=y
+CONFIG_EFI_STUB=y
+CONFIG_SMP=y
+CONFIG_HOTPLUG_CPU=y
+CONFIG_NR_CPUS=64
+CONFIG_NUMA=y
+CONFIG_CPU_HAS_LSX=y
+CONFIG_CPU_HAS_LASX=y
+
+##
+## file: drivers/acpi/Kconfig
+##
+CONFIG_ACPI_IPMI=m
+CONFIG_ACPI_PCI_SLOT=y
+CONFIG_ACPI_HOTPLUG_MEMORY=y
+
+##
+## file: drivers/bluetooth/Kconfig
+##
+CONFIG_BT_HCIUART=m
+CONFIG_BT_HCIUART_BCSP=y
+CONFIG_BT_HCIBCM203X=m
+CONFIG_BT_HCIBPA10X=m
+CONFIG_BT_HCIBFUSB=m
+CONFIG_BT_HCIDTL1=m
+CONFIG_BT_HCIBT3C=m
+CONFIG_BT_HCIBLUECARD=m
+CONFIG_BT_HCIVHCI=m
+CONFIG_BT_VIRTIO=m
+
+##
+## file: drivers/char/Kconfig
+##
+CONFIG_PRINTER=m
+
+##
+## file: drivers/dma/Kconfig
+##
+CONFIG_DMADEVICES=y
+
+##
+## file: drivers/firmware/efi/Kconfig
+##
+CONFIG_EFI_ZBOOT=y
+
+##
+## file: drivers/gpio/Kconfig
+##
+CONFIG_GPIO_LOONGSON=y
+
+##
+## file: drivers/gpu/drm/Kconfig
+##
+CONFIG_DRM=m
+
+##
+## file: drivers/gpu/drm/amd/amdgpu/Kconfig
+##
+CONFIG_DRM_AMDGPU=m
+
+##
+## file: drivers/gpu/drm/ast/Kconfig
+##
+CONFIG_DRM_AST=m
+
+##
+## file: drivers/gpu/drm/radeon/Kconfig
+##
+CONFIG_DRM_RADEON=m
+
+##
+## file: drivers/hwmon/Kconfig
+##
+CONFIG_SENSORS_LM75=m
+CONFIG_SENSORS_W83627HF=m
+
+##
+## file: drivers/i2c/Kconfig
+##
+CONFIG_I2C=y
+
+##
+## file: drivers/i2c/busses/Kconfig
+##
+CONFIG_I2C_PIIX4=m
+
+##
+## file: drivers/input/keyboard/Kconfig
+##
+CONFIG_KEYBOARD_XTKBD=m
+
+##
+## file: drivers/input/misc/Kconfig
+##
+CONFIG_INPUT_MISC=y
+CONFIG_INPUT_UINPUT=m
+
+##
+## file: drivers/input/mouse/Kconfig
+##
+CONFIG_INPUT_MOUSE=y
+CONFIG_MOUSE_PS2=m
+CONFIG_MOUSE_PS2_VMMOUSE=y
+CONFIG_MOUSE_SERIAL=m
+
+##
+## file: drivers/input/serio/Kconfig
+##
+CONFIG_SERIO_SERPORT=m
+CONFIG_SERIO_RAW=m
+
+##
+## file: drivers/mtd/chips/Kconfig
+##
+CONFIG_MTD_CFI=m
+CONFIG_MTD_JEDECPROBE=m
+CONFIG_MTD_CFI_INTELEXT=m
+CONFIG_MTD_CFI_AMDSTD=m
+CONFIG_MTD_CFI_STAA=m
+CONFIG_MTD_RAM=m
+CONFIG_MTD_ROM=m
+
+##
+## file: drivers/net/ethernet/realtek/Kconfig
+##
+CONFIG_8139CP=m
+CONFIG_8139TOO=m
+
+##
+## file: drivers/net/ethernet/stmicro/stmmac/Kconfig
+##
+CONFIG_STMMAC_ETH=m
+
+##
+## file: drivers/pci/hotplug/Kconfig
+##
+CONFIG_HOTPLUG_PCI=y
+CONFIG_HOTPLUG_PCI_SHPC=y
+
+##
+## file: drivers/power/reset/Kconfig
+##
+CONFIG_POWER_RESET=y
+CONFIG_POWER_RESET_RESTART=y
+CONFIG_POWER_RESET_SYSCON=y
+CONFIG_POWER_RESET_SYSCON_POWEROFF=y
+CONFIG_SYSCON_REBOOT_MODE=m
+
+##
+## file: drivers/pwm/Kconfig
+##
+CONFIG_PWM=y
+
+##
+## file: drivers/rtc/Kconfig
+##
+CONFIG_RTC_DRV_EFI=y
+
+##
+## file: drivers/scsi/megaraid/Kconfig.megaraid
+##
+CONFIG_MEGARAID_NEWGEN=y
+CONFIG_MEGARAID_MM=m
+CONFIG_MEGARAID_MAILBOX=m
+CONFIG_MEGARAID_LEGACY=m
+
+##
+## file: drivers/tty/serial/8250/Kconfig
+##
+CONFIG_SERIAL_8250=y
+CONFIG_SERIAL_8250_CONSOLE=y
+CONFIG_SERIAL_8250_NR_UARTS=16
+CONFIG_SERIAL_8250_RUNTIME_UARTS=16
+CONFIG_SERIAL_8250_EXTENDED=y
+CONFIG_SERIAL_8250_MANY_PORTS=y
+CONFIG_SERIAL_8250_SHARE_IRQ=y
+CONFIG_SERIAL_8250_RSA=y
+CONFIG_SERIAL_OF_PLATFORM=y
+
+##
+## file: drivers/usb/Kconfig
+##
+CONFIG_USB=m
+
+##
+## file: drivers/usb/host/Kconfig
+##
+CONFIG_USB_EHCI_HCD_PLATFORM=m
+CONFIG_USB_OHCI_HCD_PLATFORM=m
+
+##
+## file: drivers/usb/typec/tcpm/Kconfig
+##
+CONFIG_TYPEC_TCPCI=m
+
+##
+## file: drivers/vfio/Kconfig
+##
+CONFIG_VFIO=m
+
+##
+## file: drivers/vfio/pci/Kconfig
+##
+CONFIG_VFIO_PCI=m
+
+##
+## file: drivers/video/backlight/Kconfig
+##
+CONFIG_LCD_CLASS_DEVICE=m
+CONFIG_LCD_PLATFORM=m
+
+##
+## file: drivers/video/fbdev/Kconfig
+##
+CONFIG_FB_EFI=y
+CONFIG_FB_RADEON=m
+
+##
+## file: kernel/Kconfig.kexec
+##
+CONFIG_KEXEC=y
+CONFIG_CRASH_DUMP=y
+
+##
+## file: sound/pci/Kconfig
+##
+CONFIG_SND_BT87X=m
+
+##
+## file: sound/pci/hda/Kconfig
+##
+CONFIG_SND_HDA_INTEL=m
diff --git a/debian/config/loong64/defines.toml b/debian/config/loong64/defines.toml
new file mode 100644
index 0000000000..ee8ce61e9a
--- /dev/null
+++ b/debian/config/loong64/defines.toml
@@ -0,0 +1,16 @@
+[[flavour]]
+name = 'loong64'
+[flavour.defs]
+is_default = true
+[flavour.description]
+hardware = '64-bit LoongArch platforms'
+[flavour.packages]
+installer = true
+
+[[featureset]]
+name = 'none'
+
+[build]
+enable_vdso = true
+kernel_file = 'arch/loongarch/boot/vmlinuz.efi'
+kernel_stem = 'vmlinuz'
diff --git a/debian/config/m68k/config b/debian/config/m68k/config
index c7dc8d1aaa..5a171354f4 100644
--- a/debian/config/m68k/config
+++ b/debian/config/m68k/config
@@ -346,11 +346,6 @@ CONFIG_MAC_EMUMOUSEBTN=m
 # CONFIG_MTD is not set
 
 ##
-## file: drivers/net/appletalk/Kconfig
-##
-CONFIG_DEV_APPLETALK=m
-
-##
 ## file: drivers/net/arcnet/Kconfig
 ##
 # CONFIG_ARCNET is not set
diff --git a/debian/config/m68k/defines b/debian/config/m68k/defines
deleted file mode 100644
index b572549dcc..0000000000
--- a/debian/config/m68k/defines
+++ /dev/null
@@ -1,19 +0,0 @@
-[base]
-cflags: -ffreestanding
-flavours:
- m68k
-default-flavour: m68k
-kernel-arch: m68k
-
-[build]
-image-file: vmlinux
-
-[image]
-suggests: vmelilo, fdutils
-install-stem: vmlinux
-
-[m68k_description]
-hardware: Motorola MC68020+ family
-
-[m68k_packages]
-installer: true
diff --git a/debian/config/m68k/defines.toml b/debian/config/m68k/defines.toml
new file mode 100644
index 0000000000..c5dbaab92e
--- /dev/null
+++ b/debian/config/m68k/defines.toml
@@ -0,0 +1,18 @@
+[[flavour]]
+name = 'm68k'
+[flavour.defs]
+is_default = true
+[flavour.description]
+hardware = 'Motorola MC68020+ family'
+[flavour.packages]
+installer = true
+
+[[featureset]]
+name = 'none'
+
+[build]
+kernel_file = 'vmlinux'
+kernel_stem = 'vmlinux'
+
+[relations.image]
+suggests = ['vmelilo', 'fdutils']
diff --git a/debian/config/mips/defines b/debian/config/mips/defines
deleted file mode 100644
index 6833df7342..0000000000
--- a/debian/config/mips/defines
+++ /dev/null
@@ -1,50 +0,0 @@
-[base]
-flavours:
- 4kc-malta
- mips32r2eb
- octeon
-kernel-arch: mips
-
-[build]
-image-file: vmlinuz
-
-[image]
-install-stem: vmlinuz
-
-[4kc-malta_description]
-hardware: MIPS Malta
-hardware-long: MIPS Malta boards
-
-[4kc-malta_image]
-configs:
- kernelarch-mips/config.malta
- kernelarch-mips/config.mips32r2
-
-[4kc-malta_packages]
-installer: true
-
-[mips32r2eb_description]
-hardware: MIPS Generic (mips32r2eb)
-hardware-long: MIPS Generic platform (mips32r2eb)
-
-[mips32r2eb_image]
-configs:
- kernelarch-mips/config.boston
- kernelarch-mips/config.mips32r2
-
-[mips32r2eb_packages]
-installer: true
-
-[octeon_description]
-hardware: Octeon
-hardware-long: Cavium Networks Octeon
-
-[octeon_build]
-image-file: vmlinux
-
-[octeon_image]
-install-stem: vmlinux
-configs: kernelarch-mips/config.octeon
-
-[octeon_packages]
-installer: true
diff --git a/debian/config/mips/defines.toml b/debian/config/mips/defines.toml
new file mode 100644
index 0000000000..f2d98e7a7e
--- /dev/null
+++ b/debian/config/mips/defines.toml
@@ -0,0 +1,46 @@
+[[flavour]]
+name = '4kc-malta'
+[flavour.build]
+config = [
+  'kernelarch-mips/config.malta',
+  'kernelarch-mips/config.mips32r2',
+]
+[flavour.description]
+hardware = 'MIPS Malta'
+hardware_long = 'MIPS Malta boards'
+[flavour.packages]
+installer = true
+
+[[flavour]]
+name = 'mips32r2eb'
+[flavour.build]
+config = [
+  'kernelarch-mips/config.boston',
+  'kernelarch-mips/config.mips32r2',
+]
+[flavour.description]
+hardware = 'MIPS Generic (mips32r2eb)'
+hardware_long = 'MIPS Generic platform (mips32r2eb)'
+[flavour.packages]
+installer = true
+
+[[flavour]]
+name = 'octeon'
+[flavour.build]
+config = [
+  'kernelarch-mips/config.octeon',
+]
+kernel_file = 'vmlinux'
+kernel_stem = 'vmlinux'
+[flavour.description]
+hardware = 'Octeon'
+hardware_long = 'Cavium Networks Octeon'
+[flavour.packages]
+installer = true
+
+[[featureset]]
+name = 'none'
+
+[build]
+kernel_file = 'vmlinuz'
+kernel_stem = 'vmlinuz'
diff --git a/debian/config/mips64/defines b/debian/config/mips64/defines
deleted file mode 100644
index 7b4efe79c6..0000000000
--- a/debian/config/mips64/defines
+++ /dev/null
@@ -1,50 +0,0 @@
-[base]
-flavours:
- 5kc-malta
- mips64r2eb
- octeon
-kernel-arch: mips
-
-[build]
-image-file: vmlinuz
-
-[image]
-install-stem: vmlinuz
-
-[5kc-malta_description]
-hardware: MIPS Malta
-hardware-long: MIPS Malta boards
-
-[5kc-malta_image]
-configs:
- kernelarch-mips/config.malta
- kernelarch-mips/config.mips64r2
-
-[5kc-malta_packages]
-installer: true
-
-[mips64r2eb_description]
-hardware: MIPS Generic (mips64r2eb)
-hardware-long: MIPS Generic platform (mips64r2eb)
-
-[mips64r2eb_image]
-configs:
- kernelarch-mips/config.boston
- kernelarch-mips/config.mips64r2
-
-[mips64r2eb_packages]
-installer: true
-
-[octeon_description]
-hardware: Octeon
-hardware-long: Cavium Networks Octeon
-
-[octeon_build]
-image-file: vmlinux
-
-[octeon_image]
-install-stem: vmlinux
-configs: kernelarch-mips/config.octeon
-
-[octeon_packages]
-installer: true
diff --git a/debian/config/mips64/defines.toml b/debian/config/mips64/defines.toml
new file mode 100644
index 0000000000..686be0d2b7
--- /dev/null
+++ b/debian/config/mips64/defines.toml
@@ -0,0 +1,46 @@
+[[flavour]]
+name = '5kc-malta'
+[flavour.build]
+config = [
+  'kernelarch-mips/config.malta',
+  'kernelarch-mips/config.mips64r2',
+]
+[flavour.description]
+hardware = 'MIPS Malta'
+hardware_long = 'MIPS Malta boards'
+[flavour.packages]
+installer = true
+
+[[flavour]]
+name = 'mips64r2eb'
+[flavour.build]
+config = [
+  'kernelarch-mips/config.boston',
+  'kernelarch-mips/config.mips64r2',
+]
+[flavour.description]
+hardware = 'MIPS Generic (mips64r2eb)'
+hardware_long = 'MIPS Generic platform (mips64r2eb)'
+[flavour.packages]
+installer = true
+
+[[flavour]]
+name = 'octeon'
+[flavour.build]
+config = [
+  'kernelarch-mips/config.octeon',
+]
+kernel_file = 'vmlinux'
+kernel_stem = 'vmlinux'
+[flavour.description]
+hardware = 'Octeon'
+hardware_long = 'Cavium Networks Octeon'
+[flavour.packages]
+installer = true
+
+[[featureset]]
+name = 'none'
+
+[build]
+kernel_file = 'vmlinuz'
+kernel_stem = 'vmlinuz'
diff --git a/debian/config/mips64el/defines b/debian/config/mips64el/defines
deleted file mode 100644
index 08cbbae433..0000000000
--- a/debian/config/mips64el/defines
+++ /dev/null
@@ -1,62 +0,0 @@
-[base]
-flavours:
- 5kc-malta
- mips64r2el
- loongson-3
- octeon
-kernel-arch: mips
-
-[build]
-image-file: vmlinuz
-
-[image]
-install-stem: vmlinuz
-
-[5kc-malta_description]
-hardware: MIPS Malta
-hardware-long: MIPS Malta boards
-
-[5kc-malta_image]
-configs:
- kernelarch-mips/config.malta
- kernelarch-mips/config.mips64r2
-
-[5kc-malta_packages]
-installer: true
-
-[mips64r2el_description]
-hardware: MIPS Generic (mips64r2el)
-hardware-long: MIPS Generic platform (mips64r2el)
-
-[mips64r2el_image]
-configs:
- kernelarch-mips/config.boston
- kernelarch-mips/config.mips64r2
-
-[mips64r2el_packages]
-installer: true
-
-[loongson-3_description]
-hardware: Loongson 3A/3B
-hardware-long: Loongson 3A or 3B based systems (e.g. from Loongson or Lemote)
-
-[loongson-3_image]
-recommends: pmon-update
-configs: kernelarch-mips/config.loongson-3
-
-[loongson-3_packages]
-installer: true
-
-[octeon_description]
-hardware: Octeon
-hardware-long: Cavium Networks Octeon
-
-[octeon_build]
-image-file: vmlinux
-
-[octeon_image]
-install-stem: vmlinux
-configs: kernelarch-mips/config.octeon
-
-[octeon_packages]
-installer: true
diff --git a/debian/config/mips64el/defines.toml b/debian/config/mips64el/defines.toml
new file mode 100644
index 0000000000..0be05d5d76
--- /dev/null
+++ b/debian/config/mips64el/defines.toml
@@ -0,0 +1,60 @@
+[[flavour]]
+name = '5kc-malta'
+[flavour.build]
+config = [
+  'kernelarch-mips/config.malta',
+  'kernelarch-mips/config.mips64r2',
+]
+[flavour.description]
+hardware = 'MIPS Malta'
+hardware_long = 'MIPS Malta boards'
+[flavour.packages]
+installer = true
+
+[[flavour]]
+name = 'mips64r2el'
+[flavour.build]
+config = [
+  'kernelarch-mips/config.boston',
+  'kernelarch-mips/config.mips64r2',
+]
+[flavour.description]
+hardware = 'MIPS Generic (mips64r2el)'
+hardware_long = 'MIPS Generic platform (mips64r2el)'
+[flavour.packages]
+installer = true
+
+[[flavour]]
+name = 'loongson-3'
+[flavour.build]
+config = [
+  'kernelarch-mips/config.loongson-3',
+]
+[flavour.description]
+hardware = 'Loongson 3A/3B'
+hardware_long = 'Loongson 3A or 3B based systems (e.g. from Loongson or Lemote)'
+[flavour.packages]
+installer = true
+[flavour.relations.image]
+recommends = ['pmon-update']
+
+[[flavour]]
+name = 'octeon'
+[flavour.build]
+config = [
+  'kernelarch-mips/config.octeon',
+]
+kernel_file = 'vmlinux'
+kernel_stem = 'vmlinux'
+[flavour.description]
+hardware = 'Octeon'
+hardware_long = 'Cavium Networks Octeon'
+[flavour.packages]
+installer = true
+
+[[featureset]]
+name = 'none'
+
+[build]
+kernel_file = 'vmlinuz'
+kernel_stem = 'vmlinuz'
diff --git a/debian/config/mips64r6el/defines b/debian/config/mips64r6el/defines
deleted file mode 100644
index 410cee457f..0000000000
--- a/debian/config/mips64r6el/defines
+++ /dev/null
@@ -1,22 +0,0 @@
-[base]
-flavours:
- mips64r6el
-kernel-arch: mips
-
-[build]
-image-file: vmlinuz
-
-[image]
-install-stem: vmlinuz
-
-[mips64r6el_description]
-hardware: MIPS Generic (mips64r6el)
-hardware-long: MIPS Generic platform (mips64r6el)
-
-[mips64r6el_image]
-configs:
- kernelarch-mips/config.boston
- kernelarch-mips/config.mips64r6
-
-[mips64r6el_packages]
-installer: true
diff --git a/debian/config/mips64r6el/defines.toml b/debian/config/mips64r6el/defines.toml
new file mode 100644
index 0000000000..40848b9805
--- /dev/null
+++ b/debian/config/mips64r6el/defines.toml
@@ -0,0 +1,19 @@
+[[flavour]]
+name = 'mips64r6el'
+[flavour.build]
+config = [
+  'kernelarch-mips/config.boston',
+  'kernelarch-mips/config.mips64r6',
+]
+[flavour.description]
+hardware = 'MIPS Generic (mips64r6el)'
+hardware_long = 'MIPS Generic platform (mips64r6el)'
+[flavour.packages]
+installer = true
+
+[[featureset]]
+name = 'none'
+
+[build]
+kernel_file = 'vmlinuz'
+kernel_stem = 'vmlinuz'
diff --git a/debian/config/mipsel/defines b/debian/config/mipsel/defines
deleted file mode 100644
index 4340af2b1f..0000000000
--- a/debian/config/mipsel/defines
+++ /dev/null
@@ -1,62 +0,0 @@
-[base]
-flavours:
- 4kc-malta
- mips32r2el
- loongson-3
- octeon
-kernel-arch: mips
-
-[build]
-image-file: vmlinuz
-
-[image]
-install-stem: vmlinuz
-
-[4kc-malta_description]
-hardware: MIPS Malta
-hardware-long: MIPS Malta boards
-
-[4kc-malta_image]
-configs:
- kernelarch-mips/config.malta
- kernelarch-mips/config.mips32r2
-
-[4kc-malta_packages]
-installer: true
-
-[mips32r2el_description]
-hardware: MIPS Generic (mips32r2el)
-hardware-long: MIPS Generic platform (mips32r2el)
-
-[mips32r2el_image]
-configs:
- kernelarch-mips/config.boston
- kernelarch-mips/config.mips32r2
-
-[mips32r2el_packages]
-installer: true
-
-[loongson-3_description]
-hardware: Loongson 3A/3B
-hardware-long: Loongson 3A or 3B based systems (e.g. from Loongson or Lemote)
-
-[loongson-3_image]
-recommends: pmon-update
-configs: kernelarch-mips/config.loongson-3
-
-[loongson-3_packages]
-installer: true
-
-[octeon_description]
-hardware: Octeon
-hardware-long: Cavium Networks Octeon
-
-[octeon_build]
-image-file: vmlinux
-
-[octeon_image]
-install-stem: vmlinux
-configs: kernelarch-mips/config.octeon
-
-[octeon_packages]
-installer: true
diff --git a/debian/config/mipsel/defines.toml b/debian/config/mipsel/defines.toml
new file mode 100644
index 0000000000..d5e0a1f82b
--- /dev/null
+++ b/debian/config/mipsel/defines.toml
@@ -0,0 +1,60 @@
+[[flavour]]
+name = '4kc-malta'
+[flavour.build]
+config = [
+  'kernelarch-mips/config.malta',
+  'kernelarch-mips/config.mips32r2',
+]
+[flavour.description]
+hardware = 'MIPS Malta'
+hardware_long = 'MIPS Malta boards'
+[flavour.packages]
+installer = true
+
+[[flavour]]
+name = 'mips32r2el'
+[flavour.build]
+config = [
+  'kernelarch-mips/config.boston',
+  'kernelarch-mips/config.mips32r2',
+]
+[flavour.description]
+hardware = 'MIPS Generic (mips32r2el)'
+hardware_long = 'MIPS Generic platform (mips32r2el)'
+[flavour.packages]
+installer = true
+
+[[flavour]]
+name = 'loongson-3'
+[flavour.build]
+config = [
+  'kernelarch-mips/config.loongson-3',
+]
+[flavour.description]
+hardware = 'Loongson 3A/3B'
+hardware_long = 'Loongson 3A or 3B based systems (e.g. from Loongson or Lemote)'
+[flavour.packages]
+installer = true
+[flavour.relations.image]
+recommends = ['pmon-update']
+
+[[flavour]]
+name = 'octeon'
+[flavour.build]
+config = [
+  'kernelarch-mips/config.octeon',
+]
+kernel_file = 'vmlinux'
+kernel_stem = 'vmlinux'
+[flavour.description]
+hardware = 'Octeon'
+hardware_long = 'Cavium Networks Octeon'
+[flavour.packages]
+installer = true
+
+[[featureset]]
+name = 'none'
+
+[build]
+kernel_file = 'vmlinuz'
+kernel_stem = 'vmlinuz'
diff --git a/debian/config/powerpc/defines b/debian/config/powerpc/defines
deleted file mode 100644
index 00d21fb8aa..0000000000
--- a/debian/config/powerpc/defines
+++ /dev/null
@@ -1,35 +0,0 @@
-[base]
-flavours:
- powerpc
- powerpc-smp
- powerpc64
-kernel-arch: powerpc
-
-[build]
-image-file: vmlinux
-
-[image]
-configs:
-suggests: mkvmlinuz, grub-ieee1275
-install-stem: vmlinux
-
-[powerpc_description]
-hardware: uniprocessor 32-bit PowerPC
-
-[powerpc_packages]
-installer: true
-
-[powerpc-smp_description]
-hardware: multiprocessor 32-bit PowerPC
-
-[powerpc-smp_image]
-configs: powerpc/config.powerpc powerpc/config.powerpc-smp
-
-[powerpc64_description]
-hardware: 64-bit PowerPC
-
-[powerpc64_image]
-configs: kernelarch-powerpc/config-arch-64 kernelarch-powerpc/config-arch-64-be
-
-[powerpc64_packages]
-installer: true
diff --git a/debian/config/powerpc/defines.toml b/debian/config/powerpc/defines.toml
new file mode 100644
index 0000000000..6821eec17c
--- /dev/null
+++ b/debian/config/powerpc/defines.toml
@@ -0,0 +1,40 @@
+[[flavour]]
+name = 'powerpc'
+[flavour.description]
+hardware = 'uniprocessor 32-bit PowerPC'
+[flavour.packages]
+installer = true
+
+[[flavour]]
+name = 'powerpc-smp'
+[flavour.build]
+config = [
+  'powerpc/config.powerpc',
+]
+[flavour.description]
+hardware = 'multiprocessor 32-bit PowerPC'
+
+[[flavour]]
+name = 'powerpc64'
+[flavour.build]
+config = [
+  'kernelarch-powerpc/config-arch-64',
+  'kernelarch-powerpc/config-arch-64-be',
+]
+[flavour.description]
+hardware = '64-bit PowerPC'
+[flavour.packages]
+installer = true
+
+[[featureset]]
+name = 'none'
+
+[build]
+kernel_file = 'vmlinux'
+kernel_stem = 'vmlinux'
+
+[relations.image]
+suggests = [
+  'mkvmlinuz',
+  'grub-ieee1275',
+]
diff --git a/debian/config/ppc64/defines b/debian/config/ppc64/defines
deleted file mode 100644
index 8443505197..0000000000
--- a/debian/config/ppc64/defines
+++ /dev/null
@@ -1,22 +0,0 @@
-[base]
-flavours:
- powerpc64
-default-flavour: powerpc64
-kernel-arch: powerpc
-
-[build]
-image-file: vmlinux
-
-[image]
-configs:
-suggests: mkvmlinuz, grub-ieee1275
-install-stem: vmlinux
-
-[powerpc64_description]
-hardware: 64-bit PowerPC
-
-[powerpc64_image]
-configs: kernelarch-powerpc/config-arch-64 kernelarch-powerpc/config-arch-64-be
-
-[powerpc64_packages]
-installer: true
diff --git a/debian/config/ppc64/defines.toml b/debian/config/ppc64/defines.toml
new file mode 100644
index 0000000000..157d9ec038
--- /dev/null
+++ b/debian/config/ppc64/defines.toml
@@ -0,0 +1,26 @@
+[[flavour]]
+name = 'powerpc64'
+[flavour.build]
+config = [
+  'kernelarch-powerpc/config-arch-64',
+  'kernelarch-powerpc/config-arch-64-be',
+]
+[flavour.defs]
+is_default = true
+[flavour.description]
+hardware = '64-bit PowerPC'
+[flavour.packages]
+installer = true
+
+[[featureset]]
+name = 'none'
+
+[build]
+kernel_file = 'vmlinux'
+kernel_stem = 'vmlinux'
+
+[relations.image]
+suggests = [
+  'mkvmlinuz',
+  'grub-ieee1275',
+]
diff --git a/debian/config/ppc64el/defines b/debian/config/ppc64el/defines
deleted file mode 100644
index 1fad62778e..0000000000
--- a/debian/config/ppc64el/defines
+++ /dev/null
@@ -1,22 +0,0 @@
-[base]
-flavours:
- powerpc64le
-default-flavour: powerpc64le
-kernel-arch: powerpc
-
-[build]
-image-file: vmlinux
-
-[image]
-configs:
-suggests: mkvmlinuz, grub-ieee1275
-install-stem: vmlinux
-
-[powerpc64le_description]
-hardware: Little-endian 64-bit PowerPC
-
-[powerpc64le_image]
-configs: kernelarch-powerpc/config-arch-64 kernelarch-powerpc/config-arch-64-le
-
-[powerpc64le_packages]
-installer: true
diff --git a/debian/config/ppc64el/defines.toml b/debian/config/ppc64el/defines.toml
new file mode 100644
index 0000000000..e0c43e476d
--- /dev/null
+++ b/debian/config/ppc64el/defines.toml
@@ -0,0 +1,26 @@
+[[flavour]]
+name = 'powerpc64le'
+[flavour.build]
+config = [
+  'kernelarch-powerpc/config-arch-64',
+  'kernelarch-powerpc/config-arch-64-le',
+]
+[flavour.defs]
+is_default = true
+[flavour.description]
+hardware = 'Little-endian 64-bit PowerPC'
+[flavour.packages]
+installer = true
+
+[[featureset]]
+name = 'none'
+
+[build]
+kernel_file = 'vmlinux'
+kernel_stem = 'vmlinux'
+
+[relations.image]
+suggests = [
+  'mkvmlinuz',
+  'grub-ieee1275',
+]
diff --git a/debian/config/riscv64/config b/debian/config/riscv64/config
index 3f8ff5e063..eb2f476b70 100644
--- a/debian/config/riscv64/config
+++ b/debian/config/riscv64/config
@@ -16,8 +16,10 @@ CONFIG_NUMA=y
 CONFIG_SOC_MICROCHIP_POLARFIRE=y
 CONFIG_ARCH_RENESAS=y
 CONFIG_SOC_SIFIVE=y
+CONFIG_ARCH_SOPHGO=y
 CONFIG_SOC_STARFIVE=y
 CONFIG_ARCH_SUNXI=y
+CONFIG_ARCH_THEAD=y
 CONFIG_SOC_VIRT=y
 
 ##
@@ -50,11 +52,6 @@ CONFIG_CPUFREQ_DT=m
 CONFIG_CPUFREQ_DT_PLATDEV=y
 
 ##
-## file: drivers/crypto/starfive/Kconfig
-##
-CONFIG_CRYPTO_DEV_JH7110=m
-
-##
 ## file: drivers/cxl/Kconfig
 ##
 CONFIG_CXL_BUS=y
@@ -120,6 +117,16 @@ CONFIG_INPUT_DA9063_ONKEY=m
 CONFIG_SUN50I_IOMMU=y
 
 ##
+## file: drivers/leds/Kconfig
+##
+CONFIG_LEDS_PWM=m
+
+##
+## file: drivers/leds/rgb/Kconfig
+##
+CONFIG_LEDS_PWM_MULTICOLOR=m
+
+##
 ## file: drivers/mailbox/Kconfig
 ##
 CONFIG_MAILBOX=y
@@ -191,6 +198,13 @@ CONFIG_PCIE_FU740=y
 CONFIG_PHY_SUN4I_USB=m
 
 ##
+## file: drivers/phy/starfive/Kconfig
+##
+CONFIG_PHY_STARFIVE_JH7110_DPHY_RX=m
+CONFIG_PHY_STARFIVE_JH7110_PCIE=m
+CONFIG_PHY_STARFIVE_JH7110_USB=m
+
+##
 ## file: drivers/power/reset/Kconfig
 ##
 CONFIG_POWER_RESET=y
@@ -229,11 +243,6 @@ CONFIG_RTC_DRV_POLARFIRE_SOC=m
 CONFIG_POLARFIRE_SOC_SYS_CTRL=m
 
 ##
-## file: drivers/soc/renesas/Kconfig
-##
-CONFIG_ARCH_R9A07G043=y
-
-##
 ## file: drivers/spi/Kconfig
 ##
 CONFIG_SPI_SIFIVE=m
diff --git a/debian/config/riscv64/defines b/debian/config/riscv64/defines
deleted file mode 100644
index 1d5a58b731..0000000000
--- a/debian/config/riscv64/defines
+++ /dev/null
@@ -1,15 +0,0 @@
-[base]
-kernel-arch: riscv
-featuresets:
- none
-
-[build]
-image-file: arch/riscv/boot/Image
-vdso: true
-
-[image]
-install-stem: vmlinux
-
-[riscv64_description]
-hardware: 64-bit RISC-V platforms
-hardware-long: 64-bit RISC-V platforms
diff --git a/debian/config/riscv64/defines.toml b/debian/config/riscv64/defines.toml
new file mode 100644
index 0000000000..56e2a27309
--- /dev/null
+++ b/debian/config/riscv64/defines.toml
@@ -0,0 +1,16 @@
+[[flavour]]
+name = 'riscv64'
+[flavour.defs]
+is_default = true
+[flavour.description]
+hardware = '64-bit RISC-V platforms'
+[flavour.packages]
+installer = true
+
+[[featureset]]
+name = 'none'
+
+[build]
+enable_vdso = true
+kernel_file = 'arch/riscv/boot/Image'
+kernel_stem = 'vmlinux'
diff --git a/debian/config/riscv64/none/defines b/debian/config/riscv64/none/defines
deleted file mode 100644
index b91369dc0b..0000000000
--- a/debian/config/riscv64/none/defines
+++ /dev/null
@@ -1,7 +0,0 @@
-[base]
-flavours:
- riscv64
-default-flavour: riscv64
-
-[riscv64_packages]
-installer: true
diff --git a/debian/config/s390x/config b/debian/config/s390x/config
index 4d9ffb34ed..fe01c9f905 100644
--- a/debian/config/s390x/config
+++ b/debian/config/s390x/config
@@ -88,11 +88,6 @@ CONFIG_S390_PRNG=m
 # CONFIG_MEMSTICK is not set
 
 ##
-## file: drivers/net/appletalk/Kconfig
-##
-# CONFIG_ATALK is not set
-
-##
 ## file: drivers/net/ppp/Kconfig
 ##
 # CONFIG_PPP is not set
@@ -212,6 +207,11 @@ CONFIG_SPARSEMEM_MANUAL=y
 ## end choice
 
 ##
+## file: net/appletalk/Kconfig
+##
+# CONFIG_ATALK is not set
+
+##
 ## file: net/atm/Kconfig
 ##
 # CONFIG_ATM is not set
diff --git a/debian/config/s390x/defines b/debian/config/s390x/defines
deleted file mode 100644
index 882c4e2b1f..0000000000
--- a/debian/config/s390x/defines
+++ /dev/null
@@ -1,19 +0,0 @@
-[base]
-flavours:
- s390x
-default-flavour: s390x
-kernel-arch: s390
-
-[build]
-image-file: arch/s390/boot/bzImage
-vdso: true
-
-[image]
-suggests: s390-tools
-install-stem: vmlinuz
-
-[s390x_description]
-hardware: IBM zSeries
-
-[s390x_packages]
-installer: true
diff --git a/debian/config/s390x/defines.toml b/debian/config/s390x/defines.toml
new file mode 100644
index 0000000000..ca4bd5c5e1
--- /dev/null
+++ b/debian/config/s390x/defines.toml
@@ -0,0 +1,21 @@
+[[flavour]]
+name = 's390x'
+[flavour.defs]
+is_default = true
+[flavour.description]
+hardware = 'IBM zSeries'
+[flavour.packages]
+installer = true
+
+[[featureset]]
+name = 'none'
+
+[build]
+enable_vdso = true
+kernel_file = 'arch/s390/boot/bzImage'
+kernel_stem = 'vmlinuz'
+
+[relations.image]
+suggests = [
+  's390-tools',
+]
diff --git a/debian/config/sh4/defines b/debian/config/sh4/defines
deleted file mode 100644
index 46f2633ec0..0000000000
--- a/debian/config/sh4/defines
+++ /dev/null
@@ -1,30 +0,0 @@
-[base]
-flavours:
- sh7751r
- sh7785lcr
-kernel-arch: sh
-
-[build]
-image-file: arch/sh/boot/zImage
-
-[image]
-install-stem: vmlinuz
-
-[sh7751r_description]
-hardware: sh7751r
-hardware-long: Renesas SH7751R R2D plus board
-
-[sh7751r_packages]
-installer: true
-
-[sh7785lcr_description]
-hardware: sh7785lcr
-hardware-long: Renesas SH7785 reference board
-
-[sh7785lcr_image]
-recommends: u-boot-tools
-# Kernel partition size: 4MB
-check-size: 4194304
-
-[sh7785lcr_packages]
-installer: true
diff --git a/debian/config/sh4/defines.toml b/debian/config/sh4/defines.toml
new file mode 100644
index 0000000000..cf13488dce
--- /dev/null
+++ b/debian/config/sh4/defines.toml
@@ -0,0 +1,24 @@
+[[flavour]]
+name = 'sh7751r'
+[flavour.description]
+hardware = 'sh7751r'
+hardware_long = 'Renesas SH7751R R2D plus board'
+[flavour.packages]
+installer = true
+
+[[flavour]]
+name = 'sh7785lcr'
+[flavour.description]
+hardware = 'sh7785lcr'
+hardware_long = 'Renesas SH7785 reference board'
+[flavour.packages]
+installer = true
+[flavour.relations.image]
+recommends = ['u-boot-tools']
+
+[[featureset]]
+name = 'none'
+
+[build]
+kernel_file = 'arch/sh/boot/zImage'
+kernel_stem = 'vmlinuz'
diff --git a/debian/config/sparc64/defines b/debian/config/sparc64/defines
deleted file mode 100644
index a663ddf147..0000000000
--- a/debian/config/sparc64/defines
+++ /dev/null
@@ -1,29 +0,0 @@
-[base]
-flavours:
- sparc64
- sparc64-smp
-default-flavour: sparc64-smp
-kernel-arch: sparc
-
-[build]
-image-file: vmlinux
-
-[image]
-configs:
-suggests: fdutils, grub-ieee1275
-install-stem: vmlinux
-
-[sparc64_description]
-hardware: uniprocessor 64-bit UltraSPARC
-
-[sparc64_image]
-configs: kernelarch-sparc/config-up
-
-[sparc64_packages]
-installer: true
-
-[sparc64-smp_description]
-hardware: multiprocessor 64-bit UltraSPARC
-
-[sparc64-smp_image]
-configs: kernelarch-sparc/config-smp
diff --git a/debian/config/sparc64/defines.toml b/debian/config/sparc64/defines.toml
new file mode 100644
index 0000000000..b3969e82a8
--- /dev/null
+++ b/debian/config/sparc64/defines.toml
@@ -0,0 +1,34 @@
+[[flavour]]
+name = 'sparc64'
+[flavour.build]
+config = [
+  'kernelarch-sparc/config-up',
+]
+[flavour.description]
+hardware = 'uniprocessor 64-bit UltraSPARC'
+[flavour.packages]
+installer = true
+
+[[flavour]]
+name = 'sparc64-smp'
+[flavour.build]
+config = [
+  'kernelarch-sparc/config-smp',
+]
+[flavour.defs]
+is_default = true
+[flavour.description]
+hardware = 'multiprocessor 64-bit UltraSPARC'
+
+[[featureset]]
+name = 'none'
+
+[build]
+kernel_file = 'vmlinux'
+kernel_stem = 'vmlinux'
+
+[relations.image]
+suggests = [
+  'fdutils',
+  'grub-ieee1275',
+]
diff --git a/debian/config/x32/defines b/debian/config/x32/defines
deleted file mode 100644
index 0a19846d48..0000000000
--- a/debian/config/x32/defines
+++ /dev/null
@@ -1,4 +0,0 @@
-[base]
-kernel-arch: x86
-featuresets:
-# empty; x32 must be part of a multiarch installation with an amd64 kernel