diff --git a/BaseTools/ImageTool/Makefile b/BaseTools/ImageTool/Makefile
index 2b1ad69ea0..7f972aecc7 100644
--- a/BaseTools/ImageTool/Makefile
+++ b/BaseTools/ImageTool/Makefile
@@ -27,7 +27,7 @@ OUT  = $(UDK_PATH)\MdePkg\Library\UefiDebugLibConOut
 PRIN = $(UDK_PATH)\MdePkg\Library\BasePrintLib
 ERRO = $(UDK_PATH)\MdePkg\Library\BaseDebugPrintErrorLevelLib
 USER = $(OC_USER)\User\Library
-OBJECTS = $(OBJECTS) {$(BASE)}SafeString.obj String.obj SwapBytes16.obj SwapBytes32.obj CpuDeadLoop.obj
+OBJECTS = $(OBJECTS) {$(BASE)}SafeString.obj String.obj SwapBytes16.obj SwapBytes32.obj CpuDeadLoop.obj CheckSum.obj
 OBJECTS = $(OBJECTS) {$(OUT)}DebugLib.obj {$(PRIN)}PrintLib.obj PrintLibInternal.obj {$(ERRO)}BaseDebugPrintErrorLevelLib.obj
 OBJECTS = $(OBJECTS) {$(USER)}UserFile.obj UserBaseMemoryLib.obj UserMath.obj UserPcd.obj UserMisc.obj UserGlobalVar.obj UserBootServices.obj
 
diff --git a/BaseTools/MicroTool/Makefile b/BaseTools/MicroTool/Makefile
index c6b679091a..54ce9422dc 100644
--- a/BaseTools/MicroTool/Makefile
+++ b/BaseTools/MicroTool/Makefile
@@ -20,7 +20,7 @@ OUT  = $(UDK_PATH)\MdePkg\Library\UefiDebugLibConOut
 PRIN = $(UDK_PATH)\MdePkg\Library\BasePrintLib
 ERRO = $(UDK_PATH)\MdePkg\Library\BaseDebugPrintErrorLevelLib
 USER = $(OC_USER)\User\Library
-OBJECTS = $(OBJECTS) {$(BASE)}SafeString.obj String.obj SwapBytes16.obj SwapBytes32.obj CpuDeadLoop.obj
+OBJECTS = $(OBJECTS) {$(BASE)}SafeString.obj String.obj SwapBytes16.obj SwapBytes32.obj CpuDeadLoop.obj CheckSum.obj
 OBJECTS = $(OBJECTS) {$(OUT)}DebugLib.obj {$(PRIN)}PrintLib.obj PrintLibInternal.obj {$(ERRO)}BaseDebugPrintErrorLevelLib.obj
 OBJECTS = $(OBJECTS) {$(USER)}UserFile.obj UserBaseMemoryLib.obj UserMath.obj UserPcd.obj UserMisc.obj UserGlobalVar.obj UserBootServices.obj
 
diff --git a/OpenCorePkg b/OpenCorePkg
index 092af5d99c..336ca8796d 160000
--- a/OpenCorePkg
+++ b/OpenCorePkg
@@ -1 +1 @@
-Subproject commit 092af5d99c764cbe06372dfed3fa03af719550cc
+Subproject commit 336ca8796da71c2b3ad6ce083486d7df1db3e6ff