From 05933ff83f0a51dbf280aea9d5ef437caeab4707 Mon Sep 17 00:00:00 2001 From: Heinrich Schuchardt Date: Thu, 6 Jun 2024 16:19:24 +0200 Subject: [PATCH] riscv64: use earlycon=sbi on command line With current kernel we need to specify the SBI driver for the early console to work. Signed-off-by: Heinrich Schuchardt --- debian/changelog | 6 ++++++ .../ubuntu-cpc/hooks.d/base/riscv64/grub/10_cmdline.cfg | 2 +- .../hooks.d/base/riscv64/u-boot-menu/10_cmdline.conf | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 5ecf2e92..8cf7a408 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +livecd-rootfs (24.04.72) UNRELEASED; urgency=medium + + * riscv64: use earlycon=sbi on command line (LP: #2068739) + + -- Heinrich Schuchardt Fri, 07 Jun 2024 13:58:34 +0200 + livecd-rootfs (24.04.71) noble; urgency=medium * Re-enable ability to build HyperV desktop images (LP: #2064280) diff --git a/live-build/ubuntu-cpc/hooks.d/base/riscv64/grub/10_cmdline.cfg b/live-build/ubuntu-cpc/hooks.d/base/riscv64/grub/10_cmdline.cfg index c8cf57d0..39cd1e13 100644 --- a/live-build/ubuntu-cpc/hooks.d/base/riscv64/grub/10_cmdline.cfg +++ b/live-build/ubuntu-cpc/hooks.d/base/riscv64/grub/10_cmdline.cfg @@ -1,4 +1,4 @@ # Booting on many riscv64 systems is slow. Let the user view progress. # For minimum output use # GRUB_CMDLINE_LINUX_DEFAULT="quiet" -GRUB_CMDLINE_LINUX_DEFAULT="efi=debug earlycon" +GRUB_CMDLINE_LINUX_DEFAULT="efi=debug earlycon=sbi" diff --git a/live-build/ubuntu-cpc/hooks.d/base/riscv64/u-boot-menu/10_cmdline.conf b/live-build/ubuntu-cpc/hooks.d/base/riscv64/u-boot-menu/10_cmdline.conf index 380be66e..231c2c23 100644 --- a/live-build/ubuntu-cpc/hooks.d/base/riscv64/u-boot-menu/10_cmdline.conf +++ b/live-build/ubuntu-cpc/hooks.d/base/riscv64/u-boot-menu/10_cmdline.conf @@ -1 +1 @@ -U_BOOT_PARAMETERS="ro efi=debug earlycon" +U_BOOT_PARAMETERS="ro efi=debug earlycon=sbi"