OpenCorePlatform: Revert ReplaceableMemory as it does not work

Changelog.md

@@ -8,7 +8,7 @@ OpenCore Changelog
 - Fixed microcode reading on Intel CPUs
 - Fixed SMBIOS Type4 External Clock values
 - Improved Windows compatibility on some setups (acidanthera/bugtracker#614)
-- Added `SupportsCsm` and `ReplaceableMemory` options in `PlatformInfo/Generic`
+- Added `SupportsCsm` and option in `PlatformInfo/Generic`
 
 #### v0.5.3
 - Update builtin firmware versions

Docs/Configuration.tex

@@ -2943,14 +2943,6 @@ be used. Version with macOS specific enhancements can be downloaded from
 \subsection{Generic Properties}\label{platforminfogeneric}
 
 \begin{enumerate}
-\item
-  \texttt{ReplaceableMemory}\\
-  \textbf{Type}: \texttt{plist\ boolean}\\
-  \textbf{Failsafe}: \texttt{false}\\
-  \textbf{Description}: Forces replaceable memory bit in \texttt{PlatformFeature}.
-
-  Resetting soldered bit in \texttt{PlatformFeature} enables memory tab in
-  \texttt{About My Mac}.
 \item
   \texttt{SpoofVendor}\\
   \textbf{Type}: \texttt{plist\ boolean}\\

Docs/Differences/Differences.tex

 \documentclass[]{article}
 %DIF LATEXDIFF DIFFERENCE FILE
 %DIF DEL PreviousConfiguration.tex   Tue Dec 10 15:40:50 2019
-%DIF ADD ../Configuration.tex        Sun Jan  5 00:00:22 2020
+%DIF ADD ../Configuration.tex        Sun Jan  5 01:16:21 2020
 
 \usepackage{lmodern}
 \usepackage{amssymb,amsmath}
@@ -3012,16 +3012,7 @@ be used. Version with macOS specific enhancements can be downloaded from
 
 \begin{enumerate}
 \item
-  \DIFaddbegin \texttt{\DIFadd{ReplaceableMemory}}\\
-  \textbf{\DIFadd{Type}}\DIFadd{: }\texttt{\DIFadd{plist\ boolean}}\\
-  \textbf{\DIFadd{Failsafe}}\DIFadd{: }\texttt{\DIFadd{false}}\\
-  \textbf{\DIFadd{Description}}\DIFadd{: Forces replaceable memory bit in }\texttt{\DIFadd{PlatformFeature}}\DIFadd{.
-}
-
-  \DIFadd{Resetting soldered bit in }\texttt{\DIFadd{PlatformFeature}} \DIFadd{enables memory tab in
-  }\texttt{\DIFadd{About My Mac}}\DIFadd{.
-}\item
-  \DIFaddend \texttt{SpoofVendor}\\
+  \texttt{SpoofVendor}\\
   \textbf{Type}: \texttt{plist\ boolean}\\
   \textbf{Failsafe}: \texttt{false}\\
   \textbf{Description}: Sets SMBIOS vendor fields to \texttt{Acidanthera}.

Docs/Sample.plist

@@ -709,12 +709,10 @@
 			<string>M000000000001</string>
 			<key>ROM</key>
 			<data>ESIzAAAA</data>
-			<key>ReplaceableMemory</key>
-			<true/>
 			<key>SpoofVendor</key>
 			<true/>
 			<key>SupportsCsm</key>
-			<true/>
+			<false/>
 			<key>SystemProductName</key>
 			<string>MacPro5,1</string>
 			<key>SystemSerialNumber</key>

Docs/SampleFull.plist

@@ -740,12 +740,10 @@
 			<string>M000000000001</string>
 			<key>ROM</key>
 			<data>ESIzAAAA</data>
-			<key>ReplaceableMemory</key>
-			<true/>
 			<key>SpoofVendor</key>
 			<true/>
 			<key>SupportsCsm</key>
-			<true/>
+			<false/>
 			<key>SystemProductName</key>
 			<string>MacPro5,1</string>
 			<key>SystemSerialNumber</key>

Platform/OpenCore/OpenCorePlatform.c

@@ -175,7 +175,6 @@ OcPlatformUpdateSmbios (
   OC_SMBIOS_DATA   Data;
   EFI_GUID         Uuid;
   UINT8            SmcVersion[APPLE_SMBIOS_SMC_VERSION_SIZE];
-  UINT32           PlatformFeature;
 
   ZeroMem (&Data, sizeof (Data));
 
@@ -353,17 +352,7 @@ OcPlatformUpdateSmbios (
     }
 
     Data.ProcessorType        = NULL;
-
-    if (MacInfo->Smbios.PlatformFeature != NULL) {
-      PlatformFeature = *MacInfo->Smbios.PlatformFeature;
-      if (Config->PlatformInfo.Generic.ReplaceableMemory) {
-        PlatformFeature &= ~PT_FEATURE_HAS_SOLDERED_SYSTEM_MEMORY;
-      }
-    } else {
-      PlatformFeature = 0;
-    }
-
-    Data.PlatformFeature      = &PlatformFeature;
+    Data.PlatformFeature      = MacInfo->Smbios.PlatformFeature;
 
     if (MacInfo->DataHub.SmcRevision != NULL) {
       SmbiosGetSmcVersion (MacInfo->DataHub.SmcRevision, SmcVersion);