Skip to content

Commit 24c0ba3

Browse files
committed
Clean up a few more stale Arch references
1 parent 3d57425 commit 24c0ba3

File tree

2 files changed

+18
-26
lines changed

2 files changed

+18
-26
lines changed

docs/platform/kb-layout-issues.md

Lines changed: 15 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ Known issue: on M2 MacBook Air machines, currently the default behavior of the `
3939
### System configuration
4040
```
4141
# Output of running:
42-
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"
42+
cd /sys/module/hid_apple/parameters/; grep . *; rpm -q xkeyboard-config; uname -r; cat /proc/device-tree/model; echo; find /sys/devices -name country | xargs cat; dmesg | grep "Keyboard type"
4343
```
4444

4545
## ISO - International English - M1 Macbook Air 2020
@@ -58,9 +58,6 @@ iso_layout:-1
5858
swap_ctrl_cmd:0
5959
swap_fn_leftctrl:0
6060
swap_opt_cmd:0
61-
error: failed to initialize alpm library:
62-
(root: /, dbpath: /var/lib/pacman/)
63-
could not create database
6461
6.14.2-401.asahi.fc42.aarch64+16k
6562
Apple MacBook Air (M1, 2020)
6663
00
@@ -219,16 +216,16 @@ The keyboard mostly works like it should on a non-Mac keyboard. Combinations tha
219216

220217
### System configuration
221218
```
222-
fnmode:3
223-
iso_layout:-1
224-
swap_ctrl_cmd:0
225-
swap_fn_leftctrl:0
226-
swap_opt_cmd:0
227-
xkeyboard-config-asahi 2.35.1_3-1
228-
6.2.0-asahi-11-1-edge-ARCH
229-
Apple MacBook Pro (13-inch, M2, 2022)
230-
00
231-
00
219+
fnmode:3
220+
iso_layout:-1
221+
swap_ctrl_cmd:0
222+
swap_fn_leftctrl:0
223+
swap_opt_cmd:0
224+
xkeyboard-config-asahi 2.35.1_3-1
225+
6.2.0-asahi-11-1-edge-ARCH
226+
Apple MacBook Pro (13-inch, M2, 2022)
227+
00
228+
00
232229
0d
233230
```
234231
## ANSI US - Polish - M1 Max MBP 2021
@@ -237,10 +234,10 @@ Apple MacBook Pro (13-inch, M2, 2022)
237234

238235
Keyboard model on startup defaulted to Generic.
239236

240-
Letters with diacritics (ąćęłóćżź) work with the right option key: correct
241-
Special characters (digits + shift): correct
242-
Special characters right to letters: correct
243-
backtick / tilde left to digits: correct
237+
Letters with diacritics (ąćęłóćżź) work with the right option key: correct
238+
Special characters (digits + shift): correct
239+
Special characters right to letters: correct
240+
backtick / tilde left to digits: correct
244241

245242
### System configuration
246243
```
@@ -301,10 +298,6 @@ iso_layout:-1
301298
swap_ctrl_cmd:0
302299
swap_fn_leftctrl:0
303300
swap_opt_cmd:0
304-
warning: database file for 'core' does not exist (use '-Sy' to download)
305-
warning: database file for 'community' does not exist (use '-Sy' to download)
306-
warning: database file for 'extra' does not exist (use '-Sy' to download)
307-
error: package 'xkeyboard-config-asahi' was not found
308301
6.10.6-401.asahi.fc40.aarch64+16k
309302
Apple MacBook Air (M1, 2020)
310303
00

docs/sw/u-boot.md

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ install it. It is assumed that you are working on an Apple Silicon machine using
99

1010
Do note that the process for building and installing U-Boot listed here is for documentation and development purposes
1111
only. If you are an Asahi user and not interested in hacking on U-Boot or m1n1, they are managed automatically
12-
via `pacman`.
12+
by the distribution.
1313

1414
## Standard boot flow
1515
We make use of U-Boot's UEFI implementation to load and execute a UEFI binary located at `/EFI/BOOT/BOOTAA64.EFI`
@@ -54,8 +54,7 @@ cat build/m1n1.bin /path/to/dtbs/*.dtb <(gzip -c /path/to/uboot/u-boot-nodtb.bin
5454
We recommend that you install the bare m1n1/U-Boot images and DTBs to a specific location on the
5555
root filesystem, and ship a script that backs up the existing image and creates a new one. This prevents regressions from making bricking
5656
the OS install. Users can simply mount the ESP in macOS, delete the new `boot.bin` and rename the backup to recover their machine to a
57-
known good state. For an example of how we do this in Asahi, see `uboot-asahi` and `asahi-scripts/update-m1n1` in the
58-
`AsahiLinux/PKGBUILDs` repo.
57+
known good state. For an example of how we do this in Fedora Asahi Remix, see our [`uboot`](https://pagure.io/fedora-asahi/uboot-tools) and [`asahi-scripts`](https://src.fedoraproject.org/rpms/asahi-scripts/) packaging.
5958

6059
## Helpful U-Boot tricks
6160

@@ -72,7 +71,7 @@ usb start
7271
usb reset
7372
```
7473

75-
If you are using a USB to load a recovery / "Live CD", ensure you also have `usbhid xhci_hcd` under MODULES in `/etc/mkinitcpio.conf`. Also have a read of [Install_Arch_Linux_on_a_removable_medium](https://wiki.archlinux.org/title/Install_Arch_Linux_on_a_removable_medium) for tips and tricks.
74+
If you are using a USB to load a recovery / "Live CD", ensure you also have `usbhid xhci_hcd` under `force_drivers` in `/etc/dracut.conf`.
7675

7776
### Other useful U-Boot commands
7877
```sh

0 commit comments

Comments
 (0)