From 9ebcdd9ea2144c7112accd9b2a1a56ae7fea4449 Mon Sep 17 00:00:00 2001 From: Jan-Simon Möller Date: Mon, 11 May 2020 19:32:45 +0200 Subject: Update Raspberry Pi (3/4) templates to match meta-raspberrypi configuration MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Change-Id: Ia2acb54516464d433c64adfc7ba832ccfdf899c3 --- meta-agl-bsp/conf/include/agl_raspberrypi3.inc | 36 +++++--------------------- meta-agl-bsp/conf/include/agl_raspberrypi4.inc | 19 ++++++++++++++ 2 files changed, 26 insertions(+), 29 deletions(-) create mode 100644 meta-agl-bsp/conf/include/agl_raspberrypi4.inc (limited to 'meta-agl-bsp/conf/include') 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)} \ - " diff --git a/meta-agl-bsp/conf/include/agl_raspberrypi4.inc b/meta-agl-bsp/conf/include/agl_raspberrypi4.inc new file mode 100644 index 000000000..b91c330f2 --- /dev/null +++ b/meta-agl-bsp/conf/include/agl_raspberrypi4.inc @@ -0,0 +1,19 @@ +# Maximum memory allowed to be assigned +GPU_MEM = "256" + +# Add CMA to the kernel arguments for SOTA +OSTREE_KERNEL_ARGS_sota_append = " cma=256M" + +# use u-boot always +RPI_USE_U_BOOT = "1" + +# For libomxil +#LICENSE_FLAGS_WHITELIST = "commercial" + +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" + +# Build updatable image. Only takes effect when sota.bbclass is inherited +DISTRO_FEATURES_append = " sota" -- cgit 1.2.3-korg