diff options
9 files changed, 0 insertions, 64 deletions
diff --git a/meta-xilinx-standalone/recipes-bsp/embeddedsw/embeddedsw/2023.1/0001-Workaround-Disable-Wnull-dereference.patch b/meta-xilinx-standalone/recipes-bsp/embeddedsw/embeddedsw/2023.1/0001-Workaround-Disable-Wnull-dereference.patch deleted file mode 100644 index a71a4c11..00000000 --- a/meta-xilinx-standalone/recipes-bsp/embeddedsw/embeddedsw/2023.1/0001-Workaround-Disable-Wnull-dereference.patch +++ /dev/null | |||
@@ -1,42 +0,0 @@ | |||
1 | From 98b3377a70ee057f7529bd3381fa6d844ba6fe09 Mon Sep 17 00:00:00 2001 | ||
2 | From: Mark Hatle <mark.hatle@amd.com> | ||
3 | Date: Wed, 7 Dec 2022 17:36:22 -0800 | ||
4 | Subject: [PATCH] Workaround: Disable -Wnull-dereference | ||
5 | |||
6 | xpm_domain_iso.c:724:42: error: potential null pointer dereference [-Werror=null-dereference] | ||
7 | |||
8 | Signed-off-by: Mark Hatle <mark.hatle@amd.com> | ||
9 | --- | ||
10 | lib/sw_services/xilpm/src/versal/common/Makefile | 2 +- | ||
11 | lib/sw_services/xilpm/src/versal_net/common/Makefile | 2 +- | ||
12 | 2 files changed, 2 insertions(+), 2 deletions(-) | ||
13 | |||
14 | diff --git a/lib/sw_services/xilpm/src/versal/common/Makefile b/lib/sw_services/xilpm/src/versal/common/Makefile | ||
15 | index 0b61e37bbb..6c5f776ef0 100644 | ||
16 | --- a/lib/sw_services/xilpm/src/versal/common/Makefile | ||
17 | +++ b/lib/sw_services/xilpm/src/versal/common/Makefile | ||
18 | @@ -10,7 +10,7 @@ COMPILER_FLAGS= | ||
19 | EXTRA_COMPILER_FLAGS= | ||
20 | CUSTOM_COMPILER_FLAGS=-Werror | ||
21 | ifeq ($(findstring gcc, $(COMPILER)), gcc) | ||
22 | -CUSTOM_COMPILER_FLAGS+=-Wall -Wextra -Warray-bounds=2 -Wformat=2 -Wno-main -Wimplicit-function-declaration -Wmissing-prototypes -Wmissing-braces -Wmultistatement-macros -Wparentheses -Wreturn-type -Wsequence-point -Wbool-compare -Wbool-operation -Wchar-subscripts -Wenum-compare -Winit-self -fno-strict-aliasing -Wtautological-compare -Wuninitialized -Wunused-function -Wunused-label -Wunused-variable -Wcast-function-type -Wenum-conversion -Wmissing-parameter-type -Wtype-limits -Wshift-negative-value -Wshadow -Wdouble-promotion -fno-common -Wnull-dereference -Wmissing-include-dirs -Wswitch-default -Wswitch-enum -Wswitch-bool -Wshift-overflow=2 -Wswitch-outside-range -Wswitch-unreachable -Wunused-parameter -Wduplicated-branches -Wduplicated-cond -Wdiv-by-zero -Wshadow=local -Wpointer-arith -Wunused-macros -Wdangling-else -Waggressive-loop-optimizations -Wstrict-prototypes -Woverflow -Wredundant-decls -Wvla -Wlogical-op -Wconversion -Wundef | ||
23 | +CUSTOM_COMPILER_FLAGS+=-Wall -Wextra -Warray-bounds=2 -Wformat=2 -Wno-main -Wimplicit-function-declaration -Wmissing-prototypes -Wmissing-braces -Wmultistatement-macros -Wparentheses -Wreturn-type -Wsequence-point -Wbool-compare -Wbool-operation -Wchar-subscripts -Wenum-compare -Winit-self -fno-strict-aliasing -Wtautological-compare -Wuninitialized -Wunused-function -Wunused-label -Wunused-variable -Wcast-function-type -Wenum-conversion -Wmissing-parameter-type -Wtype-limits -Wshift-negative-value -Wshadow -Wdouble-promotion -fno-common -Wmissing-include-dirs -Wswitch-default -Wswitch-enum -Wswitch-bool -Wshift-overflow=2 -Wswitch-outside-range -Wswitch-unreachable -Wunused-parameter -Wduplicated-branches -Wduplicated-cond -Wdiv-by-zero -Wshadow=local -Wpointer-arith -Wunused-macros -Wdangling-else -Waggressive-loop-optimizations -Wstrict-prototypes -Woverflow -Wredundant-decls -Wvla -Wlogical-op -Wconversion -Wundef | ||
24 | endif | ||
25 | LIB= libxilpm.a | ||
26 | |||
27 | diff --git a/lib/sw_services/xilpm/src/versal_net/common/Makefile b/lib/sw_services/xilpm/src/versal_net/common/Makefile | ||
28 | index 36460a1b18..257ad694e3 100644 | ||
29 | --- a/lib/sw_services/xilpm/src/versal_net/common/Makefile | ||
30 | +++ b/lib/sw_services/xilpm/src/versal_net/common/Makefile | ||
31 | @@ -10,7 +10,7 @@ COMPILER_FLAGS= | ||
32 | EXTRA_COMPILER_FLAGS= | ||
33 | CUSTOM_COMPILER_FLAGS=-Werror | ||
34 | ifeq ($(findstring gcc, $(COMPILER)), gcc) | ||
35 | -CUSTOM_COMPILER_FLAGS+=-Wall -Wextra -Warray-bounds=2 -Wformat=2 -Wno-main -Wimplicit-function-declaration -Wmissing-prototypes -Wmissing-braces -Wmultistatement-macros -Wparentheses -Wreturn-type -Wsequence-point -Wbool-compare -Wbool-operation -Wchar-subscripts -Wenum-compare -Winit-self -fno-strict-aliasing -Wtautological-compare -Wuninitialized -Wunused-function -Wunused-label -Wunused-variable -Wcast-function-type -Wenum-conversion -Wmissing-parameter-type -Wtype-limits -Wshift-negative-value -Wshadow -Wdouble-promotion -fno-common -Wnull-dereference -Wmissing-include-dirs -Wswitch-default -Wswitch-enum -Wswitch-bool -Wshift-overflow=2 -Wswitch-outside-range -Wswitch-unreachable -Wunused-parameter -Wduplicated-branches -Wduplicated-cond -Wdiv-by-zero -Wshadow=local -Wpointer-arith -Wunused-macros -Wdangling-else -Waggressive-loop-optimizations -Wstrict-prototypes -Woverflow -Wredundant-decls -Wvla -Wlogical-op -Wconversion -Wundef | ||
36 | +CUSTOM_COMPILER_FLAGS+=-Wall -Wextra -Warray-bounds=2 -Wformat=2 -Wno-main -Wimplicit-function-declaration -Wmissing-prototypes -Wmissing-braces -Wmultistatement-macros -Wparentheses -Wreturn-type -Wsequence-point -Wbool-compare -Wbool-operation -Wchar-subscripts -Wenum-compare -Winit-self -fno-strict-aliasing -Wtautological-compare -Wuninitialized -Wunused-function -Wunused-label -Wunused-variable -Wcast-function-type -Wenum-conversion -Wmissing-parameter-type -Wtype-limits -Wshift-negative-value -Wshadow -Wdouble-promotion -fno-common -Wmissing-include-dirs -Wswitch-default -Wswitch-enum -Wswitch-bool -Wshift-overflow=2 -Wswitch-outside-range -Wswitch-unreachable -Wunused-parameter -Wduplicated-branches -Wduplicated-cond -Wdiv-by-zero -Wshadow=local -Wpointer-arith -Wunused-macros -Wdangling-else -Waggressive-loop-optimizations -Wstrict-prototypes -Woverflow -Wredundant-decls -Wvla -Wlogical-op -Wconversion -Wundef | ||
37 | endif | ||
38 | LIB= libxilpm.a | ||
39 | |||
40 | -- | ||
41 | 2.17.1 | ||
42 | |||
diff --git a/meta-xilinx-standalone/recipes-bsp/embeddedsw/fsbl-firmware_2023.1.bb b/meta-xilinx-standalone/recipes-bsp/embeddedsw/fsbl-firmware_2023.1.bb index 9055ac6c..8816dc4d 100644 --- a/meta-xilinx-standalone/recipes-bsp/embeddedsw/fsbl-firmware_2023.1.bb +++ b/meta-xilinx-standalone/recipes-bsp/embeddedsw/fsbl-firmware_2023.1.bb | |||
@@ -5,7 +5,6 @@ FILESPATH .= ":${FILE_DIRNAME}/embeddedsw/2023.1:${FILE_DIRNAME}/embeddedsw" | |||
5 | SRC_URI += " \ | 5 | SRC_URI += " \ |
6 | file://makefile-skip-copy_bsp.sh.patch \ | 6 | file://makefile-skip-copy_bsp.sh.patch \ |
7 | file://fsbl-fixups.patch \ | 7 | file://fsbl-fixups.patch \ |
8 | file://0001-Workaround-Disable-Wnull-dereference.patch \ | ||
9 | " | 8 | " |
10 | 9 | ||
11 | # This version does not build for zynq | 10 | # This version does not build for zynq |
diff --git a/meta-xilinx-standalone/recipes-bsp/embeddedsw/fsbl-firmware_git.bb b/meta-xilinx-standalone/recipes-bsp/embeddedsw/fsbl-firmware_git.bb index dc3b0ca9..f5e55ecc 100644 --- a/meta-xilinx-standalone/recipes-bsp/embeddedsw/fsbl-firmware_git.bb +++ b/meta-xilinx-standalone/recipes-bsp/embeddedsw/fsbl-firmware_git.bb | |||
@@ -8,7 +8,6 @@ FILESPATH .= ":${FILE_DIRNAME}/embeddedsw/2023.1:${FILE_DIRNAME}/embeddedsw" | |||
8 | SRC_URI += " \ | 8 | SRC_URI += " \ |
9 | file://makefile-skip-copy_bsp.sh.patch \ | 9 | file://makefile-skip-copy_bsp.sh.patch \ |
10 | file://fsbl-fixups.patch \ | 10 | file://fsbl-fixups.patch \ |
11 | file://0001-Workaround-Disable-Wnull-dereference.patch \ | ||
12 | " | 11 | " |
13 | 12 | ||
14 | # This version does not build for zynq | 13 | # This version does not build for zynq |
diff --git a/meta-xilinx-standalone/recipes-bsp/embeddedsw/plm-firmware_2023.1.bb b/meta-xilinx-standalone/recipes-bsp/embeddedsw/plm-firmware_2023.1.bb index 22626f4d..37861b75 100644 --- a/meta-xilinx-standalone/recipes-bsp/embeddedsw/plm-firmware_2023.1.bb +++ b/meta-xilinx-standalone/recipes-bsp/embeddedsw/plm-firmware_2023.1.bb | |||
@@ -12,17 +12,10 @@ FILESPATH .= ":${FILE_DIRNAME}/embeddedsw/2023.1:${FILE_DIRNAME}/embeddedsw" | |||
12 | SRC_URI += " \ | 12 | SRC_URI += " \ |
13 | file://makefile-skip-copy_bsp.sh.patch \ | 13 | file://makefile-skip-copy_bsp.sh.patch \ |
14 | file://0001-versal_fw-Fixup-core-makefiles.patch \ | 14 | file://0001-versal_fw-Fixup-core-makefiles.patch \ |
15 | file://0001-Workaround-Disable-Wnull-dereference.patch \ | ||
16 | " | 15 | " |
17 | 16 | ||
18 | EXTRA_COMPILER_FLAGS = "-g -ffunction-sections -fdata-sections -Wall -Wextra -Os -flto -ffat-lto-objects" | 17 | EXTRA_COMPILER_FLAGS = "-g -ffunction-sections -fdata-sections -Wall -Wextra -Os -flto -ffat-lto-objects" |
19 | 18 | ||
20 | # Workaround for: ../../../include/xparameters.h:1021:67: warning: conversion from 'long long unsigned int' to 'unsigned int' changes value from '18446744073709551615' to '4294967295' [-Woverflow] | ||
21 | EXTRA_COMPILER_FLAGS += "-Wno-overflow" | ||
22 | |||
23 | # Workaround for: xpm_domain_iso.c:724:42: error: potential null pointer dereference [-Werror=null-dereference] | ||
24 | EXTRA_COMPILER_FLAGS += "-Wno-null-dereference" | ||
25 | |||
26 | do_configure() { | 19 | do_configure() { |
27 | # manually do the copy_bsp step first, so as to be able to fix up use of | 20 | # manually do the copy_bsp step first, so as to be able to fix up use of |
28 | # mb-* commands | 21 | # mb-* commands |
@@ -30,7 +23,6 @@ do_configure() { | |||
30 | } | 23 | } |
31 | 24 | ||
32 | do_compile() { | 25 | do_compile() { |
33 | pwd | ||
34 | oe_runmake | 26 | oe_runmake |
35 | 27 | ||
36 | ${MB_OBJCOPY} -O binary ${B}/${ESW_COMPONENT} ${B}/${ESW_COMPONENT}.bin | 28 | ${MB_OBJCOPY} -O binary ${B}/${ESW_COMPONENT} ${B}/${ESW_COMPONENT}.bin |
diff --git a/meta-xilinx-standalone/recipes-bsp/embeddedsw/plm-firmware_git.bb b/meta-xilinx-standalone/recipes-bsp/embeddedsw/plm-firmware_git.bb index aae0e8af..bbc7519f 100644 --- a/meta-xilinx-standalone/recipes-bsp/embeddedsw/plm-firmware_git.bb +++ b/meta-xilinx-standalone/recipes-bsp/embeddedsw/plm-firmware_git.bb | |||
@@ -15,17 +15,10 @@ FILESPATH .= ":${FILE_DIRNAME}/embeddedsw/2023.1:${FILE_DIRNAME}/embeddedsw" | |||
15 | SRC_URI += " \ | 15 | SRC_URI += " \ |
16 | file://makefile-skip-copy_bsp.sh.patch \ | 16 | file://makefile-skip-copy_bsp.sh.patch \ |
17 | file://0001-versal_fw-Fixup-core-makefiles.patch \ | 17 | file://0001-versal_fw-Fixup-core-makefiles.patch \ |
18 | file://0001-Workaround-Disable-Wnull-dereference.patch \ | ||
19 | " | 18 | " |
20 | 19 | ||
21 | EXTRA_COMPILER_FLAGS = "-g -ffunction-sections -fdata-sections -Wall -Wextra -Os -flto -ffat-lto-objects" | 20 | EXTRA_COMPILER_FLAGS = "-g -ffunction-sections -fdata-sections -Wall -Wextra -Os -flto -ffat-lto-objects" |
22 | 21 | ||
23 | # Workaround for: ../../../include/xparameters.h:1021:67: warning: conversion from 'long long unsigned int' to 'unsigned int' changes value from '18446744073709551615' to '4294967295' [-Woverflow] | ||
24 | EXTRA_COMPILER_FLAGS += "-Wno-overflow" | ||
25 | |||
26 | # Workaround for: xpm_domain_iso.c:724:42: error: potential null pointer dereference [-Werror=null-dereference] | ||
27 | EXTRA_COMPILER_FLAGS += "-Wno-null-dereference" | ||
28 | |||
29 | do_configure() { | 22 | do_configure() { |
30 | # manually do the copy_bsp step first, so as to be able to fix up use of | 23 | # manually do the copy_bsp step first, so as to be able to fix up use of |
31 | # mb-* commands | 24 | # mb-* commands |
@@ -33,7 +26,6 @@ do_configure() { | |||
33 | } | 26 | } |
34 | 27 | ||
35 | do_compile() { | 28 | do_compile() { |
36 | pwd | ||
37 | oe_runmake | 29 | oe_runmake |
38 | 30 | ||
39 | ${MB_OBJCOPY} -O binary ${B}/${ESW_COMPONENT} ${B}/${ESW_COMPONENT}.bin | 31 | ${MB_OBJCOPY} -O binary ${B}/${ESW_COMPONENT} ${B}/${ESW_COMPONENT}.bin |
diff --git a/meta-xilinx-standalone/recipes-bsp/embeddedsw/pmu-firmware_2023.1.bb b/meta-xilinx-standalone/recipes-bsp/embeddedsw/pmu-firmware_2023.1.bb index b1e8c005..fe6deddc 100644 --- a/meta-xilinx-standalone/recipes-bsp/embeddedsw/pmu-firmware_2023.1.bb +++ b/meta-xilinx-standalone/recipes-bsp/embeddedsw/pmu-firmware_2023.1.bb | |||
@@ -5,7 +5,6 @@ FILESPATH .= ":${FILE_DIRNAME}/embeddedsw/2023.1:${FILE_DIRNAME}/embeddedsw" | |||
5 | SRC_URI += " \ | 5 | SRC_URI += " \ |
6 | file://makefile-skip-copy_bsp.sh.patch \ | 6 | file://makefile-skip-copy_bsp.sh.patch \ |
7 | file://0001-zynqmp_pmufw-Fixup-core-makefiles.patch \ | 7 | file://0001-zynqmp_pmufw-Fixup-core-makefiles.patch \ |
8 | file://0001-Workaround-Disable-Wnull-dereference.patch \ | ||
9 | " | 8 | " |
10 | 9 | ||
11 | EXTRA_COMPILER_FLAGS = "-ffunction-sections -fdata-sections -Wall -Wextra -Os -flto -ffat-lto-objects" | 10 | 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_git.bb b/meta-xilinx-standalone/recipes-bsp/embeddedsw/pmu-firmware_git.bb index e55edd1d..c55cd149 100644 --- a/meta-xilinx-standalone/recipes-bsp/embeddedsw/pmu-firmware_git.bb +++ b/meta-xilinx-standalone/recipes-bsp/embeddedsw/pmu-firmware_git.bb | |||
@@ -8,7 +8,6 @@ FILESPATH .= ":${FILE_DIRNAME}/embeddedsw/2023.1:${FILE_DIRNAME}/embeddedsw" | |||
8 | SRC_URI += " \ | 8 | SRC_URI += " \ |
9 | file://makefile-skip-copy_bsp.sh.patch \ | 9 | file://makefile-skip-copy_bsp.sh.patch \ |
10 | file://0001-zynqmp_pmufw-Fixup-core-makefiles.patch \ | 10 | file://0001-zynqmp_pmufw-Fixup-core-makefiles.patch \ |
11 | file://0001-Workaround-Disable-Wnull-dereference.patch \ | ||
12 | " | 11 | " |
13 | 12 | ||
14 | EXTRA_COMPILER_FLAGS = "-ffunction-sections -fdata-sections -Wall -Wextra -Os -flto -ffat-lto-objects" | 13 | EXTRA_COMPILER_FLAGS = "-ffunction-sections -fdata-sections -Wall -Wextra -Os -flto -ffat-lto-objects" |
diff --git a/meta-xilinx-standalone/recipes-bsp/embeddedsw/psm-firmware_2023.1.bb b/meta-xilinx-standalone/recipes-bsp/embeddedsw/psm-firmware_2023.1.bb index bd992e41..569c5a46 100644 --- a/meta-xilinx-standalone/recipes-bsp/embeddedsw/psm-firmware_2023.1.bb +++ b/meta-xilinx-standalone/recipes-bsp/embeddedsw/psm-firmware_2023.1.bb | |||
@@ -12,7 +12,6 @@ FILESPATH .= ":${FILE_DIRNAME}/embeddedsw/2023.1:${FILE_DIRNAME}/embeddedsw" | |||
12 | SRC_URI += " \ | 12 | SRC_URI += " \ |
13 | file://makefile-skip-copy_bsp.sh.patch \ | 13 | file://makefile-skip-copy_bsp.sh.patch \ |
14 | file://0001-versal_fw-Fixup-core-makefiles.patch \ | 14 | file://0001-versal_fw-Fixup-core-makefiles.patch \ |
15 | file://0001-Workaround-Disable-Wnull-dereference.patch \ | ||
16 | " | 15 | " |
17 | 16 | ||
18 | EXTRA_COMPILER_FLAGS = "-g -ffunction-sections -fdata-sections -Wall -Wextra" | 17 | EXTRA_COMPILER_FLAGS = "-g -ffunction-sections -fdata-sections -Wall -Wextra" |
diff --git a/meta-xilinx-standalone/recipes-bsp/embeddedsw/psm-firmware_git.bb b/meta-xilinx-standalone/recipes-bsp/embeddedsw/psm-firmware_git.bb index a70c7a8d..42e0a95f 100644 --- a/meta-xilinx-standalone/recipes-bsp/embeddedsw/psm-firmware_git.bb +++ b/meta-xilinx-standalone/recipes-bsp/embeddedsw/psm-firmware_git.bb | |||
@@ -15,7 +15,6 @@ FILESPATH .= ":${FILE_DIRNAME}/embeddedsw/2023.1:${FILE_DIRNAME}/embeddedsw" | |||
15 | SRC_URI += " \ | 15 | SRC_URI += " \ |
16 | file://makefile-skip-copy_bsp.sh.patch \ | 16 | file://makefile-skip-copy_bsp.sh.patch \ |
17 | file://0001-versal_fw-Fixup-core-makefiles.patch \ | 17 | file://0001-versal_fw-Fixup-core-makefiles.patch \ |
18 | file://0001-Workaround-Disable-Wnull-dereference.patch \ | ||
19 | " | 18 | " |
20 | 19 | ||
21 | EXTRA_COMPILER_FLAGS = "-g -ffunction-sections -fdata-sections -Wall -Wextra" | 20 | EXTRA_COMPILER_FLAGS = "-g -ffunction-sections -fdata-sections -Wall -Wextra" |