diff options
Diffstat (limited to 'meta-xilinx-standalone/recipes-bsp/embeddedsw/embeddedsw/2022.2/0001-versal_fw-Fixup-core-makefiles.patch')
-rw-r--r-- | meta-xilinx-standalone/recipes-bsp/embeddedsw/embeddedsw/2022.2/0001-versal_fw-Fixup-core-makefiles.patch | 101 |
1 files changed, 101 insertions, 0 deletions
diff --git a/meta-xilinx-standalone/recipes-bsp/embeddedsw/embeddedsw/2022.2/0001-versal_fw-Fixup-core-makefiles.patch b/meta-xilinx-standalone/recipes-bsp/embeddedsw/embeddedsw/2022.2/0001-versal_fw-Fixup-core-makefiles.patch new file mode 100644 index 00000000..d6cb0e38 --- /dev/null +++ b/meta-xilinx-standalone/recipes-bsp/embeddedsw/embeddedsw/2022.2/0001-versal_fw-Fixup-core-makefiles.patch | |||
@@ -0,0 +1,101 @@ | |||
1 | From 607322dafb2979affd329ea70a2a7952203188a4 Mon Sep 17 00:00:00 2001 | ||
2 | From: Mark Hatle <mark.hatle@amd.com> | ||
3 | Date: Wed, 7 Dec 2022 15:42:15 -0800 | ||
4 | Subject: [PATCH] versal_fw: Fixup core makefiles | ||
5 | |||
6 | The Yocto Project build environment needs to be able to override a few | ||
7 | additional variables that may not be appropriate to do on the regular | ||
8 | command line build version. This patch preserves the default while | ||
9 | allowing it to be overriden as necessary. | ||
10 | |||
11 | Signed-off-by: Mark Hatle <mark.hatle@amd.com> | ||
12 | --- | ||
13 | lib/sw_apps/versal_plm/misc/versal/Makefile | 6 ++++-- | ||
14 | lib/sw_apps/versal_plm/misc/versal_net/Makefile | 6 ++++-- | ||
15 | lib/sw_apps/versal_psmfw/misc/Makefile | 6 ++++-- | ||
16 | 3 files changed, 12 insertions(+), 6 deletions(-) | ||
17 | |||
18 | diff --git a/lib/sw_apps/versal_plm/misc/versal/Makefile b/lib/sw_apps/versal_plm/misc/versal/Makefile | ||
19 | index 5c8e719e9c..af070716b6 100644 | ||
20 | --- a/lib/sw_apps/versal_plm/misc/versal/Makefile | ||
21 | +++ b/lib/sw_apps/versal_plm/misc/versal/Makefile | ||
22 | @@ -2,6 +2,8 @@ | ||
23 | COMPILER := mb-gcc | ||
24 | ARCHIVER := mb-gcc-ar | ||
25 | ASSEMBLER := mb-as | ||
26 | +COMPILER_FLAGS := -O2 -c -mcpu=v10.0 -mlittle-endian -mxl-barrel-shift -mxl-pattern-compare | ||
27 | +EXTRA_COMPILER_FLAGS := -g -ffunction-sections -fdata-sections -Wall -Wextra -Os -flto -ffat-lto-objects | ||
28 | DRIVER_LIB_VERSION = 1.0 | ||
29 | PROCESSOR = psv_pmc_0 | ||
30 | LIBRARIES = ${PROCESSOR}/lib/libxil.a | ||
31 | @@ -40,11 +42,11 @@ $(PROCESSOR)/lib/libxil.a: $(PROCESSOR)/lib/libxil_init.a | ||
32 | |||
33 | %/make.include: $(if $(wildcard $(PROCESSOR)/lib/libxil_init.a),$(PROCESSOR)/lib/libxil.a,) | ||
34 | @echo "Running Make include in $(subst /make.include,,$@)" | ||
35 | - $(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" | ||
36 | + $(MAKE) -C $(subst /make.include,,$@) -s include "SHELL=$(SHELL)" "COMPILER=$(COMPILER)" "ASSEMBLER=$(ASSEMBLER)" "ARCHIVER=$(ARCHIVER)" "COMPILER_FLAGS=$(COMPILER_FLAGS)" "EXTRA_COMPILER_FLAGS=$(EXTRA_COMPILER_FLAGS)" | ||
37 | |||
38 | %/make.libs: include | ||
39 | @echo "Running Make libs in $(subst /make.libs,,$@)" | ||
40 | - $(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" | ||
41 | + $(MAKE) -C $(subst /make.libs,,$@) -s libs "SHELL=$(SHELL)" "COMPILER=$(COMPILER)" "ASSEMBLER=$(ASSEMBLER)" "ARCHIVER=$(ARCHIVER)" "COMPILER_FLAGS=$(COMPILER_FLAGS)" "EXTRA_COMPILER_FLAGS=$(EXTRA_COMPILER_FLAGS)" | ||
42 | |||
43 | %/make.clean: | ||
44 | $(MAKE) -C $(subst /make.clean,,$@) -s clean | ||
45 | diff --git a/lib/sw_apps/versal_plm/misc/versal_net/Makefile b/lib/sw_apps/versal_plm/misc/versal_net/Makefile | ||
46 | index abffa6c5ed..4af5a02001 100644 | ||
47 | --- a/lib/sw_apps/versal_plm/misc/versal_net/Makefile | ||
48 | +++ b/lib/sw_apps/versal_plm/misc/versal_net/Makefile | ||
49 | @@ -2,6 +2,8 @@ | ||
50 | COMPILER := mb-gcc | ||
51 | ARCHIVER := mb-gcc-ar | ||
52 | ASSEMBLER := mb-as | ||
53 | +COMPILER_FLAGS := -O2 -c -mcpu=v10.0 -mlittle-endian -mxl-barrel-shift -mxl-pattern-compare | ||
54 | +EXTRA_COMPILER_FLAGS := -g -ffunction-sections -fdata-sections -Wall -Wextra -Os -flto -ffat-lto-objects | ||
55 | DRIVER_LIB_VERSION = 1.0 | ||
56 | PROCESSOR = psx_pmc_0 | ||
57 | LIBRARIES = ${PROCESSOR}/lib/libxil.a | ||
58 | @@ -40,11 +42,11 @@ $(PROCESSOR)/lib/libxil.a: $(PROCESSOR)/lib/libxil_init.a | ||
59 | |||
60 | %/make.include: $(if $(wildcard $(PROCESSOR)/lib/libxil_init.a),$(PROCESSOR)/lib/libxil.a,) | ||
61 | @echo "Running Make include in $(subst /make.include,,$@)" | ||
62 | - $(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" | ||
63 | + $(MAKE) -C $(subst /make.include,,$@) -s include "SHELL=$(SHELL)" "COMPILER=$(COMPILER)" "ASSEMBLER=$(ASSEMBLER)" "ARCHIVER=$(ARCHIVER)" "COMPILER_FLAGS=$(COMPILER_FLAGS)" "EXTRA_COMPILER_FLAGS=$(EXTRA_COMPILER_FLAGS)" | ||
64 | |||
65 | %/make.libs: include | ||
66 | @echo "Running Make libs in $(subst /make.libs,,$@)" | ||
67 | - $(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" | ||
68 | + $(MAKE) -C $(subst /make.libs,,$@) -s libs "SHELL=$(SHELL)" "COMPILER=$(COMPILER)" "ASSEMBLER=$(ASSEMBLER)" "ARCHIVER=$(ARCHIVER)" "COMPILER_FLAGS=$(COMPILER_FLAGS)" "EXTRA_COMPILER_FLAGS=$(EXTRA_COMPILER_FLAGS)" | ||
69 | |||
70 | %/make.clean: | ||
71 | $(MAKE) -C $(subst /make.clean,,$@) -s clean | ||
72 | diff --git a/lib/sw_apps/versal_psmfw/misc/Makefile b/lib/sw_apps/versal_psmfw/misc/Makefile | ||
73 | index 02d85e492e..f6386dcbed 100644 | ||
74 | --- a/lib/sw_apps/versal_psmfw/misc/Makefile | ||
75 | +++ b/lib/sw_apps/versal_psmfw/misc/Makefile | ||
76 | @@ -11,6 +11,8 @@ PAR_SUBDIRS := $(patsubst %/Makefile, %, $(BSP_PARALLEL_MAKEFILES)) | ||
77 | COMPILER := mb-gcc | ||
78 | ARCHIVER := mb-ar | ||
79 | ASSEMBLER := mb-as | ||
80 | +COMPILER_FLAGS := -O2 -c -mcpu=v10.0 -mlittle-endian -mxl-barrel-shift -mxl-pattern-compare | ||
81 | +EXTRA_COMPILER_FLAGS := -g -ffunction-sections -fdata-sections -Wall -Wextra | ||
82 | |||
83 | ifneq (,$(findstring win,$(RDI_PLATFORM))) | ||
84 | SHELL = CMD | ||
85 | @@ -41,11 +43,11 @@ $(PROCESSOR)/lib/libxil.a: $(PROCESSOR)/lib/libxil_init.a | ||
86 | |||
87 | %/make.include: $(if $(wildcard $(PROCESSOR)/lib/libxil_init.a),$(PROCESSOR)/lib/libxil.a,) | ||
88 | @echo "Running Make include in $(subst /make.include,,$@)" | ||
89 | - $(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" | ||
90 | + $(MAKE) -C $(subst /make.include,,$@) -s include "SHELL=$(SHELL)" "COMPILER=$(COMPILER)" "ASSEMBLER=$(ASSEMBLER)" "ARCHIVER=$(ARCHIVER)" "COMPILER_FLAGS=$(COMPILER_FLAGS)" "EXTRA_COMPILER_FLAGS=$(EXTRA_COMPILER_FLAGS)" | ||
91 | |||
92 | %/make.libs: include | ||
93 | @echo "Running Make libs in $(subst /make.libs,,$@)" | ||
94 | - $(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" | ||
95 | + $(MAKE) -C $(subst /make.libs,,$@) -s libs "SHELL=$(SHELL)" "COMPILER=$(COMPILER)" "ASSEMBLER=$(ASSEMBLER)" "ARCHIVER=$(ARCHIVER)" "COMPILER_FLAGS=$(COMPILER_FLAGS)" "EXTRA_COMPILER_FLAGS=$(EXTRA_COMPILER_FLAGS)" | ||
96 | |||
97 | %/make.clean: | ||
98 | $(MAKE) -C $(subst /make.clean,,$@) -s clean | ||
99 | -- | ||
100 | 2.17.1 | ||
101 | |||