From 43938950246d3919921dbc0340b1d3123fa09162 Mon Sep 17 00:00:00 2001
From: Scott Murray <scott.murray@konsulko.com>
Date: Mon, 15 Apr 2024 15:45:44 -0400
Subject: Repository refreshes for Scarthgap upgrade

Upgrade more repositories to their scarthgap branches as they've
become available, and refresh to latest commits.  Also added
u-boot mixin to use with Raspberry Pi 5 builds.

Bug-AGL: SPEC-4578

Change-Id: Ie9c9d88e4848d483381211ae2d2f481f38826e32
Signed-off-by: Scott Murray <scott.murray@konsulko.com>
---
 default-floating.xml | 25 ++++++++++++++-----------
 default.xml          | 31 ++++++++++++++++---------------
 2 files changed, 30 insertions(+), 26 deletions(-)

diff --git a/default-floating.xml b/default-floating.xml
index 4b3e71a9..0747a5cf 100644
--- a/default-floating.xml
+++ b/default-floating.xml
@@ -37,16 +37,16 @@
   <!-- UPSTREAM COMPONENTS -->
 
   <!-- meta-virtualization -->
-  <project name="meta-virtualization" path="external/meta-virtualization" remote="yocto" revision="master"/>
+  <project name="meta-virtualization" path="external/meta-virtualization" remote="yocto" revision="scarthgap"/>
 
   <!-- Qt things -->
   <project name="meta-qt5/meta-qt5" path="external/meta-qt5" remote="github" revision="master"/>
 
   <!-- Security layer -->
-  <project name="meta-security" path="external/meta-security" remote="yocto" revision="master"/>
+  <project name="meta-security" path="external/meta-security" remote="yocto" revision="scarthgap"/>
 
   <!-- SELinux layer -->
-  <project name="meta-selinux" path="external/meta-selinux" remote="yocto" revision="master"/>
+  <project name="meta-selinux" path="external/meta-selinux" remote="yocto" revision="scarthgap"/>
 
   <!-- meta-codescanner - support for using CodeScanner during the build -->
   <project name="dl9pf/meta-codechecker" path="external/meta-codechecker" remote="github" revision="master"/>
@@ -55,35 +55,38 @@
   <project name="meta-spdxscanner" path="external/meta-spdxscanner" remote="yocto" revision="master"/>
 
   <!-- clang support -->
-  <project name="kraj/meta-clang" path="external/meta-clang" remote="github" revision="master"/>
+  <project name="kraj/meta-clang" path="external/meta-clang" remote="github" revision="scarthgap"/>
 
   <!-- meta-flutter -->
-  <project name="meta-flutter/meta-flutter" path="external/meta-flutter" remote="github" revision="kirkstone"/>
+  <project name="meta-flutter/meta-flutter" path="external/meta-flutter" remote="github" revision="master"/>
+  <project name="meta-flutter/workspace-automation" path="external/workspace-automation" remote="github" revision="main"/>
+
 
   <!-- BSPs -->
 
   <!-- Renesas Gen3 specific things -->
-  <project name="renesas-rcar/meta-renesas" path="bsp/meta-renesas" remote="github" revision="kirkstone-dev"/>
+  <project name="renesas-rcar/meta-renesas" path="bsp/meta-renesas" remote="github" revision="scarthgap-dev"/>
   <project name="CogentEmbedded/meta-rcar" path="bsp/meta-rcar" remote="github" revision="kirkstone-Yocto-v5.9.0"/>
   <project name="AGL/meta-agl-refhw" path="bsp/meta-agl-refhw" />
 
   <!-- consolidate on meta-freescale from git.yoctoproject.org -->
-  <project name="meta-freescale" path="bsp/meta-freescale" remote="yocto" revision="master"/>
-  <project name="Freescale/meta-freescale-3rdparty" path="bsp/meta-freescale-3rdparty" remote="github" revision="master"/>
+  <project name="meta-freescale" path="bsp/meta-freescale" remote="yocto" revision="scarthgap"/>
+  <project name="Freescale/meta-freescale-3rdparty" path="bsp/meta-freescale-3rdparty" remote="github" revision="scarthgap"/>
 
   <!-- TI Vayu / Jacinto 6 / DRA7 -->
   <project name="meta-arm" path="bsp/meta-arm" remote="yocto" revision="master"/>
-  <project name="meta-ti" path="bsp/meta-ti" remote="yocto" revision="master"/>
+  <project name="meta-ti" path="bsp/meta-ti" remote="yocto" revision="scarthgap"/>
 
-  <!-- Raspberry Pi 3, 3B+, and 4 -->
+  <!-- Raspberry Pi -->
   <project name="meta-raspberrypi" path="bsp/meta-raspberrypi" remote="yocto" revision="master"/>
+  <project name="meta-lts-mixins" path="bsp/meta-lts-mixins_u-boot" remote="yocto" revision="scarthgap/u-boot"/>
 
   <!-- Sancloud BSP layers -->
   <project name="SanCloudLtd/meta-sancloud" path="bsp/meta-sancloud" remote="github" revision="kirkstone"/>
   <project name="EmbeddedAndroid/meta-rtlwifi" path="bsp/meta-rtlwifi" remote="github" revision="master"/>
 
   <!-- meta-sifive -->
-  <project name="sifive/meta-sifive" path="bsp/meta-sifive" remote="github" revision="master"/>
+  <project name="sifive/meta-sifive" path="bsp/meta-sifive" remote="github" revision="scarthgap"/>
 
   <!-- meta-riscv for several risc boards -->
   <project name="riscv/meta-riscv" path="bsp/meta-riscv" remote="github" revision="master"/>
diff --git a/default.xml b/default.xml
index c4785560..d2893503 100644
--- a/default.xml
+++ b/default.xml
@@ -29,23 +29,23 @@
   <!-- YOCTO & OE -->
 
   <!-- Yocto/OpenEmbedded things. -->
-  <project name="poky" path="external/poky" remote="yocto" revision="78e48090b2c2aa94112b986e0948b0a981d08e7f" upstream="scarthgap" />
-  <project name="openembedded/meta-openembedded" path="external/meta-openembedded" remote="github" revision="30a5a3bb26cf80f97b0f2cc232fe2fdcc663fd11" upstream="scarthgap" />
+  <project name="poky" path="external/poky" remote="yocto" revision="eb723d4a1082b10d14554f799c6c31cee620152d" upstream="scarthgap" />
+  <project name="openembedded/meta-openembedded" path="external/meta-openembedded" remote="github" revision="6819f825caf750b4deac5d8dda1b81f3380615be" upstream="scarthgap" />
 
 
   <!-- UPSTREAM COMPONENTS -->
 
   <!-- meta-virtualization -->
-  <project name="meta-virtualization" path="external/meta-virtualization" remote="yocto" revision="7a3b0b7ae1ac1a721369ee3f7a73b40b73510099" upstream="master"/>
+  <project name="meta-virtualization" path="external/meta-virtualization" remote="yocto" revision="3ff80e14e243a2bbdbf20a61aff4115d11c2da06" upstream="scarthgap"/>
 
   <!-- Qt things -->
-  <project name="meta-qt5/meta-qt5" path="external/meta-qt5" remote="github" revision="b8e1ae8ce6140f6084388842751280b55d55988b" upstream="master"/>
+  <project name="meta-qt5/meta-qt5" path="external/meta-qt5" remote="github" revision="fe008b6174862a05de14aa350efec271631697e7" upstream="master"/>
 
   <!-- Security layer -->
-  <project name="meta-security" path="external/meta-security" remote="yocto" revision="30e755c59204cbd64c3aa12e64ab33041f6f02c0" upstream="master"/>
+  <project name="meta-security" path="external/meta-security" remote="yocto" revision="11ea91192d43d7c2b0b95a93aa63ca7e73e38034" upstream="scarthgap"/>
 
   <!-- SELinux layer -->
-  <project name="meta-selinux" path="external/meta-selinux" remote="yocto" revision="b1eddc23d6b46a403bd1548a98512b69e5ecbd7e" upstream="master"/>
+  <project name="meta-selinux" path="external/meta-selinux" remote="yocto" revision="07f3233374f013412d691732adfa2c20167a0ea0" upstream="scarthgap"/>
 
   <!-- meta-codescanner - support for using CodeScanner during the build -->
   <project name="dl9pf/meta-codechecker" path="external/meta-codechecker" remote="github" revision="38f9a4a68349b6ce32fdaa320f378991e29d09e9" upstream="master"/>
@@ -54,37 +54,38 @@
   <project name="meta-spdxscanner" path="external/meta-spdxscanner" remote="yocto" revision="8b07df1535fe1203b07fc87f8c6a1e34311e2a1d" upstream="master"/>
 
   <!-- clang support -->
-  <project name="kraj/meta-clang" path="external/meta-clang" remote="github" revision="f4a5667a6e1832c10f7228970b5966443794d751" upstream="master"/>
+  <project name="kraj/meta-clang" path="external/meta-clang" remote="github" revision="66414c17ae60e489bef9a97031323e92c247fbe1" upstream="scarthgap"/>
 
   <!-- meta-flutter -->
-  <project name="meta-flutter/meta-flutter" path="external/meta-flutter" remote="github" revision="0af7a6dee90050d5efc63b7abae235e874b5f206" upstream="master"/>
+  <project name="meta-flutter/meta-flutter" path="external/meta-flutter" remote="github" revision="6f431e743a878c738d35383c5cbabda71ba6538f" upstream="master"/>
   <project name="meta-flutter/workspace-automation" path="external/workspace-automation" remote="github" revision="418058a45eab3e1b50dd125c901f0ae4253bd472" upstream="main"/>
  
  
   <!-- BSPs -->
 
   <!-- Renesas Gen3 specific things -->
-  <project name="renesas-rcar/meta-renesas" path="bsp/meta-renesas" remote="github" revision="0e6f9a1c74a71622161e4e145b43f9f9b4f6d39a" upstream="kirkstone-dev"/>
+  <project name="renesas-rcar/meta-renesas" path="bsp/meta-renesas" remote="github" revision="0605dac7d8972740e58d08a9cf1e2040617fe1fc" upstream="scarthgap-dev"/>
   <project name="CogentEmbedded/meta-rcar" path="bsp/meta-rcar" remote="github" revision="511808a3e794ad0e35386f83d3d159c9ba48b4be" upstream="kirkstone-Yocto-v5.9.0"/>
   <project name="AGL/meta-agl-refhw" path="bsp/meta-agl-refhw" />
 
   <!-- consolidate on meta-freescale from git.yoctoproject.org -->
-  <project name="meta-freescale" path="bsp/meta-freescale" remote="yocto" revision="da46cb6c07ff25a000840b695627a326b0d4085a" upstream="master"/>
-  <project name="Freescale/meta-freescale-3rdparty" path="bsp/meta-freescale-3rdparty" remote="github" revision="ae392bf4c9b9499234cb4a3411624a4177237af2" upstream="master"/>
+  <project name="meta-freescale" path="bsp/meta-freescale" remote="yocto" revision="19ffbd1a6bf1caadbc23b09415985d73c1827828" upstream="scarthgap"/>
+  <project name="Freescale/meta-freescale-3rdparty" path="bsp/meta-freescale-3rdparty" remote="github" revision="8b61684f0b1ba8bacdf3a69d993445e9791d4932" upstream="scarthgap"/>
 
   <!-- TI Vayu / Jacinto 6 / DRA7 -->
   <project name="meta-arm" path="bsp/meta-arm" remote="yocto" revision="c93a1459dafa86a0bef346e95f688e7c32bc5eef" upstream="master"/>
-  <project name="meta-ti" path="bsp/meta-ti" remote="yocto" revision="0584bef40f3806613d0d2c3ff0c990705cba3a5b" upstream="master"/>
+  <project name="meta-ti" path="bsp/meta-ti" remote="yocto" revision="5c049dcb30d7a644333762198771d7fd3795b686" upstream="scarthgap"/>
 
-  <!-- Raspberry Pi 4 -->
-  <project name="meta-raspberrypi" path="bsp/meta-raspberrypi" remote="yocto" revision="d88e625cf2d12adc3aba03567b7f9f639ba5f129" upstream="master"/>
+  <!-- Raspberry Pi -->
+  <project name="meta-raspberrypi" path="bsp/meta-raspberrypi" remote="yocto" revision="1879cb831f4ea3e532cb5ce9fa0f32be917e8fa3" upstream="master"/>
+  <project name="meta-lts-mixins" path="bsp/meta-lts-mixins_u-boot" remote="yocto" revision="66ceeebd047d7fdfc8668b300319a76da8ae257d" upstream="scarthgap/u-boot"/>
 
   <!-- Sancloud BSP layers -->
   <project name="SanCloudLtd/meta-sancloud" path="bsp/meta-sancloud" remote="github" revision="7eb9a421f547e347c9da23463734758568e13f95" upstream="kirkstone"/>
   <project name="EmbeddedAndroid/meta-rtlwifi" path="bsp/meta-rtlwifi" remote="github" revision="032a394e7569d1254cd17a0358475b986e64a5a4" upstream="master"/>
 
   <!-- meta-sifive -->
-  <project name="sifive/meta-sifive" path="bsp/meta-sifive" remote="github" revision="b2678e67b079b4fb233bed4eb9b70a46b5bb06a7" upstream="master"/>
+  <project name="sifive/meta-sifive" path="bsp/meta-sifive" remote="github" revision="b2678e67b079b4fb233bed4eb9b70a46b5bb06a7" upstream="scarthgap"/>
 
   <!-- meta-riscv for several risc boards -->
   <project name="riscv/meta-riscv" path="bsp/meta-riscv" remote="github" revision="c1c671a97025941f7ec4d98e586f357f126e9379" upstream="master"/>
-- 
cgit 1.2.3-korg