未验证 提交 7642ceb6 编写于 作者: D dakanji 提交者: GitHub

Docs: Fix 'Firmware' Pluralisation (#209)

上级 55394f52
......@@ -67,11 +67,11 @@ OpenCore Changelog
- Fixed CPU frequency calculation on AMD 19h family
- Updated recovery_urls
- Fixed `DisableSingleUser` quirk when Apple Secure Boot is enabled
- Added `BootstrapShort` to workaround buggy Insyde firmwares
- Added `BootstrapShort` to workaround buggy Insyde firmware
- Changed `Bootstrap(Short)` to choose dynamic entry (requires NVRAM reset)
- Avoided `Boot` prefix in `RequestBootVarRouting` to workaround AMI issues
- Added bootloader patch support in `Booter` `Patch` section
- Fixed startup hang on firmwares allowong reentrance for timer functions
- Fixed startup hang on firmware that permit timer function re-entrance
- Made pointer control optional for OpenCanopy via `PickerAttributes`
- Added support for `StartupMute` variable in `PlayChime`
- Added support for per-volume icons for APFS on Preboot
......
......@@ -1394,10 +1394,10 @@ To view their current state use \texttt{pmset -g} command in Terminal.
\textbf{Description}: Allows booting macOS through a relocation block.
Relocation block is a scratch buffer allocated in lower 4 GB to be used for
loading the kernel and related structures by EfiBoot on firmwares where
lower memory is otherwise occupied by the (assumed to be) non-runtime data.
Right before kernel startup the relocation block is copied back to lower
addresses. Similarly all the other addresses pointing to relocation block
loading the kernel and related structures by EfiBoot on firmware where the
lower memory region is otherwise occupied by (assumed) non-runtime data.
Right before kernel startup, the relocation block is copied back to lower
addresses. Similarly, all the other addresses pointing to relocation block
are also carefully adjusted. Relocation block can be used when:
\begin{itemize}
......@@ -3017,8 +3017,8 @@ entry choice will update till next manual reconfiguration.
boot option in UEFI variable storage at bootloader startup. For this option
to work \texttt{RequestBootVarRouting} is required to be enabled.
\item \texttt{Short} --- create a short boot option instead of a complete one.
This variant is useful for some older firmwares, Insyde in particular,
but possibly others, which cannot handle full device paths.
This variant is useful for some older types of firmware, typically from Insyde,
that are unable to manage full device paths.
\end{itemize}
This option provides integration with third-party operating system installation and upgrade
......@@ -4781,7 +4781,7 @@ be used. Version with macOS specific enhancements can be downloaded from
Specify special string value \texttt{OEM} to extract current value from SMBIOS
and use it throughout the sections. This feature can only be
used on Mac-compatible firmwares.
used on Mac-compatible firmware.
\item
\texttt{SystemUUID}\\
\textbf{Type}: \texttt{plist\ string}, GUID\\
......@@ -4789,8 +4789,8 @@ be used. Version with macOS specific enhancements can be downloaded from
\textbf{Description}: Refer to SMBIOS \texttt{SystemUUID}.
Specify special string value \texttt{OEM} to extract current value from SMBIOS
and use it throughout the sections. Since not all firmwares
have valid (and unique) values, this feature is not applicable
and use it throughout the sections. Since not every firmware implementation
has valid (and unique) values, this feature is not applicable
to some setups, and may provide unexpected results. It is highly
recommended to specify the UUID explicitly. Refer to
\texttt{UseRawUuidEncoding} to determine how SMBIOS value is parsed.
......@@ -4802,7 +4802,7 @@ be used. Version with macOS specific enhancements can be downloaded from
Specify special string value \texttt{OEM} to extract current value from NVRAM
(\texttt{MLB} variable) or SMBIOS and use it throughout the sections.
This feature can only be used on Mac-compatible firmwares.
This feature can only be used on Mac-compatible firmware.
\item
\texttt{ROM}\\
\textbf{Type}: \texttt{plist\ metadata}, 6 bytes\\
......@@ -4812,7 +4812,7 @@ be used. Version with macOS specific enhancements can be downloaded from
Specify special string value \texttt{OEM} to extract current value from NVRAM
(\texttt{ROM} variable) and use it throughout the sections.
This feature can only be used on Mac-compatible firmwares.
This feature can only be used on Mac-compatible firmware.
\end{enumerate}
......
\documentclass[]{article}
%DIF LATEXDIFF DIFFERENCE FILE
%DIF DEL PreviousConfiguration.tex Sun Feb 14 13:02:39 2021
%DIF ADD ../Configuration.tex Mon Feb 15 00:42:21 2021
%DIF DEL PreviousConfiguration.tex Sat Feb 6 19:45:31 2021
%DIF ADD ../Configuration.tex Mon Feb 15 10:03:52 2021
\usepackage{lmodern}
\usepackage{amssymb,amsmath}
......@@ -1474,10 +1474,10 @@ To view their current state use \texttt{pmset -g} command in Terminal.
\textbf{Description}: Allows booting macOS through a relocation block.
Relocation block is a scratch buffer allocated in lower 4 GB to be used for
loading the kernel and related structures by EfiBoot on firmwares where
lower memory is otherwise occupied by the (assumed to be) non-runtime data.
Right before kernel startup the relocation block is copied back to lower
addresses. Similarly all the other addresses pointing to relocation block
loading the kernel and related structures by EfiBoot on \DIFdelbegin \DIFdel{firmwares where lower memory }\DIFdelend \DIFaddbegin \DIFadd{firmware where the
lower memory region }\DIFaddend is otherwise occupied by \DIFdelbegin \DIFdel{the (assumedto be}\DIFdelend \DIFaddbegin \DIFadd{(assumed}\DIFaddend ) non-runtime data.
Right before kernel startup\DIFaddbegin \DIFadd{, }\DIFaddend the relocation block is copied back to lower
addresses. Similarly\DIFaddbegin \DIFadd{, }\DIFaddend all the other addresses pointing to relocation block
are also carefully adjusted. Relocation block can be used when:
\begin{itemize}
......@@ -3110,8 +3110,9 @@ entry choice will update till next manual reconfiguration.
boot option in UEFI variable storage at bootloader startup. For this option
to work \texttt{RequestBootVarRouting} is required to be enabled.
\item \texttt{Short} --- create a short boot option instead of a complete one.
This variant is useful for some older firmwares, Insyde in particular,
but possibly others, which cannot handle full device paths.
This variant is useful for some older \DIFdelbegin \DIFdel{firmwares, Insyde in particular,
but possibly others, which cannot handle }\DIFdelend \DIFaddbegin \DIFadd{types of firmware, typically from Insyde,
that are unable to manage }\DIFaddend full device paths.
\end{itemize}
This option provides integration with third-party operating system installation and upgrade
......@@ -4877,7 +4878,7 @@ be used. Version with macOS specific enhancements can be downloaded from
\DIFadd{Specify special string value }\texttt{\DIFadd{OEM}} \DIFadd{to extract current value from SMBIOS
and use it throughout the sections. This feature can only be
used on Mac-compatible firmwares.
used on Mac-compatible firmware.
}\DIFaddend \item
\texttt{SystemUUID}\\
\textbf{Type}: \texttt{plist\ string}, GUID\\
......@@ -4886,8 +4887,8 @@ be used. Version with macOS specific enhancements can be downloaded from
\DIFaddbegin
\DIFadd{Specify special string value }\texttt{\DIFadd{OEM}} \DIFadd{to extract current value from SMBIOS
and use it throughout the sections. Since not all firmwares
have valid (and unique) values, this feature is not applicable
and use it throughout the sections. Since not every firmware implementation
has valid (and unique) values, this feature is not applicable
to some setups, and may provide unexpected results. It is highly
recommended to specify the UUID explicitly. Refer to
}\texttt{\DIFadd{UseRawUuidEncoding}} \DIFadd{to determine how SMBIOS value is parsed.
......@@ -4900,7 +4901,7 @@ be used. Version with macOS specific enhancements can be downloaded from
\DIFadd{Specify special string value }\texttt{\DIFadd{OEM}} \DIFadd{to extract current value from NVRAM
(}\texttt{\DIFadd{MLB}} \DIFadd{variable) or SMBIOS and use it throughout the sections.
This feature can only be used on Mac-compatible firmwares.
This feature can only be used on Mac-compatible firmware.
}\DIFaddend \item
\texttt{ROM}\\
\textbf{Type}: \texttt{plist\ \DIFdelbegin \DIFdel{data}\DIFdelend \DIFaddbegin \DIFadd{metadata}\DIFaddend }, 6 bytes\\
......@@ -4910,7 +4911,7 @@ be used. Version with macOS specific enhancements can be downloaded from
\DIFaddbegin \DIFadd{Specify special string value }\texttt{\DIFadd{OEM}} \DIFadd{to extract current value from NVRAM
(}\texttt{\DIFadd{ROM}} \DIFadd{variable) and use it throughout the sections.
This feature can only be used on Mac-compatible firmwares.
This feature can only be used on Mac-compatible firmware.
}
\DIFaddend \end{enumerate}
......
......@@ -309,7 +309,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
#define EB_FEATURE_HAS_APPLE_SECURE_BOOT 0x00200000U
//
// Apple Trusted Boot enabled configuration (detected via proto & policy).
// Some unfinished(?) variant of Secure Boot found in preview firmwares.
// Some unfinished(?) variant of Secure Boot found in preview firmware.
// 24B73556-2197-4702-82A8-3E1337DAFBF3 GUID.
//
#define EB_FEATURE_HAS_APPLE_TRUSTED_BOOT 0x01000000U
......
......@@ -119,7 +119,7 @@
#define CALL_GATE_JUMP_SIZE (sizeof (CALL_GATE_JUMP))
/**
Command used to perform an absolute 64-bit jump from Call Gate to our code.
Command used to perform an absolute 64-bit jump from Call Gate to our code.
**/
#pragma pack(push,1)
typedef struct CALL_GATE_JUMP_ {
......@@ -315,12 +315,12 @@ typedef struct KERNEL_SUPPORT_STATE_ {
UINTN VmMapDescSize;
///
/// Relocation block is a scratch buffer allocated in lower 4GB to be used for
/// loading the kernel and related structures by EfiBoot on firmwares where
/// lower memory is otherwise occupied (assumed to be) non-runtime data.
/// loading the kernel and related structures by EfiBoot on firmware where the
/// lower memory region is otherwise occupied by (assumed) non-runtime data.
/// Relocation block can be used when:
/// - no better slide exists (all the memory is used)
/// - slide=0 is forced (by an argument or safe mode)
/// - KASLR (slide) is unsupported (macOS 10.7 or older)
/// - KASLR (slide) is unsupported (macOS 10.7 or older)
/// Right before kernel startup the relocation block is copied back to lower
/// addresses. Similarly all the other addresses pointing to relocation block
/// are also carefully adjusted.
......
......@@ -139,11 +139,11 @@ IsEfiBootVar (
// every Boot#### variable as a potential boot option regardless
// of the GUID namespace it is in.
//
// The correct way to do it is to only check Boot#### variables in
// gEfiGlobalVariableGuid VendorGuid. However, since they made a mistake,
// most ASUS firmwares (and perhaps other vendors) get corrupted boot option
// list (with e.g. duplicated options) if Boot#### variables are present
// outside of gEfiGlobalVariableGuid.
// The correct way is to only check for Boot#### variables under the
// gEfiGlobalVariableGuid VendorGuid. Due to these bugs however, the
// boot option list on most ASUS firmware, and perhaps other vendors, is
// corrupted (e.g. duplicated options) if Boot#### variables are present
// outside gEfiGlobalVariableGuid.
//
// This is the case with OpenCore as we store macOS-specific boot options
// in a separate GUID (gOcVendorVariableGuid). To workaround the issue
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册