Merge branch 'next'

[AGL/meta-agl.git] / meta-agl-bsp / conf / include / agl_raspberrypi3.inc

diff --git a/meta-agl-bsp/conf/include/agl_raspberrypi3.inc b/meta-agl-bsp/conf/include/agl_raspberrypi3.inc
index 2e5f6fc..1b95828 100644 (file)
--- a/meta-agl-bsp/conf/include/agl_raspberrypi3.inc
+++ b/meta-agl-bsp/conf/include/agl_raspberrypi3.inc
@@ -2,6 +2,8 @@
 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"
 
@@ -12,8 +14,16 @@ UBOOT_MACHINE = "rpi_3_32b_config"
 
 KERNEL_IMAGETYPE = "uImage"
 
+PREFERRED_VERSION_linux-raspberrypi = "4.19%"
+RPI_KERNEL_DEVICETREE_remove_raspberrypi3 = "bcm2708-rpi-0-w.dtb"
+RPI_KERNEL_DEVICETREE_OVERLAYS_remove_raspberrypi3 = "overlays/lirc-rpi.dtbo"
+RPI_KERNEL_DEVICETREE_OVERLAYS_append_raspberrypi3 = " overlays/vc4-fkms-v3d.dtbo"
+
 MACHINE_FEATURES += "vc4graphics"
 
+# Switch to firmware KMS to support the official DSI touchscreen display
+VC4DTBO = "vc4-fkms-v3d"
+
 # For libomxil
 #LICENSE_FLAGS_WHITELIST = "commercial"
 
@@ -25,17 +35,8 @@ IMAGE_FEATURES_remove = "splash"
 # Build updatable image. Only takes effect when sota.bbclass is inherited
 DISTRO_FEATURES_append = " sota"
 
-# Add overlays for 7inch touch
-# https://github.com/k-quigley/linux/commits/rpi-4.14.y
-RPI_KERNEL_DEVICETREE_OVERLAYS_append = "\
-    overlays/rpi-backlight.dtbo \
-    overlays/rpi-7inch.dtbo \
-"
-
-
 # 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', \