1 files changed, 5 insertions, 7 deletions

diff --git a/conf/include/local/sota_raspberrypi.inc b/conf/include/local/sota_raspberrypi.inc
index 51919f0..ae13b8e 100644
--- a/conf/include/local/sota_raspberrypi.inc
+++ b/conf/include/local/sota_raspberrypi.inc
@@ -1,16 +1,14 @@
 MACHINE ?= "raspberrypi3"
 
-# normal image class is sdcard_image-rpi-gdp, for sota it is image_types_uboot & sdcard_image-rpi-ota
-IMAGE_CLASSES += "image_types_uboot sdcard_image-rpi-ota"
+IMAGE_CLASSES += "${@bb.utils.contains('DISTRO_FEATURES', 'sota', 'image_types_uboot sdcard_image-rpi-ota', '', d)}"
+IMAGE_FSTYPES += "${@bb.utils.contains('DISTRO_FEATURES', 'sota', 'rpi-sdimg-ota', 'rpi-sdimg', d)}"
 
-# normal image is rpi-sdimg, for sota it is rpi-sdimg-ota
-IMAGE_FSTYPES += "rpi-sdimg-ota"
 ### both rpi-sdimg and rpi-sdimg-ota broken
 IMAGE_FSTYPES += "ext4.xz ext4.bmap tar.xz"
 
 KERNEL_IMAGETYPE_sota = "uImage"
-PREFERRED_PROVIDER_virtual/bootloader = "u-boot"
-UBOOT_MACHINE_raspberrypi2 = "rpi_2_defconfig"
-UBOOT_MACHINE_raspberrypi3 = "rpi_3_32b_defconfig"
+PREFERRED_PROVIDER_virtual/bootloader_sota ?= "u-boot"
+UBOOT_MACHINE_raspberrypi2_sota ?= "rpi_2_defconfig"
+UBOOT_MACHINE_raspberrypi3_sota ?= "rpi_3_32b_defconfig"
 
 OSTREE_BOOTLOADER ?= "u-boot"