From 3f32af24f16cb634e69a001a35ba2c049ee5a97e Mon Sep 17 00:00:00 2001
From: Scott Murray <scott.murray@konsulko.com>
Date: Fri, 26 Apr 2024 10:35:31 -0400
Subject: [PATCH 1/2] Update to YP 5.0 aka scarthgap

Update default manifests with repository configurations from 'next'
branch to switch to the upstream 5.0 / scarthgap compatible branches.
This aligns us with the final 5.0 release that should happen soon.

Bug-AGL: SPEC-4578

Change-Id: I7d53788d1ca363b7bc9e6ce574220e694c268711
Signed-off-by: Scott Murray <scott.murray@konsulko.com>
---
 default-floating.xml | 46 ++++++++++++++++++++++++----------------------
 default.xml          | 50 +++++++++++++++++++++++++++-----------------------
 2 files changed, 51 insertions(+), 45 deletions(-)

diff --git a/default-floating.xml b/default-floating.xml
index 322c0731..bd455da8 100644
--- a/default-floating.xml
+++ b/default-floating.xml
@@ -30,24 +30,23 @@
   <!-- YOCTO & OE -->
 
   <!-- Yocto/OpenEmbedded things. -->
-  <project name="poky" path="external/poky" remote="yocto" revision="kirkstone" />
-  <project name="openembedded/meta-openembedded" path="external/meta-openembedded" remote="github" revision="kirkstone" />
-  <project name="meta-lts-mixins" path="external/meta-lts-mixins_rust" remote="yocto" revision="kirkstone/rust" />
+  <project name="poky" path="external/poky" remote="yocto" revision="scarthgap" />
+  <project name="openembedded/meta-openembedded" path="external/meta-openembedded" remote="github" revision="scarthgap" />
 
 
   <!-- UPSTREAM COMPONENTS -->
 
   <!-- meta-virtualization -->
-  <project name="meta-virtualization" path="external/meta-virtualization" remote="yocto" revision="kirkstone"/>
+  <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="kirkstone"/>
+  <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="kirkstone"/>
+  <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="kirkstone"/>
+  <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"/>
@@ -56,43 +55,46 @@
   <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="kirkstone"/>
+  <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"/>
 
   <!-- meta-tensorflow -->
-  <project name="meta-tensorflow" path="external/meta-tensorflow" remote="yocto" revision="kirkstone"/>
+  <project name="meta-tensorflow" path="external/meta-tensorflow" remote="yocto" revision="master"/>
 
-  <!-- meta-aws -->
-  <project name="aws4embeddedlinux/meta-aws" path="external/meta-aws" remote="github" revision="kirkstone"/>
 
   <!-- BSPs -->
 
   <!-- meta-aws -->
-  <project name="aws4embeddedlinux/meta-aws" path="bsp/meta-aws" remote="github" revision="kirkstone"/>
+  <project name="aws4embeddedlinux/meta-aws" path="bsp/meta-aws" remote="github" revision="master"/>
 
   <!-- 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="kirkstone"/>
-  <project name="Freescale/meta-freescale-3rdparty" path="bsp/meta-freescale-3rdparty" remote="github" revision="kirkstone"/>
+  <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="kirkstone"/>
-  <project name="meta-ti" path="bsp/meta-ti" remote="yocto" revision="kirkstone"/>
+  <project name="meta-arm" path="bsp/meta-arm" remote="yocto" revision="master"/>
+  <project name="meta-ti" path="bsp/meta-ti" remote="yocto" revision="scarthgap"/>
 
-  <!-- Raspberry Pi 3, 3B+, and 4 -->
-  <project name="meta-raspberrypi" path="bsp/meta-raspberrypi" remote="yocto" revision="kirkstone"/>
+  <!-- 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"/>
 
-  <!-- Sifive BSP -->
-  <project name="dl9pf/meta-sifive" path="bsp/meta-sifive" remote="github" revision="master"/>
+  <!-- meta-sifive -->
+  <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"/>
 
 </manifest>
diff --git a/default.xml b/default.xml
index 50cd2ec5..8e6f6995 100644
--- a/default.xml
+++ b/default.xml
@@ -29,67 +29,71 @@
   <!-- YOCTO & OE -->
 
   <!-- Yocto/OpenEmbedded things. -->
-  <project name="poky" path="external/poky" remote="yocto" revision="54af8c5e80ebf63707ef4e51cc9d374f716da603" upstream="kirkstone" />
-  <project name="openembedded/meta-openembedded" path="external/meta-openembedded" remote="github" revision="8609de00952d65bb813a48c535c937324efeb18a" upstream="kirkstone" />
-  <project name="meta-lts-mixins" path="external/meta-lts-mixins_rust" remote="yocto" revision="1a6746a81da4d5bf2e5640fd2fa8f3ea453d40bf" upstream="kirkstone/rust" />
+  <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="7902664f89678164b7fc90d421cee74cbec51cdf" upstream="kirkstone"/>
+  <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="fe0bf7f0e5408aac6cc89ff3b19b1b1941df4f64" upstream="kirkstone"/>
+  <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="1a3e42cedbd94ca73be45800d0e902fec35d0f0f" upstream="kirkstone"/>
+  <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="a401f4b2816a0b41ce8d9351542658c721935bcd" upstream="kirkstone"/>
+  <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="f27a46feb2291d333744850a82d5c8af303e3bd5" upstream="master"/>
+  <project name="dl9pf/meta-codechecker" path="external/meta-codechecker" remote="github" revision="38f9a4a68349b6ce32fdaa320f378991e29d09e9" upstream="master"/>
 
   <!-- meta-spdxscanner - support for fossology -->
-  <project name="meta-spdxscanner" path="external/meta-spdxscanner" remote="yocto" revision="25373bc58ece8b6f07680a103b4a1bbbc99e0db1" upstream="master"/>
+  <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="312ff1c39b1bf5d35c0321e873417eb013cea477" upstream="kirkstone"/>
+  <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="8ace6f2c5d3c634e9c3f49b267e170aa4ba86ee4" upstream="kirkstone"/>
+  <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"/>
 
   <!-- meta-tensorflow -->
-  <project name="meta-tensorflow" path="external/meta-tensorflow" remote="yocto" revision="ec20e19319f9eb89ceadc04923cc5bc75e865692" upstream="kirkstone"/>
+  <project name="meta-tensorflow" path="external/meta-tensorflow" remote="yocto" revision="29509c97e9009ed0ae99ce6c2554e463575dc10c" upstream="master"/>
+
 
   <!-- BSPs -->
 
   <!-- meta-aws -->
-  <project name="aws4embeddedlinux/meta-aws" path="bsp/meta-aws" remote="github" revision="a1aec268e6935a1bf7c7cae5166491551bdade5d" upstream="kirkstone"/>
+  <project name="aws4embeddedlinux/meta-aws" path="bsp/meta-aws" remote="github" revision="b7df61417aaf741260044e4f246844608ee33900" upstream="master"/>
 
   <!-- Renesas Gen3 specific things -->
-  <project name="renesas-rcar/meta-renesas" path="bsp/meta-renesas" remote="github" revision="11221be7ff3a535f17357bc8ac7e2851d0e8ff02" 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="710e55d529c86d15a93c4421365ef62eb601a49b" upstream="kirkstone"/>
-  <project name="Freescale/meta-freescale-3rdparty" path="bsp/meta-freescale-3rdparty" remote="github" revision="9e94b64bdfebcf7bfdf2af6447cec866a4efa814" upstream="kirkstone"/>
+  <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="b187fb9232ca0a6b5f8f90b4715958546fc41d73" upstream="kirkstone"/>
-  <project name="meta-ti" path="bsp/meta-ti" remote="yocto" revision="8899ce3b9ee450ea55ba33786facf08b59100cce" upstream="kirkstone"/>
+  <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="5c049dcb30d7a644333762198771d7fd3795b686" upstream="scarthgap"/>
 
-  <!-- Raspberry Pi 4 -->
-  <project name="meta-raspberrypi" path="bsp/meta-raspberrypi" remote="yocto" revision="9dc6673d41044f1174551120ce63501421dbcd85" upstream="kirkstone"/>
+  <!-- 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="e1a23019ce2ff3879986fa63071f1a2caa23697c" upstream="kirkstone"/>
+  <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"/>
 
-  <!-- Sifive BSP -->
-  <project name="dl9pf/meta-sifive" path="bsp/meta-sifive" remote="github" revision="80a979fd222623b56e44493cf92bd9e276a65453" upstream="master"/>
+  <!-- meta-sifive -->
+  <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"/>
 
 </manifest>
-- 
2.16.6


From d0d7d030f7a408bd6bf1ce90462d20eacf127c0a Mon Sep 17 00:00:00 2001
From: Scott Murray <scott.murray@konsulko.com>
Date: Mon, 27 May 2024 14:05:12 -0400
Subject: [PATCH 2/2] Update to YP 5.0.1

Changes:
- Update poky to YP 5.0.1 commit.
- Switch meta-qt5, meta-aws, meta-arm, and meta-riscv to latest
  commit of their scarthgap branches now that the branch is
  available.
- Other layers have been updated to their latest scarthgap or
  master branch commits as appropriate to pick up fixes.

Bug-AGL: SPEC-5149

Change-Id: Id83a05f6203db228055f6455b3fc792375e0f785
Signed-off-by: Scott Murray <scott.murray@konsulko.com>
---
 default-floating.xml |  8 ++++----
 default.xml          | 24 ++++++++++++------------
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/default-floating.xml b/default-floating.xml
index bd455da8..32d6e2dd 100644
--- a/default-floating.xml
+++ b/default-floating.xml
@@ -40,7 +40,7 @@
   <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"/>
+  <project name="meta-qt5/meta-qt5" path="external/meta-qt5" remote="github" revision="scarthgap"/>
 
   <!-- Security layer -->
   <project name="meta-security" path="external/meta-security" remote="yocto" revision="scarthgap"/>
@@ -68,7 +68,7 @@
   <!-- BSPs -->
 
   <!-- meta-aws -->
-  <project name="aws4embeddedlinux/meta-aws" path="bsp/meta-aws" remote="github" revision="master"/>
+  <project name="aws4embeddedlinux/meta-aws" path="bsp/meta-aws" remote="github" revision="scarthgap"/>
 
   <!-- Renesas Gen3 specific things -->
   <project name="renesas-rcar/meta-renesas" path="bsp/meta-renesas" remote="github" revision="scarthgap-dev"/>
@@ -80,7 +80,7 @@
   <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-arm" path="bsp/meta-arm" remote="yocto" revision="scarthgap"/>
   <project name="meta-ti" path="bsp/meta-ti" remote="yocto" revision="scarthgap"/>
 
   <!-- Raspberry Pi -->
@@ -95,6 +95,6 @@
   <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"/>
+  <project name="riscv/meta-riscv" path="bsp/meta-riscv" remote="github" revision="scarthgap"/>
 
 </manifest>
diff --git a/default.xml b/default.xml
index 8e6f6995..f0da8c28 100644
--- a/default.xml
+++ b/default.xml
@@ -29,17 +29,17 @@
   <!-- YOCTO & OE -->
 
   <!-- Yocto/OpenEmbedded things. -->
-  <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" />
+  <project name="poky" path="external/poky" remote="yocto" revision="4b07a5316ed4b858863dfdb7cab63859d46d1810" upstream="scarthgap" />
+  <project name="openembedded/meta-openembedded" path="external/meta-openembedded" remote="github" revision="6de0ab744341ad61b0661aa28d78dc6767ce0786" upstream="scarthgap" />
 
 
   <!-- UPSTREAM COMPONENTS -->
 
   <!-- meta-virtualization -->
-  <project name="meta-virtualization" path="external/meta-virtualization" remote="yocto" revision="3ff80e14e243a2bbdbf20a61aff4115d11c2da06" upstream="scarthgap"/>
+  <project name="meta-virtualization" path="external/meta-virtualization" remote="yocto" revision="1a547c0aa0d75c4143cbb66de6e653d51cdc8bda" upstream="scarthgap"/>
 
   <!-- Qt things -->
-  <project name="meta-qt5/meta-qt5" path="external/meta-qt5" remote="github" revision="fe008b6174862a05de14aa350efec271631697e7" upstream="master"/>
+  <project name="meta-qt5/meta-qt5" path="external/meta-qt5" remote="github" revision="d8eeef0bfd84672c7919cd346f25f7c9a98ddaea" upstream="scarthgap"/>
 
   <!-- Security layer -->
   <project name="meta-security" path="external/meta-security" remote="yocto" revision="11ea91192d43d7c2b0b95a93aa63ca7e73e38034" upstream="scarthgap"/>
@@ -51,10 +51,10 @@
   <project name="dl9pf/meta-codechecker" path="external/meta-codechecker" remote="github" revision="38f9a4a68349b6ce32fdaa320f378991e29d09e9" upstream="master"/>
 
   <!-- meta-spdxscanner - support for fossology -->
-  <project name="meta-spdxscanner" path="external/meta-spdxscanner" remote="yocto" revision="8b07df1535fe1203b07fc87f8c6a1e34311e2a1d" upstream="master"/>
+  <project name="meta-spdxscanner" path="external/meta-spdxscanner" remote="yocto" revision="2c376d72a1aed6b335aebd3bb28663f973a11fa9" upstream="master"/>
 
   <!-- clang support -->
-  <project name="kraj/meta-clang" path="external/meta-clang" remote="github" revision="66414c17ae60e489bef9a97031323e92c247fbe1" upstream="scarthgap"/>
+  <project name="kraj/meta-clang" path="external/meta-clang" remote="github" revision="e7dceb1c92caf7f21ef1d7b49c85328c30cffd90" upstream="scarthgap"/>
 
   <!-- meta-flutter -->
   <project name="meta-flutter/meta-flutter" path="external/meta-flutter" remote="github" revision="6f431e743a878c738d35383c5cbabda71ba6538f" upstream="master"/>
@@ -67,20 +67,20 @@
   <!-- BSPs -->
 
   <!-- meta-aws -->
-  <project name="aws4embeddedlinux/meta-aws" path="bsp/meta-aws" remote="github" revision="b7df61417aaf741260044e4f246844608ee33900" upstream="master"/>
+  <project name="aws4embeddedlinux/meta-aws" path="bsp/meta-aws" remote="github" revision="91bf8b1d9100f090a9ba7889ab35c9193ec6e4ad" upstream="scarthgap"/>
 
   <!-- Renesas Gen3 specific things -->
-  <project name="renesas-rcar/meta-renesas" path="bsp/meta-renesas" remote="github" revision="0605dac7d8972740e58d08a9cf1e2040617fe1fc" upstream="scarthgap-dev"/>
+  <project name="renesas-rcar/meta-renesas" path="bsp/meta-renesas" remote="github" revision="5bb1f62a70a9febac6d93d552c1d045251715dea" 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="19ffbd1a6bf1caadbc23b09415985d73c1827828" upstream="scarthgap"/>
+  <project name="meta-freescale" path="bsp/meta-freescale" remote="yocto" revision="9dbd423c6262a09e86ea6c5bbf71e43c1089c825" 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="5c049dcb30d7a644333762198771d7fd3795b686" upstream="scarthgap"/>
+  <project name="meta-arm" path="bsp/meta-arm" remote="yocto" revision="1200a59db6a484618bd42ecb1d7d1e3593eb7708" upstream="scarthgap"/>
+  <project name="meta-ti" path="bsp/meta-ti" remote="yocto" revision="7f5bdf201b882e0879cb73a5e1b4d22725e851ff" upstream="scarthgap"/>
 
   <!-- Raspberry Pi -->
   <project name="meta-raspberrypi" path="bsp/meta-raspberrypi" remote="yocto" revision="1879cb831f4ea3e532cb5ce9fa0f32be917e8fa3" upstream="master"/>
@@ -94,6 +94,6 @@
   <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"/>
+  <project name="riscv/meta-riscv" path="bsp/meta-riscv" remote="github" revision="d330dfe4011a873d379cdf6228fa1f243cf5a6db" upstream="scarthgap"/>
 
 </manifest>
-- 
2.16.6