4 files changed, 35 insertions, 32 deletions
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