diff --git a/README.md b/README.md index 777303a..8c8bd8f 100644 --- a/README.md +++ b/README.md @@ -29,7 +29,8 @@

-Thinkpad X1 Carbon 6th Gen + + Thinkpad X1 Carbon 6th Gen

diff --git a/docs/BIOS.md b/docs/BIOS.md index f80b23e..7d6f025 100644 --- a/docs/BIOS.md +++ b/docs/BIOS.md @@ -4,57 +4,73 @@ At the minimum, these BIOS settings must be made to install and run macOS without any problems: -| Main Menu | Sub 1 | Sub 2 | Sub 3 | -| --------- | ----------- | --------------------------------------------- | ------------------------------------------------------------------ | -| | >> Security | >> Security Chip | Security Chip `DISABLED` | -| | | >> Fingerprint | Predesktop Authentication `DISABLED` | -| | | >> Secure Boot Configuration | Secure Boot `DISABLED` | -| | | | Press `Clear All Secure Boot Keys` | -| | | >> Intel SGX | Intel SGX Control `DISABLED` | -| | >> Config | >> Network | Wake on Lan `DISABLED` | -| | | | Wake on Lan from Dock `DISABLED` | -| | | | UEFI IPv4 Network Stack `DISABLED` | -| | | | UEFI IPv6 Network Stack `DISABLED` | -| | >> Startup | UEFI/Legacy Boot `UEFI Only` | | -| | | CSM Support `No` (per OpenCore Documentation) | | +``` mermaid +graph LR; + id1[Main Menu]-->Security; + id1-->Config; + id1-->Startup; + Security-->TPM[Security Chip]; + Security-->Fingerprint; + Security-->SBC[Secure Boot Configuration]; + Config-->Network; + Startup-->|UEFI/Legacy Boot|id4[UEFI Only]; + Startup-->|CSM Support|No; + TPM-->|Security Chip|id2[Disabled]; + Fingerprint-->|Predesktop Authentication|id2; + SBC-->|Secure Boot|id2; + Network-->|Wake on LAN|id3[Disabled]; + Network-->|Wake on LAN from Dock|id3; + Network-->|UEFI IPv4 Network Stack|id3; + Network-->|UEFI IPv6 Network Stack|id3; +``` !!! Tip You can also disable hardware/features you do not need to save power, some examples are: -| Main Menu | Sub 1 | Sub 2 | Sub 3 | -| --------- | ----------- | --------------------------------------------- | ------------------------------------------------------------------ | -| | >> Security | >> I/O Port Access | Wireless WAN `DISABLED` | -| | | | Fingerprint Reader `DISABLED` | -| | | | Memory Card Slot `DISABLED` | -| | >> Config | >> USB | Always On USB `DISABLED` | +``` mermaid +graph LR; + id1[Main Menu]-->Security; + id1-->Config; + Security-->id2[I/O Port Access]; + Config-->USB; + id2-->|Wireless WAN|id3[Disabled]; + id2-->|Fingerprint Reader|id3; + id2-->|Memory Card Slot|id3; + USB-->|Always on USB|Disabled; +``` * If you **DO NOT use Thunderbolt 3 hotplug** in macOS (don't mind shutting down the machine to connect TB3 devices), this will drastically lower power consumption: -| Main Menu | Sub 1 | Sub 2 | Sub 3 | -| --------- | ----------- | --------------------------------------------- | ------------------------------------------------------------------ | -| | >> Config | >> Thunderbolt (TM) 3 | Thunderbolt BIOS Assist Mode `Enabled` | -| | | | Thunderbolt(TM) Device `Enabled` | +``` mermaid +graph LR; + id1[Main Menu]-->Config; + Config-->id2[Thunderbolt 3]; + id2-->|Thunderbolt BIOS Assist Mode|Enabled + id2-->|Thunderbolt Device|Enabled +``` * If you **DO use Thunderbolt 3 hotplug in macOS** (at the expense of idle power consumption): -| Main Menu | Sub 1 | Sub 2 | Sub 3 | -| --------- | ----------- | --------------------------------------------- | ------------------------------------------------------------------ | -| | >> Config | >> Thunderbolt (TM) 3 | Thunderbolt BIOS Assist Mode `Disabled` | -| | | | Security Level `No Security` | -| | | | Support in Pre Boot Environment: Thunderbolt(TM) Device `Disabled` | - +``` mermaid +graph LR; + id1[Main Menu]-->Config; + Config-->id2[Thunderbolt 3]; + id2-->|Thunderbolt BIOS Assist Mode|Disabled + id2-->|Security Level|id3[No Security] + id2-->|Support in Pre Boot Environment: Thunderbolt Device|Disabled +``` ## Modding the BIOS -!!! danger +!!! Danger As of of July 16th, 2021: the BIOS mod will break TPM. Hence, Windows 11 will not work. Consider this if you wish to proceed. A modded BIOS will allow for more optimizations to be made for macOS and will overall make your hackintosh better. I am a BIOS modding novice myself, but with these instructions, I was able to mod my x1c6 BIOS in less than one hour. I fully recommend doing this for all who think themselves capable. Furthermore, the default `config.plist` for this repository is meant to accommodate a modded BIOS with appropriate settings. If you cannot mod your BIOS or is unwilling to do so, use `config_unmoddedBIOS.plist`. -SPI_Programmer_CH341a.jpg +CH341a [SPI Programmer CH341a and SOIC8 connector](https://www.amazon.com/Organizer-Socket-Adpter-Programmer-CH341A/dp/B07R5LPTYM) are needed. -Here are the steps to mod your BIOS (credits to paranoidbashthot and \x). Attempt this at your own risk. +Here are the steps to mod your BIOS (credits to `paranoidbashthot` and `\x`). Attempt this at your own risk. 1. Refer to [digmorepaka/thinkpad-firnware-patches](https://github.com/digmorepaka/thinkpad-firmware-patches). 2. Use `xx_80_patches-v*.txt`, I commented out WWAN patches since I do not need it. @@ -82,39 +98,56 @@ The following are further optimization settings that can be figured once your BI * These settings are universally recommended optimizations for your hackintosh: -| Main Menu | Sub 1 | Sub 2 | Sub 3 | Sub 4 | -|--------------|------------------------|------------------------------------|-----------------------------------|--------------------------| -| Advanced Tab | >> Intel Advanced Menu | >> System Agent (SA) Configuration | >> Graphics Configuration | DVMT Pre-Allocated `64M` | -| | | >> Power & Performance | >> CPU - Power Management Control | >> CPU Lock Configuration (Last item, scroll up/down until you see it) CFG Lock `Disabled`| +``` mermaid +graph TD; + id1[Advance Tab]-->id2[Intel Advanced Menu]; + id2-->id3[System Agent Configuration]; + id2-->id4[Power & Performance]; + id3-->id5[Graphics Configuration]; + id4-->id6[CPU - Power Management Control]; + id5-->|DVMT Pre-Allocated|64M; + id6-->id7[CPU Lock Configuration]; + id7-->|CFG Lock|Disabled; +``` * I also recommend undervolting your machine regarless of your usage, the following are stable settings for my x1c6 with `i7-8650U`, verified by stress testing with `Prime95` and `Heaven Benchmark`, your may be worse or better, please do your own testing. In addition, I suggest you repaste your machine with an aftermarket thermal paste for lower temps and a better undervolt. -| Main Menu | Sub 1 | Sub 2 | Sub 3 | Sub 4 | -|--------------|------------------------|------------------------------------|------------------------------------------------------------------------|---------------------------| -| Advanced Tab | >> Intel Advanced Menu | >> OverClocking Performance Menu | OverClocking Feature `Enabled` | | -| | | | >> Processor | Voltage Offset `100` | -| | | | | Offset Prefix `-` | -| | | | >> GT | GT Voltage Offset `80` | -| | | | | Offset Prefix `-` | -| | | | | GTU Voltage Offset `80` | -| | | | | Offset Prefix `-` | -| | | | >> Uncore | Uncore Voltage Offset `80`| -| | | | | Offset Prefix `-` | -| | | | | | +``` mermaid +graph TD; + id1[Advance Tab]-->id2[Intel Advanced Menu]; + id2-->id3[OverClocking Performance Menu]; + id3-->|OverClocking Feature|Enabled; + id3-->Processor; + id3-->GT; + id3-->Uncore; + Processor-->|Voltage Offset|100; + Processor-->|Offset Prefix|id4[-]; + GT-->|GT Voltage Offset|id8[80]; + GT-->|Offset Prefix|id5[-]; + GT-->|GTU Voltage Offset|id8; + GT-->|Offset Prefix|id5; + Uncore-->|Uncore Voltage Offset|80; + Uncore-->|Offset Prefix|id6[-]; +``` * The following settings depend on your own personal preference: * If you want to optimize CPU **performance** at the cost of battery: -| Main Menu | Sub 1 | Sub 2 | Sub 3 | Sub 4 | -|--------------|------------------------|------------------------------------|------------------------------------------------------------------------|--------------------------| -| Advanced Tab | >> Power & Performance | >> CPU - Power Management Control | Boot performance mode `Turbo Performance` | | -| | | | >> Config TDP Configurations | `Up` | -| | | | | | +``` mermaid +graph LR; + id1[Advance Tab]-->id2[Power & Performance]; + id2-->id3[CPU - Power Management Control]; + id3-->|Boot Performance Mode|id4[Turbo Performance]; + id3-->|Config TDP Configurations|Up; +``` + * If you want to optimize **battery time** at the cost of performance: -| Main Menu | Sub 1 | Sub 2 | Sub 3 | Sub 4 | -|--------------|------------------------|------------------------------------|------------------------------------------------------------------------|--------------------------| -| Advanced Tab | >> Power & Performance | >> CPU - Power Management Control | Boot performance mode `Max Battery` | | -| | | | >> Config TDP Configurations | `Down` | -| | | | | | \ No newline at end of file +``` mermaid +graph LR; + id1[Advance Tab]-->id2[Power & Performance]; + id2-->id3[CPU - Power Management Control]; + id3-->|Boot Performance Mode|id4[Max Battery]; + id3-->|Config TDP Configurations|Down; +``` diff --git a/docs/Hardware.md b/docs/Hardware.md index 38f10e8..aa6eb3f 100644 --- a/docs/Hardware.md +++ b/docs/Hardware.md @@ -21,7 +21,7 @@ This is very useful if you intend to also use Windows/Linux, as partitioning a s ## WiFi and Bluetooth !!! Tip - If your laptop did not come with WWAN, you can purchase additional antennas to add to your laptop. This is useful when using WiFi/Bluetooth cards that have 3 antennas.** + If your laptop did not come with WWAN, you can purchase additional antennas to add to your laptop. This is useful when using WiFi/Bluetooth cards that have 3 antennas. - The laptop's default wireless card should work via the [OpenIntelWireless](https://github.com/OpenIntelWireless) kexts. - For a vanilla and native experience, you may wish to buy a BCM94360CS2 card, along with a M.2 NGFF adapter. @@ -37,7 +37,7 @@ This is very useful if you intend to also use Windows/Linux, as partitioning a s - Repaste the machine with thermal [Grizzly Kryonaut](https://www.thermal-grizzly.com/en/products/16-kryonaut-en). - If you're experienced or would to try liquid metal, use [Grizzly Conductonaut](https://www.thermal-grizzly.com/produkte/25-conductonaut). Though I've found that in my expereience, [Grizzly Kryonaut](https://www.thermal-grizzly.com/en/products/16-kryonaut-en) is enough. - Replace your machine's fan (if applicable). See https://www.reddit.com/r/thinkpad/comments/c7zpah/x1_carbon_6th_gen_horrible_cooling_fan_design/ -- Mod the BIOS the unlock Intel Advance Menu. see [docs/1_README-HARDWAREandBIOS.md](https://github.com/tylernguyen/x1c6-hackintosh/blob/main/docs/1_README-HARDWAREandBIOS.md) +- Mod the BIOS the unlock Intel Advance Menu. see [BIOS.md](https://tylernguyen.github.io/x1c6-hackintosh/BIOS/) ## Differing Models diff --git a/docs/assets/SPI_Programmer_CH341a.png b/docs/assets/CH341a.png similarity index 100% rename from docs/assets/SPI_Programmer_CH341a.png rename to docs/assets/CH341a.png diff --git a/docs/assets/logo.png b/docs/assets/logo.png index 578898a..9bb92f4 100644 Binary files a/docs/assets/logo.png and b/docs/assets/logo.png differ diff --git a/docs/assets/opencore.png b/docs/assets/opencore.png deleted file mode 100644 index b97d2ad..0000000 Binary files a/docs/assets/opencore.png and /dev/null differ diff --git a/docs/index.md b/docs/index.md index 20fb58c..e6c317f 100644 --- a/docs/index.md +++ b/docs/index.md @@ -1,7 +1,7 @@ # FAQ #### "Does everything work?" -Not everything, some features will inherently never work under macOS. The most needed, day-to-day features, however, work as they do in a real Mac. +Not everything, some features will inherently never work under macOS. The most needed, day-to-day features, however, work as they do in a real Mac. See [Summary](https://tylernguyen.github.io/x1c6-hackintosh/Summary/). #### "Is this project maintained?" Yes, until eventually my x1c6 dies or macOS phases out update (even then, it'll likely last a few more years). diff --git a/mkdocs.yml b/mkdocs.yml index 9d61220..f0ebd18 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -39,6 +39,7 @@ theme: palette: primary: blue grey accent: red + logo: docs/assets/logo.png features: - header.autohide - search.highlight @@ -59,4 +60,8 @@ plugins: markdown_extensions: - admonition - footnotes - + - pymdownx.superfences: + custom_fences: + - name: mermaid + class: mermaid + format: !!python/name:pymdownx.superfences.fence_code_format \ No newline at end of file