Lubuntu/livecd-rootfs
3
0
Fork 0
mirror of https://git.launchpad.net/livecd-rootfs synced 2025-04-04 23:01:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'watchdog_thresh' of git+ssh://git.launchpad.net/~xypron/livecd-rootfs into ubuntu/master

Browse Source
This commit is contained in:
Łukasz 'sil2100' Zemczak 2023-02-23 16:27:56 +01:00
commit 1123aaa6f5
5 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
live-build/ubuntu-cpc/hooks.d/base/disk-image-uefi.binary
View File

@ -243,10 +243,11 @@ install_grub() {
local my_d=$(dirname $(readlink -f ${0}))
echo "Adjusting GRUB defaults for ${ARCH}"
mkdir -p mountpoint/etc/default/grub.d/
cp ${my_d}/riscv64/grub/cmdline.cfg mountpoint/etc/default/grub.d/
cp ${my_d}/riscv64/grub/10_cmdline.cfg mountpoint/etc/default/grub.d/
case "${SUBARCH}" in
"icicle")
echo "Installing GRUB for ${SUBARCH} board"
cp ${my_d}/riscv64/grub/90_watchdog-thresh.cfg mountpoint/etc/default/grub.d/
# flash-kernel is needed to install the dtb for update-grub: it uses the
# /proc/device-tree/model value to pick the correct dtb and as we are in a chroot,
# the model value is wrong and we need to use /etc/flash-kernel/machine instead.
@ -367,7 +368,10 @@ EOF
setup_cinocloud mountpoint
;;
*)
cp ${my_d}/riscv64/grub/90_watchdog-thresh.cfg mountpoint/etc/default/grub.d/
chroot mountpoint apt-get install -qqy u-boot-menu #grub-efi-riscv64
mkdir -p mountpoint/etc/u-boot-menu/conf.d/
cp ${my_d}/riscv64/u-boot-menu/*.conf mountpoint/etc/u-boot-menu/conf.d/
efi_target=riscv64-efi
chroot mountpoint u-boot-update
u_boot_arch="${SUBARCH}"

0
live-build/ubuntu-cpc/hooks.d/base/riscv64/grub/cmdline.cfg → live-build/ubuntu-cpc/hooks.d/base/riscv64/grub/10_cmdline.cfg
View File

3
live-build/ubuntu-cpc/hooks.d/base/riscv64/grub/90_watchdog-thresh.cfg Normal file
View File

@ -0,0 +1,3 @@
# When booting with Radeon GPUs a soft lockup was observed. Increase the
# watchdog threshhold.
GRUB_CMDLINE_LINUX_DEFAULT="$GRUB_CMDLINE_LINUX_DEFAULT sysctl.kernel.watchdog_thresh=60"

1
live-build/ubuntu-cpc/hooks.d/base/riscv64/u-boot-menu/10_cmdline.conf Normal file
View File

@ -0,0 +1 @@
U_BOOT_PARAMETERS="ro efi=debug earlycon"

3
live-build/ubuntu-cpc/hooks.d/base/riscv64/u-boot-menu/90_watchdog-thresh.conf Normal file
View File

@ -0,0 +1,3 @@
# When booting with Radeon GPUs a soft lockup was observed. Increase the
# watchdog threshhold.
U_BOOT_PARAMETERS="$U_BOOT_PARAMETERS sysctl.kernel.watchdog_thresh=60"