summaryrefslogtreecommitdiffstats
path: root/meta-xilinx-standalone
diff options
context:
space:
mode:
authorMark Hatle <mark.hatle@amd.com>2024-11-24 16:58:53 -0700
committerMark Hatle <mark.hatle@amd.com>2024-11-24 16:58:53 -0700
commit1d98f8981e3157aa265ca141a0fc9e6e2640394f (patch)
tree3923c7c04f92a75bbc4f0bb3c15b81019e830d75 /meta-xilinx-standalone
parentfc651966ac5add0bd5d4e2612c02368ff715621b (diff)
downloadmeta-xilinx-master.tar.gz
meta-xilinx-standalone: Rework embeddedsw integrationHEADmaster
Introduce a new embeddedsw-source recipe that is a single point for unpack, and patch of the sources. This will allow someone to universally patch (via a bbappend or similar) the esw sources. As part of this work, we transfered the various patches for fsbl, pmu, plm, and psm to the universe source recipe. Most of this is transparent to any recipe using xlnx-embeddedsw. The class automaticaly detects if the recipe is a user our the special embeddedsw-source recipe and enables the correct behavior. Since the esw sources expect the S and B to be the same, the cmake objects get written into S, we are not able to follow the gcc-source example. Instead recipes that use the xlnx-embeddedsw class will hard link or copy the source files to their working directory. This avoid the penalty for fetch, unpack and patch. Note these recipes may also add their own SRC_URI which WILL be processed as normal. This is often used to introduce special tcl scripts. See the do_copy_shared_src task injected by the xlnx-embeddedsw.bbclass for technical details. Additionally, correct some of the existing patch Upstream-Status entries to conform to current YP guidelines. For 2024.2 introduce a special Xil_Assert fix for the current toolchain which is more strict on type conversion.. See the patch itself for more details. Signed-off-by: Mark Hatle <mark.hatle@amd.com>
Diffstat (limited to 'meta-xilinx-standalone')
-rw-r--r--meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass22
-rw-r--r--meta-xilinx-standalone/conf/distro/xilinx-standalone.inc1
-rw-r--r--meta-xilinx-standalone/recipes-bsp/embeddedsw/embeddedsw-source.inc33
-rw-r--r--meta-xilinx-standalone/recipes-bsp/embeddedsw/embeddedsw-source_2023.1.bb17
-rw-r--r--meta-xilinx-standalone/recipes-bsp/embeddedsw/embeddedsw-source_2023.2.bb17
-rw-r--r--meta-xilinx-standalone/recipes-bsp/embeddedsw/embeddedsw-source_2024.1.bb17
-rw-r--r--meta-xilinx-standalone/recipes-bsp/embeddedsw/embeddedsw-source_2024.2.bb15
-rw-r--r--meta-xilinx-standalone/recipes-bsp/embeddedsw/embeddedsw/2023.1+git/0001-versal_fw-Fixup-core-makefiles.patch2
-rw-r--r--meta-xilinx-standalone/recipes-bsp/embeddedsw/embeddedsw/2023.1+git/makefile-skip-copy_bsp.sh.patch2
-rw-r--r--meta-xilinx-standalone/recipes-bsp/embeddedsw/embeddedsw/2023.2+git/0001-versal_fw-Fixup-core-makefiles.patch2
-rw-r--r--meta-xilinx-standalone/recipes-bsp/embeddedsw/embeddedsw/2023.2+git/makefile-skip-copy_bsp.sh.patch2
-rw-r--r--meta-xilinx-standalone/recipes-bsp/embeddedsw/embeddedsw/2024.1+git/0001-versal_fw-Fixup-core-makefiles.patch2
-rw-r--r--meta-xilinx-standalone/recipes-bsp/embeddedsw/embeddedsw/2024.1+git/makefile-skip-copy_bsp.sh.patch2
-rw-r--r--meta-xilinx-standalone/recipes-bsp/embeddedsw/embeddedsw/2024.2+git/0001-versal_fw-Fixup-core-makefiles.patch2
-rw-r--r--meta-xilinx-standalone/recipes-bsp/embeddedsw/embeddedsw/2024.2+git/fix-xil-assert-filename.patch26
-rw-r--r--meta-xilinx-standalone/recipes-bsp/embeddedsw/embeddedsw/2024.2+git/makefile-skip-copy_bsp.sh.patch2
-rw-r--r--meta-xilinx-standalone/recipes-bsp/embeddedsw/embeddedsw/fsbl-fixups.patch2
-rw-r--r--meta-xilinx-standalone/recipes-bsp/embeddedsw/fsbl-firmware.inc2
-rw-r--r--meta-xilinx-standalone/recipes-bsp/embeddedsw/fsbl-firmware_2023.1+git-generic.inc7
-rw-r--r--meta-xilinx-standalone/recipes-bsp/embeddedsw/fsbl-firmware_2023.2+git-generic.inc7
-rw-r--r--meta-xilinx-standalone/recipes-bsp/embeddedsw/fsbl-firmware_2024.1+git-generic.inc7
-rw-r--r--meta-xilinx-standalone/recipes-bsp/embeddedsw/fsbl-firmware_2024.2+git-generic.inc7
-rw-r--r--meta-xilinx-standalone/recipes-bsp/embeddedsw/plm-firmware.inc2
-rw-r--r--meta-xilinx-standalone/recipes-bsp/embeddedsw/plm-firmware_2023.1+git-generic.inc7
-rw-r--r--meta-xilinx-standalone/recipes-bsp/embeddedsw/plm-firmware_2023.2+git-generic.inc7
-rw-r--r--meta-xilinx-standalone/recipes-bsp/embeddedsw/plm-firmware_2024.1+git-generic.inc7
-rw-r--r--meta-xilinx-standalone/recipes-bsp/embeddedsw/plm-firmware_2024.2+git-generic.inc7
-rw-r--r--meta-xilinx-standalone/recipes-bsp/embeddedsw/pmu-firmware.inc2
-rw-r--r--meta-xilinx-standalone/recipes-bsp/embeddedsw/pmu-firmware_2023.1+git-generic.inc7
-rw-r--r--meta-xilinx-standalone/recipes-bsp/embeddedsw/pmu-firmware_2023.2+git-generic.inc7
-rw-r--r--meta-xilinx-standalone/recipes-bsp/embeddedsw/pmu-firmware_2024.1+git-generic.inc7
-rw-r--r--meta-xilinx-standalone/recipes-bsp/embeddedsw/pmu-firmware_2024.2+git-generic.inc7
-rw-r--r--meta-xilinx-standalone/recipes-bsp/embeddedsw/psm-firmware.inc2
-rw-r--r--meta-xilinx-standalone/recipes-bsp/embeddedsw/psm-firmware_2023.1+git-generic.inc7
-rw-r--r--meta-xilinx-standalone/recipes-bsp/embeddedsw/psm-firmware_2023.2+git-generic.inc7
-rw-r--r--meta-xilinx-standalone/recipes-bsp/embeddedsw/psm-firmware_2024.1+git-generic.inc7
-rw-r--r--meta-xilinx-standalone/recipes-bsp/embeddedsw/psm-firmware_2024.2+git-generic.inc7
-rw-r--r--meta-xilinx-standalone/recipes-bsp/libdfeccf/libdfeccf_2024.2.bb2
-rw-r--r--meta-xilinx-standalone/recipes-bsp/libdfeequ/libdfeequ_2024.2.bb2
-rw-r--r--meta-xilinx-standalone/recipes-bsp/libdfemix/libdfemix_2024.2.bb2
-rw-r--r--meta-xilinx-standalone/recipes-bsp/libdfeofdm/libdfeofdm_2024.2.bb2
-rw-r--r--meta-xilinx-standalone/recipes-bsp/libdfeprach/libdfeprach_2024.2.bb2
-rw-r--r--meta-xilinx-standalone/recipes-bsp/librfclk/librfclk_2024.2.bb2
-rw-r--r--meta-xilinx-standalone/recipes-bsp/librfdc/librfdc_2024.2.bb2
44 files changed, 160 insertions, 140 deletions
diff --git a/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass b/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass
index 6a6faf01..805aa18d 100644
--- a/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass
+++ b/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass
@@ -35,7 +35,6 @@ LIC_FILES_CHKSUM[xlnx_rel_v2024.1] = '0dcabd3719e5ac33f7c03f0d77d473f2'
35LIC_FILES_CHKSUM[xlnx_rel_v2024.2] = '689662801a76c14d0cb57ae169cbec7c' 35LIC_FILES_CHKSUM[xlnx_rel_v2024.2] = '689662801a76c14d0cb57ae169cbec7c'
36LIC_FILES_CHKSUM ??= "file://license.txt;md5=${@d.getVarFlag('LIC_FILES_CHKSUM', d.getVar('BRANCH')) or '0'}" 36LIC_FILES_CHKSUM ??= "file://license.txt;md5=${@d.getVarFlag('LIC_FILES_CHKSUM', d.getVar('BRANCH')) or '0'}"
37 37
38SRC_URI = "${EMBEDDEDSW_SRCURI}"
39PV .= "+git" 38PV .= "+git"
40 39
41python() { 40python() {
@@ -47,3 +46,24 @@ python() {
47 except: 46 except:
48 raise bb.parse.SkipRecipe('BB_NO_NETWORK is enabled, can not fetch SRCREV (%s)' % d.getVar('SRCREV')) 47 raise bb.parse.SkipRecipe('BB_NO_NETWORK is enabled, can not fetch SRCREV (%s)' % d.getVar('SRCREV'))
49} 48}
49
50SHARED_S = "${TMPDIR}/work-shared/embeddedsw-${PV}-${PR}/source/git"
51S = "${WORKDIR}/source"
52B = "${WORKDIR}/build"
53
54ERROR_QA:remove = "buildpaths"
55
56# The following is for recipes that use the common sources
57python do_copy_shared_src() {
58 src = d.getVar('SHARED_S')
59 dest = d.getVar('S')
60 if src != dest:
61 oe.path.copyhardlinktree(src, dest)
62}
63
64python() {
65 if d.getVar('BPN') != "embeddedsw-source":
66 bb.build.addtask('do_copy_shared_src', 'do_configure do_populate_lic do_deploy_source_date_epoch', 'do_patch', d)
67
68 d.appendVarFlag('do_copy_shared_src', 'depends', ' embeddedsw-source-${PV}:do_patch')
69}
diff --git a/meta-xilinx-standalone/conf/distro/xilinx-standalone.inc b/meta-xilinx-standalone/conf/distro/xilinx-standalone.inc
index 17b9430d..4fa4bfb6 100644
--- a/meta-xilinx-standalone/conf/distro/xilinx-standalone.inc
+++ b/meta-xilinx-standalone/conf/distro/xilinx-standalone.inc
@@ -3,7 +3,6 @@ DISTRO_VERSION = "1.0"
3TARGET_VENDOR = "-xilinx" 3TARGET_VENDOR = "-xilinx"
4 4
5TCLIBC = "newlib" 5TCLIBC = "newlib"
6TCLIBCAPPEND =""
7 6
8# Change SDK name 7# Change SDK name
9SDK_VERSION = "xilinx-standalone" 8SDK_VERSION = "xilinx-standalone"
diff --git a/meta-xilinx-standalone/recipes-bsp/embeddedsw/embeddedsw-source.inc b/meta-xilinx-standalone/recipes-bsp/embeddedsw/embeddedsw-source.inc
new file mode 100644
index 00000000..3be268bf
--- /dev/null
+++ b/meta-xilinx-standalone/recipes-bsp/embeddedsw/embeddedsw-source.inc
@@ -0,0 +1,33 @@
1deltask do_configure
2deltask do_compile
3deltask do_install
4deltask do_populate_sysroot
5deltask do_populate_lic
6RM_WORK_EXCLUDE += "${PN}"
7
8inherit xlnx-embeddedsw nopackages
9
10COMPATIBLE_HOST = ".*"
11COMPATIBLE_MACHINE = ".*"
12
13PN = "embeddedsw-source-${PV}"
14WORKDIR = "${TMPDIR}/work-shared/embeddedsw-${PV}-${PR}"
15SSTATE_SWSPEC = "sstate:embeddedsw::${PV}:${PR}::${SSTATE_VERSION}:"
16
17STAMP = "${STAMPS_DIR}/work-shared/embeddedsw-${PV}-${PR}"
18STAMPCLEAN = "${STAMPS_DIR}/work-shared/embeddedsw-${PV}-*"
19
20INHIBIT_DEFAULT_DEPS = "1"
21DEPENDS = ""
22PACKAGES = ""
23TARGET_ARCH = "allarch"
24TARGET_AS_ARCH = "none"
25TARGET_CC_ARCH = "none"
26TARGET_LD_ARCH = "none"
27TARGET_OS = "linux"
28baselib = "lib"
29PACKAGE_ARCH = "all"
30
31UNPACKDIR = "${WORKDIR}/source"
32S = "${SHARED_S}"
33B = "${WORKDIR}/build"
diff --git a/meta-xilinx-standalone/recipes-bsp/embeddedsw/embeddedsw-source_2023.1.bb b/meta-xilinx-standalone/recipes-bsp/embeddedsw/embeddedsw-source_2023.1.bb
new file mode 100644
index 00000000..d3994bf4
--- /dev/null
+++ b/meta-xilinx-standalone/recipes-bsp/embeddedsw/embeddedsw-source_2023.1.bb
@@ -0,0 +1,17 @@
1require recipes-bsp/embeddedsw/embeddedsw-source.inc
2
3
4BPN = "embeddedsw-source"
5EXCLUDE_FROM_WORLD = "1"
6
7FILESPATH .= ":${FILE_DIRNAME}/embeddedsw/${PV}:${FILE_DIRNAME}/embeddedsw"
8
9SRC_URI = " \
10 ${EMBEDDEDSW_SRCURI} \
11 file://makefile-skip-copy_bsp.sh.patch \
12 file://fsbl-fixups.patch \
13 file://0001-versal_fw-Fixup-core-makefiles.patch \
14 "
15
16# file://fix-xil-assert-filename.patch \
17#
diff --git a/meta-xilinx-standalone/recipes-bsp/embeddedsw/embeddedsw-source_2023.2.bb b/meta-xilinx-standalone/recipes-bsp/embeddedsw/embeddedsw-source_2023.2.bb
new file mode 100644
index 00000000..d3994bf4
--- /dev/null
+++ b/meta-xilinx-standalone/recipes-bsp/embeddedsw/embeddedsw-source_2023.2.bb
@@ -0,0 +1,17 @@
1require recipes-bsp/embeddedsw/embeddedsw-source.inc
2
3
4BPN = "embeddedsw-source"
5EXCLUDE_FROM_WORLD = "1"
6
7FILESPATH .= ":${FILE_DIRNAME}/embeddedsw/${PV}:${FILE_DIRNAME}/embeddedsw"
8
9SRC_URI = " \
10 ${EMBEDDEDSW_SRCURI} \
11 file://makefile-skip-copy_bsp.sh.patch \
12 file://fsbl-fixups.patch \
13 file://0001-versal_fw-Fixup-core-makefiles.patch \
14 "
15
16# file://fix-xil-assert-filename.patch \
17#
diff --git a/meta-xilinx-standalone/recipes-bsp/embeddedsw/embeddedsw-source_2024.1.bb b/meta-xilinx-standalone/recipes-bsp/embeddedsw/embeddedsw-source_2024.1.bb
new file mode 100644
index 00000000..d3994bf4
--- /dev/null
+++ b/meta-xilinx-standalone/recipes-bsp/embeddedsw/embeddedsw-source_2024.1.bb
@@ -0,0 +1,17 @@
1require recipes-bsp/embeddedsw/embeddedsw-source.inc
2
3
4BPN = "embeddedsw-source"
5EXCLUDE_FROM_WORLD = "1"
6
7FILESPATH .= ":${FILE_DIRNAME}/embeddedsw/${PV}:${FILE_DIRNAME}/embeddedsw"
8
9SRC_URI = " \
10 ${EMBEDDEDSW_SRCURI} \
11 file://makefile-skip-copy_bsp.sh.patch \
12 file://fsbl-fixups.patch \
13 file://0001-versal_fw-Fixup-core-makefiles.patch \
14 "
15
16# file://fix-xil-assert-filename.patch \
17#
diff --git a/meta-xilinx-standalone/recipes-bsp/embeddedsw/embeddedsw-source_2024.2.bb b/meta-xilinx-standalone/recipes-bsp/embeddedsw/embeddedsw-source_2024.2.bb
new file mode 100644
index 00000000..fe015bc2
--- /dev/null
+++ b/meta-xilinx-standalone/recipes-bsp/embeddedsw/embeddedsw-source_2024.2.bb
@@ -0,0 +1,15 @@
1require recipes-bsp/embeddedsw/embeddedsw-source.inc
2
3
4BPN = "embeddedsw-source"
5EXCLUDE_FROM_WORLD = "1"
6
7FILESPATH .= ":${FILE_DIRNAME}/embeddedsw/${PV}:${FILE_DIRNAME}/embeddedsw"
8
9SRC_URI = " \
10 ${EMBEDDEDSW_SRCURI} \
11 file://fix-xil-assert-filename.patch \
12 file://makefile-skip-copy_bsp.sh.patch \
13 file://fsbl-fixups.patch \
14 file://0001-versal_fw-Fixup-core-makefiles.patch \
15 "
diff --git a/meta-xilinx-standalone/recipes-bsp/embeddedsw/embeddedsw/2023.1+git/0001-versal_fw-Fixup-core-makefiles.patch b/meta-xilinx-standalone/recipes-bsp/embeddedsw/embeddedsw/2023.1+git/0001-versal_fw-Fixup-core-makefiles.patch
index 788cfb35..0e96f4df 100644
--- a/meta-xilinx-standalone/recipes-bsp/embeddedsw/embeddedsw/2023.1+git/0001-versal_fw-Fixup-core-makefiles.patch
+++ b/meta-xilinx-standalone/recipes-bsp/embeddedsw/embeddedsw/2023.1+git/0001-versal_fw-Fixup-core-makefiles.patch
@@ -8,6 +8,8 @@ additional variables that may not be appropriate to do on the regular
8command line build version. This patch preserves the default while 8command line build version. This patch preserves the default while
9allowing it to be overriden as necessary. 9allowing it to be overriden as necessary.
10 10
11Upstream-Status: Inappropriate [YP integration specific]
12
11Signed-off-by: Mark Hatle <mark.hatle@amd.com> 13Signed-off-by: Mark Hatle <mark.hatle@amd.com>
12--- 14---
13 lib/sw_apps/versal_plm/misc/versal/Makefile | 6 ++++-- 15 lib/sw_apps/versal_plm/misc/versal/Makefile | 6 ++++--
diff --git a/meta-xilinx-standalone/recipes-bsp/embeddedsw/embeddedsw/2023.1+git/makefile-skip-copy_bsp.sh.patch b/meta-xilinx-standalone/recipes-bsp/embeddedsw/embeddedsw/2023.1+git/makefile-skip-copy_bsp.sh.patch
index 1300c7e1..c1b9a5bd 100644
--- a/meta-xilinx-standalone/recipes-bsp/embeddedsw/embeddedsw/2023.1+git/makefile-skip-copy_bsp.sh.patch
+++ b/meta-xilinx-standalone/recipes-bsp/embeddedsw/embeddedsw/2023.1+git/makefile-skip-copy_bsp.sh.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Prevent makefile from calling copy_bsp.sh
6If we call copy_bsp.sh we will undo any manual compliation steps we 6If we call copy_bsp.sh we will undo any manual compliation steps we
7have already done. Avoid this. 7have already done. Avoid this.
8 8
9YP integration specific 9Upstream-Status: Inappropriate [YP integration specific]
10 10
11Signed-off-by: Mark Hatle <mark.hatle@amd.com> 11Signed-off-by: Mark Hatle <mark.hatle@amd.com>
12--- 12---
diff --git a/meta-xilinx-standalone/recipes-bsp/embeddedsw/embeddedsw/2023.2+git/0001-versal_fw-Fixup-core-makefiles.patch b/meta-xilinx-standalone/recipes-bsp/embeddedsw/embeddedsw/2023.2+git/0001-versal_fw-Fixup-core-makefiles.patch
index 788cfb35..0e96f4df 100644
--- a/meta-xilinx-standalone/recipes-bsp/embeddedsw/embeddedsw/2023.2+git/0001-versal_fw-Fixup-core-makefiles.patch
+++ b/meta-xilinx-standalone/recipes-bsp/embeddedsw/embeddedsw/2023.2+git/0001-versal_fw-Fixup-core-makefiles.patch
@@ -8,6 +8,8 @@ additional variables that may not be appropriate to do on the regular
8command line build version. This patch preserves the default while 8command line build version. This patch preserves the default while
9allowing it to be overriden as necessary. 9allowing it to be overriden as necessary.
10 10
11Upstream-Status: Inappropriate [YP integration specific]
12
11Signed-off-by: Mark Hatle <mark.hatle@amd.com> 13Signed-off-by: Mark Hatle <mark.hatle@amd.com>
12--- 14---
13 lib/sw_apps/versal_plm/misc/versal/Makefile | 6 ++++-- 15 lib/sw_apps/versal_plm/misc/versal/Makefile | 6 ++++--
diff --git a/meta-xilinx-standalone/recipes-bsp/embeddedsw/embeddedsw/2023.2+git/makefile-skip-copy_bsp.sh.patch b/meta-xilinx-standalone/recipes-bsp/embeddedsw/embeddedsw/2023.2+git/makefile-skip-copy_bsp.sh.patch
index 4ce521cd..3f7bb7a8 100644
--- a/meta-xilinx-standalone/recipes-bsp/embeddedsw/embeddedsw/2023.2+git/makefile-skip-copy_bsp.sh.patch
+++ b/meta-xilinx-standalone/recipes-bsp/embeddedsw/embeddedsw/2023.2+git/makefile-skip-copy_bsp.sh.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Prevent makefile from calling copy_bsp.sh
6If we call copy_bsp.sh we will undo any manual compliation steps we 6If we call copy_bsp.sh we will undo any manual compliation steps we
7have already done. Avoid this. 7have already done. Avoid this.
8 8
9YP integration specific 9Upstream-Status: Inappropriate [YP integration specific]
10 10
11Signed-off-by: Mark Hatle <mark.hatle@amd.com> 11Signed-off-by: Mark Hatle <mark.hatle@amd.com>
12--- 12---
diff --git a/meta-xilinx-standalone/recipes-bsp/embeddedsw/embeddedsw/2024.1+git/0001-versal_fw-Fixup-core-makefiles.patch b/meta-xilinx-standalone/recipes-bsp/embeddedsw/embeddedsw/2024.1+git/0001-versal_fw-Fixup-core-makefiles.patch
index 4bc191c1..f3726714 100644
--- a/meta-xilinx-standalone/recipes-bsp/embeddedsw/embeddedsw/2024.1+git/0001-versal_fw-Fixup-core-makefiles.patch
+++ b/meta-xilinx-standalone/recipes-bsp/embeddedsw/embeddedsw/2024.1+git/0001-versal_fw-Fixup-core-makefiles.patch
@@ -8,6 +8,8 @@ additional variables that may not be appropriate to do on the regular
8command line build version. This patch preserves the default while 8command line build version. This patch preserves the default while
9allowing it to be overriden as necessary. 9allowing it to be overriden as necessary.
10 10
11Upstream-Status: Inappropriate [YP integration specific]
12
11Signed-off-by: Mark Hatle <mark.hatle@amd.com> 13Signed-off-by: Mark Hatle <mark.hatle@amd.com>
12--- 14---
13 lib/sw_apps/versal_plm/misc/versal/Makefile | 6 ++++-- 15 lib/sw_apps/versal_plm/misc/versal/Makefile | 6 ++++--
diff --git a/meta-xilinx-standalone/recipes-bsp/embeddedsw/embeddedsw/2024.1+git/makefile-skip-copy_bsp.sh.patch b/meta-xilinx-standalone/recipes-bsp/embeddedsw/embeddedsw/2024.1+git/makefile-skip-copy_bsp.sh.patch
index 4ce521cd..3f7bb7a8 100644
--- a/meta-xilinx-standalone/recipes-bsp/embeddedsw/embeddedsw/2024.1+git/makefile-skip-copy_bsp.sh.patch
+++ b/meta-xilinx-standalone/recipes-bsp/embeddedsw/embeddedsw/2024.1+git/makefile-skip-copy_bsp.sh.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Prevent makefile from calling copy_bsp.sh
6If we call copy_bsp.sh we will undo any manual compliation steps we 6If we call copy_bsp.sh we will undo any manual compliation steps we
7have already done. Avoid this. 7have already done. Avoid this.
8 8
9YP integration specific 9Upstream-Status: Inappropriate [YP integration specific]
10 10
11Signed-off-by: Mark Hatle <mark.hatle@amd.com> 11Signed-off-by: Mark Hatle <mark.hatle@amd.com>
12--- 12---
diff --git a/meta-xilinx-standalone/recipes-bsp/embeddedsw/embeddedsw/2024.2+git/0001-versal_fw-Fixup-core-makefiles.patch b/meta-xilinx-standalone/recipes-bsp/embeddedsw/embeddedsw/2024.2+git/0001-versal_fw-Fixup-core-makefiles.patch
index 4bc191c1..cbe0c4e5 100644
--- a/meta-xilinx-standalone/recipes-bsp/embeddedsw/embeddedsw/2024.2+git/0001-versal_fw-Fixup-core-makefiles.patch
+++ b/meta-xilinx-standalone/recipes-bsp/embeddedsw/embeddedsw/2024.2+git/0001-versal_fw-Fixup-core-makefiles.patch
@@ -8,6 +8,8 @@ additional variables that may not be appropriate to do on the regular
8command line build version. This patch preserves the default while 8command line build version. This patch preserves the default while
9allowing it to be overriden as necessary. 9allowing it to be overriden as necessary.
10 10
11Upstream-Status: Pending
12
11Signed-off-by: Mark Hatle <mark.hatle@amd.com> 13Signed-off-by: Mark Hatle <mark.hatle@amd.com>
12--- 14---
13 lib/sw_apps/versal_plm/misc/versal/Makefile | 6 ++++-- 15 lib/sw_apps/versal_plm/misc/versal/Makefile | 6 ++++--
diff --git a/meta-xilinx-standalone/recipes-bsp/embeddedsw/embeddedsw/2024.2+git/fix-xil-assert-filename.patch b/meta-xilinx-standalone/recipes-bsp/embeddedsw/embeddedsw/2024.2+git/fix-xil-assert-filename.patch
new file mode 100644
index 00000000..2f7af0e9
--- /dev/null
+++ b/meta-xilinx-standalone/recipes-bsp/embeddedsw/embeddedsw/2024.2+git/fix-xil-assert-filename.patch
@@ -0,0 +1,26 @@
1Fix __FILENAME__ definition
2
3This fixes the error:
4
5| <command-line>: error: passing argument 1 of 'Xil_Assert' makes pointer from integer without a cast [-Wint-conversion]
6| .../work-shared/embeddedsw-2024.2+git-r0/source/git/lib/bsp/standalone/src/common/xil_assert.h:123:20: note: in expansion of macro '__FILENAME__'
7| 123 | Xil_Assert(__FILENAME__, __LINE__); \
8| | ^~~~~~~~~~~~
9
10Upstream-Status: Pending
11
12Signed-off-by: Mark Hatle <mark.hatle@amd.com>
13
14diff --git a/cmake/Findcommon.cmake b/cmake/Findcommon.cmake
15index c856d408fb..acac2e8fcc 100644
16--- a/cmake/Findcommon.cmake
17+++ b/cmake/Findcommon.cmake
18@@ -11,7 +11,7 @@ endif()
19 if("${CMAKE_HOST_NAME}" STREQUAL "Linux")
20 add_compile_options("-D__FILENAME__=\"$(subst ${CMAKE_SOURCE_DIR}/,,$(abspath $<))\"")
21 else()
22- add_compile_options("-D__FILENAME__='__FILE__'")
23+ add_compile_options("-D__FILENAME__=__FILE__")
24 endif()
25 set (CMAKE_INSTALL_LIBDIR "lib")
26 function (collector_create name base)
diff --git a/meta-xilinx-standalone/recipes-bsp/embeddedsw/embeddedsw/2024.2+git/makefile-skip-copy_bsp.sh.patch b/meta-xilinx-standalone/recipes-bsp/embeddedsw/embeddedsw/2024.2+git/makefile-skip-copy_bsp.sh.patch
index 4ce521cd..3f7bb7a8 100644
--- a/meta-xilinx-standalone/recipes-bsp/embeddedsw/embeddedsw/2024.2+git/makefile-skip-copy_bsp.sh.patch
+++ b/meta-xilinx-standalone/recipes-bsp/embeddedsw/embeddedsw/2024.2+git/makefile-skip-copy_bsp.sh.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Prevent makefile from calling copy_bsp.sh
6If we call copy_bsp.sh we will undo any manual compliation steps we 6If we call copy_bsp.sh we will undo any manual compliation steps we
7have already done. Avoid this. 7have already done. Avoid this.
8 8
9YP integration specific 9Upstream-Status: Inappropriate [YP integration specific]
10 10
11Signed-off-by: Mark Hatle <mark.hatle@amd.com> 11Signed-off-by: Mark Hatle <mark.hatle@amd.com>
12--- 12---
diff --git a/meta-xilinx-standalone/recipes-bsp/embeddedsw/embeddedsw/fsbl-fixups.patch b/meta-xilinx-standalone/recipes-bsp/embeddedsw/embeddedsw/fsbl-fixups.patch
index 2c3b4e67..83fe4d2a 100644
--- a/meta-xilinx-standalone/recipes-bsp/embeddedsw/embeddedsw/fsbl-fixups.patch
+++ b/meta-xilinx-standalone/recipes-bsp/embeddedsw/embeddedsw/fsbl-fixups.patch
@@ -1,3 +1,5 @@
1Upstream-Status: Pending
2
1Index: git/lib/sw_apps/zynqmp_fsbl/misc/makefile 3Index: git/lib/sw_apps/zynqmp_fsbl/misc/makefile
2=================================================================== 4===================================================================
3--- git.orig/lib/sw_apps/zynqmp_fsbl/misc/makefile 5--- git.orig/lib/sw_apps/zynqmp_fsbl/misc/makefile
diff --git a/meta-xilinx-standalone/recipes-bsp/embeddedsw/fsbl-firmware.inc b/meta-xilinx-standalone/recipes-bsp/embeddedsw/fsbl-firmware.inc
index 5b2e123f..c600128a 100644
--- a/meta-xilinx-standalone/recipes-bsp/embeddedsw/fsbl-firmware.inc
+++ b/meta-xilinx-standalone/recipes-bsp/embeddedsw/fsbl-firmware.inc
@@ -9,8 +9,6 @@ COMPATIBLE_MACHINE:zynqmp = ".*"
9 9
10PACKAGE_ARCH = "${MACHINE_ARCH}" 10PACKAGE_ARCH = "${MACHINE_ARCH}"
11 11
12S = "${UNPACKDIR}/git"
13
14# This is the default in most BSPs. A MACHINE.conf can override this! 12# This is the default in most BSPs. A MACHINE.conf can override this!
15FSBL_IMAGE_NAME ??= "fsbl-${MACHINE}" 13FSBL_IMAGE_NAME ??= "fsbl-${MACHINE}"
16 14
diff --git a/meta-xilinx-standalone/recipes-bsp/embeddedsw/fsbl-firmware_2023.1+git-generic.inc b/meta-xilinx-standalone/recipes-bsp/embeddedsw/fsbl-firmware_2023.1+git-generic.inc
index 7a0a35da..645d4bec 100644
--- a/meta-xilinx-standalone/recipes-bsp/embeddedsw/fsbl-firmware_2023.1+git-generic.inc
+++ b/meta-xilinx-standalone/recipes-bsp/embeddedsw/fsbl-firmware_2023.1+git-generic.inc
@@ -1,10 +1,3 @@
1SKIP_MSG = "" 1SKIP_MSG = ""
2SKIP_MSG:zynq = "Generic support for zynq is not available" 2SKIP_MSG:zynq = "Generic support for zynq is not available"
3SKIP_RECIPE[fsbl-firmware] = "${SKIP_MSG}" 3SKIP_RECIPE[fsbl-firmware] = "${SKIP_MSG}"
4
5FILESPATH .= ":${FILE_DIRNAME}/embeddedsw/${PV}:${FILE_DIRNAME}/embeddedsw"
6
7SRC_URI += " \
8 file://makefile-skip-copy_bsp.sh.patch \
9 file://fsbl-fixups.patch \
10 "
diff --git a/meta-xilinx-standalone/recipes-bsp/embeddedsw/fsbl-firmware_2023.2+git-generic.inc b/meta-xilinx-standalone/recipes-bsp/embeddedsw/fsbl-firmware_2023.2+git-generic.inc
index 7a0a35da..645d4bec 100644
--- a/meta-xilinx-standalone/recipes-bsp/embeddedsw/fsbl-firmware_2023.2+git-generic.inc
+++ b/meta-xilinx-standalone/recipes-bsp/embeddedsw/fsbl-firmware_2023.2+git-generic.inc
@@ -1,10 +1,3 @@
1SKIP_MSG = "" 1SKIP_MSG = ""
2SKIP_MSG:zynq = "Generic support for zynq is not available" 2SKIP_MSG:zynq = "Generic support for zynq is not available"
3SKIP_RECIPE[fsbl-firmware] = "${SKIP_MSG}" 3SKIP_RECIPE[fsbl-firmware] = "${SKIP_MSG}"
4
5FILESPATH .= ":${FILE_DIRNAME}/embeddedsw/${PV}:${FILE_DIRNAME}/embeddedsw"
6
7SRC_URI += " \
8 file://makefile-skip-copy_bsp.sh.patch \
9 file://fsbl-fixups.patch \
10 "
diff --git a/meta-xilinx-standalone/recipes-bsp/embeddedsw/fsbl-firmware_2024.1+git-generic.inc b/meta-xilinx-standalone/recipes-bsp/embeddedsw/fsbl-firmware_2024.1+git-generic.inc
index 7a0a35da..645d4bec 100644
--- a/meta-xilinx-standalone/recipes-bsp/embeddedsw/fsbl-firmware_2024.1+git-generic.inc
+++ b/meta-xilinx-standalone/recipes-bsp/embeddedsw/fsbl-firmware_2024.1+git-generic.inc
@@ -1,10 +1,3 @@
1SKIP_MSG = "" 1SKIP_MSG = ""
2SKIP_MSG:zynq = "Generic support for zynq is not available" 2SKIP_MSG:zynq = "Generic support for zynq is not available"
3SKIP_RECIPE[fsbl-firmware] = "${SKIP_MSG}" 3SKIP_RECIPE[fsbl-firmware] = "${SKIP_MSG}"
4
5FILESPATH .= ":${FILE_DIRNAME}/embeddedsw/${PV}:${FILE_DIRNAME}/embeddedsw"
6
7SRC_URI += " \
8 file://makefile-skip-copy_bsp.sh.patch \
9 file://fsbl-fixups.patch \
10 "
diff --git a/meta-xilinx-standalone/recipes-bsp/embeddedsw/fsbl-firmware_2024.2+git-generic.inc b/meta-xilinx-standalone/recipes-bsp/embeddedsw/fsbl-firmware_2024.2+git-generic.inc
index 7a0a35da..645d4bec 100644
--- a/meta-xilinx-standalone/recipes-bsp/embeddedsw/fsbl-firmware_2024.2+git-generic.inc
+++ b/meta-xilinx-standalone/recipes-bsp/embeddedsw/fsbl-firmware_2024.2+git-generic.inc
@@ -1,10 +1,3 @@
1SKIP_MSG = "" 1SKIP_MSG = ""
2SKIP_MSG:zynq = "Generic support for zynq is not available" 2SKIP_MSG:zynq = "Generic support for zynq is not available"
3SKIP_RECIPE[fsbl-firmware] = "${SKIP_MSG}" 3SKIP_RECIPE[fsbl-firmware] = "${SKIP_MSG}"
4
5FILESPATH .= ":${FILE_DIRNAME}/embeddedsw/${PV}:${FILE_DIRNAME}/embeddedsw"
6
7SRC_URI += " \
8 file://makefile-skip-copy_bsp.sh.patch \
9 file://fsbl-fixups.patch \
10 "
diff --git a/meta-xilinx-standalone/recipes-bsp/embeddedsw/plm-firmware.inc b/meta-xilinx-standalone/recipes-bsp/embeddedsw/plm-firmware.inc
index 2a00afac..7654b28f 100644
--- a/meta-xilinx-standalone/recipes-bsp/embeddedsw/plm-firmware.inc
+++ b/meta-xilinx-standalone/recipes-bsp/embeddedsw/plm-firmware.inc
@@ -10,8 +10,6 @@ COMPATIBLE_MACHINE:versal-net = ".*"
10 10
11PACKAGE_ARCH = "${MACHINE_ARCH}" 11PACKAGE_ARCH = "${MACHINE_ARCH}"
12 12
13S = "${UNPACKDIR}/git"
14
15# This is the default in most BSPs. A MACHINE.conf can override this! 13# This is the default in most BSPs. A MACHINE.conf can override this!
16PLM_IMAGE_NAME ??= "plm-${MACHINE}" 14PLM_IMAGE_NAME ??= "plm-${MACHINE}"
17 15
diff --git a/meta-xilinx-standalone/recipes-bsp/embeddedsw/plm-firmware_2023.1+git-generic.inc b/meta-xilinx-standalone/recipes-bsp/embeddedsw/plm-firmware_2023.1+git-generic.inc
index 7416dfb5..3b171f70 100644
--- a/meta-xilinx-standalone/recipes-bsp/embeddedsw/plm-firmware_2023.1+git-generic.inc
+++ b/meta-xilinx-standalone/recipes-bsp/embeddedsw/plm-firmware_2023.1+git-generic.inc
@@ -5,13 +5,6 @@ B = "${S}/lib/sw_apps/versal_plm/src/${SOC_DIR}"
5 5
6BSP_DIR ?= "${B}/../../misc/versal_plm_bsp" 6BSP_DIR ?= "${B}/../../misc/versal_plm_bsp"
7 7
8FILESPATH .= ":${FILE_DIRNAME}/embeddedsw/${PV}:${FILE_DIRNAME}/embeddedsw"
9
10SRC_URI += " \
11 file://makefile-skip-copy_bsp.sh.patch \
12 file://0001-versal_fw-Fixup-core-makefiles.patch \
13 "
14
15EXTRA_COMPILER_FLAGS = "-g -ffunction-sections -fdata-sections -Wall -Wextra -Os -flto -ffat-lto-objects" 8EXTRA_COMPILER_FLAGS = "-g -ffunction-sections -fdata-sections -Wall -Wextra -Os -flto -ffat-lto-objects"
16 9
17do_configure() { 10do_configure() {
diff --git a/meta-xilinx-standalone/recipes-bsp/embeddedsw/plm-firmware_2023.2+git-generic.inc b/meta-xilinx-standalone/recipes-bsp/embeddedsw/plm-firmware_2023.2+git-generic.inc
index 7416dfb5..3b171f70 100644
--- a/meta-xilinx-standalone/recipes-bsp/embeddedsw/plm-firmware_2023.2+git-generic.inc
+++ b/meta-xilinx-standalone/recipes-bsp/embeddedsw/plm-firmware_2023.2+git-generic.inc
@@ -5,13 +5,6 @@ B = "${S}/lib/sw_apps/versal_plm/src/${SOC_DIR}"
5 5
6BSP_DIR ?= "${B}/../../misc/versal_plm_bsp" 6BSP_DIR ?= "${B}/../../misc/versal_plm_bsp"
7 7
8FILESPATH .= ":${FILE_DIRNAME}/embeddedsw/${PV}:${FILE_DIRNAME}/embeddedsw"
9
10SRC_URI += " \
11 file://makefile-skip-copy_bsp.sh.patch \
12 file://0001-versal_fw-Fixup-core-makefiles.patch \
13 "
14
15EXTRA_COMPILER_FLAGS = "-g -ffunction-sections -fdata-sections -Wall -Wextra -Os -flto -ffat-lto-objects" 8EXTRA_COMPILER_FLAGS = "-g -ffunction-sections -fdata-sections -Wall -Wextra -Os -flto -ffat-lto-objects"
16 9
17do_configure() { 10do_configure() {
diff --git a/meta-xilinx-standalone/recipes-bsp/embeddedsw/plm-firmware_2024.1+git-generic.inc b/meta-xilinx-standalone/recipes-bsp/embeddedsw/plm-firmware_2024.1+git-generic.inc
index 7416dfb5..3b171f70 100644
--- a/meta-xilinx-standalone/recipes-bsp/embeddedsw/plm-firmware_2024.1+git-generic.inc
+++ b/meta-xilinx-standalone/recipes-bsp/embeddedsw/plm-firmware_2024.1+git-generic.inc
@@ -5,13 +5,6 @@ B = "${S}/lib/sw_apps/versal_plm/src/${SOC_DIR}"
5 5
6BSP_DIR ?= "${B}/../../misc/versal_plm_bsp" 6BSP_DIR ?= "${B}/../../misc/versal_plm_bsp"
7 7
8FILESPATH .= ":${FILE_DIRNAME}/embeddedsw/${PV}:${FILE_DIRNAME}/embeddedsw"
9
10SRC_URI += " \
11 file://makefile-skip-copy_bsp.sh.patch \
12 file://0001-versal_fw-Fixup-core-makefiles.patch \
13 "
14
15EXTRA_COMPILER_FLAGS = "-g -ffunction-sections -fdata-sections -Wall -Wextra -Os -flto -ffat-lto-objects" 8EXTRA_COMPILER_FLAGS = "-g -ffunction-sections -fdata-sections -Wall -Wextra -Os -flto -ffat-lto-objects"
16 9
17do_configure() { 10do_configure() {
diff --git a/meta-xilinx-standalone/recipes-bsp/embeddedsw/plm-firmware_2024.2+git-generic.inc b/meta-xilinx-standalone/recipes-bsp/embeddedsw/plm-firmware_2024.2+git-generic.inc
index 7416dfb5..3b171f70 100644
--- a/meta-xilinx-standalone/recipes-bsp/embeddedsw/plm-firmware_2024.2+git-generic.inc
+++ b/meta-xilinx-standalone/recipes-bsp/embeddedsw/plm-firmware_2024.2+git-generic.inc
@@ -5,13 +5,6 @@ B = "${S}/lib/sw_apps/versal_plm/src/${SOC_DIR}"
5 5
6BSP_DIR ?= "${B}/../../misc/versal_plm_bsp" 6BSP_DIR ?= "${B}/../../misc/versal_plm_bsp"
7 7
8FILESPATH .= ":${FILE_DIRNAME}/embeddedsw/${PV}:${FILE_DIRNAME}/embeddedsw"
9
10SRC_URI += " \
11 file://makefile-skip-copy_bsp.sh.patch \
12 file://0001-versal_fw-Fixup-core-makefiles.patch \
13 "
14
15EXTRA_COMPILER_FLAGS = "-g -ffunction-sections -fdata-sections -Wall -Wextra -Os -flto -ffat-lto-objects" 8EXTRA_COMPILER_FLAGS = "-g -ffunction-sections -fdata-sections -Wall -Wextra -Os -flto -ffat-lto-objects"
16 9
17do_configure() { 10do_configure() {
diff --git a/meta-xilinx-standalone/recipes-bsp/embeddedsw/pmu-firmware.inc b/meta-xilinx-standalone/recipes-bsp/embeddedsw/pmu-firmware.inc
index e821c05d..a6f39acf 100644
--- a/meta-xilinx-standalone/recipes-bsp/embeddedsw/pmu-firmware.inc
+++ b/meta-xilinx-standalone/recipes-bsp/embeddedsw/pmu-firmware.inc
@@ -8,8 +8,6 @@ COMPATIBLE_MACHINE:zynqmp = ".*"
8 8
9PACKAGE_ARCH = "${MACHINE_ARCH}" 9PACKAGE_ARCH = "${MACHINE_ARCH}"
10 10
11S = "${UNPACKDIR}/git"
12
13# This is the default in most BSPs. A MACHINE.conf can override this! 11# This is the default in most BSPs. A MACHINE.conf can override this!
14PMU_FIRMWARE_IMAGE_NAME ??= "pmu-firmware-${MACHINE}" 12PMU_FIRMWARE_IMAGE_NAME ??= "pmu-firmware-${MACHINE}"
15 13
diff --git a/meta-xilinx-standalone/recipes-bsp/embeddedsw/pmu-firmware_2023.1+git-generic.inc b/meta-xilinx-standalone/recipes-bsp/embeddedsw/pmu-firmware_2023.1+git-generic.inc
index 8defde17..fc6f9fcf 100644
--- a/meta-xilinx-standalone/recipes-bsp/embeddedsw/pmu-firmware_2023.1+git-generic.inc
+++ b/meta-xilinx-standalone/recipes-bsp/embeddedsw/pmu-firmware_2023.1+git-generic.inc
@@ -1,8 +1 @@
1FILESPATH .= ":${FILE_DIRNAME}/embeddedsw/${PV}:${FILE_DIRNAME}/embeddedsw"
2
3SRC_URI += " \
4 file://makefile-skip-copy_bsp.sh.patch \
5 file://0001-zynqmp_pmufw-Fixup-core-makefiles.patch \
6 "
7
8EXTRA_COMPILER_FLAGS = "-ffunction-sections -fdata-sections -Wall -Wextra -Os -flto -ffat-lto-objects" EXTRA_COMPILER_FLAGS = "-ffunction-sections -fdata-sections -Wall -Wextra -Os -flto -ffat-lto-objects"
diff --git a/meta-xilinx-standalone/recipes-bsp/embeddedsw/pmu-firmware_2023.2+git-generic.inc b/meta-xilinx-standalone/recipes-bsp/embeddedsw/pmu-firmware_2023.2+git-generic.inc
index 8defde17..fc6f9fcf 100644
--- a/meta-xilinx-standalone/recipes-bsp/embeddedsw/pmu-firmware_2023.2+git-generic.inc
+++ b/meta-xilinx-standalone/recipes-bsp/embeddedsw/pmu-firmware_2023.2+git-generic.inc
@@ -1,8 +1 @@
1FILESPATH .= ":${FILE_DIRNAME}/embeddedsw/${PV}:${FILE_DIRNAME}/embeddedsw"
2
3SRC_URI += " \
4 file://makefile-skip-copy_bsp.sh.patch \
5 file://0001-zynqmp_pmufw-Fixup-core-makefiles.patch \
6 "
7
8EXTRA_COMPILER_FLAGS = "-ffunction-sections -fdata-sections -Wall -Wextra -Os -flto -ffat-lto-objects" EXTRA_COMPILER_FLAGS = "-ffunction-sections -fdata-sections -Wall -Wextra -Os -flto -ffat-lto-objects"
diff --git a/meta-xilinx-standalone/recipes-bsp/embeddedsw/pmu-firmware_2024.1+git-generic.inc b/meta-xilinx-standalone/recipes-bsp/embeddedsw/pmu-firmware_2024.1+git-generic.inc
index 935f6e32..d5850ba3 100644
--- a/meta-xilinx-standalone/recipes-bsp/embeddedsw/pmu-firmware_2024.1+git-generic.inc
+++ b/meta-xilinx-standalone/recipes-bsp/embeddedsw/pmu-firmware_2024.1+git-generic.inc
@@ -1,8 +1 @@
1FILESPATH .= ":${FILE_DIRNAME}/embeddedsw/${PV}:${FILE_DIRNAME}/embeddedsw"
2
3SRC_URI += " \
4 file://makefile-skip-copy_bsp.sh.patch \
5 file://0001-zynqmp_pmufw-Fixup-core-makefiles.patch \
6 "
7
8EXTRA_COMPILER_FLAGS = "-ffunction-sections -fdata-sections -Wall -Wextra ${ESW_CFLAGS}" EXTRA_COMPILER_FLAGS = "-ffunction-sections -fdata-sections -Wall -Wextra ${ESW_CFLAGS}"
diff --git a/meta-xilinx-standalone/recipes-bsp/embeddedsw/pmu-firmware_2024.2+git-generic.inc b/meta-xilinx-standalone/recipes-bsp/embeddedsw/pmu-firmware_2024.2+git-generic.inc
index 935f6e32..d5850ba3 100644
--- a/meta-xilinx-standalone/recipes-bsp/embeddedsw/pmu-firmware_2024.2+git-generic.inc
+++ b/meta-xilinx-standalone/recipes-bsp/embeddedsw/pmu-firmware_2024.2+git-generic.inc
@@ -1,8 +1 @@
1FILESPATH .= ":${FILE_DIRNAME}/embeddedsw/${PV}:${FILE_DIRNAME}/embeddedsw"
2
3SRC_URI += " \
4 file://makefile-skip-copy_bsp.sh.patch \
5 file://0001-zynqmp_pmufw-Fixup-core-makefiles.patch \
6 "
7
8EXTRA_COMPILER_FLAGS = "-ffunction-sections -fdata-sections -Wall -Wextra ${ESW_CFLAGS}" EXTRA_COMPILER_FLAGS = "-ffunction-sections -fdata-sections -Wall -Wextra ${ESW_CFLAGS}"
diff --git a/meta-xilinx-standalone/recipes-bsp/embeddedsw/psm-firmware.inc b/meta-xilinx-standalone/recipes-bsp/embeddedsw/psm-firmware.inc
index 2bdb17ed..7957c6d6 100644
--- a/meta-xilinx-standalone/recipes-bsp/embeddedsw/psm-firmware.inc
+++ b/meta-xilinx-standalone/recipes-bsp/embeddedsw/psm-firmware.inc
@@ -10,8 +10,6 @@ COMPATIBLE_MACHINE:versal-net = ".*"
10 10
11PACKAGE_ARCH = "${MACHINE_ARCH}" 11PACKAGE_ARCH = "${MACHINE_ARCH}"
12 12
13S = "${UNPACKDIR}/git"
14
15# This is the default in most BSPs. A MACHINE.conf can override this! 13# This is the default in most BSPs. A MACHINE.conf can override this!
16PSM_FIRMWARE_IMAGE_NAME ??= "psm-firmware-${MACHINE}" 14PSM_FIRMWARE_IMAGE_NAME ??= "psm-firmware-${MACHINE}"
17 15
diff --git a/meta-xilinx-standalone/recipes-bsp/embeddedsw/psm-firmware_2023.1+git-generic.inc b/meta-xilinx-standalone/recipes-bsp/embeddedsw/psm-firmware_2023.1+git-generic.inc
index 7ba3707e..4d303a84 100644
--- a/meta-xilinx-standalone/recipes-bsp/embeddedsw/psm-firmware_2023.1+git-generic.inc
+++ b/meta-xilinx-standalone/recipes-bsp/embeddedsw/psm-firmware_2023.1+git-generic.inc
@@ -5,13 +5,6 @@ B = "${S}/lib/sw_apps/versal_psmfw/src/${SOC_DIR}"
5 5
6BSP_DIR ?= "${B}/../../misc/versal_psmfw_bsp" 6BSP_DIR ?= "${B}/../../misc/versal_psmfw_bsp"
7 7
8FILESPATH .= ":${FILE_DIRNAME}/embeddedsw/${PV}:${FILE_DIRNAME}/embeddedsw"
9
10SRC_URI += " \
11 file://makefile-skip-copy_bsp.sh.patch \
12 file://0001-versal_fw-Fixup-core-makefiles.patch \
13 "
14
15EXTRA_COMPILER_FLAGS = "-g -ffunction-sections -fdata-sections -Wall -Wextra" 8EXTRA_COMPILER_FLAGS = "-g -ffunction-sections -fdata-sections -Wall -Wextra"
16 9
17# Override default since we're in a subdirectory deeper now... 10# Override default since we're in a subdirectory deeper now...
diff --git a/meta-xilinx-standalone/recipes-bsp/embeddedsw/psm-firmware_2023.2+git-generic.inc b/meta-xilinx-standalone/recipes-bsp/embeddedsw/psm-firmware_2023.2+git-generic.inc
index 7ba3707e..4d303a84 100644
--- a/meta-xilinx-standalone/recipes-bsp/embeddedsw/psm-firmware_2023.2+git-generic.inc
+++ b/meta-xilinx-standalone/recipes-bsp/embeddedsw/psm-firmware_2023.2+git-generic.inc
@@ -5,13 +5,6 @@ B = "${S}/lib/sw_apps/versal_psmfw/src/${SOC_DIR}"
5 5
6BSP_DIR ?= "${B}/../../misc/versal_psmfw_bsp" 6BSP_DIR ?= "${B}/../../misc/versal_psmfw_bsp"
7 7
8FILESPATH .= ":${FILE_DIRNAME}/embeddedsw/${PV}:${FILE_DIRNAME}/embeddedsw"
9
10SRC_URI += " \
11 file://makefile-skip-copy_bsp.sh.patch \
12 file://0001-versal_fw-Fixup-core-makefiles.patch \
13 "
14
15EXTRA_COMPILER_FLAGS = "-g -ffunction-sections -fdata-sections -Wall -Wextra" 8EXTRA_COMPILER_FLAGS = "-g -ffunction-sections -fdata-sections -Wall -Wextra"
16 9
17# Override default since we're in a subdirectory deeper now... 10# Override default since we're in a subdirectory deeper now...
diff --git a/meta-xilinx-standalone/recipes-bsp/embeddedsw/psm-firmware_2024.1+git-generic.inc b/meta-xilinx-standalone/recipes-bsp/embeddedsw/psm-firmware_2024.1+git-generic.inc
index 7ba3707e..4d303a84 100644
--- a/meta-xilinx-standalone/recipes-bsp/embeddedsw/psm-firmware_2024.1+git-generic.inc
+++ b/meta-xilinx-standalone/recipes-bsp/embeddedsw/psm-firmware_2024.1+git-generic.inc
@@ -5,13 +5,6 @@ B = "${S}/lib/sw_apps/versal_psmfw/src/${SOC_DIR}"
5 5
6BSP_DIR ?= "${B}/../../misc/versal_psmfw_bsp" 6BSP_DIR ?= "${B}/../../misc/versal_psmfw_bsp"
7 7
8FILESPATH .= ":${FILE_DIRNAME}/embeddedsw/${PV}:${FILE_DIRNAME}/embeddedsw"
9
10SRC_URI += " \
11 file://makefile-skip-copy_bsp.sh.patch \
12 file://0001-versal_fw-Fixup-core-makefiles.patch \
13 "
14
15EXTRA_COMPILER_FLAGS = "-g -ffunction-sections -fdata-sections -Wall -Wextra" 8EXTRA_COMPILER_FLAGS = "-g -ffunction-sections -fdata-sections -Wall -Wextra"
16 9
17# Override default since we're in a subdirectory deeper now... 10# Override default since we're in a subdirectory deeper now...
diff --git a/meta-xilinx-standalone/recipes-bsp/embeddedsw/psm-firmware_2024.2+git-generic.inc b/meta-xilinx-standalone/recipes-bsp/embeddedsw/psm-firmware_2024.2+git-generic.inc
index 7ba3707e..4d303a84 100644
--- a/meta-xilinx-standalone/recipes-bsp/embeddedsw/psm-firmware_2024.2+git-generic.inc
+++ b/meta-xilinx-standalone/recipes-bsp/embeddedsw/psm-firmware_2024.2+git-generic.inc
@@ -5,13 +5,6 @@ B = "${S}/lib/sw_apps/versal_psmfw/src/${SOC_DIR}"
5 5
6BSP_DIR ?= "${B}/../../misc/versal_psmfw_bsp" 6BSP_DIR ?= "${B}/../../misc/versal_psmfw_bsp"
7 7
8FILESPATH .= ":${FILE_DIRNAME}/embeddedsw/${PV}:${FILE_DIRNAME}/embeddedsw"
9
10SRC_URI += " \
11 file://makefile-skip-copy_bsp.sh.patch \
12 file://0001-versal_fw-Fixup-core-makefiles.patch \
13 "
14
15EXTRA_COMPILER_FLAGS = "-g -ffunction-sections -fdata-sections -Wall -Wextra" 8EXTRA_COMPILER_FLAGS = "-g -ffunction-sections -fdata-sections -Wall -Wextra"
16 9
17# Override default since we're in a subdirectory deeper now... 10# Override default since we're in a subdirectory deeper now...
diff --git a/meta-xilinx-standalone/recipes-bsp/libdfeccf/libdfeccf_2024.2.bb b/meta-xilinx-standalone/recipes-bsp/libdfeccf/libdfeccf_2024.2.bb
index 2efbfd31..db376e41 100644
--- a/meta-xilinx-standalone/recipes-bsp/libdfeccf/libdfeccf_2024.2.bb
+++ b/meta-xilinx-standalone/recipes-bsp/libdfeccf/libdfeccf_2024.2.bb
@@ -8,8 +8,6 @@ REQUIRED_MACHINE_FEATURES = "rfsoc"
8 8
9FILESEXTRAPATHS:prepend := "${THISDIR}/files:" 9FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
10 10
11S = "${UNPACKDIR}/git"
12
13PACKAGE_ARCH = "${MACHINE_ARCH}" 11PACKAGE_ARCH = "${MACHINE_ARCH}"
14 12
15DEPENDS = "libmetal" 13DEPENDS = "libmetal"
diff --git a/meta-xilinx-standalone/recipes-bsp/libdfeequ/libdfeequ_2024.2.bb b/meta-xilinx-standalone/recipes-bsp/libdfeequ/libdfeequ_2024.2.bb
index e2a73c39..339138e6 100644
--- a/meta-xilinx-standalone/recipes-bsp/libdfeequ/libdfeequ_2024.2.bb
+++ b/meta-xilinx-standalone/recipes-bsp/libdfeequ/libdfeequ_2024.2.bb
@@ -8,8 +8,6 @@ REQUIRED_MACHINE_FEATURES = "rfsoc"
8 8
9FILESEXTRAPATHS:prepend := "${THISDIR}/files:" 9FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
10 10
11S = "${UNPACKDIR}/git"
12
13PACKAGE_ARCH = "${MACHINE_ARCH}" 11PACKAGE_ARCH = "${MACHINE_ARCH}"
14 12
15DEPENDS = "libmetal" 13DEPENDS = "libmetal"
diff --git a/meta-xilinx-standalone/recipes-bsp/libdfemix/libdfemix_2024.2.bb b/meta-xilinx-standalone/recipes-bsp/libdfemix/libdfemix_2024.2.bb
index d15beb53..75283e50 100644
--- a/meta-xilinx-standalone/recipes-bsp/libdfemix/libdfemix_2024.2.bb
+++ b/meta-xilinx-standalone/recipes-bsp/libdfemix/libdfemix_2024.2.bb
@@ -8,8 +8,6 @@ REQUIRED_MACHINE_FEATURES = "rfsoc"
8 8
9FILESEXTRAPATHS:prepend := "${THISDIR}/files:" 9FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
10 10
11S = "${UNPACKDIR}/git"
12
13PACKAGE_ARCH = "${MACHINE_ARCH}" 11PACKAGE_ARCH = "${MACHINE_ARCH}"
14 12
15DEPENDS = "libmetal" 13DEPENDS = "libmetal"
diff --git a/meta-xilinx-standalone/recipes-bsp/libdfeofdm/libdfeofdm_2024.2.bb b/meta-xilinx-standalone/recipes-bsp/libdfeofdm/libdfeofdm_2024.2.bb
index a1e51216..0adf4f96 100644
--- a/meta-xilinx-standalone/recipes-bsp/libdfeofdm/libdfeofdm_2024.2.bb
+++ b/meta-xilinx-standalone/recipes-bsp/libdfeofdm/libdfeofdm_2024.2.bb
@@ -8,8 +8,6 @@ REQUIRED_MACHINE_FEATURES = "rfsoc"
8 8
9FILESEXTRAPATHS:prepend := "${THISDIR}/files:" 9FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
10 10
11S = "${UNPACKDIR}/git"
12
13PACKAGE_ARCH = "${MACHINE_ARCH}" 11PACKAGE_ARCH = "${MACHINE_ARCH}"
14 12
15DEPENDS = "libmetal" 13DEPENDS = "libmetal"
diff --git a/meta-xilinx-standalone/recipes-bsp/libdfeprach/libdfeprach_2024.2.bb b/meta-xilinx-standalone/recipes-bsp/libdfeprach/libdfeprach_2024.2.bb
index ec6e35d0..de5e5f11 100644
--- a/meta-xilinx-standalone/recipes-bsp/libdfeprach/libdfeprach_2024.2.bb
+++ b/meta-xilinx-standalone/recipes-bsp/libdfeprach/libdfeprach_2024.2.bb
@@ -8,8 +8,6 @@ REQUIRED_MACHINE_FEATURES = "rfsoc"
8 8
9FILESEXTRAPATHS:prepend := "${THISDIR}/files:" 9FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
10 10
11S = "${UNPACKDIR}/git"
12
13PACKAGE_ARCH = "${MACHINE_ARCH}" 11PACKAGE_ARCH = "${MACHINE_ARCH}"
14 12
15DEPENDS = "libmetal" 13DEPENDS = "libmetal"
diff --git a/meta-xilinx-standalone/recipes-bsp/librfclk/librfclk_2024.2.bb b/meta-xilinx-standalone/recipes-bsp/librfclk/librfclk_2024.2.bb
index 5de31f05..28c7ee35 100644
--- a/meta-xilinx-standalone/recipes-bsp/librfclk/librfclk_2024.2.bb
+++ b/meta-xilinx-standalone/recipes-bsp/librfclk/librfclk_2024.2.bb
@@ -7,8 +7,6 @@ REQUIRED_MACHINE_FEATURES = "rfsoc"
7 7
8FILESEXTRAPATHS:prepend := "${THISDIR}/files:" 8FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
9 9
10S = "${UNPACKDIR}/git"
11
12PACKAGE_ARCH = "${MACHINE_ARCH}" 10PACKAGE_ARCH = "${MACHINE_ARCH}"
13 11
14PROVIDES = "librfclk" 12PROVIDES = "librfclk"
diff --git a/meta-xilinx-standalone/recipes-bsp/librfdc/librfdc_2024.2.bb b/meta-xilinx-standalone/recipes-bsp/librfdc/librfdc_2024.2.bb
index d638af27..b426cf58 100644
--- a/meta-xilinx-standalone/recipes-bsp/librfdc/librfdc_2024.2.bb
+++ b/meta-xilinx-standalone/recipes-bsp/librfdc/librfdc_2024.2.bb
@@ -8,8 +8,6 @@ REQUIRED_MACHINE_FEATURES = "rfsoc"
8 8
9FILESEXTRAPATHS:prepend := "${THISDIR}/files:" 9FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
10 10
11S = "${UNPACKDIR}/git"
12
13PACKAGE_ARCH = "${MACHINE_ARCH}" 11PACKAGE_ARCH = "${MACHINE_ARCH}"
14 12
15DEPENDS = "libmetal" 13DEPENDS = "libmetal"
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2025-05-13 06:15:56 +0000