1 files changed, 17 insertions, 2 deletions

diff --git a/conf/distro/sota.conf.inc b/conf/distro/sota.conf.inc
index c7f8cde..ccbb0e4 100644
--- a/conf/distro/sota.conf.inc
+++ b/conf/distro/sota.conf.inc
@@ -1,7 +1,7 @@
-IMAGE_INSTALL_append_sota = " rvi-sota-client"
+IMAGE_INSTALL_append = " rvi-sota-client"
 
 # live image for OSTree-enabled systems
-IMAGE_CLASSES_append_sota = "image_types_ostree image_types_ota"
+IMAGE_CLASSES_append = " image_types_ostree image_types_ota"
 IMAGE_FSTYPES += "ostreepush otaimg"
 
 # Please redefine OSTREE_REPO in order to have a persistent OSTree repo
@@ -10,3 +10,18 @@ OSTREE_BRANCHNAME ?= "ota-${MACHINE}"
 OSTREE_OSNAME ?= "poky"
 OSTREE_INITRAMFS_IMAGE ?= "initramfs-ostree-image"
 
+# Platform-specific configuration
+IMAGE_CLASSES_append_raspberrypi2 = " image_types_uboot sdcard_image-rpi-ota"
+IMAGE_CLASSES_append_raspberrypi3 = " image_types_uboot sdcard_image-rpi-ota"
+IMAGE_FSTYPES += "${@'rpi-sdimg-ota' if d.getVar('MACHINE', True).startswith('raspberrypi') else ''}"
+IMAGE_FSTYPES_remove = "rpi-sdimg"
+
+KERNEL_IMAGETYPE_raspberrypi2 = "uImage"
+KERNEL_IMAGETYPE_raspberrypi3 = "uImage"
+
+UBOOT_MACHINE_raspberrypi2 = "rpi_2_defconfig"
+UBOOT_MACHINE_raspberrypi3 = "rpi_3_32b_defconfig"
+PREFERRED_PROVIDER_virtual/bootloader_raspberrypi2 = "u-boot"
+PREFERRED_PROVIDER_virtual/bootloader_raspberrypi3 = "u-boot"
+
+DISTROOVERRIDES_append = ":sota"