Set tty0 in cmdline as the default preferred console (#3402)

The preferred console (which is used for printing the systemd boot log)
is the last one specified in the cmdline boot arguments. Make sure it is
always tty0, i.e. the first graphical console.

In some places tty1 was used - change it to tty0 which is commonly used,
and in HAOS points to tty1 anyway.

The only exception is the Yellow, which doesn't have an HDMI port, so
the serial console is used as the preferred one instead.

For ASUS Tinker, use a versioned cmdline.txt file instead of in-place
generating it in the post-build hook.
This commit is contained in:
Jan Čermák 2024-06-07 12:59:21 +02:00 committed by GitHub
parent bd7474fc97
commit 22b63ae779
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
16 changed files with 16 additions and 13 deletions

View File

@ -1 +1 @@
console=tty1 console=ttyS0
console=ttyS0 console=tty0

View File

@ -13,8 +13,7 @@ function hassos_pre_image() {
mkdir -p "${BOOT_DATA}/overlays"
cp "${BINARIES_DIR}"/*.dtbo "${BOOT_DATA}/overlays/"
cp "${BOARD_DIR}/boot-env.txt" "${BOOT_DATA}/haos-config.txt"
echo "console=tty1" > "${BOOT_DATA}/cmdline.txt"
cp "${BOARD_DIR}/cmdline.txt" "${BOOT_DATA}/cmdline.txt"
# SPL
create_spl_image

View File

@ -0,0 +1 @@
console=tty0

View File

@ -1 +1 @@
console=tty0 console=ttyAML0,115200n8
console=ttyAML0,115200n8 console=tty0

View File

@ -1 +1 @@
console=tty0 console=ttyAML0,115200n8
console=ttyAML0,115200n8 console=tty0

View File

@ -0,0 +1 @@
console=tty0

View File

@ -0,0 +1 @@
console=tty0

View File

@ -1 +1 @@
console=tty0 console=ttyAML0,115200n8
console=ttyAML0,115200n8 console=tty0

View File

@ -1 +1 @@
console=tty1 console=ttySAC2,115200
console=ttySAC2,115200 console=tty0

View File

@ -1 +1 @@
console=tty0 console=ttyAML0,115200n8
console=ttyAML0,115200n8 console=tty0

View File

@ -0,0 +1 @@
console=tty0

View File

@ -1 +1 @@
console=tty1
console=tty0

View File

@ -1 +1 @@
console=ttyS0 console=tty1
console=ttyS0 console=tty0

View File

@ -1 +1 @@
dwc_otg.lpm_enable=0 console=tty1 usb-storage.quirks=174c:55aa:u,2109:0715:u,152d:0578:u,152d:0579:u,152d:1561:u,174c:0829:u,14b0:0206:u,174c:225c:u,7825:a2a4:u,152d:0562:u,125f:a88a:u
dwc_otg.lpm_enable=0 console=tty0 usb-storage.quirks=174c:55aa:u,2109:0715:u,152d:0578:u,152d:0579:u,152d:1561:u,174c:0829:u,14b0:0206:u,174c:225c:u,7825:a2a4:u,152d:0562:u,125f:a88a:u

View File

@ -1 +1 @@
zram.enabled=1 zram.num_devices=3 rootwait cgroup_enable=memory fsck.repair=yes console=tty1 root=PARTUUID=8d3d53e3-6d49-4c38-8349-aff6859e82fd rootfstype=squashfs ro rauc.slot=A
zram.enabled=1 zram.num_devices=3 rootwait cgroup_enable=memory fsck.repair=yes console=tty0 root=PARTUUID=8d3d53e3-6d49-4c38-8349-aff6859e82fd rootfstype=squashfs ro rauc.slot=A

View File

@ -1 +1 @@
dwc_otg.lpm_enable=0 console=tty1 console=ttyAMA2,115200n8
dwc_otg.lpm_enable=0 console=tty0 console=ttyAMA2,115200n8