From 4afde2e340bd85cd56b1a429be6862b0ab116b5f Mon Sep 17 00:00:00 2001 From: Mark Hatle Date: Thu, 18 Apr 2024 13:26:35 -0600 Subject: meta-xilinx-standalone-experimental: embeddedsw: Fix integration Fix plm and psm firwmare integration. The class EXPORT behavior has changed in Scarthgap, so sync up to the recent changes to ensure behavior is the same as the prior langdale based system. Signed-off-by: Mark Hatle --- .../recipes-bsp/embeddedsw/plm-firmware_git.bbappend | 10 ++++++++-- .../recipes-bsp/embeddedsw/psm-firmware_git.bbappend | 10 ++++++++-- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/meta-xilinx-standalone-experimental/recipes-bsp/embeddedsw/plm-firmware_git.bbappend b/meta-xilinx-standalone-experimental/recipes-bsp/embeddedsw/plm-firmware_git.bbappend index cc6d757f..202764ac 100644 --- a/meta-xilinx-standalone-experimental/recipes-bsp/embeddedsw/plm-firmware_git.bbappend +++ b/meta-xilinx-standalone-experimental/recipes-bsp/embeddedsw/plm-firmware_git.bbappend @@ -17,8 +17,14 @@ do_configure:prepend() { ) } -do_compile:append() { - ${MB_OBJCOPY} -O binary ${B}/${ESW_COMPONENT} ${B}/${ESW_COMPONENT}.bin +do_configure() { + cmake_do_configure +} + +do_compile() { + cmake_do_compile + + ${OBJCOPY} -O binary ${B}/${ESW_COMPONENT} ${B}/${ESW_COMPONENT}.bin } do_install() { diff --git a/meta-xilinx-standalone-experimental/recipes-bsp/embeddedsw/psm-firmware_git.bbappend b/meta-xilinx-standalone-experimental/recipes-bsp/embeddedsw/psm-firmware_git.bbappend index c4953ce7..96cd38cd 100644 --- a/meta-xilinx-standalone-experimental/recipes-bsp/embeddedsw/psm-firmware_git.bbappend +++ b/meta-xilinx-standalone-experimental/recipes-bsp/embeddedsw/psm-firmware_git.bbappend @@ -17,8 +17,14 @@ do_configure:prepend() { ) } -do_compile:append() { - ${MB_OBJCOPY} -O binary ${B}/${ESW_COMPONENT} ${B}/${ESW_COMPONENT}.bin +do_configure() { + cmake_do_configure +} + +do_compile() { + cmake_do_compile + + ${OBJCOPY} -O binary ${B}/${ESW_COMPONENT} ${B}/${ESW_COMPONENT}.bin } do_install() { -- cgit v1.2.3-54-g00ecf