[neon/neon/livecd-rootfs/Neon/release] /: riscv64: use earlycon=sbi on command line

[Heinrich Schuchardt]

Git commit 05933ff83f0a51dbf280aea9d5ef437caeab4707 by Heinrich Schuchardt.
Committed on 07/06/2024 at 14:21.
Pushed by carlosdem into branch 'Neon/release'.

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 <heinrich.schuchardt at canonical.com>

M  +6    -0    debian/changelog
M  +1    -1    live-build/ubuntu-cpc/hooks.d/base/riscv64/grub/10_cmdline.cfg
M  +1    -1    live-build/ubuntu-cpc/hooks.d/base/riscv64/u-boot-menu/10_cmdline.conf

https://invent.kde.org/neon/neon/livecd-rootfs/-/commit/05933ff83f0a51dbf280aea9d5ef437caeab4707

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 <heinrich.schuchardt at canonical.com>  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"