From 0e0c07fd99c8c539ff74a08a40131826956ead81 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Fita?=
 <4925040+michalfita@users.noreply.github.com>
Date: Tue, 4 Apr 2023 14:22:05 +0100
Subject: [PATCH] pmu-firmware, fsbl-firmware: Fix build with `TCLIBC = "musl"`
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Both packages require toolchains outside normal build environment to target
bare metal targets on MicroBlaze and ARM64 respectively. This patch fixes
recipies to deal with that situation under musl environment as well.

Signed-off-by: Michał Fita <4925040+michalfita@users.noreply.github.com>
---
 classes/xsct-tc.bbclass                              | 2 ++
 recipes-bsp/embeddedsw/fsbl-firmware_2022.2.bbappend | 1 +
 recipes-bsp/embeddedsw/pmu-firmware_2022.2.bbappend  | 2 ++
 3 files changed, 5 insertions(+)

diff --git a/classes/xsct-tc.bbclass b/classes/xsct-tc.bbclass
index b9fba8ec..a7b8b350 100644
--- a/classes/xsct-tc.bbclass
+++ b/classes/xsct-tc.bbclass
@@ -6,6 +6,7 @@ XSCT_PATH_ADD = "${XILINX_SDK_TOOLCHAIN}/bin:"
 # compiler, don't bother to build compilers for this...
 INHIBIT_DEFAULT_DEPS:linux = "1"
 INHIBIT_DEFAULT_DEPS:linux-gnueabi = "1"
+INHIBIT_DEFAULT_DEPS:linux-musl = "1"
 
 TC_XSCT_PATH = "\
 ${XILINX_SDK_TOOLCHAIN}/gnu/microblaze/lin/bin:\
@@ -15,6 +16,7 @@ ${XILINX_SDK_TOOLCHAIN}/gnu/aarch64/lin/aarch64-none/bin:"
 
 XSCT_PATH_ADD:append:linux = "${TC_XSCT_PATH}"
 XSCT_PATH_ADD:append:linux-gnueabi = "${TC_XSCT_PATH}"
+XSCT_PATH_ADD:append:linux-musl = "${TC_XSCT_PATH}"
 
 PATH =. "${XSCT_PATH_ADD}"
 TOOL_PATH = "${XILINX_SDK_TOOLCHAIN}/bin"
diff --git a/recipes-bsp/embeddedsw/fsbl-firmware_2022.2.bbappend b/recipes-bsp/embeddedsw/fsbl-firmware_2022.2.bbappend
index ba8e1ce0..49b07cb1 100644
--- a/recipes-bsp/embeddedsw/fsbl-firmware_2022.2.bbappend
+++ b/recipes-bsp/embeddedsw/fsbl-firmware_2022.2.bbappend
@@ -30,6 +30,7 @@ COMPATIBLE_HOST:zynqmp = "${HOST_SYS}"
 # Clear this for a Linux build, using the XSCT toolchain
 EXTRA_OEMAKE:linux = ""
 EXTRA_OEMAKE:linux-gnueabi = ""
+EXTRA_OEMAKE:linux-musl = ""
 
 # Workaround for hardcoded toolchain items
 XSCT_PATH_ADD:append:elf = "\
diff --git a/recipes-bsp/embeddedsw/pmu-firmware_2022.2.bbappend b/recipes-bsp/embeddedsw/pmu-firmware_2022.2.bbappend
index 932b36f9..c9e4f5ab 100644
--- a/recipes-bsp/embeddedsw/pmu-firmware_2022.2.bbappend
+++ b/recipes-bsp/embeddedsw/pmu-firmware_2022.2.bbappend
@@ -24,6 +24,8 @@ COMPATIBLE_HOST:zynqmp = "${HOST_SYS}"
 
 # Clear this for a Linux build, using the XSCT toolchain
 EXTRA_OEMAKE:linux = ""
+EXTRA_OEMAKE:linux-gnueabi = ""
+EXTRA_OEMAKE:linux-musl = ""
 
 # Workaround for hardcoded toolchain items
 XSCT_PATH_ADD:append:elf = "\