summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Hatle <mark.hatle@xilinx.com>2021-02-23 18:22:36 -0800
committerSai Hari Chandana Kalluri <chandana.kalluri@xilinx.com>2021-07-14 14:48:56 -0700
commitc20cfb159e434ab0385086974034d565b8fc43a9 (patch)
treec5d14bf5ce0520c73fba1084075aa35ae24a6e28
parentb46c96dca99e52f539b9344fe60620708e6d32a2 (diff)
downloadmeta-xilinx-c20cfb159e434ab0385086974034d565b8fc43a9.tar.gz
Sync to latest embeddedsw
Move versal-mb conf to meta-xilinx-standalone Sync to latest official patches for zynqmp_pmufw to deal with assert now now being a macro. Sync to latest official patches for copy_bsp.sh (standalone) configurations. Delete versions that do NOT compile. Update remaining versions to compile on current toolchain. Signed-off-by: Mark Hatle <mark.hatle@xilinx.com>
Diffstat
-rw-r--r--meta-xilinx-standalone/recipes-bsp/embeddedsw/embeddedsw.inc2
-rw-r--r--meta-xilinx-standalone/recipes-bsp/embeddedsw/embeddedsw/0001-sw_apps-versal_plm-Changes-to-ensure-versionless-bui.patch261
-rw-r--r--meta-xilinx-standalone/recipes-bsp/embeddedsw/embeddedsw/0001-versal_psmfw-misc-Update-makefile-for-version-less-b.patch56
-rw-r--r--meta-xilinx-standalone/recipes-bsp/embeddedsw/embeddedsw/0001-zynqmp_pmufw-Correct-structure-header-of-PmResetOps.patch30
-rw-r--r--meta-xilinx-standalone/recipes-bsp/embeddedsw/embeddedsw/0001-zynqmp_pmufw-Fix-reset-ops-for-assert.patch (renamed from meta-xilinx-standalone/recipes-bsp/embeddedsw/pmu-firmware/fix-zynqmp-assert.patch)33
-rw-r--r--meta-xilinx-standalone/recipes-bsp/embeddedsw/embeddedsw/makefile-skip-copy_bsp.sh.patch54
-rw-r--r--meta-xilinx-standalone/recipes-bsp/embeddedsw/embeddedsw/zynqmp_pmufw-fixup.patch19
-rw-r--r--meta-xilinx-standalone/recipes-bsp/embeddedsw/plm-firmware.inc2
-rw-r--r--meta-xilinx-standalone/recipes-bsp/embeddedsw/plm-firmware_2019.2.bb1
-rw-r--r--meta-xilinx-standalone/recipes-bsp/embeddedsw/plm-firmware_2020.2.bb52
-rw-r--r--meta-xilinx-standalone/recipes-bsp/embeddedsw/pmu-firmware.inc2
-rw-r--r--meta-xilinx-standalone/recipes-bsp/embeddedsw/pmu-firmware_2019.2.bb1
-rw-r--r--meta-xilinx-standalone/recipes-bsp/embeddedsw/pmu-firmware_2020.1.bb6
-rw-r--r--meta-xilinx-standalone/recipes-bsp/embeddedsw/pmu-firmware_2020.2.bb44
-rw-r--r--meta-xilinx-standalone/recipes-bsp/embeddedsw/psm-firmware.inc2
-rw-r--r--meta-xilinx-standalone/recipes-bsp/embeddedsw/psm-firmware_2019.2.bb1
-rw-r--r--meta-xilinx-standalone/recipes-bsp/embeddedsw/psm-firmware_2020.1.bb1
-rw-r--r--meta-xilinx-standalone/recipes-bsp/embeddedsw/psm-firmware_2020.2.bb52
18 files changed, 604 insertions, 15 deletions
diff --git a/meta-xilinx-standalone/recipes-bsp/embeddedsw/embeddedsw.inc b/meta-xilinx-standalone/recipes-bsp/embeddedsw/embeddedsw.inc
index d7cd3c3f..49bbcae9 100644
--- a/meta-xilinx-standalone/recipes-bsp/embeddedsw/embeddedsw.inc
+++ b/meta-xilinx-standalone/recipes-bsp/embeddedsw/embeddedsw.inc
@@ -28,3 +28,5 @@ LIC_FILES_CHKSUM ??= "file://license.txt;md5=${@d.getVarFlag('LIC_FILES_CHKSUM',
28 28
29SRC_URI = "${EMBEDDEDSW_SRCURI}" 29SRC_URI = "${EMBEDDEDSW_SRCURI}"
30PV = "${ESW_VER}+git${SRCPV}" 30PV = "${ESW_VER}+git${SRCPV}"
31
32FILESPATH .= ":${FILE_DIRNAME}/embeddedsw"
diff --git a/meta-xilinx-standalone/recipes-bsp/embeddedsw/embeddedsw/0001-sw_apps-versal_plm-Changes-to-ensure-versionless-bui.patch b/meta-xilinx-standalone/recipes-bsp/embeddedsw/embeddedsw/0001-sw_apps-versal_plm-Changes-to-ensure-versionless-bui.patch
new file mode 100644
index 00000000..0dbe68dc
--- /dev/null
+++ b/meta-xilinx-standalone/recipes-bsp/embeddedsw/embeddedsw/0001-sw_apps-versal_plm-Changes-to-ensure-versionless-bui.patch
@@ -0,0 +1,261 @@
1From 3b706021d06b9dbbe5848e524da09b527f75ad4f Mon Sep 17 00:00:00 2001
2From: "b.vikram@xilinx.com" <b.vikram@xilinx.com>
3Date: Thu, 11 Feb 2021 23:20:31 +0530
4Subject: [PATCH] sw_apps :versal_plm: Changes to ensure versionless build
5 works with yocto flow
6
7The syntax of updating BSP_SEQUENTIAL_FILES variable in copy_bsp.sh is updated.
8Using COMPILER, ARCHIVER and AASEMBLER variables in bsp Makefile instead of
9hardcoding them. This would help yocto flow as it does not use mb-gcc.
10
11Signed-off-by: Vikram Sreenivasa Batchali <b.vikram@xilinx.com>
12Acked-by: Krishna Chaitanya Patakamuri <krishna.chaitanya.patakamuri@xilinx.com>
13---
14 lib/sw_apps/versal_plm/misc/Makefile | 10 ++++++----
15 lib/sw_apps/versal_plm/misc/copy_bsp.sh | 16 ++++++++--------
16 lib/sw_apps/zynq_fsbl/misc/copy_bsp.sh | 6 +++---
17 lib/sw_apps/zynqmp_fsbl/misc/copy_bsp.sh | 8 ++++----
18 lib/sw_apps/zynqmp_pmufw/misc/Makefile | 10 ++++++----
19 lib/sw_apps/zynqmp_pmufw/misc/copy_bsp.sh | 8 ++++----
20 6 files changed, 31 insertions(+), 27 deletions(-)
21
22diff --git a/lib/sw_apps/versal_plm/misc/Makefile b/lib/sw_apps/versal_plm/misc/Makefile
23index 23ac27b52b..d1be4ffc8e 100644
24--- a/lib/sw_apps/versal_plm/misc/Makefile
25+++ b/lib/sw_apps/versal_plm/misc/Makefile
26@@ -1,5 +1,7 @@
27 # Makefile generated by Xilinx.
28-
29+COMPILER := mb-gcc
30+ARCHIVER := mb-gcc-ar
31+ASSEMBLER := mb-as
32 DRIVER_LIB_VERSION = 1.0
33 PROCESSOR = psv_pmc_0
34 LIBRARIES = ${PROCESSOR}/lib/libxil.a
35@@ -28,7 +30,7 @@ par_libs: $(addsuffix /make.libs,$(PAR_SUBDIRS))
36 @echo 'Finished building libraries parallelly.'
37
38 archive:
39- mb-gcc-ar -r $(LIBRARIES) $(wildcard $(PROCESSOR)/lib/*.o)
40+ $(ARCHIVER) -r $(LIBRARIES) $(wildcard $(PROCESSOR)/lib/*.o)
41
42 clean: $(addsuffix /make.clean,$(SUBDIRS))
43 rm -f ${PROCESSOR}/lib/libxil.a
44@@ -38,11 +40,11 @@ $(PROCESSOR)/lib/libxil.a: $(PROCESSOR)/lib/libxil_init.a
45
46 %/make.include: $(if $(wildcard $(PROCESSOR)/lib/libxil_init.a),$(PROCESSOR)/lib/libxil.a,)
47 @echo "Running Make include in $(subst /make.include,,$@)"
48- $(MAKE) -C $(subst /make.include,,$@) -s include "SHELL=$(SHELL)" "COMPILER=mb-gcc" "ASSEMBLER=mb-as" "ARCHIVER=mb-gcc-ar" "COMPILER_FLAGS= -O2 -c -mcpu=v10.0 -mlittle-endian -mxl-barrel-shift -mxl-pattern-compare" "EXTRA_COMPILER_FLAGS=-g -ffunction-sections -fdata-sections -Wall -Wextra -Os -flto -ffat-lto-objects"
49+ $(MAKE) -C $(subst /make.include,,$@) -s include "SHELL=$(SHELL)" "COMPILER=$(COMPILER)" "ASSEMBLER=$(ASSEMBLER)" "ARCHIVER=$(ARCHIVER)" "COMPILER_FLAGS= -O2 -c -mcpu=v10.0 -mlittle-endian -mxl-barrel-shift -mxl-pattern-compare" "EXTRA_COMPILER_FLAGS=-g -ffunction-sections -fdata-sections -Wall -Wextra -Os -flto -ffat-lto-objects"
50
51 %/make.libs: include
52 @echo "Running Make libs in $(subst /make.libs,,$@)"
53- $(MAKE) -C $(subst /make.libs,,$@) -s libs "SHELL=$(SHELL)" "COMPILER=mb-gcc" "ASSEMBLER=mb-as" "ARCHIVER=mb-gcc-ar" "COMPILER_FLAGS= -O2 -c -mcpu=v10.0 -mlittle-endian -mxl-barrel-shift -mxl-pattern-compare" "EXTRA_COMPILER_FLAGS=-g -ffunction-sections -fdata-sections -Wall -Wextra -Os -flto -ffat-lto-objects"
54+ $(MAKE) -C $(subst /make.libs,,$@) -s libs "SHELL=$(SHELL)" "COMPILER=$(COMPILER)" "ASSEMBLER=$(ASSEMBLER)" "ARCHIVER=$(ARCHIVER)" "COMPILER_FLAGS= -O2 -c -mcpu=v10.0 -mlittle-endian -mxl-barrel-shift -mxl-pattern-compare" "EXTRA_COMPILER_FLAGS=-g -ffunction-sections -fdata-sections -Wall -Wextra -Os -flto -ffat-lto-objects"
55
56 %/make.clean:
57 $(MAKE) -C $(subst /make.clean,,$@) -s clean
58diff --git a/lib/sw_apps/versal_plm/misc/copy_bsp.sh b/lib/sw_apps/versal_plm/misc/copy_bsp.sh
59index 2e4e393b5d..4f082de37c 100755
60--- a/lib/sw_apps/versal_plm/misc/copy_bsp.sh
61+++ b/lib/sw_apps/versal_plm/misc/copy_bsp.sh
62@@ -48,33 +48,33 @@ fi
63 mkdir -p $BSP_DIR/libsrc/xilffs
64 cp -r $SERVICES_DIR/xilffs/src $BSP_DIR/libsrc/xilffs/
65 cp -r $SERVICES_DIR/xilffs/src/include/* $BSP_DIR/include/
66-set BSP_SEQUENTIAL_MAKEFILES += $BSP_DIR/libsrc/xilffs/src/Makefile
67+BSP_SEQUENTIAL_MAKEFILES="$BSP_SEQUENTIAL_MAKEFILES $BSP_DIR/libsrc/xilffs/src/Makefile"
68
69 mkdir -p $BSP_DIR/libsrc/xilpdi
70 cp -r $SERVICES_DIR/xilpdi/src $BSP_DIR/libsrc/xilpdi/
71 cp -r $SERVICES_DIR/xilpdi/src/*.h $BSP_DIR/include/
72-set BSP_SEQUENTIAL_MAKEFILES += $BSP_DIR/libsrc/xilpdi/src/Makefile
73+BSP_SEQUENTIAL_MAKEFILES="$BSP_SEQUENTIAL_MAKEFILES $BSP_DIR/libsrc/xilpdi/src/Makefile"
74
75 mkdir -p $BSP_DIR/libsrc/xilplmi
76 cp -r $SERVICES_DIR/xilplmi/src $BSP_DIR/libsrc/xilplmi/
77-set BSP_SEQUENTIAL_MAKEFILES += $BSP_DIR/libsrc/xilplmi/src/Makefile
78+BSP_SEQUENTIAL_MAKEFILES="$BSP_SEQUENTIAL_MAKEFILES $BSP_DIR/libsrc/xilplmi/src/Makefile"
79
80 mkdir -p $BSP_DIR/libsrc/xilpuf
81 cp -r $SERVICES_DIR/xilpuf/src $BSP_DIR/libsrc/xilpuf/
82 cp -r $SERVICES_DIR/xilpuf/src/*.h $BSP_DIR/include/
83-set SP_SEQUENTIAL_MAKEFILES += $BSP_DIR/libsrc/xilpuf/src/Makefile
84+BSP_SEQUENTIAL_MAKEFILES="$BSP_SEQUENTIAL_MAKEFILES $BSP_DIR/libsrc/xilpuf/src/Makefile"
85
86 mkdir -p $BSP_DIR/libsrc/xilloader
87 cp -r $SERVICES_DIR/xilloader/src $BSP_DIR/libsrc/xilloader/
88 cp -r $SERVICES_DIR/xilloader/src/*.h $BSP_DIR/include/
89-set BSP_SEQUENTIAL_MAKEFILES += $BSP_DIR/libsrc/xilloader/src/Makefile
90+BSP_SEQUENTIAL_MAKEFILES="$BSP_SEQUENTIAL_MAKEFILES $BSP_DIR/libsrc/xilloader/src/Makefile"
91
92 mkdir -p $BSP_DIR/libsrc/xilpm/src/
93 cp -r $SERVICES_DIR/xilpm/src/versal/common/* $BSP_DIR/libsrc/xilpm/src/
94 cp -r $SERVICES_DIR/xilpm/src/versal/server/* $BSP_DIR/libsrc/xilpm/src/
95 cp -r $SERVICES_DIR/xilpm/src/versal/common/*.h $BSP_DIR/include/
96 cp -r $SERVICES_DIR/xilpm/src/versal/server/*.h $BSP_DIR/include/
97-set BSP_SEQUENTIAL_MAKEFILES += $BSP_DIR/libsrc/xilpm/src/versal/common/Makefile
98+BSP_SEQUENTIAL_MAKEFILES="$BSP_SEQUENTIAL_MAKEFILES $BSP_DIR/libsrc/xilpm/src/versal/common/Makefile"
99
100 mkdir -p $BSP_DIR/libsrc/xilsecure/src/
101 cp -r $SERVICES_DIR/xilsecure/src/Makefile $BSP_DIR/libsrc/xilsecure/src/
102@@ -84,7 +84,7 @@ cp -r $SERVICES_DIR/xilsecure/src/common/*.h $BSP_DIR/include/
103 cp -r $SERVICES_DIR/xilsecure/src/versal/*.h $BSP_DIR/include/
104 mv $BSP_DIR/libsrc/xilsecure/src/libxilsecure_pmc.a $BSP_DIR/libsrc/xilsecure/src/libxilsecure.a
105 rm $BSP_DIR/libsrc/xilsecure/src/libxilsecure_*.a
106-set BSP_SEQUENTIAL_MAKEFILES += $BSP_DIR/libsrc/xilsecure/src/Makefile
107+BSP_SEQUENTIAL_MAKEFILES="$BSP_SEQUENTIAL_MAKEFILES $BSP_DIR/libsrc/xilsecure/src/Makefile"
108
109 mkdir -p $BSP_DIR/libsrc/xilsem
110 cp -r $SERVICES_DIR/xilsem/src $BSP_DIR/libsrc/xilsem/
111@@ -116,7 +116,7 @@ do
112 cp -r $DRIVERS_DIR/$line/src/*.h $BSP_DIR/include/
113 # copy all the HSM generated driver files DRIVER_g.c
114 cp $WORKING_DIR/x"$line"_g.c $BSP_DIR/libsrc/$line/src/
115- set BSP_SEQUENTIAL_MAKEFILES += $BSP_DIR/libsrc/$line/src/Makefile
116+ BSP_SEQUENTIAL_MAKEFILES="$BSP_SEQUENTIAL_MAKEFILES $BSP_DIR/libsrc/$line/src/Makefile"
117 done < $DRIVERS_LIST
118
119 #copy the processor code.
120diff --git a/lib/sw_apps/zynq_fsbl/misc/copy_bsp.sh b/lib/sw_apps/zynq_fsbl/misc/copy_bsp.sh
121index 70dae119b2..70a83ffd50 100755
122--- a/lib/sw_apps/zynq_fsbl/misc/copy_bsp.sh
123+++ b/lib/sw_apps/zynq_fsbl/misc/copy_bsp.sh
124@@ -75,18 +75,18 @@ do
125 cp -r $DRIVERS_DIR/$line/src $BSP_DIR/libsrc/$line
126 # copy all the HSM generated driver files DRIVER_g.c
127 # cp $BOARD_DIR/x"$line"_g.c $BSP_DIR/libsrc/$line/src/
128- set BSP_SEQUENTIAL_MAKEFILES += $BSP_DIR/libsrc/$line/src/Makefile
129+ BSP_SEQUENTIAL_MAKEFILES="$BSP_SEQUENTIAL_MAKEFILES $BSP_DIR/libsrc/$line/src/Makefile"
130
131 done < $DRIVERS_LIST
132
133 # copy the libraries required
134 cp -r $SERVICES_DIR/xilffs/ $BSP_DIR/libsrc/
135 cp -r $SERVICES_DIR/xilffs/src/include/* $BSP_DIR/include/
136-set BSP_SEQUENTIAL_MAKEFILES += $BSP_DIR/libsrc/xilffs/src/Makefile
137+BSP_SEQUENTIAL_MAKEFILES="$BSP_SEQUENTIAL_MAKEFILES $BSP_DIR/libsrc/xilffs/src/Makefile"
138
139 cp -r $SERVICES_DIR/xilrsa/ $BSP_DIR/libsrc/
140 cp -r $SERVICES_DIR/xilrsa/src/include/* $BSP_DIR/include/
141-set BSP_SEQUENTIAL_MAKEFILES += $BSP_DIR/libsrc/xilrsa/src/Makefile
142+BSP_SEQUENTIAL_MAKEFILES="$BSP_SEQUENTIAL_MAKEFILES $BSP_DIR/libsrc/xilrsa/src/Makefile"
143
144 #copy the xparameters.h
145 cp $BOARD_DIR/xparameters.h $BSP_DIR/include/
146diff --git a/lib/sw_apps/zynqmp_fsbl/misc/copy_bsp.sh b/lib/sw_apps/zynqmp_fsbl/misc/copy_bsp.sh
147index 8cc6e3a66e..120aeb8fc7 100755
148--- a/lib/sw_apps/zynqmp_fsbl/misc/copy_bsp.sh
149+++ b/lib/sw_apps/zynqmp_fsbl/misc/copy_bsp.sh
150@@ -65,7 +65,7 @@ fi
151 mkdir -p $BSP_DIR/libsrc/xilffs
152 cp -r $SERVICES_DIR/xilffs/src $BSP_DIR/libsrc/xilffs/
153 cp -r $SERVICES_DIR/xilffs/src/include/* $BSP_DIR/include/
154-set BSP_SEQUENTIAL_MAKEFILES += $BSP_DIR/libsrc/xilffs/src/Makefile
155+BSP_SEQUENTIAL_MAKEFILES="$BSP_SEQUENTIAL_MAKEFILES $BSP_DIR/libsrc/xilffs/src/Makefile"
156
157 mkdir -p $BSP_DIR/libsrc/xilsecure/src/
158 cp -r $SERVICES_DIR/xilsecure/src/Makefile $BSP_DIR/libsrc/xilsecure/src/
159@@ -73,13 +73,13 @@ cp -r $SERVICES_DIR/xilsecure/src/common/* $BSP_DIR/libsrc/xilsecure/src/
160 cp -r $SERVICES_DIR/xilsecure/src/zynqmp/* $BSP_DIR/libsrc/xilsecure/src/
161 cp -r $SERVICES_DIR/xilsecure/src/common/*.h $BSP_DIR/include/
162 cp -r $SERVICES_DIR/xilsecure/src/zynqmp/*.h $BSP_DIR/include/
163-set BSP_SEQUENTIAL_MAKEFILES += $BSP_DIR/libsrc/xilsecure/src/Makefile
164+BSP_SEQUENTIAL_MAKEFILES="BSP_SEQUENTIAL_MAKEFILES $BSP_DIR/libsrc/xilsecure/src/Makefile"
165
166 cp -r $SERVICES_DIR/xilpm/ $BSP_DIR/libsrc/
167 cp -r $SERVICES_DIR/xilpm/src/zynqmp/client/common/* $BSP_DIR/libsrc/xilpm/src/
168 cp -r $SERVICES_DIR/xilpm/src/zynqmp/client/common/*.h $BSP_DIR/include/
169 cp $WORKING_DIR/pm_cfg_obj.c $BSP_DIR/libsrc/xilpm/src/
170-set BSP_SEQUENTIAL_MAKEFILES += $BSP_DIR/libsrc/xilpm/src/zynqmp/client/common/Makefile
171+BSP_SEQUENTIAL_MAKEFILES="BSP_SEQUENTIAL_MAKEFILES $BSP_DIR/libsrc/xilpm/src/zynqmp/client/common/Makefile"
172
173 rm -rf $BSP_DIR/libsrc/xilpm/src/zynqmp/
174 rm -rf $BSP_DIR/libsrc/xilpm/src/versal/
175@@ -161,7 +161,7 @@ do
176
177 # copy all the HSM generated driver files DRIVER_g.c
178 # cp $BOARD_DIR/x"$line"_g.c $BSP_DIR/libsrc/$line/src/
179- set BSP_SEQUENTIAL_MAKEFILES += $BSP_DIR/libsrc/$line/src/Makefile
180+ BSP_SEQUENTIAL_MAKEFILES="$BSP_SEQUENTIAL_MAKEFILES $BSP_DIR/libsrc/$line/src/Makefile"
181
182 done < $DRIVERS_LIST
183
184diff --git a/lib/sw_apps/zynqmp_pmufw/misc/Makefile b/lib/sw_apps/zynqmp_pmufw/misc/Makefile
185index 142581b2b9..a773498512 100644
186--- a/lib/sw_apps/zynqmp_pmufw/misc/Makefile
187+++ b/lib/sw_apps/zynqmp_pmufw/misc/Makefile
188@@ -1,5 +1,7 @@
189 # Makefile generated by Xilinx.
190-
191+COMPILER := mb-gcc
192+ARCHIVER := mb-gcc-ar
193+ASSEMBLER := mb-as
194 DRIVER_LIB_VERSION = 1.0
195 PROCESSOR = psu_pmu_0
196 LIBRARIES = ${PROCESSOR}/lib/libxil.a
197@@ -28,7 +30,7 @@ par_libs: $(addsuffix /make.libs,$(PAR_SUBDIRS))
198 @echo 'Finished building libraries parallelly.'
199
200 archive:
201- mb-gcc-ar -r $(LIBRARIES) $(wildcard $(PROCESSOR)/lib/*.o)
202+ $(ARCHIVER) -r $(LIBRARIES) $(wildcard $(PROCESSOR)/lib/*.o)
203
204 clean: $(addsuffix /make.clean,$(SUBDIRS))
205 rm -f ${PROCESSOR}/lib/libxil.a
206@@ -38,11 +40,11 @@ $(PROCESSOR)/lib/libxil.a: $(PROCESSOR)/lib/libxil_init.a
207
208 %/make.include: $(if $(wildcard $(PROCESSOR)/lib/libxil_init.a),$(PROCESSOR)/lib/libxil.a,)
209 @echo "Running Make include in $(subst /make.include,,$@)"
210- $(MAKE) -C $(subst /make.include,,$@) -s include "SHELL=$(SHELL)" "COMPILER=mb-gcc" "ARCHIVER=mb-ar" "COMPILER_FLAGS= -O2 -c -mcpu=v9.2 -mlittle-endian -mxl-barrel-shift -mxl-pattern-compare -mxl-soft-mul" "EXTRA_COMPILER_FLAGS=-ffunction-sections -fdata-sections -Wall -Wextra -Os -flto -ffat-lto-objects"
211+ $(MAKE) -C $(subst /make.include,,$@) -s include "SHELL=$(SHELL)" "COMPILER=$(COMPILER)" "ARCHIVER=$(ARCHIVER)" "COMPILER_FLAGS= -O2 -c -mcpu=v9.2 -mlittle-endian -mxl-barrel-shift -mxl-pattern-compare -mxl-soft-mul" "EXTRA_COMPILER_FLAGS=-ffunction-sections -fdata-sections -Wall -Wextra -Os -flto -ffat-lto-objects"
212
213 %/make.libs: include
214 @echo "Running Make libs in $(subst /make.libs,,$@)"
215- $(MAKE) -C $(subst /make.libs,,$@) -s libs "SHELL=$(SHELL)" "COMPILER=mb-gcc" "ARCHIVER=mb-ar" "COMPILER_FLAGS= -O2 -c -mcpu=v9.2 -mlittle-endian -mxl-barrel-shift -mxl-pattern-compare -mxl-soft-mul" "EXTRA_COMPILER_FLAGS=-ffunction-sections -fdata-sections -Wall -Wextra -Os -flto -ffat-lto-objects"
216+ $(MAKE) -C $(subst /make.libs,,$@) -s libs "SHELL=$(SHELL)" "COMPILER=$(COMPILER)" "ARCHIVER=$(ARCHIVER)" "COMPILER_FLAGS= -O2 -c -mcpu=v9.2 -mlittle-endian -mxl-barrel-shift -mxl-pattern-compare -mxl-soft-mul" "EXTRA_COMPILER_FLAGS=-ffunction-sections -fdata-sections -Wall -Wextra -Os -flto -ffat-lto-objects"
217
218 %/make.clean:
219 $(MAKE) -C $(subst /make.clean,,$@) -s clean
220diff --git a/lib/sw_apps/zynqmp_pmufw/misc/copy_bsp.sh b/lib/sw_apps/zynqmp_pmufw/misc/copy_bsp.sh
221index c683e4f73d..be8616968e 100755
222--- a/lib/sw_apps/zynqmp_pmufw/misc/copy_bsp.sh
223+++ b/lib/sw_apps/zynqmp_pmufw/misc/copy_bsp.sh
224@@ -52,14 +52,14 @@ cp -r $SERVICES_DIR/xilfpga/src/interface/zynqmp/xilfpga_pcap.c $BSP_DIR/libsrc/
225 cp -r $SERVICES_DIR/xilfpga/src/*.h $BSP_DIR/include/
226 cp -r $SERVICES_DIR/xilfpga/src/interface/zynqmp/*.h $BSP_DIR/include/
227 rm -r $BSP_DIR/libsrc/xilfpga/src/interface/
228-set BSP_SEQUENTIAL_MAKEFILES += $BSP_DIR/libsrc/xilfpga/src/Makefile
229+BSP_SEQUENTIAL_MAKEFILES="$BSP_SEQUENTIAL_MAKEFILES $BSP_DIR/libsrc/xilfpga/src/Makefile"
230 mkdir -p $BSP_DIR/libsrc/xilsecure/src/
231 cp -r $SERVICES_DIR/xilsecure/src/Makefile $BSP_DIR/libsrc/xilsecure/src/
232 cp -r $SERVICES_DIR/xilsecure/src/common/* $BSP_DIR/libsrc/xilsecure/src/
233 cp -r $SERVICES_DIR/xilsecure/src/zynqmp/* $BSP_DIR/libsrc/xilsecure/src/
234 cp -r $SERVICES_DIR/xilsecure/src/common/*.h $BSP_DIR/include/
235 cp -r $SERVICES_DIR/xilsecure/src/zynqmp/*.h $BSP_DIR/include/
236-set BSP_SEQUENTIAL_MAKEFILES += $BSP_DIR/libsrc/xilsecure/src/Makefile
237+BSP_SEQUENTIAL_MAKEFILES="$BSP_SEQUENTIAL_MAKEFILES $BSP_DIR/libsrc/xilsecure/src/Makefile"
238 cp -r $SERVICES_DIR/xilskey/ $BSP_DIR/libsrc/
239
240 # remove the xilskey library files which are not required for PMU
241@@ -81,7 +81,7 @@ rm -r $BSP_DIR/libsrc/xilskey/src/include/xilskey_bbram.h
242 # copy the xilskey library header files to include directory
243 cp -r $BSP_DIR/libsrc/xilskey/src/*.h $BSP_DIR/include/
244 cp -r $BSP_DIR/libsrc/xilskey/src/include/*.h $BSP_DIR/include/
245-set BSP_SEQUENTIAL_MAKEFILES += $BSP_DIR/libsrc/xilskey/src/Makefile
246+BSP_SEQUENTIAL_MAKEFILES="$BSP_SEQUENTIAL_MAKEFILES $BSP_DIR/libsrc/xilskey/src/Makefile"
247
248 # copy bsp standalone code
249 cp $STANDALONE_DIR/common/* $BSP_DIR/libsrc/standalone/src/
250@@ -108,7 +108,7 @@ do
251 cp -r $DRIVERS_DIR/$line/src/*.h $BSP_DIR/include/
252 # copy all the HSM generated driver files DRIVER_g.c
253 cp $WORKING_DIR/x"$line"_g.c $BSP_DIR/libsrc/$line/src/
254- set BSP_SEQUENTIAL_MAKEFILES += $BSP_DIR/libsrc/$line/src/Makefile
255+ BSP_SEQUENTIAL_MAKEFILES="$BSP_SEQUENTIAL_MAKEFILES $BSP_DIR/libsrc/$line/src/Makefile"
256
257 done < $DRIVERS_LIST
258
259--
2602.17.1
261
diff --git a/meta-xilinx-standalone/recipes-bsp/embeddedsw/embeddedsw/0001-versal_psmfw-misc-Update-makefile-for-version-less-b.patch b/meta-xilinx-standalone/recipes-bsp/embeddedsw/embeddedsw/0001-versal_psmfw-misc-Update-makefile-for-version-less-b.patch
new file mode 100644
index 00000000..295d59bb
--- /dev/null
+++ b/meta-xilinx-standalone/recipes-bsp/embeddedsw/embeddedsw/0001-versal_psmfw-misc-Update-makefile-for-version-less-b.patch
@@ -0,0 +1,56 @@
1From 79e17afd2c943c53978dceab2f8fd17cba8994ec Mon Sep 17 00:00:00 2001
2From: Rajan Vaja <rajan.vaja@xilinx.com>
3Date: Mon, 15 Feb 2021 22:53:37 -0800
4Subject: [PATCH] versal_psmfw: misc: Update makefile for version less build
5 with yocto
6
7Use COMPILER, ARCHIVER and ASSEMBLER variables in Makefile instead of
8hard coding them. This would help yocto flow as it does not use
9mb-gcc.
10
11Signed-off-by: Rajan Vaja <rajan.vaja@xilinx.com>
12Acked-by: Nicole Baze <nicole.baze@xilinx.com>
13---
14 lib/sw_apps/versal_psmfw/misc/Makefile | 9 ++++++---
15 1 file changed, 6 insertions(+), 3 deletions(-)
16
17diff --git a/lib/sw_apps/versal_psmfw/misc/Makefile b/lib/sw_apps/versal_psmfw/misc/Makefile
18index 6374302f5c..2164c19f03 100644
19--- a/lib/sw_apps/versal_psmfw/misc/Makefile
20+++ b/lib/sw_apps/versal_psmfw/misc/Makefile
21@@ -8,6 +8,9 @@ SUBDIRS := $(patsubst %/Makefile, %, $(BSP_MAKEFILES))
22 BSP_PARALLEL_MAKEFILES := $(filter-out $(BSP_SEQUENTIAL_MAKEFILES),$(BSP_MAKEFILES))
23 SEQ_SUBDIRS := $(patsubst %/Makefile, %, $(BSP_SEQUENTIAL_MAKEFILES))
24 PAR_SUBDIRS := $(patsubst %/Makefile, %, $(BSP_PARALLEL_MAKEFILES))
25+COMPILER := mb-gcc
26+ARCHIVER := mb-ar
27+ASSEMBLER := mb-as
28
29 ifneq (,$(findstring win,$(RDI_PLATFORM)))
30 SHELL = CMD
31@@ -28,7 +31,7 @@ par_libs: $(addsuffix /make.libs,$(PAR_SUBDIRS))
32 @echo 'Finished building libraries parallelly.'
33
34 archive:
35- mb-ar -r $(LIBRARIES) $(wildcard $(PROCESSOR)/lib/*.o)
36+ $(ARCHIVER) -r $(LIBRARIES) $(wildcard $(PROCESSOR)/lib/*.o)
37
38 clean: $(addsuffix /make.clean,$(SUBDIRS))
39 rm -f ${PROCESSOR}/lib/libxil.a
40@@ -38,11 +41,11 @@ $(PROCESSOR)/lib/libxil.a: $(PROCESSOR)/lib/libxil_init.a
41
42 %/make.include: $(if $(wildcard $(PROCESSOR)/lib/libxil_init.a),$(PROCESSOR)/lib/libxil.a,)
43 @echo "Running Make include in $(subst /make.include,,$@)"
44- $(MAKE) -C $(subst /make.include,,$@) -s include "SHELL=$(SHELL)" "COMPILER=mb-gcc" "ASSEMBLER=mb-as" "ARCHIVER=mb-ar" "COMPILER_FLAGS= -O2 -c -mcpu=v -mlittle-endian -mxl-barrel-shift -mxl-pattern-compare" "EXTRA_COMPILER_FLAGS=-g -ffunction-sections -fdata-sections -Wall -Wextra"
45+ $(MAKE) -C $(subst /make.include,,$@) -s include "SHELL=$(SHELL)" "COMPILER=$(COMPILER)" "ASSEMBLER=$(ASSEMBLER)" "ARCHIVER=$(ARCHIVER)" "COMPILER_FLAGS= -O2 -c -mcpu=v -mlittle-endian -mxl-barrel-shift -mxl-pattern-compare" "EXTRA_COMPILER_FLAGS=-g -ffunction-sections -fdata-sections -Wall -Wextra"
46
47 %/make.libs: include
48 @echo "Running Make libs in $(subst /make.libs,,$@)"
49- $(MAKE) -C $(subst /make.libs,,$@) -s libs "SHELL=$(SHELL)" "COMPILER=mb-gcc" "ASSEMBLER=mb-as" "ARCHIVER=mb-ar" "COMPILER_FLAGS= -O2 -c -mcpu=v -mlittle-endian -mxl-barrel-shift -mxl-pattern-compare" "EXTRA_COMPILER_FLAGS=-g -ffunction-sections -fdata-sections -Wall -Wextra"
50+ $(MAKE) -C $(subst /make.libs,,$@) -s libs "SHELL=$(SHELL)" "COMPILER=$(COMPILER)" "ASSEMBLER=$(ASSEMBLER)" "ARCHIVER=$(ARCHIVER)" "COMPILER_FLAGS= -O2 -c -mcpu=v -mlittle-endian -mxl-barrel-shift -mxl-pattern-compare" "EXTRA_COMPILER_FLAGS=-g -ffunction-sections -fdata-sections -Wall -Wextra"
51
52 %/make.clean:
53 $(MAKE) -C $(subst /make.clean,,$@) -s clean
54--
552.17.1
56
diff --git a/meta-xilinx-standalone/recipes-bsp/embeddedsw/embeddedsw/0001-zynqmp_pmufw-Correct-structure-header-of-PmResetOps.patch b/meta-xilinx-standalone/recipes-bsp/embeddedsw/embeddedsw/0001-zynqmp_pmufw-Correct-structure-header-of-PmResetOps.patch
new file mode 100644
index 00000000..a5d0894a
--- /dev/null
+++ b/meta-xilinx-standalone/recipes-bsp/embeddedsw/embeddedsw/0001-zynqmp_pmufw-Correct-structure-header-of-PmResetOps.patch
@@ -0,0 +1,30 @@
1From 27d08d91eedb77c28e7776d0ccf6b92d79d3b6bb Mon Sep 17 00:00:00 2001
2From: Rajan Vaja <rajan.vaja@xilinx.com>
3Date: Mon, 15 Feb 2021 22:47:13 -0800
4Subject: [PATCH] zynqmp_pmufw: Correct structure header of PmResetOps
5
6Update structure header of PmResetOps for using resetAssert instead
7of assert.
8
9Signed-off-by: Rajan Vaja <rajan.vaja@xilinx.com>
10Acked-by: Mounika Akula <mounika.akula@xilinx.com>
11---
12 lib/sw_apps/zynqmp_pmufw/src/pm_reset.c | 2 +-
13 1 file changed, 1 insertion(+), 1 deletion(-)
14
15diff --git a/lib/sw_apps/zynqmp_pmufw/src/pm_reset.c b/lib/sw_apps/zynqmp_pmufw/src/pm_reset.c
16index bcd8aa73db..a693eb4196 100644
17--- a/lib/sw_apps/zynqmp_pmufw/src/pm_reset.c
18+++ b/lib/sw_apps/zynqmp_pmufw/src/pm_reset.c
19@@ -29,7 +29,7 @@
20
21 /**
22 * PmResetOps - Reset operations
23- * @assert Assert or release reset line
24+ * @resetAssert Assert or release reset line
25 * @getStatus Get current status of reset line
26 * @pulse Function performing reset pulse operation
27 */
28--
292.17.1
30
diff --git a/meta-xilinx-standalone/recipes-bsp/embeddedsw/pmu-firmware/fix-zynqmp-assert.patch b/meta-xilinx-standalone/recipes-bsp/embeddedsw/embeddedsw/0001-zynqmp_pmufw-Fix-reset-ops-for-assert.patch
index 87e1b111..a0e67dfd 100644
--- a/meta-xilinx-standalone/recipes-bsp/embeddedsw/pmu-firmware/fix-zynqmp-assert.patch
+++ b/meta-xilinx-standalone/recipes-bsp/embeddedsw/embeddedsw/0001-zynqmp_pmufw-Fix-reset-ops-for-assert.patch
@@ -1,8 +1,30 @@
1From 57a5a13ef730c5c46d9db159ed9b7a466cc70388 Mon Sep 17 00:00:00 2001
2From: Rajan Vaja <rajan.vaja@xilinx.com>
3Date: Wed, 27 Jan 2021 22:19:51 -0800
4Subject: [PATCH] zynqmp_pmufw: Fix reset ops for assert()
5
6New compiler toolchain treats "assert" as a macro always. So rename
7the existing "assert" variable to "resetAssert" in the codebase.
8
9Signed-off-by: Rajan Vaja <rajan.vaja@xilinx.com>
10Acked-by: Ravi Patel <ravi.patel@xilinx.com>
11Acked-by: Tejas Patel <tejas.patel@xilinx.com>
12---
13 lib/sw_apps/zynqmp_pmufw/src/pm_reset.c | 20 ++++++++++----------
14 1 file changed, 10 insertions(+), 10 deletions(-)
15
1diff --git a/lib/sw_apps/zynqmp_pmufw/src/pm_reset.c b/lib/sw_apps/zynqmp_pmufw/src/pm_reset.c 16diff --git a/lib/sw_apps/zynqmp_pmufw/src/pm_reset.c b/lib/sw_apps/zynqmp_pmufw/src/pm_reset.c
2index 297c6c2ddc..bc295cf013 100644 17index c66aae4a0c..bcd8aa73db 100644
3--- a/lib/sw_apps/zynqmp_pmufw/src/pm_reset.c 18--- a/lib/sw_apps/zynqmp_pmufw/src/pm_reset.c
4+++ b/lib/sw_apps/zynqmp_pmufw/src/pm_reset.c 19+++ b/lib/sw_apps/zynqmp_pmufw/src/pm_reset.c
5@@ -52,7 +52,7 @@ 20@@ -1,5 +1,5 @@
21 /*
22-* Copyright (c) 2014 - 2020 Xilinx, Inc. All rights reserved.
23+* Copyright (c) 2014 - 2021 Xilinx, Inc. All rights reserved.
24 * SPDX-License-Identifier: MIT
25 */
26
27@@ -34,7 +34,7 @@
6 * @pulse Function performing reset pulse operation 28 * @pulse Function performing reset pulse operation
7 */ 29 */
8 typedef struct PmResetOps { 30 typedef struct PmResetOps {
@@ -11,7 +33,7 @@ index 297c6c2ddc..bc295cf013 100644
11 u32 (*const getStatus)(const PmReset* const s); 33 u32 (*const getStatus)(const PmReset* const s);
12 u32 (*const pulse)(const PmReset* const rst); 34 u32 (*const pulse)(const PmReset* const rst);
13 } PmResetOps; 35 } PmResetOps;
14@@ -415,37 +415,37 @@ static u32 PmResetPulsePl(const PmReset* const rst) 36@@ -399,37 +399,37 @@ static u32 PmResetPulsePl(const PmReset* const rst)
15 } 37 }
16 38
17 static const PmResetOps pmResetOpsGeneric = { 39 static const PmResetOps pmResetOpsGeneric = {
@@ -55,7 +77,7 @@ index 297c6c2ddc..bc295cf013 100644
55 .getStatus = PmResetGetStatusGpioBankIOs, 77 .getStatus = PmResetGetStatusGpioBankIOs,
56 .pulse = PmResetPulseGpioBankIOs, 78 .pulse = PmResetPulseGpioBankIOs,
57 }; 79 };
58@@ -1901,8 +1901,8 @@ s32 PmResetDoAssert(const PmReset *reset, u32 action) 80@@ -1885,8 +1885,8 @@ s32 PmResetDoAssert(const PmReset *reset, u32 action)
59 switch (action) { 81 switch (action) {
60 case PM_RESET_ACTION_RELEASE: 82 case PM_RESET_ACTION_RELEASE:
61 case PM_RESET_ACTION_ASSERT: 83 case PM_RESET_ACTION_ASSERT:
@@ -66,3 +88,6 @@ index 297c6c2ddc..bc295cf013 100644
66 } else { 88 } else {
67 status = XST_INVALID_PARAM; 89 status = XST_INVALID_PARAM;
68 } 90 }
91--
922.17.1
93
diff --git a/meta-xilinx-standalone/recipes-bsp/embeddedsw/embeddedsw/makefile-skip-copy_bsp.sh.patch b/meta-xilinx-standalone/recipes-bsp/embeddedsw/embeddedsw/makefile-skip-copy_bsp.sh.patch
new file mode 100644
index 00000000..5b9cc71b
--- /dev/null
+++ b/meta-xilinx-standalone/recipes-bsp/embeddedsw/embeddedsw/makefile-skip-copy_bsp.sh.patch
@@ -0,0 +1,54 @@
1Prevent makefile from calling copy_bsp.sh
2
3If we call copy_bsp.sh we will undo any manual compliation steps we
4have already done. Avoid this.
5
6YP integration specific
7
8Signed-off-by: Mark Hatle <mark.hatle@xilinx.com>
9
10diff --git a/lib/sw_apps/zynqmp_pmufw/src/Makefile b/lib/sw_apps/zynqmp_pmufw/src/Makefile
11index 1750c0a329..17f6a545ea 100644
12--- a/lib/sw_apps/zynqmp_pmufw/src/Makefile
13+++ b/lib/sw_apps/zynqmp_pmufw/src/Makefile
14@@ -28,8 +28,8 @@ $(EXEC): $(LIBS) $(OBJS) $(INCLUDES)
15 $(CC) -o $@ $(OBJS) $(CC_FLAGS) $(CFLAGS) $(LN_FLAGS) $(LIBPATH) $(LSCRIPT)
16
17 $(LIBS):
18- echo "Copying BSP files"
19- ../misc/copy_bsp.sh
20+ #echo "Copying BSP files"
21+ #../misc/copy_bsp.sh
22 echo "Compiling bsp"
23 $(MAKE) -C ../misc/zynqmp_pmufw_bsp
24
25diff --git a/lib/sw_apps/versal_plm/src/Makefile b/lib/sw_apps/versal_plm/src/Makefile
26index b4536e8584..a8643ecd47 100644
27--- a/lib/sw_apps/versal_plm/src/Makefile
28+++ b/lib/sw_apps/versal_plm/src/Makefile
29@@ -30,8 +30,8 @@ $(EXEC): $(LIBS) $(OBJS) $(INCLUDES)
30 $(CC) -o $@ $(OBJS) $(CC_FLAGS) $(CFLAGS) $(LN_FLAGS) $(LIBPATH) $(LSCRIPT)
31
32 $(LIBS):
33- echo "Copying BSP files"
34- ../misc/copy_bsp.sh
35+ #echo "Copying BSP files"
36+ #../misc/copy_bsp.sh
37 echo "Compiling bsp"
38 $(MAKE) -C ../misc/versal_plm_bsp
39
40diff --git a/lib/sw_apps/versal_psmfw/src/Makefile b/lib/sw_apps/versal_psmfw/src/Makefile
41index fdfee0a092..1ed664114b 100644
42--- a/lib/sw_apps/versal_psmfw/src/Makefile
43+++ b/lib/sw_apps/versal_psmfw/src/Makefile
44@@ -29,8 +29,8 @@ $(EXEC): $(LIBS) $(OBJS) $(INCLUDES)
45 $(CC) -o $@ $(OBJS) $(CC_FLAGS) $(CFLAGS) $(LN_FLAGS) $(LIBPATH) $(LSCRIPT)
46
47 $(LIBS):
48- echo "Copying BSP files"
49- ../misc/copy_bsp.sh
50+ #echo "Copying BSP files"
51+ #../misc/copy_bsp.sh
52 echo "Compiling bsp"
53 $(MAKE) -C ../misc/versal_psmfw_bsp
54
diff --git a/meta-xilinx-standalone/recipes-bsp/embeddedsw/embeddedsw/zynqmp_pmufw-fixup.patch b/meta-xilinx-standalone/recipes-bsp/embeddedsw/embeddedsw/zynqmp_pmufw-fixup.patch
new file mode 100644
index 00000000..50ce7bcb
--- /dev/null
+++ b/meta-xilinx-standalone/recipes-bsp/embeddedsw/embeddedsw/zynqmp_pmufw-fixup.patch
@@ -0,0 +1,19 @@
1Fix incorrect copy that triggers a failure:
2
3| cp: -r not specified; omitting directory '../misc/../../../../lib/bsp/standalone/src/common/clocking'
4
5Signed-off-by: Mark Hatle <mark.hatle@xilinx.com>
6
7diff --git a/lib/sw_apps/zynqmp_pmufw/misc/copy_bsp.sh b/lib/sw_apps/zynqmp_pmufw/misc/copy_bsp.sh
8index be8616968e..c3eca3f092 100755
9--- a/lib/sw_apps/zynqmp_pmufw/misc/copy_bsp.sh
10+++ b/lib/sw_apps/zynqmp_pmufw/misc/copy_bsp.sh
11@@ -84,7 +84,7 @@ cp -r $BSP_DIR/libsrc/xilskey/src/include/*.h $BSP_DIR/include/
12 BSP_SEQUENTIAL_MAKEFILES="$BSP_SEQUENTIAL_MAKEFILES $BSP_DIR/libsrc/xilskey/src/Makefile"
13
14 # copy bsp standalone code
15-cp $STANDALONE_DIR/common/* $BSP_DIR/libsrc/standalone/src/
16+cp -r $STANDALONE_DIR/common/* $BSP_DIR/libsrc/standalone/src/
17 cp $STANDALONE_DIR/microblaze/* $BSP_DIR/libsrc/standalone/src/
18 cp -r $STANDALONE_DIR/profile $BSP_DIR/libsrc/standalone/src/
19 cp $WORKING_DIR/bspconfig.h $BSP_DIR/include
diff --git a/meta-xilinx-standalone/recipes-bsp/embeddedsw/plm-firmware.inc b/meta-xilinx-standalone/recipes-bsp/embeddedsw/plm-firmware.inc
index 79d6791c..8ff96b64 100644
--- a/meta-xilinx-standalone/recipes-bsp/embeddedsw/plm-firmware.inc
+++ b/meta-xilinx-standalone/recipes-bsp/embeddedsw/plm-firmware.inc
@@ -8,7 +8,7 @@ require embeddedsw.inc
8inherit deploy 8inherit deploy
9 9
10COMPATIBLE_HOST = "microblaze.*-elf" 10COMPATIBLE_HOST = "microblaze.*-elf"
11COMPATIBLE_MACHINE = "versal-mb" 11COMPATIBLE_MACHINE = "microblaze-plm"
12 12
13S = "${WORKDIR}/git" 13S = "${WORKDIR}/git"
14B = "${S}/lib/sw_apps/versal_plm/src" 14B = "${S}/lib/sw_apps/versal_plm/src"
diff --git a/meta-xilinx-standalone/recipes-bsp/embeddedsw/plm-firmware_2019.2.bb b/meta-xilinx-standalone/recipes-bsp/embeddedsw/plm-firmware_2019.2.bb
deleted file mode 100644
index 782c9dc4..00000000
--- a/meta-xilinx-standalone/recipes-bsp/embeddedsw/plm-firmware_2019.2.bb
+++ /dev/null
@@ -1 +0,0 @@
1require plm-firmware.inc
diff --git a/meta-xilinx-standalone/recipes-bsp/embeddedsw/plm-firmware_2020.2.bb b/meta-xilinx-standalone/recipes-bsp/embeddedsw/plm-firmware_2020.2.bb
index 69455dfa..a72b055d 100644
--- a/meta-xilinx-standalone/recipes-bsp/embeddedsw/plm-firmware_2020.2.bb
+++ b/meta-xilinx-standalone/recipes-bsp/embeddedsw/plm-firmware_2020.2.bb
@@ -1,3 +1,53 @@
1require plm-firmware.inc 1require plm-firmware.inc
2 2
3DEFAULT_PREFERENCE = "-1" 3SRC_URI += " \
4 file://0001-zynqmp_pmufw-Fix-reset-ops-for-assert.patch \
5 file://0001-zynqmp_pmufw-Correct-structure-header-of-PmResetOps.patch \
6 file://0001-sw_apps-versal_plm-Changes-to-ensure-versionless-bui.patch \
7 file://0001-versal_psmfw-misc-Update-makefile-for-version-less-b.patch \
8 file://zynqmp_pmufw-fixup.patch \
9 file://makefile-skip-copy_bsp.sh.patch \
10 "
11
12do_configure() {
13 # manually do the copy_bsp step first, so as to be able to fix up use of
14 # mb-* commands
15 . ${B}/../misc/copy_bsp.sh
16 echo "$BSP_SEQUENTIAL_MAKEFILES" > ${B}/seq.mak
17}
18
19do_compile() {
20 # First process the sequential items
21 for i in $(cat seq.mak); do
22 echo Include Seq: $i
23 if [ ! -d $i ]; then
24 echo "Skipping...."
25 continue
26 fi
27 oe_runmake -C $(dirname $i) -s include ${@bsp_make_vars(d)}
28 done
29 for i in $(cat seq.mak); do
30 echo Libs Seq: $i
31 if [ ! -d $i ]; then
32 echo "Skipping...."
33 continue
34 fi
35 oe_runmake -C $(dirname $i) -s libs ${@bsp_make_vars(d)}
36 done
37
38 # the Makefile in ${B}/../misc/Makefile, does not handle CC, AR, AS, etc
39 # properly. So do its job manually. Preparing the includes first, then libs.
40 for i in $(ls ${BSP_TARGETS_DIR}/*/src/Makefile); do
41 echo Include: $i
42 oe_runmake -C $(dirname $i) -s include ${@bsp_make_vars(d)}
43 done
44 for i in $(ls ${BSP_TARGETS_DIR}/*/src/Makefile); do
45 echo Libs: $i
46 oe_runmake -C $(dirname $i) -s libs ${@bsp_make_vars(d)}
47 done
48
49 # --build-id=none is required due to linker script not defining a location for it.
50 # Again, recipe-systoot include is necessary
51 echo Construct: executable
52 oe_runmake plm.elf ${@bsp_make_vars(d)} CC_FLAGS="-MMD -MP -Wl,--build-id=none -I${STAGING_DIR_TARGET}/usr/include"
53}
diff --git a/meta-xilinx-standalone/recipes-bsp/embeddedsw/pmu-firmware.inc b/meta-xilinx-standalone/recipes-bsp/embeddedsw/pmu-firmware.inc
index 1e1c1e65..dc0e1c82 100644
--- a/meta-xilinx-standalone/recipes-bsp/embeddedsw/pmu-firmware.inc
+++ b/meta-xilinx-standalone/recipes-bsp/embeddedsw/pmu-firmware.inc
@@ -4,8 +4,6 @@ PROVIDES = "virtual/pmu-firmware"
4 4
5require embeddedsw.inc 5require embeddedsw.inc
6 6
7SRC_URI += "file://fix-zynqmp-assert.patch"
8
9inherit deploy 7inherit deploy
10 8
11COMPATIBLE_HOST = "microblaze.*-elf" 9COMPATIBLE_HOST = "microblaze.*-elf"
diff --git a/meta-xilinx-standalone/recipes-bsp/embeddedsw/pmu-firmware_2019.2.bb b/meta-xilinx-standalone/recipes-bsp/embeddedsw/pmu-firmware_2019.2.bb
deleted file mode 100644
index 88b10b31..00000000
--- a/meta-xilinx-standalone/recipes-bsp/embeddedsw/pmu-firmware_2019.2.bb
+++ /dev/null
@@ -1 +0,0 @@
1require pmu-firmware.inc
diff --git a/meta-xilinx-standalone/recipes-bsp/embeddedsw/pmu-firmware_2020.1.bb b/meta-xilinx-standalone/recipes-bsp/embeddedsw/pmu-firmware_2020.1.bb
index 88b10b31..047047bc 100644
--- a/meta-xilinx-standalone/recipes-bsp/embeddedsw/pmu-firmware_2020.1.bb
+++ b/meta-xilinx-standalone/recipes-bsp/embeddedsw/pmu-firmware_2020.1.bb
@@ -1 +1,7 @@
1require pmu-firmware.inc 1require pmu-firmware.inc
2
3SRC_URI += " \
4 file://0001-zynqmp_pmufw-Fix-reset-ops-for-assert.patch \
5 file://0001-zynqmp_pmufw-Correct-structure-header-of-PmResetOps.patch \
6 "
7
diff --git a/meta-xilinx-standalone/recipes-bsp/embeddedsw/pmu-firmware_2020.2.bb b/meta-xilinx-standalone/recipes-bsp/embeddedsw/pmu-firmware_2020.2.bb
index e2eca1b7..09c7492a 100644
--- a/meta-xilinx-standalone/recipes-bsp/embeddedsw/pmu-firmware_2020.2.bb
+++ b/meta-xilinx-standalone/recipes-bsp/embeddedsw/pmu-firmware_2020.2.bb
@@ -1,3 +1,45 @@
1require pmu-firmware.inc 1require pmu-firmware.inc
2 2
3DEFAULT_PREFERENCE = "-1" 3SRC_URI += " \
4 file://0001-zynqmp_pmufw-Fix-reset-ops-for-assert.patch \
5 file://0001-zynqmp_pmufw-Correct-structure-header-of-PmResetOps.patch \
6 file://0001-sw_apps-versal_plm-Changes-to-ensure-versionless-bui.patch \
7 file://0001-versal_psmfw-misc-Update-makefile-for-version-less-b.patch \
8 file://zynqmp_pmufw-fixup.patch \
9 file://makefile-skip-copy_bsp.sh.patch \
10 "
11
12do_configure() {
13 # manually do the copy_bsp step first, so as to be able to fix up use of
14 # mb-* commands
15 . ${B}/../misc/copy_bsp.sh
16 echo "$BSP_SEQUENTIAL_MAKEFILES" > ${B}/seq.mak
17}
18
19do_compile() {
20 # First process the sequential items
21 for i in $(cat seq.mak); do
22 echo Include Seq: $i
23 oe_runmake -C $(dirname $i) -s include ${@bsp_make_vars(d)}
24 done
25 for i in $(cat seq.mak); do
26 echo Libs Seq: $i
27 oe_runmake -C $(dirname $i) -s libs ${@bsp_make_vars(d)}
28 done
29
30 # the Makefile in ${B}/../misc/Makefile, does not handle CC, AR, AS, etc
31 # properly. So do its job manually. Preparing the includes first, then libs.
32 for i in $(ls ${BSP_TARGETS_DIR}/*/src/Makefile); do
33 echo Include: $i
34 oe_runmake -C $(dirname $i) -s include ${@bsp_make_vars(d)}
35 done
36 for i in $(ls ${BSP_TARGETS_DIR}/*/src/Makefile); do
37 echo Libs: $i
38 oe_runmake -C $(dirname $i) -s libs ${@bsp_make_vars(d)}
39 done
40
41 # --build-id=none is required due to linker script not defining a location for it.
42 # Again, recipe-systoot include is necessary
43 echo Construct: executable
44 oe_runmake executable.elf ${@bsp_make_vars(d)} CC_FLAGS="-MMD -MP -Wl,--build-id=none -I${STAGING_DIR_TARGET}/usr/include"
45}
diff --git a/meta-xilinx-standalone/recipes-bsp/embeddedsw/psm-firmware.inc b/meta-xilinx-standalone/recipes-bsp/embeddedsw/psm-firmware.inc
index f6f7590d..66754b08 100644
--- a/meta-xilinx-standalone/recipes-bsp/embeddedsw/psm-firmware.inc
+++ b/meta-xilinx-standalone/recipes-bsp/embeddedsw/psm-firmware.inc
@@ -8,7 +8,7 @@ require embeddedsw.inc
8inherit deploy 8inherit deploy
9 9
10COMPATIBLE_HOST = "microblaze.*-elf" 10COMPATIBLE_HOST = "microblaze.*-elf"
11COMPATIBLE_MACHINE = "versal-mb" 11COMPATIBLE_MACHINE = "microblaze-psm"
12 12
13 13
14S = "${WORKDIR}/git" 14S = "${WORKDIR}/git"
diff --git a/meta-xilinx-standalone/recipes-bsp/embeddedsw/psm-firmware_2019.2.bb b/meta-xilinx-standalone/recipes-bsp/embeddedsw/psm-firmware_2019.2.bb
deleted file mode 100644
index 61509c7a..00000000
--- a/meta-xilinx-standalone/recipes-bsp/embeddedsw/psm-firmware_2019.2.bb
+++ /dev/null
@@ -1 +0,0 @@
1require psm-firmware.inc
diff --git a/meta-xilinx-standalone/recipes-bsp/embeddedsw/psm-firmware_2020.1.bb b/meta-xilinx-standalone/recipes-bsp/embeddedsw/psm-firmware_2020.1.bb
deleted file mode 100644
index 61509c7a..00000000
--- a/meta-xilinx-standalone/recipes-bsp/embeddedsw/psm-firmware_2020.1.bb
+++ /dev/null
@@ -1 +0,0 @@
1require psm-firmware.inc
diff --git a/meta-xilinx-standalone/recipes-bsp/embeddedsw/psm-firmware_2020.2.bb b/meta-xilinx-standalone/recipes-bsp/embeddedsw/psm-firmware_2020.2.bb
index 11ef4038..e3125c47 100644
--- a/meta-xilinx-standalone/recipes-bsp/embeddedsw/psm-firmware_2020.2.bb
+++ b/meta-xilinx-standalone/recipes-bsp/embeddedsw/psm-firmware_2020.2.bb
@@ -1,3 +1,53 @@
1require psm-firmware.inc 1require psm-firmware.inc
2 2
3DEFAULT_PREFERENCE = "-1" 3SRC_URI += " \
4 file://0001-zynqmp_pmufw-Fix-reset-ops-for-assert.patch \
5 file://0001-zynqmp_pmufw-Correct-structure-header-of-PmResetOps.patch \
6 file://0001-sw_apps-versal_plm-Changes-to-ensure-versionless-bui.patch \
7 file://0001-versal_psmfw-misc-Update-makefile-for-version-less-b.patch \
8 file://zynqmp_pmufw-fixup.patch \
9 file://makefile-skip-copy_bsp.sh.patch \
10 "
11
12do_configure() {
13 # manually do the copy_bsp step first, so as to be able to fix up use of
14 # mb-* commands
15 . ${B}/../misc/copy_bsp.sh
16 echo "$BSP_SEQUENTIAL_MAKEFILES" > ${B}/seq.mak
17}
18
19do_compile() {
20 # First process the sequential items
21 for i in $(cat seq.mak); do
22 echo Include Seq: $i
23 if [ ! -d $i ]; then
24 echo "Skipping...."
25 continue
26 fi
27 oe_runmake -C $(dirname $i) -s include ${@bsp_make_vars(d)}
28 done
29 for i in $(cat seq.mak); do
30 echo Libs Seq: $i
31 if [ ! -d $i ]; then
32 echo "Skipping...."
33 continue
34 fi
35 oe_runmake -C $(dirname $i) -s libs ${@bsp_make_vars(d)}
36 done
37
38 # the Makefile in ${B}/../misc/Makefile, does not handle CC, AR, AS, etc
39 # properly. So do its job manually. Preparing the includes first, then libs.
40 for i in $(ls ${BSP_TARGETS_DIR}/*/src/Makefile); do
41 echo Include: $i
42 oe_runmake -C $(dirname $i) -s include ${@bsp_make_vars(d)}
43 done
44 for i in $(ls ${BSP_TARGETS_DIR}/*/src/Makefile); do
45 echo Libs: $i
46 oe_runmake -C $(dirname $i) -s libs ${@bsp_make_vars(d)}
47 done
48
49 # --build-id=none is required due to linker script not defining a location for it.
50 # Again, recipe-systoot include is necessary
51 echo Construct: executable
52 oe_runmake psmfw.elf ${@bsp_make_vars(d)} CC_FLAGS="-MMD -MP -Wl,--build-id=none -I${STAGING_DIR_TARGET}/usr/include"
53}
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2026-08-05 21:16:47 +0000