From 949f9806469c4eaf206e9717da36fc3001fb89ab Mon Sep 17 00:00:00 2001 From: Adriano Cordova Date: Tue, 25 Feb 2025 09:49:19 -0300 Subject: [PATCH] riscv: add SUBARCH 'jh7110' Add SUBARCH 'jh7110' for jh7110-based boards. --- debian/changelog | 6 ++++++ live-build/auto/config | 3 ++- .../hooks.d/base/disk-image-uefi-non-cloud.binary | 6 +++--- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index 72074117..82511502 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +livecd-rootfs (25.04.20) plucky; urgency=medium + + * riscv: add SUBARCH 'jh7110'. (LP: #2099993) + + -- Adriano Cordova Tue, 25 Feb 2025 15:28:06 -0300 + livecd-rootfs (25.04.19) plucky; urgency=medium * add cpc-sbom to create_manifest calls to generate sboms (LP: #2077105) diff --git a/live-build/auto/config b/live-build/auto/config index 5535b3e5..c89034a1 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -9,7 +9,7 @@ case $ARCH:$SUBARCH in armhf:|\ i386:|\ ppc64el:|\ - riscv64:|riscv64:generic|riscv64:icicle|riscv64:licheerv|\ + riscv64:|riscv64:generic|riscv64:icicle|riscv64:jh7110|riscv64:licheerv|\ riscv64:milkvmars|riscv64:nezha|riscv64:pic64gx|riscv64:unmatched|\ riscv64:visionfive|riscv64:visionfive2|\ s390x:|\ @@ -416,6 +416,7 @@ fi if [ "$IMAGEFORMAT" = "ext4" ] && [ "$PROJECT" = "ubuntu-cpc" ]; then case $ARCH:$SUBARCH in riscv64:icicle | \ + riscv64:jh7110 | \ riscv64:licheerv | \ riscv64:milkvmars | \ riscv64:nezha | \ 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 d137c045..09d767fe 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 @@ -133,8 +133,8 @@ create_partitions() { --change-name=3:uEnv \ --new=1:: \ --attributes=1:set:2 - elif [ "${SUBARCH:-}" = "visionfive2" ] || [ "${SUBARCH:-}" = "milkvmars" ]; then - # VisionFive 2, Milk-V Mars + elif [ "${SUBARCH:-}" = "visionfive2" ] || [ "${SUBARCH:-}" = "milkvmars" ] || [ "${SUBARCH:-}" = "jh7110" ]; then + # JH7110 chips: VisionFive 2, Milk-V Mars sgdisk "${disk_image}" \ --set-alignment=4096 \ --new=13:4096:8191 \ @@ -338,7 +338,7 @@ EOF umount "${uenv_mnt_dir}" rmdir "${uenv_mnt_dir}" ;; - "visionfive2"|"milkvmars") + "visionfive2"|"milkvmars"|"jh7110") cp ${my_d}/riscv64/grub/90_watchdog-thresh.cfg mountpoint/etc/default/grub.d/ chroot mountpoint apt-get install -qqy u-boot-starfive # U-Boot SPL