3 files changed, 17 insertions, 21 deletions
diff --git a/debian/config/armel/config.rpi b/debian/config/armel/config.rpi
index 5a6bf6fb4..b87c158fc 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 6a074ca66..000000000
--- 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 000000000..4fd318e6d
--- /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'