X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=meta-agl-bsp%2Fconf%2Finclude%2Fagl_raspberrypi3.inc;h=cc30748583bed128c7e7126a63a34cf8b4b34bd5;hb=2e378b64235957e1c75cd0482049f9e2547ccb12;hp=24077f02a9f3a6d0861349bd35680e65418de780;hpb=521815fa95dba3d47704b62b4b6911fc994ad4c8;p=AGL%2Fmeta-agl.git

diff --git a/meta-agl-bsp/conf/include/agl_raspberrypi3.inc b/meta-agl-bsp/conf/include/agl_raspberrypi3.inc
index 24077f02a..cc3074858 100644
--- a/meta-agl-bsp/conf/include/agl_raspberrypi3.inc
+++ b/meta-agl-bsp/conf/include/agl_raspberrypi3.inc
@@ -1,34 +1,42 @@
-#GPU_MEM = "512"
-# Increase GPU_MEM for AGL apps (navi/poi)
-GPU_MEM = "640"
+# Maximum memory allowed to be assigned
+GPU_MEM = "128"
 
 ENABLE_CMA = "1"
+# Add CMA to the kernel arguments for SOTA
+OSTREE_KERNEL_ARGS_sota_append = " cma=256M"
 CMA_LWM = "16"
 CMA_HWM = "32"
 
-CORE_IMAGE_EXTRA_INSTALL += "wayland weston"
-
 MULTI_PROVIDER_WHITELIST += "virtual/libgl virtual/egl virtual/libgles1 virtual/libgles2"
 
-KERNEL_DEVICETREE_append = " overlays/vc4-kms-v3d-overlay.dtb"
-KERNEL_IMAGETYPE_sota = "uImage"
-PREFERRED_VERSION_linux-raspberrypi = "4.4.%"
-PREFERRED_VERSION_mesa = "12.%"
+# The correct config for a Raspberry Pi 3 in 32bit mode
+UBOOT_MACHINE = "rpi_3_32b_config"
 
-PREFERRED_PROVIDER_virtual/egl = "mesa"
-PREFERRED_PROVIDER_virtual/libgles2 = "mesa"
-PREFERRED_PROVIDER_virtual/libgl = "mesa"
-PREFERRED_PROVIDER_virtual/mesa = "mesa"
-PREFERRED_PROVIDER_jpeg = "jpeg"
+KERNEL_IMAGETYPE = "uImage"
 
 MACHINE_FEATURES += "vc4graphics"
 
 # For libomxil
 #LICENSE_FLAGS_WHITELIST = "commercial"
 
-IMAGE_INSTALL_append = " kernel-modules linux-firmware "
+IMAGE_INSTALL_append = " kernel-modules linux-firmware-rpidistro-bcm43430 linux-firmware-rpidistro-bcm43455 create-combined-dtb "
 
 # Psplash causes crash on first boot on RPi
 IMAGE_FEATURES_remove = "splash"
 
-include conf/include/local/sota_raspberrypi.inc
+# Build updatable image. Only takes effect when sota.bbclass is inherited
+DISTRO_FEATURES_append = " sota"
+
+# Create WIC images to write to SD cards.
+WKS_FILE = "sdimage-raspberrypi.wks"
+AGL_EXTRA_IMAGE_FSTYPES = "wic.xz wic.bmap wic.xz.sha256sum"
+IMAGE_BOOT_FILES = "bcm2835-bootfiles/* \
+                 ${@make_dtb_boot_files(d)} \
+                 ${@bb.utils.contains('KERNEL_IMAGETYPE', 'uImage', \
+                    '${KERNEL_IMAGETYPE} u-boot.bin;${SDIMG_KERNELIMAGE} boot.scr', \
+                    '${KERNEL_IMAGETYPE};${SDIMG_KERNELIMAGE}', d)} \
+                 "
+do_image_wic[depends] += " \
+    bcm2835-bootfiles:do_deploy \
+    ${@bb.utils.contains('KERNEL_IMAGETYPE', 'uImage', 'u-boot:do_deploy', '',d)} \
+    "