5 files changed, 37 insertions, 41 deletions
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