From 4a19cb0dc422ea0eb8d3cff797c915e4ee9c0bed Mon Sep 17 00:00:00 2001
From: Savva Mitrofanov <savvamtr@gmail.com>
Date: Fri, 14 Apr 2023 19:24:25 +0600
Subject: [PATCH] BaseTools/ImageTool: Move Pcd tokens into OC User library

---
 BaseTools/ImageTool/GNUmakefile |  2 +-
 BaseTools/ImageTool/Makefile    |  2 +-
 BaseTools/ImageTool/Pcds.h      | 10 ----------
 OpenCorePkg                     |  2 +-
 4 files changed, 3 insertions(+), 13 deletions(-)
 delete mode 100644 BaseTools/ImageTool/Pcds.h

diff --git a/BaseTools/ImageTool/GNUmakefile b/BaseTools/ImageTool/GNUmakefile
index a69a3e5f30..4065576144 100644
--- a/BaseTools/ImageTool/GNUmakefile
+++ b/BaseTools/ImageTool/GNUmakefile
@@ -19,7 +19,7 @@ include $(OC_USER)/User/Makefile
 
 .DEFAULT_GOAL := Tools
 
-CFLAGS += -include Pcds.h -Werror
+CFLAGS += -Werror
 
 VPATH  += ../../MdePkg/Library/BasePeCoffLib2:$\
 					../../MdePkg/Library/BaseUefiImageExtraActionLibNull
diff --git a/BaseTools/ImageTool/Makefile b/BaseTools/ImageTool/Makefile
index 367a3241ef..fd48e5df94 100644
--- a/BaseTools/ImageTool/Makefile
+++ b/BaseTools/ImageTool/Makefile
@@ -70,7 +70,7 @@ cleanall:
 	@move $@ $(OUT_DIR)\
 
 {$(PE)}.c.obj :
-  $(CC) -c $(CFLAGS) $(INC) /FI Pcds.h $< -Fo$@
+  $(CC) -c $(CFLAGS) $(INC) $< -Fo$@
 	@move $@ $(OUT_DIR)\
 
 {$(UA)}.c.obj :
diff --git a/BaseTools/ImageTool/Pcds.h b/BaseTools/ImageTool/Pcds.h
deleted file mode 100644
index bda9d1d1f0..0000000000
--- a/BaseTools/ImageTool/Pcds.h
+++ /dev/null
@@ -1,10 +0,0 @@
-/** @file
-  Copyright (c) 2021, Marvin Häuser. All rights reserved.
-  SPDX-License-Identifier: BSD-3-Clause
-**/
-
-#define _PCD_GET_MODE_32_PcdImageLoaderAlignmentPolicy          0xFFFFFFFFU
-#define _PCD_GET_MODE_BOOL_PcdImageLoaderWXorX                  TRUE
-#define _PCD_GET_MODE_32_PcdImageLoaderRelocTypePolicy          0x00
-#define _PCD_GET_MODE_BOOL_PcdImageLoaderDebugSupport           TRUE
-#define _PCD_GET_MODE_BOOL_PcdImageLoaderAllowMisalignedOffset  FALSE
diff --git a/OpenCorePkg b/OpenCorePkg
index c42343b6bf..c72c258fca 160000
--- a/OpenCorePkg
+++ b/OpenCorePkg
@@ -1 +1 @@
-Subproject commit c42343b6bf3207ca0cb0145b46345da76627a3bb
+Subproject commit c72c258fca896aa1e3ba1c8326b001a84d94bdbc