Merge remote-tracking branch 'origin/scarthgap' into yocto-master

This moves the system to scarthgap.  It is known to NOT work with Styhead and master,

Signed-off-by: Mark Hatle <mark.hatle@amd.com>

1 files changed, 1 insertions, 5 deletions

diff --git a/meta-microblaze/conf/layer.conf b/meta-microblaze/conf/layer.conf
index 045550eb..f7aaf40f 100644
--- a/meta-microblaze/conf/layer.conf
+++ b/meta-microblaze/conf/layer.conf
@@ -21,13 +21,9 @@ OLDEST_KERNEL:microblaze = "3.15"
 INHERIT += "rust_microblaze"
 
 # We want to use gcc 12.x for the microblaze stuff, and 14.x for any host tooling
-GCCVERSION:microblaze = "12.2.%"
+GCCVERSION:microblaze = "13.3.%"
 SDKGCCVERSION:microblaze = "14.%"
 
-GDBVERSION:microblaze = "12.1"
-# canon-prefix-map doesn't exist in gcc 12.x
-DEBUG_PREFIX_MAP:remove:microblaze = "-fcanon-prefix-map"
-
 MICROBLAZE_SKIP_MSG = ""
 MICROBLAZE_SKIP_MSG:microblaze = "This recipe does not currently work on microblaze."