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 <scott.murray@konsulko.com>
Reviewed-on: https://gerrit.automotivelinux.org/gerrit/c/AGL/meta-agl/+/29974
Tested-by: Jan-Simon Moeller <jsmoeller@linuxfoundation.org>
Reviewed-by: Jan-Simon Moeller <jsmoeller@linuxfoundation.org>

diff --git a/meta-agl-bsp/conf/include/agl_raspberrypi5.inc b/meta-agl-bsp/conf/include/agl_raspberrypi5.inc
index 212c9ff..4db5bb7 100644 (file)
--- 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"