Skip to content

Commit be71610

Browse files
andybottingandybotting
authored
Merge branch 'AsahiLinux:main' into m2-hdmi-audio-appledrm
2 parents f11cfae + 3d57425 commit be71610

6 files changed

Lines changed: 50 additions & 25 deletions

File tree

‎docs/platform/feature-support/m4.md‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -59,25 +59,25 @@ These are features/hardware blocks that are present on all devices with the give
5959

6060

6161
## M4 devices
62-
| | MacBook Pro<br>(14-inch, Nov 2024) | MacBook Pro<br>(16-inch, Nov 2024) |
63-
|--------------------|:-----------------------------------:|:----------------------------------:|
64-
| Installer | no | no |
65-
| Devicetree | TBA | TBA |
66-
| Main display | TBA | TBA |
67-
| Keyboard | TBA | TBA |
68-
| KB backlight | TBA | TBA |
69-
| Touchpad | TBA | TBA |
70-
| Brightness | TBA | TBA |
71-
| Battery info | TBA | TBA |
72-
| WiFi | TBA | TBA |
73-
| Bluetooth | TBA | TBA |
74-
| HDMI Out | TBA | TBA |
75-
| 3.5mm jack | TBA | TBA |
76-
| Speakers | TBA | TBA |
77-
| Microphones | TBA | TBA |
78-
| Webcam | TBA | TBA |
79-
| SD card slot | TBA | TBA |
80-
| TouchID | TBA | TBA |
62+
| | MacBook Pro<br>(14-inch, Nov 2024) | MacBook Pro<br>(16-inch, Nov 2024) | MacBook Air<br>(13" and 15" 2025) |
63+
|--------------------|:-----------------------------------:|:----------------------------------:|:---------------------------------:|
64+
| Installer | no | no | no |
65+
| Devicetree | TBA | TBA | TBA |
66+
| Main display | TBA | TBA | TBA |
67+
| Keyboard | TBA | TBA | TBA |
68+
| KB backlight | TBA | TBA | TBA |
69+
| Touchpad | TBA | TBA | TBA |
70+
| Brightness | TBA | TBA | TBA |
71+
| Battery info | TBA | TBA | TBA |
72+
| WiFi | TBA | TBA | TBA |
73+
| Bluetooth | TBA | TBA | TBA |
74+
| HDMI Out | TBA | TBA | - |
75+
| 3.5mm jack | TBA | TBA | TBA |
76+
| Speakers | TBA | TBA | TBA |
77+
| Microphones | TBA | TBA | TBA |
78+
| Webcam | TBA | TBA | TBA |
79+
| SD card slot | TBA | TBA | - |
80+
| TouchID | TBA | TBA | TBA |
8181

8282
## M4 Pro/Max devices
8383
| | Mac mini<br>(2024) | MacBook Pro<br>(14-inch, Nov 2024) | MacBook Pro<br>(16-inch, Nov 2024) |

‎docs/platform/kb-layout-issues.md‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,31 @@ Known issue: on M2 MacBook Air machines, currently the default behavior of the `
4242
cd /sys/module/hid_apple/parameters/; grep . *; pacman -Q xkeyboard-config-asahi; uname -r; cat /proc/device-tree/model; echo; find /sys/devices -name country | xargs cat; dmesg | grep "Keyboard type"
4343
```
4444

45+
## ISO - International English - M1 Macbook Air 2020
46+
* UK, Macintosh, intl.
47+
48+
In the first row: All symbols are correct except 3, it only has a hashtag on my layout, not the currency symbol
49+
In the second row: All symbols are correct, except e does not have a currency symbol.
50+
In the third row: All good
51+
In the fourth row: The only symbols that are wrong is that my ~key only has ~and `, not the other pipe and broken pipe character.
52+
53+
### System configuration
54+
```
55+
# Output of running:
56+
fnmode:3
57+
iso_layout:-1
58+
swap_ctrl_cmd:0
59+
swap_fn_leftctrl:0
60+
swap_opt_cmd:0
61+
error: failed to initialize alpm library:
62+
(root: /, dbpath: /var/lib/pacman/)
63+
could not create database
64+
6.14.2-401.asahi.fc42.aarch64+16k
65+
Apple MacBook Air (M1, 2020)
66+
00
67+
0d
68+
```
69+
4570
## JIS - Japanese
4671
* Best XKB keyboard layout/variant: `Japanese/Japanese`
4772

‎docs/project/faq.md‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -87,10 +87,6 @@ Make sure you have the GPU drivers installed. If screen recording is still slow,
8787
## Chromium / VS Code / Slack / Discord / some other Electron app or Chrome-based browser stopped rendering after an update.
8888
This is an [upstream Chromium bug](https://bugs.chromium.org/p/chromium/issues/detail?id=1442633) affecting all Chromium-based frameworks such as [Electron](https://github.com/electron/electron/issues/40366). You have to manually delete your shader cache (e.g. `~/.config/Slack/GPUCache`). We can't do anything about it until the fix is backported/released to users.
8989

90-
## Start up automatically after a power failure
91-
92-
This configuration is available at `/sys/bus/platform/devices/macsmc-reboot/ac_power_mode`. Valid options are `off` and `restore`, which is equivalent to the toggle in System Settings on macOS. It is not possible to set the machine to power on unconditionally when power is connected.
93-
9490
## Wake for network access (WoL/WoWLAN)
9591

9692
- Wake on LAN does not work. The BCM57762 gigabit Ethernet controller supports WoL via magic packets, it can be enabled with `ethtool -s REPLACE_WITH_YOUR_INTERFACE wol g`, but the machine does not wake up when it receives magic packets.

‎docs/sw/m1n1-hypervisor.md‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@
22
title: m1n1 Hypervisor
33
---
44

5+
!!! warning
6+
The m1n1 hypervisor targets macOS Ventura 13.5. Running later versions of macOS under the m1n1 hypervisor is not supported.
7+
58
# Running macOS under the m1n1 hypervisor
69

710
You can run either a development kernel obtained from Apple, in which case you will have debug symbols, or use the stock kernel found in a macOS install.

‎docs/sw/partitioning-cheatsheet.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ Each macOS install has within it *its own copy of recoveryOS*. Then there is a g
5353

5454
For Asahi Linux, we do not install alongside macOS in the same container, because that would require using APFS for Linux (which isn't stable yet nor mainlined). We just create normal GPT partitions for Linux. Asahi Linux also needs to install itself the same way macOS would, into an APFS container as a volume group, to be actually bootable. This is what we call the "stub macOS" and is what links the Apple world to the Linux world. Think of it as a bootloader partition. We *could* share a container with macOS for this, but we *choose* not to because it makes it less error-prone and easier to delete, and we're already partitioning the disk anyway.
5555

56-
So the installer will (for a normal Asahi Linux = Arch Linux ARM install) create three partitions:
56+
So the installer will (for a normal Fedora Asahi Remix install) create three partitions:
5757

5858
* A 2.5GB APFS container, containing the bits of iBoot/macOS we need to boot the machine including a copy of recoveryOS
5959
* m1n1 stage 1 is installed here

‎docs/sw/u-boot.md‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,8 @@ If you are using a USB to load a recovery / "Live CD", ensure you also have `usb
7878
```sh
7979
bootd # Continue the default U-Boot script
8080
reset # Reboot the machine
81-
poweroff # Shutdown the machine completely
8281
nvme scan # Discover NVMe disks (required for next command to succeed)
8382
ls nvme 0:4 / # List the contents of the paired EFI System Partition
8483
```
84+
85+
Note: The `poweroff` command is not available in U-Boot on Apple Silicon. To power off the machine, boot into an operating system (Linux or macOS) and use its shutdown command.

0 commit comments

Comments
 (0)