OpenCorePlatform: Support using MacInfoPkg

Docs/Configuration.tex

@@ -476,6 +476,7 @@ Add \texttt{.clang\_complete} file with similar content to your UDK root:
 -I/UefiPackages/OpenCorePkg/Include
 -I/UefiPackages/OcSupportPkg/Include
 -I/UefiPackages/IntelFrameworkPkg/Include
+-I/UefiPackages/MacInfoPkg/Include
 -IInclude
 -include
 /UefiPackages/MdePkg/Include/Uefi.h
@@ -1701,7 +1702,8 @@ troubleshooting:
 
 Platform information is comprised of several identification fields
 generated or filled manually to be compatible with macOS services. The
-base part of the configuration may be obtained from \texttt{MacInfoPkg}
+base part of the configuration may be obtained from
+\href{https://github.com/acidanthera/MacInfoPkg}{\texttt{MacInfoPkg}}
 package, which itself generates a set of interfaces based on a database
 in \href{https://yaml.org/spec/1.2/spec.html}{YAML} format. These fields
 are written to three select destinations:
@@ -1739,9 +1741,8 @@ for system configuration.
   and \texttt{SMBIOS} sections.
 
   Enabling this option is useful when \texttt{Generic} section is flexible
-  enough. When enabled \texttt{SMBIOS} and \texttt{DataHub} data is unused.
-
-  FIXME: Currently unsupported.
+  enough. When enabled \texttt{SMBIOS}, \texttt{DataHub}, and
+  \texttt{PlatformNVRAM} data is unused.
 \item
   \texttt{UpdateDataHub}\\
   \textbf{Type}: \texttt{plist\ boolean}\\
@@ -1801,21 +1802,25 @@ for system configuration.
 \item
   \texttt{Generic}\\
   \textbf{Type}: \texttt{plist\ dictonary}\\
+  \textbf{Optional}: When \texttt{Automatic} is \texttt{false}\\
   \textbf{Description}: Update all fields. This section is read only
   when \texttt{Automatic} is active.
 \item
   \texttt{DataHub}\\
   \textbf{Type}: \texttt{plist\ dictonary}\\
+  \textbf{Optional}: When \texttt{Automatic} is \texttt{true}\\
   \textbf{Description}: Update Data Hub fields. This section is read
   only when \texttt{Automatic} is not active.
 \item
   \texttt{PlatformNVRAM}\\
   \textbf{Type}: \texttt{plist\ dictonary}\\
+  \textbf{Optional}: When \texttt{Automatic} is \texttt{true}\\
   \textbf{Description}: Update platform NVRAM fields. This section is
   read only when \texttt{Automatic} is not active.
 \item
   \texttt{SMBIOS}\\
   \textbf{Type}: \texttt{plist\ dictonary}\\
+  \textbf{Optional}: When \texttt{Automatic} is \texttt{true}\\
   \textbf{Description}: Update SMBIOS fields. This section is read only
   when \texttt{Automatic} is not active.
 \end{enumerate}

OpenCorePkg.dsc

@@ -16,7 +16,7 @@
 
 [Defines]
   PLATFORM_NAME           = OpenCorePkg
-  PLATFORM_GUID           = 6B1D3AB4-5C85-462D-9DC5-480F8B17D5CB
+  PLATFORM_GUID           = C46F121D-ABC6-42A3-A241-91B09224C357
   PLATFORM_VERSION        = 1.0
   SUPPORTED_ARCHITECTURES = X64
   BUILD_TARGETS           = RELEASE|DEBUG|NOOPT
@@ -50,6 +50,7 @@
   SerialPortLib|MdeModulePkg/Library/BaseSerialPortLib16550/BaseSerialPortLib16550.inf
   PlatformHookLib|MdeModulePkg/Library/BasePlatformHookLibNull/BasePlatformHookLibNull.inf
   HobLib|MdePkg/Library/DxeHobLib/DxeHobLib.inf
+  MacInfoLib|MacInfoPkg/Library/MacInfoLib/MacInfoLib.inf
   OcAcpiLib|OcSupportPkg/Library/OcAcpiLib/OcAcpiLib.inf
   OcAppleBootPolicyLib|OcSupportPkg/Library/OcAppleBootPolicyLib/OcAppleBootPolicyLib.inf
   OcAppleChunklistLib|OcSupportPkg/Library/OcAppleChunklistLib/OcAppleChunklistLib.inf
@@ -115,4 +116,4 @@
   MSFT:RELEASE_*_*_CC_FLAGS  = $(OCPKG_BUILD_OPTIONS_GEN)
   XCODE:DEBUG_*_*_CC_FLAGS   = $(OCPKG_BUILD_OPTIONS_GEN)
   XCODE:NOOPT_*_*_CC_FLAGS   = $(OCPKG_BUILD_OPTIONS_GEN)
-  XCODE:RELEASE_*_*_CC_FLAGS = -Wno-error -flto $(OCPKG_BUILD_OPTIONS_GEN)
+  XCODE:RELEASE_*_*_CC_FLAGS = -flto $(OCPKG_BUILD_OPTIONS_GEN)

Platform/OpenCore/OpenCore.inf

@@ -50,6 +50,7 @@
   IntelFrameworkPkg/IntelFrameworkPkg.dec
   OpenCorePkg/OpenCorePkg.dec
   OcSupportPkg/OcSupportPkg.dec
+  MacInfoPkg/MacInfoPkg.dec
   MdePkg/MdePkg.dec
   MdeModulePkg/MdeModulePkg.dec
 
@@ -81,6 +82,7 @@
   OcSmbiosLib
   OcStorageLib
   OcVirtualFsLib
+  MacInfoLib
   PcdLib
   PrintLib
   UefiBootServicesTableLib

macbuild.tool

@@ -135,6 +135,7 @@ updaterepo "https://github.com/tianocore/edk2" UDK UDK2018 || exit 1
 cd UDK
 updaterepo "https://github.com/acidanthera/EfiPkg" EfiPkg master || exit 1
 updaterepo "https://github.com/acidanthera/OcSupportPkg" OcSupportPkg master || exit 1
+updaterepo "https://github.com/acidanthera/MacInfoPkg" MacInfoPkg master || exit 1
 
 if [ ! -d OpenCorePkg ]; then
   ln -s .. OpenCorePkg || exit 1