From 66e1a6f39ca640f8e8e909c64cf3158f8f9b7633 Mon Sep 17 00:00:00 2001 From: Scott Murray Date: Tue, 4 Jun 2024 11:30:20 -0400 Subject: [PATCH] meta-agl-bsp: update raspberrypi5 template Update the raspberrypi5 template .inc file to drop the extra U-Boot enabling configuration, as those tweaks are now available in the new scarthgap branch in meta-raspberrypi. Bug-AGL: SPEC-5164 Change-Id: Ib65d2b722ea6274b32061262d780c80436fac036 Signed-off-by: Scott Murray Reviewed-on: https://gerrit.automotivelinux.org/gerrit/c/AGL/meta-agl/+/29974 Tested-by: Jan-Simon Moeller Reviewed-by: Jan-Simon Moeller --- meta-agl-bsp/conf/include/agl_raspberrypi5.inc | 8 -------- 1 file changed, 8 deletions(-) diff --git a/meta-agl-bsp/conf/include/agl_raspberrypi5.inc b/meta-agl-bsp/conf/include/agl_raspberrypi5.inc index 212c9ff1b..4db5bb762 100644 --- a/meta-agl-bsp/conf/include/agl_raspberrypi5.inc +++ b/meta-agl-bsp/conf/include/agl_raspberrypi5.inc @@ -7,14 +7,6 @@ OSTREE_KERNEL_ARGS:sota:append = " cma=256M" # use u-boot always RPI_USE_U_BOOT = "1" -# Re-enable U-Boot for raspberrypi5 here until upstream is fixed. -# Note that this assumes the use of scarthgap/u-boot meta-lts-mixins -# branch. -UBOOT_MACHINE = "rpi_arm64_config" -COMPATIBLE_MACHINE:pn-u-boot:forcevariable = "" -KERNEL_IMAGETYPE_UBOOT ?= "Image" -KERNEL_BOOTCMD ?= "booti" - # Use UART for serial console ENABLE_UART ?= "1" -- 2.16.6