From e5977a2e2bf57eb5661164a0af522558eed0a969 Mon Sep 17 00:00:00 2001 From: Heinrich Schuchardt Date: Fri, 4 Oct 2024 10:31:51 +0200 Subject: [PATCH] riscv: use generic kernel flavor for Nezha D1 and LicheeRV Dock Signed-off-by: Heinrich Schuchardt --- debian/changelog | 6 ++++++ live-build/auto/config | 3 --- .../hooks.d/base/disk-image-uefi-non-cloud.binary | 1 + .../hooks.d/base/riscv64/initramfs-tools/allwinner | 3 +++ 4 files changed, 10 insertions(+), 3 deletions(-) create mode 100644 live-build/ubuntu-cpc/hooks.d/base/riscv64/initramfs-tools/allwinner diff --git a/debian/changelog b/debian/changelog index c4230c1f..4fae0869 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +livecd-rootfs (24.10.26) UNRELEASED; urgency=medium + + * Use generic kernel flavor for Nezha D1 and LicheeRV Dock. + + -- Heinrich Schuchardt Fri, 04 Oct 2024 10:30:28 +0200 + livecd-rootfs (24.10.25) oracular; urgency=medium * Update the model used for TPM FDE installs, yet again. diff --git a/live-build/auto/config b/live-build/auto/config index e9d58265..30bb7d39 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -1133,9 +1133,6 @@ case $PROJECT in riscv64*) if [ -n "$SUBARCH" ]; then case "${SUBARCH:-}" in - nezha|licheerv) - KERNEL_FLAVOURS=allwinner - ;; visionfive) KERNEL_FLAVOURS=starfive ;; diff --git a/live-build/ubuntu-cpc/hooks.d/base/disk-image-uefi-non-cloud.binary b/live-build/ubuntu-cpc/hooks.d/base/disk-image-uefi-non-cloud.binary index a2a2b5dd..85e6c7d5 100755 --- a/live-build/ubuntu-cpc/hooks.d/base/disk-image-uefi-non-cloud.binary +++ b/live-build/ubuntu-cpc/hooks.d/base/disk-image-uefi-non-cloud.binary @@ -305,6 +305,7 @@ install_grub() { echo "Reducing initramfs size for ${SUBARCH} board" mkdir -p mountpoint/etc/initramfs-tools/conf.d/ cp ${my_d}/riscv64/initramfs-tools/modules_list.conf mountpoint/etc/initramfs-tools/conf.d/ + cat ${my_d}/riscv64/initramfs-tools/allwinner >> mountpoint/etc/initramfs-tools/modules chroot mountpoint update-initramfs -c -v -k all echo "Installing U-Boot for ${SUBARCH} board" # flash-kernel is needed to install the dtb for update-grub: it uses the diff --git a/live-build/ubuntu-cpc/hooks.d/base/riscv64/initramfs-tools/allwinner b/live-build/ubuntu-cpc/hooks.d/base/riscv64/initramfs-tools/allwinner new file mode 100644 index 00000000..28ac2b70 --- /dev/null +++ b/live-build/ubuntu-cpc/hooks.d/base/riscv64/initramfs-tools/allwinner @@ -0,0 +1,3 @@ +# Required drivers to boot off MMC +mmc-block +sunxi-mmc