summaryrefslogtreecommitdiffstats
path: root/meta-agl-bsp/conf/include/agl_raspberrypi3.inc
diff options
context:
space:
mode:
authorJan-Simon Möller <jsmoeller@linuxfoundation.org>2020-05-11 19:32:45 +0200
committerJan-Simon Moeller <jsmoeller@linuxfoundation.org>2020-05-12 23:50:18 +0000
commit9ebcdd9ea2144c7112accd9b2a1a56ae7fea4449 (patch)
treea47c6b4c974cc2f3c59ed176af66bf0752b274f4 /meta-agl-bsp/conf/include/agl_raspberrypi3.inc
parent4ee8c933aa9726f0493ead14b4e1c97a0844ec28 (diff)
Update Raspberry Pi (3/4) templates to match meta-raspberrypi configuration
Update the templates to use the updated flags and configuration present in meta-raspberrypi. The previous template did not properly pull-in the u-boot fragments for the RPI4. v4: the MACHINE in the AGL template for the RPI4 is now 'raspberrypi4-64' as in upstream. CI will get support-patches through releng-scripts. Bug-AGL: SPEC-3368 Signed-off-by: Jan-Simon Möller <jsmoeller@linuxfoundation.org> Change-Id: Ia2acb54516464d433c64adfc7ba832ccfdf899c3
Diffstat (limited to 'meta-agl-bsp/conf/include/agl_raspberrypi3.inc')
-rw-r--r--meta-agl-bsp/conf/include/agl_raspberrypi3.inc36
1 files changed, 7 insertions, 29 deletions
diff --git a/meta-agl-bsp/conf/include/agl_raspberrypi3.inc b/meta-agl-bsp/conf/include/agl_raspberrypi3.inc
index 1b958289d..a4989b79a 100644
--- a/meta-agl-bsp/conf/include/agl_raspberrypi3.inc
+++ b/meta-agl-bsp/conf/include/agl_raspberrypi3.inc
@@ -1,29 +1,20 @@
# Maximum memory allowed to be assigned
-GPU_MEM = "128"
+GPU_MEM = "256"
-ENABLE_CMA = "1"
# Add CMA to the kernel arguments for SOTA
OSTREE_KERNEL_ARGS_sota_append = " cma=256M"
-CMA_LWM = "16"
-CMA_HWM = "32"
-MULTI_PROVIDER_WHITELIST += "virtual/libgl virtual/egl virtual/libgles1 virtual/libgles2"
+#MULTI_PROVIDER_WHITELIST += "virtual/libgl virtual/egl virtual/libgles1 virtual/libgles2"
-# The correct config for a Raspberry Pi 3 in 32bit mode
-UBOOT_MACHINE = "rpi_3_32b_config"
+# use u-boot always
+RPI_USE_U_BOOT = "1"
-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"
+#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"
@@ -34,16 +25,3 @@ IMAGE_FEATURES_remove = "splash"
# 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"
-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)} \
- "