2 files changed, 40 insertions, 17 deletions
diff --git a/templates/machine/raspberrypi2/50_local.conf.inc b/templates/machine/raspberrypi2/50_local.conf.inc
index dad7c69d4..5543e8465 100644
--- a/templates/machine/raspberrypi2/50_local.conf.inc
+++ b/templates/machine/raspberrypi2/50_local.conf.inc
@@ -1,17 +1,16 @@
 MACHINE = "raspberrypi2"
 
-GPU_MEM = "128"
+#GPU_MEM = "512"
+# Increase GPU_MEM for AGL apps (navi/poi)
+GPU_MEM = "640"
+
+ENABLE_CMA = "1"
+CMA_LWM = "16"
+CMA_HWM = "32"
 
 CORE_IMAGE_EXTRA_INSTALL += "wayland weston"
 
 MULTI_PROVIDER_WHITELIST += "virtual/libgl virtual/egl virtual/libgles1 virtual/libgles2"
-IMAGE_CLASSES += "sdcard_image-rpi-gdp"
-IMAGE_FSTYPES += "tar.bz2 ext3 rpi-sdimg"
-IMAGE_CLASSES_append_sota = " image_types_uboot sdcard_image-rpi-ota"
-IMAGE_CLASSES_remove_sota = " sdcard_image-rpi-gdp"
-IMAGE_FSTYPES += "${@bb.utils.contains('DISTRO_FEATURES', 'agl-ota', 'rpi-sdimg-ota', '', d)}"
-IMAGE_FSTYPES_remove_sota = "rpi-sdimg"
-IMAGE_FSTYPES_remove_sota = "rpi-sdimg"
 
 KERNEL_DEVICETREE_append = " overlays/vc4-kms-v3d-overlay.dtb"
 KERNEL_IMAGETYPE_sota = "uImage"
@@ -24,7 +23,25 @@ PREFERRED_PROVIDER_virtual/libgl = "mesa"
 PREFERRED_PROVIDER_virtual/mesa = "mesa"
 PREFERRED_PROVIDER_jpeg = "jpeg"
 
-UBOOT_MACHINE_sota = "rpi_3_32b_defconfig"
+MACHINE_FEATURES += "vc4graphics"
+
+### Image classes, fstypes and (S)OTA
+
+# normal image class is sdcard_image-rpi-gdp, for sota it is image_types_uboot & sdcard_image-rpi-ota
+IMAGE_CLASSES += "${@bb.utils.contains('DISTRO_FEATURES', 'agl-ota', 'image_types_uboot sdcard_image-rpi-ota', 'sdcard_image-rpi-gdp', d)}"
+
+# normal image is rpi-sdimg, for sota it is rpi-sdimg-ota
+#IMAGE_FSTYPES += "${@bb.utils.contains('DISTRO_FEATURES', 'agl-ota', 'rpi-sdimg-ota', 'rpi-sdimg', d)}"
+### both rpi-sdimg and rpi-sdimg-ota broken
+
+KERNEL_IMAGETYPE_sota = "uImage"
 PREFERRED_PROVIDER_virtual/bootloader_sota = "u-boot"
+UBOOT_MACHINE_sota = "rpi_2_defconfig"
+
 # For libomxil
 #LICENSE_FLAGS_WHITELIST = "commercial"
+
+IMAGE_INSTALL_append = " kernel-modules linux-firmware "
+
+# Psplash causes crash on first boot on RPi
+IMAGE_FEATURES_remove = "splash"
diff --git a/templates/machine/raspberrypi3/50_local.conf.inc b/templates/machine/raspberrypi3/50_local.conf.inc
index 64c9768fa..e7f932d9b 100644
--- a/templates/machine/raspberrypi3/50_local.conf.inc
+++ b/templates/machine/raspberrypi3/50_local.conf.inc
@@ -11,13 +11,6 @@ CMA_HWM = "32"
 CORE_IMAGE_EXTRA_INSTALL += "wayland weston"
 
 MULTI_PROVIDER_WHITELIST += "virtual/libgl virtual/egl virtual/libgles1 virtual/libgles2"
-IMAGE_CLASSES += "sdcard_image-rpi-gdp"
-IMAGE_FSTYPES += "tar.bz2 ext3 rpi-sdimg"
-IMAGE_CLASSES_append_sota = " image_types_uboot sdcard_image-rpi-ota"
-IMAGE_CLASSES_remove_sota = " sdcard_image-rpi-gdp"
-IMAGE_FSTYPES += "${@bb.utils.contains('DISTRO_FEATURES', 'agl-ota', 'rpi-sdimg-ota  ', '', d)}"
-IMAGE_FSTYPES_remove_sota = "rpi-sdimg"
-IMAGE_FSTYPES_remove_sota = "rpi-sdimg"
 
 KERNEL_DEVICETREE_append = " overlays/vc4-kms-v3d-overlay.dtb"
 KERNEL_IMAGETYPE_sota = "uImage"
@@ -30,8 +23,21 @@ PREFERRED_PROVIDER_virtual/libgl = "mesa"
 PREFERRED_PROVIDER_virtual/mesa = "mesa"
 PREFERRED_PROVIDER_jpeg = "jpeg"
 
-UBOOT_MACHINE_sota = "rpi_3_32b_defconfig"
+MACHINE_FEATURES += "vc4graphics"
+
+### Image classes, fstypes and (S)OTA
+
+# normal image class is sdcard_image-rpi-gdp, for sota it is image_types_uboot & sdcard_image-rpi-ota
+IMAGE_CLASSES += "${@bb.utils.contains('DISTRO_FEATURES', 'agl-ota', 'image_types_uboot sdcard_image-rpi-ota', 'sdcard_image-rpi-gdp', d)}"
+
+# normal image is rpi-sdimg, for sota it is rpi-sdimg-ota
+#IMAGE_FSTYPES += "${@bb.utils.contains('DISTRO_FEATURES', 'agl-ota', 'rpi-sdimg-ota', 'rpi-sdimg', d)}"
+### both rpi-sdimg and rpi-sdimg-ota broken
+
+KERNEL_IMAGETYPE_sota = "uImage"
 PREFERRED_PROVIDER_virtual/bootloader_sota = "u-boot"
+UBOOT_MACHINE_sota = "rpi_3_32b_defconfig"
+
 # For libomxil
 #LICENSE_FLAGS_WHITELIST = "commercial"