From 71308d500bd3e7a78e7b605dd7634cfae48f6293 Mon Sep 17 00:00:00 2001 From: Heinrich Schuchardt Date: Mon, 9 Jan 2023 11:37:16 +0100 Subject: [PATCH] riscv64: adjust U-Boot installation for Nezha D1 and LicheeRV Since version 2022.10 U-Boot SPL and U-Boot are installed onto the same partition. Package nezha-boot0 is not needed anymore. Signed-off-by: Heinrich Schuchardt --- .../ubuntu-cpc/hooks.d/base/disk-image-uefi.binary | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/live-build/ubuntu-cpc/hooks.d/base/disk-image-uefi.binary b/live-build/ubuntu-cpc/hooks.d/base/disk-image-uefi.binary index 3c6bd3dd..8ef4fca6 100755 --- a/live-build/ubuntu-cpc/hooks.d/base/disk-image-uefi.binary +++ b/live-build/ubuntu-cpc/hooks.d/base/disk-image-uefi.binary @@ -298,16 +298,12 @@ install_grub() { chroot mountpoint bash -c 'FK_FORCE=yes apt-get install -qqy grub-efi-riscv64 flash-kernel' efi_target=riscv64-efi - # nezha-boot0 is actually compatible with the LicheeRV boards (and probably other D1-based boards) - chroot mountpoint apt-get install -qqy nezha-boot0 - # FSBL, which gets U-Boot SPL - loader1="/dev/mapper${loop_device///dev/}p13" - dd if=mountpoint/usr/lib/u-boot/nezha/boot0_sdcard_sun20iw1p1.bin of=$loader1 - # The real U-Boot - # u-boot-nezha actually contains both the LicheeRV and the Nezha boards support + # u-boot-nezha supports both the LicheeRV and the Nezha D1. chroot mountpoint apt-get install -qqy u-boot-nezha - loader2="/dev/mapper${loop_device///dev/}p14" - dd if=mountpoint/usr/lib/u-boot/${SUBARCH}/u-boot.toc1 of=$loader2 + # Since version 2022.10 U-Boot SPL and U-Boot are installed onto the same partition. + # Package nezha-boot0 is not needed anymore. + loader1="/dev/mapper${loop_device///dev/}p13" + dd if=mountpoint/usr/lib/u-boot/${SUBARCH}/u-boot-sunxi-with-spl.bin of=$loader1 # Provide end-user modifyable CIDATA cidata_dev="/dev/mapper${loop_device///dev/}p12" setup_cidata "${cidata_dev}"