From 8cbc19209faa399e89db25b28bd42b2877ccbd2f Mon Sep 17 00:00:00 2001
From: Mattijs Korpershoek <mkorpershoek@baylibre.com>
Date: Tue, 20 Aug 2024 15:45:02 +0200
Subject: [PATCH] bootloaders: Use ti-u-boot-2024.04 by default

We temporarily had 2 set of support bootloaders:
- 2023.04
- 2024.04

Now that the SDK 10.0 release is out, remove the 2023.04 U-Boot
and use 2024.04 by default.

Signed-off-by: Mattijs Korpershoek <mkorpershoek@baylibre.com>
---
 bootloaders-next.xml | 14 --------------
 bootloaders.xml      |  2 +-
 2 files changed, 1 insertion(+), 15 deletions(-)
 delete mode 100644 bootloaders-next.xml

diff --git a/bootloaders-next.xml b/bootloaders-next.xml
deleted file mode 100644
index ad03c88..0000000
--- a/bootloaders-next.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<manifest>
-    <remote name="baylibre" fetch="ssh://git@gitlab.baylibre.com/baylibre/ti" />
-    <remote name="ti" fetch="git://git.ti.com/" />
-    <remote name="github" fetch="https://github.com/" />
-
-    <project name="android/bootloader/build-bootloaders.git" path="build" remote="baylibre" revision="integ/ti-u-boot-2024.04" />
-    <project name="ti-u-boot" path="u-boot" remote="baylibre" revision="integ/ti-u-boot-2024.04" />
-    <project name="atf/arm-trusted-firmware.git" path="arm-trusted-firmware" remote="ti" revision="refs/tags/09.02.00.009" clone-depth="1" />
-    <project name="OP-TEE/optee_os.git" path="optee-os" remote="github" revision="refs/tags/4.2.0" />
-    <project name="OP-TEE/optee_test.git" path="optee-ta/optee_test" remote="github" revision="refs/tags/4.2.0" />
-    <project name="android/aosp/external/kmgk.git" path="optee-ta/kmgk" remote="baylibre" revision="ti-android-14"/>
-    <project name="processor-firmware/ti-linux-firmware.git" path="ti-linux-firmware" remote="ti" revision="refs/tags/10.00.06" clone-depth="1"/>
-</manifest>
diff --git a/bootloaders.xml b/bootloaders.xml
index fa4e3d8..f7dd69e 100644
--- a/bootloaders.xml
+++ b/bootloaders.xml
@@ -5,7 +5,7 @@
     <remote name="github" fetch="https://github.com/" />
 
     <project name="android/bootloader/build-bootloaders.git" path="build" remote="baylibre" revision="ti-android-14" />
-    <project name="ti-u-boot" path="u-boot" remote="baylibre" revision="integ/ti-u-boot-2023.04" />
+    <project name="ti-u-boot" path="u-boot" remote="baylibre" revision="integ/ti-u-boot-2024.04" />
     <project name="atf/arm-trusted-firmware.git" path="arm-trusted-firmware" remote="ti" revision="refs/tags/09.02.00.009" clone-depth="1" />
     <project name="OP-TEE/optee_os.git" path="optee-os" remote="github" revision="refs/tags/4.2.0" />
     <project name="OP-TEE/optee_test.git" path="optee-ta/optee_test" remote="github" revision="refs/tags/4.2.0" />
-- 
GitLab