diff --git a/Changelog.md b/Changelog.md index 2bd7122d710ec262401f0871644ff070783745ee..56ae86a2c72a878f72121e5b0268c476506aee8f 100644 --- a/Changelog.md +++ b/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 diff --git a/Docs/Configuration.pdf b/Docs/Configuration.pdf index 0655772894d9305c6faf74023138406e69aa9adc..3b4d1f292eb81047c40fcff58c764eda7c6de5cf 100644 Binary files a/Docs/Configuration.pdf and b/Docs/Configuration.pdf differ diff --git a/Docs/Configuration.tex b/Docs/Configuration.tex index 9edfbe1a0c64b0f80bcc95c12b08fc358ecce227..da0d86efa48ecadfc42ff20c1941770ad3ea679b 100755 --- a/Docs/Configuration.tex +++ b/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}\\ diff --git a/Docs/Differences/Differences.pdf b/Docs/Differences/Differences.pdf index d20c04fcdf2797d98e9c864b41ad1236f0872644..29476c1c8b1f680f10306d8924f25c63b403c5f6 100644 Binary files a/Docs/Differences/Differences.pdf and b/Docs/Differences/Differences.pdf differ diff --git a/Docs/Differences/Differences.tex b/Docs/Differences/Differences.tex index 2a9287fd48f930b4ae7b54bb5885bba8efa002c1..1993aa9ba2f295291394f025f4d02982ddc10e34 100644 --- a/Docs/Differences/Differences.tex +++ b/Docs/Differences/Differences.tex @@ -1,7 +1,7 @@ \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}. diff --git a/Docs/Sample.plist b/Docs/Sample.plist index 9c402ceb35293dcaf5d42e39f10f731f17589586..916f1ee50dd0ab1c6f63286e931fde25fb6ceb47 100644 --- a/Docs/Sample.plist +++ b/Docs/Sample.plist @@ -709,12 +709,10 @@ M000000000001 ROM ESIzAAAA - ReplaceableMemory - SpoofVendor SupportsCsm - + SystemProductName MacPro5,1 SystemSerialNumber diff --git a/Docs/SampleFull.plist b/Docs/SampleFull.plist index c9bcab5874c3f66aee61136a12145f0f1f77cedb..354a8059400f5edcb56a87c3e538de811307e591 100644 --- a/Docs/SampleFull.plist +++ b/Docs/SampleFull.plist @@ -740,12 +740,10 @@ M000000000001 ROM ESIzAAAA - ReplaceableMemory - SpoofVendor SupportsCsm - + SystemProductName MacPro5,1 SystemSerialNumber diff --git a/Platform/OpenCore/OpenCorePlatform.c b/Platform/OpenCore/OpenCorePlatform.c index 9aaafcb5969bb756fc64ff63ff891c63589ba512..a45290b8ba27a8eebd493cdce51c70b7d45438e4 100644 --- a/Platform/OpenCore/OpenCorePlatform.c +++ b/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);