Thanks, I'll try to get this into the work I'm doing to update to mickledore.

--Mark

On 4/6/23 4:52 AM, Michał Fita wrote:
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 <[email protected] <mailto:4925040%[email protected]>>
---
  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 b9fba8e..a7b8b35 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 ba8e1ce..49b07cb 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 932b36f..c9e4f5a 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 = "\
--
2.34.1




-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#5200): 
https://lists.yoctoproject.org/g/meta-xilinx/message/5200
Mute This Topic: https://lists.yoctoproject.org/mt/98101638/21656
Group Owner: [email protected]
Unsubscribe: https://lists.yoctoproject.org/g/meta-xilinx/unsub 
[[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-

Reply via email to