From 6d593646babb5efbcf79ba8e012fb76bd594c5a8 Mon Sep 17 00:00:00 2001
From: Tim Orling <tim.orling@konsulko.com>
Date: Fri, 8 Mar 2024 18:40:47 -0800
Subject: [PATCH] u-boot: re-enable rapsberrypi5

With meta-lts-mixins scarthgap/u-boot we can now support raspberrypi5

Signed-off-by: Tim Orling <tim.orling@konsulko.com>
---
 conf/machine/raspberrypi5.conf       | 2 ++
 recipes-bsp/u-boot/u-boot_%.bbappend | 3 ---
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/conf/machine/raspberrypi5.conf b/conf/machine/raspberrypi5.conf
index 8c38637..e53c2d5 100644
--- a/conf/machine/raspberrypi5.conf
+++ b/conf/machine/raspberrypi5.conf
@@ -24,3 +24,5 @@ VC4DTBO ?= "vc4-kms-v3d"
 
 # "zImage" not supported on arm64 and ".gz" images not supported by bootloader yet
 KERNEL_IMAGETYPE_DIRECT ?= "Image"
+
+UBOOT_MACHINE = "rpi_arm64_config"
diff --git a/recipes-bsp/u-boot/u-boot_%.bbappend b/recipes-bsp/u-boot/u-boot_%.bbappend
index 78b3e48..e50acf5 100644
--- a/recipes-bsp/u-boot/u-boot_%.bbappend
+++ b/recipes-bsp/u-boot/u-boot_%.bbappend
@@ -12,6 +12,3 @@ do_install:append:rpi () {
     install -d ${D}${sysconfdir}
     install -m 0644 ${WORKDIR}/fw_env.config ${D}${sysconfdir}/fw_env.config
 }
-
-# Temporary avoid Raspberry Pi 5 because U-Boot has not been ported yet
-COMPATIBLE_MACHINE:raspberrypi5 = "(-)"