Lubuntu/livecd-rootfs
3
0
Fork 0
mirror of https://git.launchpad.net/livecd-rootfs synced 2025-05-09 09:51:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

riscv: add SUBARCH 'jh7110'

Browse Source 
Add SUBARCH 'jh7110' for jh7110-based boards
This commit is contained in:
Adriano Cordova 2025-02-25 11:02:02 -03:00
parent eb650f1d34
commit 0b21f55ba4
3 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
debian/changelog vendored
View File

@ -1,4 +1,10 @@
livecd-rootfs (24.04.88) noble; urgency=medium livecd-rootfs (25.04.89) noble; urgency=medium
* riscv: add SUBARCH 'jh7110'. (LP: #2099993)
-- Adriano Cordova <adriano.cordova@canonical.com> Tue, 25 Feb 2025 09:47:54 -0300
livecd-rootfs (25.04.88) noble; urgency=medium
* risc-v: directly copy device trees to /boot/dtb. (LP: #2092205) * risc-v: directly copy device trees to /boot/dtb. (LP: #2092205)

3
live-build/auto/config
View File

@ -9,7 +9,7 @@ case $ARCH:$SUBARCH in
armhf:|\ armhf:|\
i386:|\ i386:|\
ppc64el:|\ 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:milkvmars|riscv64:nezha|riscv64:pic64gx|riscv64:unmatched|\
riscv64:visionfive|riscv64:visionfive2|\ riscv64:visionfive|riscv64:visionfive2|\
s390x:|\ s390x:|\
@ -394,6 +394,7 @@ fi
if [ "$IMAGEFORMAT" = "ext4" ] && [ "$PROJECT" = "ubuntu-cpc" ]; then if [ "$IMAGEFORMAT" = "ext4" ] && [ "$PROJECT" = "ubuntu-cpc" ]; then
case $ARCH:$SUBARCH in case $ARCH:$SUBARCH in
riscv64:icicle | \ riscv64:icicle | \
riscv64:jh7110 | \
riscv64:licheerv | \ riscv64:licheerv | \
riscv64:milkvmars | \ riscv64:milkvmars | \
riscv64:nezha | \ riscv64:nezha | \

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

@ -133,8 +133,8 @@ create_partitions() {
--change-name=3:uEnv \ --change-name=3:uEnv \
--new=1:: \ --new=1:: \
--attributes=1:set:2 --attributes=1:set:2
elif [ "${SUBARCH:-}" = "visionfive2" ] || [ "${SUBARCH:-}" = "milkvmars" ]; then elif [ "${SUBARCH:-}" = "visionfive2" ] || [ "${SUBARCH:-}" = "milkvmars" ] || [ "${SUBARCH:-}" = "jh7110" ]; then
# VisionFive 2, Milk-V Mars # JH7110 chips: VisionFive 2, Milk-V Mars
sgdisk "${disk_image}" \ sgdisk "${disk_image}" \
--set-alignment=4096 \ --set-alignment=4096 \
--new=13:4096:8191 \ --new=13:4096:8191 \
@ -337,7 +337,7 @@ EOF
umount "${uenv_mnt_dir}" umount "${uenv_mnt_dir}"
rmdir "${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/ cp ${my_d}/riscv64/grub/90_watchdog-thresh.cfg mountpoint/etc/default/grub.d/
chroot mountpoint apt-get install -qqy u-boot-starfive chroot mountpoint apt-get install -qqy u-boot-starfive
# U-Boot SPL # U-Boot SPL