Signed-off-by: Mark Hatle <[email protected]>
---
recipes-bsp/embeddedsw/fsbl-firmware_xsct.inc | 16 ++++++----------
recipes-bsp/embeddedsw/plm-firmware_xsct.inc | 14 +++++---------
recipes-bsp/embeddedsw/pmu-firmware_xsct.inc | 18 +++++++++---------
recipes-bsp/embeddedsw/psm-firmware_xsct.inc | 14 +++++---------
4 files changed, 25 insertions(+), 37 deletions(-)
diff --git a/recipes-bsp/embeddedsw/fsbl-firmware_xsct.inc
b/recipes-bsp/embeddedsw/fsbl-firmware_xsct.inc
index 2745069..645effa 100644
--- a/recipes-bsp/embeddedsw/fsbl-firmware_xsct.inc
+++ b/recipes-bsp/embeddedsw/fsbl-firmware_xsct.inc
@@ -1,13 +1,7 @@
-# Should not need any external patches
-SRC_URI = "${EMBEDDEDSW_SRCURI}"
-
-# We WANT to default to this version when available
-DEFAULT_PREFERENCE = "100"
-
inherit xsctapp xsctyaml
-# This needs to match fsbl.bbappend
-FSBL_IMAGE_NAME = "fsbl-${MACHINE}"
+# The makefile does not handle parallelization
+PARALLEL_MAKE = "-j1"
B = "${S}/${XSCTH_PROJ}"
B:zynq = "${S}/${XSCTH_PROJ}"
@@ -38,7 +32,7 @@ ${UNPACKDIR}/bin:"
XSCT_PATH_ADD:append:eabi = "\
${UNPACKDIR}/bin:"
-do_compile:prepend:elf:aarch64() {
+do_configure:prepend:elf:aarch64() {
mkdir -p ${UNPACKDIR}/bin
echo "#! /bin/bash\n${CC} \$@" > ${UNPACKDIR}/bin/aarch64-none-elf-gcc
echo "#! /bin/bash\n${AS} \$@" > ${UNPACKDIR}/bin/aarch64-none-elf-as
@@ -49,7 +43,7 @@ do_compile:prepend:elf:aarch64() {
}
ARM_INSTRUCTION_SET:eabi:arm = "arm"
-do_compile:prepend:eabi:arm() {
+do_configure:prepend:eabi:arm() {
mkdir -p ${UNPACKDIR}/bin
echo "#! /bin/bash\n${CC} \$@" > ${UNPACKDIR}/bin/arm-none-eabi-gcc
echo "#! /bin/bash\n${AS} \$@" > ${UNPACKDIR}/bin/arm-none-eabi-as
@@ -73,3 +67,5 @@ do_deploy() {
install -Dm 0644 ${B}/${ESW_COMPONENT} ${DEPLOYDIR}/${FSBL_BASE_NAME}.elf
ln -sf ${FSBL_BASE_NAME}.elf ${DEPLOYDIR}/${FSBL_IMAGE_NAME}.elf
}
+
+addtask deploy before do_build after do_install
diff --git a/recipes-bsp/embeddedsw/plm-firmware_xsct.inc
b/recipes-bsp/embeddedsw/plm-firmware_xsct.inc
index 3c47295..bf75f20 100644
--- a/recipes-bsp/embeddedsw/plm-firmware_xsct.inc
+++ b/recipes-bsp/embeddedsw/plm-firmware_xsct.inc
@@ -1,13 +1,7 @@
-# Should not need any external patches
-SRC_URI = "${EMBEDDEDSW_SRCURI}"
-
-# We WANT to default to this version when available
-DEFAULT_PREFERENCE = "100"
-
inherit xsctapp xsctyaml
-# This needs to match the value in plmfw.bbappend
-PLM_IMAGE_NAME = "plm-${MACHINE}"
+# The makefile does not handle parallelization
+PARALLEL_MAKE = "-j1"
B = "${S}/${XSCTH_PROJ}"
@@ -27,7 +21,7 @@ ${UNPACKDIR}/bin:"
MB_OBJCOPY = "mb-objcopy"
-do_compile:prepend:elf() {
+do_configure:prepend:elf() {
mkdir -p ${UNPACKDIR}/bin
echo "#! /bin/bash\n${CC} \$@" > ${UNPACKDIR}/bin/mb-gcc
echo "#! /bin/bash\n${AS} \$@" > ${UNPACKDIR}/bin/mb-as
@@ -56,3 +50,5 @@ do_deploy() {
install -m 0644 ${B}/${XSCTH_PROJ}/executable.bin
${DEPLOYDIR}/${PLM_BASE_NAME}.bin
ln -sf ${PLM_BASE_NAME}.bin ${DEPLOYDIR}/${PLM_IMAGE_NAME}.bin
}
+
+addtask deploy before do_build after do_install
diff --git a/recipes-bsp/embeddedsw/pmu-firmware_xsct.inc
b/recipes-bsp/embeddedsw/pmu-firmware_xsct.inc
index 4057353..41aa157 100644
--- a/recipes-bsp/embeddedsw/pmu-firmware_xsct.inc
+++ b/recipes-bsp/embeddedsw/pmu-firmware_xsct.inc
@@ -1,13 +1,7 @@
-# Should not need any external patches
-SRC_URI = "${EMBEDDEDSW_SRCURI}"
-
-# We WANT to default to this version when available
-DEFAULT_PREFERENCE = "100"
-
inherit xsctapp xsctyaml
-# This needs to match pmufw.bbappend
-PMU_FIRMWARE_IMAGE_NAME = "pmu-firmware-${MACHINE}"
+# The makefile does not handle parallelization
+PARALLEL_MAKE = "-j1"
B = "${S}/${XSCTH_PROJ}"
@@ -31,7 +25,7 @@ ${UNPACKDIR}/bin:"
MB_OBJCOPY = "mb-objcopy"
-do_compile:prepend:elf() {
+do_configure:prepend:elf() {
mkdir -p ${UNPACKDIR}/bin
echo "#! /bin/bash\n${CC} \$@" > ${UNPACKDIR}/bin/mb-gcc
echo "#! /bin/bash\n${AS} \$@" > ${UNPACKDIR}/bin/mb-as
@@ -43,6 +37,10 @@ do_compile:prepend:elf() {
chmod 0755 ${UNPACKDIR}/bin/mb-objcopy
}
+do_compile:append() {
+ ${MB_OBJCOPY} -O binary ${B}/${ESW_COMPONENT} ${B}/${ESW_COMPONENT}.bin
+}
+
ESW_COMPONENT = "${XSCTH_PROJ}/executable.elf"
# xsctapp sets it's own do_install, replace it with the real one
@@ -57,3 +55,5 @@ do_deploy() {
install -m 0644 ${B}/${ESW_COMPONENT}.bin
${DEPLOYDIR}/${PMU_FIRMWARE_BASE_NAME}.bin
ln -sf ${PMU_FIRMWARE_BASE_NAME}.bin
${DEPLOYDIR}/${PMU_FIRMWARE_IMAGE_NAME}.bin
}
+
+addtask deploy before do_build after do_install
diff --git a/recipes-bsp/embeddedsw/psm-firmware_xsct.inc
b/recipes-bsp/embeddedsw/psm-firmware_xsct.inc
index 61d42e6..1361215 100644
--- a/recipes-bsp/embeddedsw/psm-firmware_xsct.inc
+++ b/recipes-bsp/embeddedsw/psm-firmware_xsct.inc
@@ -1,13 +1,7 @@
-# Should not need any external patches
-SRC_URI = "${EMBEDDEDSW_SRCURI}"
-
-# We WANT to default to this version when available
-DEFAULT_PREFERENCE = "100"
-
inherit xsctapp xsctyaml
-# This needs to match the value in psmfw.bbappend
-PSM_FIRMWARE_IMAGE_NAME = "psm-firmware-${MACHINE}"
+# The makefile does not handle parallelization
+PARALLEL_MAKE = "-j1"
B = "${S}/${XSCTH_PROJ}"
@@ -27,7 +21,7 @@ ${UNPACKDIR}/bin:"
MB_OBJCOPY = "mb-objcopy"
-do_compile:prepend:elf() {
+do_configure:prepend:elf() {
mkdir -p ${UNPACKDIR}/bin
echo "#! /bin/bash\n${CC} \$@" > ${UNPACKDIR}/bin/mb-gcc
echo "#! /bin/bash\n${AS} \$@" > ${UNPACKDIR}/bin/mb-as
@@ -56,3 +50,5 @@ do_deploy() {
install -m 0644 ${B}/${XSCTH_PROJ}/executable.bin
${DEPLOYDIR}/${PSM_FIRMWARE_BASE_NAME}.bin
ln -sf ${PSM_FIRMWARE_BASE_NAME}.bin
${DEPLOYDIR}/${PSM_FIRMWARE_IMAGE_NAME}.bin
}
+
+addtask deploy before do_build after do_install
--
2.34.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#5409):
https://lists.yoctoproject.org/g/meta-xilinx/message/5409
Mute This Topic: https://lists.yoctoproject.org/mt/106610000/21656
Group Owner: [email protected]
Unsubscribe: https://lists.yoctoproject.org/g/meta-xilinx/unsub
[[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-
