embeddedsw: Revert 2023.1 workarounds

Remove workaround for:
  xpm_domain_iso.c:724:42: error: potential null pointer dereference [-Werror=null-dereference]

Also the other workaround can be removed, this has apparently been fixed
in the upstream code.

Signed-off-by: Mark Hatle <mark.hatle@amd.com>

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 @@
-From 98b3377a70ee057f7529bd3381fa6d844ba6fe09 Mon Sep 17 00:00:00 2001
-From: Mark Hatle <mark.hatle@amd.com>
-Date: Wed, 7 Dec 2022 17:36:22 -0800
-Subject: [PATCH] Workaround: Disable -Wnull-dereference
-
-    xpm_domain_iso.c:724:42: error: potential null pointer dereference [-Werror=null-dereference]
-
-Signed-off-by: Mark Hatle <mark.hatle@amd.com>
----
- lib/sw_services/xilpm/src/versal/common/Makefile     | 2 +-
- lib/sw_services/xilpm/src/versal_net/common/Makefile | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/lib/sw_services/xilpm/src/versal/common/Makefile b/lib/sw_services/xilpm/src/versal/common/Makefile
-index 0b61e37bbb..6c5f776ef0 100644
---- a/lib/sw_services/xilpm/src/versal/common/Makefile
-+++ b/lib/sw_services/xilpm/src/versal/common/Makefile
-@@ -10,7 +10,7 @@ COMPILER_FLAGS=
- EXTRA_COMPILER_FLAGS=
- CUSTOM_COMPILER_FLAGS=-Werror
- ifeq ($(findstring gcc, $(COMPILER)), gcc)
--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
-+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
- endif
- LIB= libxilpm.a
- 
-diff --git a/lib/sw_services/xilpm/src/versal_net/common/Makefile b/lib/sw_services/xilpm/src/versal_net/common/Makefile
-index 36460a1b18..257ad694e3 100644
---- a/lib/sw_services/xilpm/src/versal_net/common/Makefile
-+++ b/lib/sw_services/xilpm/src/versal_net/common/Makefile
-@@ -10,7 +10,7 @@ COMPILER_FLAGS=
- EXTRA_COMPILER_FLAGS=
- CUSTOM_COMPILER_FLAGS=-Werror
- ifeq ($(findstring gcc, $(COMPILER)), gcc)
--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
-+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
- endif
- LIB= libxilpm.a
- 
--- 
-2.17.1
-
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"
 SRC_URI += " \
             file://makefile-skip-copy_bsp.sh.patch \
             file://fsbl-fixups.patch \
-            file://0001-Workaround-Disable-Wnull-dereference.patch \
            "
 
 # 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"
 SRC_URI += " \
             file://makefile-skip-copy_bsp.sh.patch \
             file://fsbl-fixups.patch \
-            file://0001-Workaround-Disable-Wnull-dereference.patch \
            "
 
 # 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"
 SRC_URI += " \
             file://makefile-skip-copy_bsp.sh.patch \
             file://0001-versal_fw-Fixup-core-makefiles.patch \
-            file://0001-Workaround-Disable-Wnull-dereference.patch \
            "
 
 EXTRA_COMPILER_FLAGS = "-g -ffunction-sections -fdata-sections -Wall -Wextra -Os -flto -ffat-lto-objects"
 
-# Workaround for: ../../../include/xparameters.h:1021:67: warning: conversion from 'long long unsigned int' to 'unsigned int' changes value from '18446744073709551615' to '4294967295' [-Woverflow]
-EXTRA_COMPILER_FLAGS += "-Wno-overflow"
-
-# Workaround for: xpm_domain_iso.c:724:42: error: potential null pointer dereference [-Werror=null-dereference]
-EXTRA_COMPILER_FLAGS += "-Wno-null-dereference"
-
 do_configure() {
     # manually do the copy_bsp step first, so as to be able to fix up use of
     # mb-* commands
@@ -30,7 +23,6 @@ do_configure() {
 }
 
 do_compile() {
-    pwd
     oe_runmake
 
     ${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"
 SRC_URI += " \
             file://makefile-skip-copy_bsp.sh.patch \
             file://0001-versal_fw-Fixup-core-makefiles.patch \
-            file://0001-Workaround-Disable-Wnull-dereference.patch \
            "
 
 EXTRA_COMPILER_FLAGS = "-g -ffunction-sections -fdata-sections -Wall -Wextra -Os -flto -ffat-lto-objects"
 
-# Workaround for: ../../../include/xparameters.h:1021:67: warning: conversion from 'long long unsigned int' to 'unsigned int' changes value from '18446744073709551615' to '4294967295' [-Woverflow]
-EXTRA_COMPILER_FLAGS += "-Wno-overflow"
-
-# Workaround for: xpm_domain_iso.c:724:42: error: potential null pointer dereference [-Werror=null-dereference]
-EXTRA_COMPILER_FLAGS += "-Wno-null-dereference"
-
 do_configure() {
     # manually do the copy_bsp step first, so as to be able to fix up use of
     # mb-* commands
@@ -33,7 +26,6 @@ do_configure() {
 }
 
 do_compile() {
-    pwd
     oe_runmake
 
     ${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"
 SRC_URI += " \
             file://makefile-skip-copy_bsp.sh.patch \
             file://0001-zynqmp_pmufw-Fixup-core-makefiles.patch \
-            file://0001-Workaround-Disable-Wnull-dereference.patch \
            "
 
 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"
 SRC_URI += " \
             file://makefile-skip-copy_bsp.sh.patch \
             file://0001-zynqmp_pmufw-Fixup-core-makefiles.patch \
-            file://0001-Workaround-Disable-Wnull-dereference.patch \
            "
 
 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"
 SRC_URI += " \
             file://makefile-skip-copy_bsp.sh.patch \
             file://0001-versal_fw-Fixup-core-makefiles.patch \
-            file://0001-Workaround-Disable-Wnull-dereference.patch \
            "
 
 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"
 SRC_URI += " \
             file://makefile-skip-copy_bsp.sh.patch \
             file://0001-versal_fw-Fixup-core-makefiles.patch \
-            file://0001-Workaround-Disable-Wnull-dereference.patch \
            "
 
 EXTRA_COMPILER_FLAGS = "-g -ffunction-sections -fdata-sections -Wall -Wextra"