File project.diff of Package JeOS-starfivevisionfive2

Overview Repositories Revisions Requests Users Attributes Meta

File project.diff of Package JeOS-starfivevisionfive2 (Revision 155f583180a0c06f59894ba12e9e2197)

Currently displaying revision 155f583180a0c06f59894ba12e9e2197 , Show latest

--- Images.kiwi.in.orig
+++ Images.kiwi.in
@@ -549,6 +549,13 @@
 #  define KERNEL_CMDLINE_GFX "KERNEL_CMDLINE_DEFAULT console=ttyS0,115200n8 console=tty"
 #  define EXTRA_PACKAGES PKG_BOOT_TAG(dtb-starfive)
 #  define USE_EFI 1
+#elif IS_FLAVOR_starfivevisionfive2
+#  define BOOTKERNEL default
+#  define KERNEL_CMDLINE_SER "KERNEL_CMDLINE_DEFAULT console=ttyS0,115200n8"
+#  define KERNEL_CMDLINE_GFX "KERNEL_CMDLINE_DEFAULT console=ttyS0,115200n8 console=tty"
+#  define EXTRA_PACKAGES PKG_TAG(dtb-starfive) \
+                         PKG_TAG(visionfive2-firmware)
+#  define USE_EFI 1
 #elif IS_FLAVOR_efi
 #ifdef USE_VMX
 #  define BOOTKERNEL default-base
@@ -699,6 +706,8 @@
 #elif IS_FLAVOR_zturn
     /* fdisk issue in kiwi: https://github.com/OSInside/kiwi/issues/1749 */
     /* Do not set disk_start_sector="" until this is resolved */
+#elif IS_FLAVOR_starfivevisionfive2
+        disk_start_sector="16384"
 #else
         disk_start_sector="8192"
 #endif
--- _constraints.orig
+++ _constraints
@@ -76,6 +76,7 @@
       <package>JeOS:JeOS-efi.riscv64</package>
       <package>JeOS:JeOS-hifiveunmatched</package>
       <package>JeOS:JeOS-starfivejh7100</package>
+      <package>JeOS:JeOS-starfivevisionfive2</package>
       <package>JeOS:JeOS-efi-pxe.riscv64</package>
       <package>JeOS:JeOS-hifiveunleashed</package>
       <package>JeOS:JeOS-efi-devel.riscv64</package>
--- contribs.orig
+++ contribs
@@ -23,3 +23,4 @@ ultra96			devel:ARM:Factory:Contrib:Zynq
 zynqmp			devel:ARM:Factory:Contrib:Zynq:dynamic
 #
 starfivejh7100		devel:RISCV:Factory:Contrib:StarFive
+starfivevisionfive2	devel:RISCV:Factory:Contrib:StarFive:VisionFive2
--- pre_checkin.sh.orig
+++ pre_checkin.sh
@@ -103,7 +103,7 @@ riscv64_gfx_images="rootfs efi"
 riscv64_gfx_images="$riscv64_gfx_images hifiveunmatched"
 # StarFive
 riscv64_gfx_images="$riscv64_gfx_images starfivejh7100"
-riscv64_jeos_images="$riscv64_gfx_images efi-pxe"
+riscv64_jeos_images="$riscv64_gfx_images starfivevisionfive2 efi-pxe"
 # SiFive
 riscv64_jeos_images="$riscv64_jeos_images hifiveunleashed"
 riscv64_devel_images="efi"
--- uboot-image-a13olinuxino-install.orig
+++ uboot-image-a13olinuxino-install
@@ -705,3 +705,28 @@ if [ "$flavor" = "hifiveunleashed" -o "$
   partx -dv $LOOPDEV
   losetup -d $LOOPDEV
 fi
+
+if [ "$flavor" = "starfivevisionfive2" ]; then
+  # create two additional partitions
+  echo "Creating SPL and U-Boot partitions..."
+  sgdisk -n 4:4096:6143 -c 4:spl -t 4:2e54b353-1271-4842-806f-e436d6af6985 \
+	 -n 5:6144:16383 -c 5:uboot -t 5:5b193300-fc78-40cd-8002-e86c45580b47 \
+	 -s $diskname
+  echo "Installing SPL..."
+  LOOPDEV=$(partx -av $diskname | sed -n '/^\//{s/:.*//p;q;}')
+  if ! dd if=usr/share/visionfive2-firmware/u-boot-spl.bin.normal.out of=${LOOPDEV}p1 bs=2k; then
+    echo "Couldn't install SPL on $diskname"
+    exit 1
+  fi
+  echo "Installing U-Boot..."
+  if ! dd if=usr/share/visionfive2-firmware/u-boot.itb of=${LOOPDEV}p2 bs=2k; then
+    echo "Couldn't install U-Boot on $diskname"
+    exit 1
+  fi
+  partx -dv $LOOPDEV
+  losetup -d $LOOPDEV
+  if test -f config.partids; then
+    # Fix up partition numbers
+    sed -ie s/3/5/ -e s/2/4/ -e s/1/3/ config.partids
+  fi
+fi
--- uboot-image-a20olinuxinolime-install.orig
+++ uboot-image-a20olinuxinolime-install
@@ -705,3 +705,28 @@ if [ "$flavor" = "hifiveunleashed" -o "$
   partx -dv $LOOPDEV
   losetup -d $LOOPDEV
 fi
+
+if [ "$flavor" = "starfivevisionfive2" ]; then
+  # create two additional partitions
+  echo "Creating SPL and U-Boot partitions..."
+  sgdisk -n 4:4096:6143 -c 4:spl -t 4:2e54b353-1271-4842-806f-e436d6af6985 \
+	 -n 5:6144:16383 -c 5:uboot -t 5:5b193300-fc78-40cd-8002-e86c45580b47 \
+	 -s $diskname
+  echo "Installing SPL..."
+  LOOPDEV=$(partx -av $diskname | sed -n '/^\//{s/:.*//p;q;}')
+  if ! dd if=usr/share/visionfive2-firmware/u-boot-spl.bin.normal.out of=${LOOPDEV}p1 bs=2k; then
+    echo "Couldn't install SPL on $diskname"
+    exit 1
+  fi
+  echo "Installing U-Boot..."
+  if ! dd if=usr/share/visionfive2-firmware/u-boot.itb of=${LOOPDEV}p2 bs=2k; then
+    echo "Couldn't install U-Boot on $diskname"
+    exit 1
+  fi
+  partx -dv $LOOPDEV
+  losetup -d $LOOPDEV
+  if test -f config.partids; then
+    # Fix up partition numbers
+    sed -ie s/3/5/ -e s/2/4/ -e s/1/3/ config.partids
+  fi
+fi
--- uboot-image-a20olinuxinomicro-install.orig
+++ uboot-image-a20olinuxinomicro-install
@@ -705,3 +705,28 @@ if [ "$flavor" = "hifiveunleashed" -o "$
   partx -dv $LOOPDEV
   losetup -d $LOOPDEV
 fi
+
+if [ "$flavor" = "starfivevisionfive2" ]; then
+  # create two additional partitions
+  echo "Creating SPL and U-Boot partitions..."
+  sgdisk -n 4:4096:6143 -c 4:spl -t 4:2e54b353-1271-4842-806f-e436d6af6985 \
+	 -n 5:6144:16383 -c 5:uboot -t 5:5b193300-fc78-40cd-8002-e86c45580b47 \
+	 -s $diskname
+  echo "Installing SPL..."
+  LOOPDEV=$(partx -av $diskname | sed -n '/^\//{s/:.*//p;q;}')
+  if ! dd if=usr/share/visionfive2-firmware/u-boot-spl.bin.normal.out of=${LOOPDEV}p1 bs=2k; then
+    echo "Couldn't install SPL on $diskname"
+    exit 1
+  fi
+  echo "Installing U-Boot..."
+  if ! dd if=usr/share/visionfive2-firmware/u-boot.itb of=${LOOPDEV}p2 bs=2k; then
+    echo "Couldn't install U-Boot on $diskname"
+    exit 1
+  fi
+  partx -dv $LOOPDEV
+  losetup -d $LOOPDEV
+  if test -f config.partids; then
+    # Fix up partition numbers
+    sed -ie s/3/5/ -e s/2/4/ -e s/1/3/ config.partids
+  fi
+fi
--- uboot-image-arndale-install.orig
+++ uboot-image-arndale-install
@@ -705,3 +705,28 @@ if [ "$flavor" = "hifiveunleashed" -o "$
   partx -dv $LOOPDEV
   losetup -d $LOOPDEV
 fi
+
+if [ "$flavor" = "starfivevisionfive2" ]; then
+  # create two additional partitions
+  echo "Creating SPL and U-Boot partitions..."
+  sgdisk -n 4:4096:6143 -c 4:spl -t 4:2e54b353-1271-4842-806f-e436d6af6985 \
+	 -n 5:6144:16383 -c 5:uboot -t 5:5b193300-fc78-40cd-8002-e86c45580b47 \
+	 -s $diskname
+  echo "Installing SPL..."
+  LOOPDEV=$(partx -av $diskname | sed -n '/^\//{s/:.*//p;q;}')
+  if ! dd if=usr/share/visionfive2-firmware/u-boot-spl.bin.normal.out of=${LOOPDEV}p1 bs=2k; then
+    echo "Couldn't install SPL on $diskname"
+    exit 1
+  fi
+  echo "Installing U-Boot..."
+  if ! dd if=usr/share/visionfive2-firmware/u-boot.itb of=${LOOPDEV}p2 bs=2k; then
+    echo "Couldn't install U-Boot on $diskname"
+    exit 1
+  fi
+  partx -dv $LOOPDEV
+  losetup -d $LOOPDEV
+  if test -f config.partids; then
+    # Fix up partition numbers
+    sed -ie s/3/5/ -e s/2/4/ -e s/1/3/ config.partids
+  fi
+fi
--- uboot-image-bananapi-install.orig
+++ uboot-image-bananapi-install
@@ -705,3 +705,28 @@ if [ "$flavor" = "hifiveunleashed" -o "$
   partx -dv $LOOPDEV
   losetup -d $LOOPDEV
 fi
+
+if [ "$flavor" = "starfivevisionfive2" ]; then
+  # create two additional partitions
+  echo "Creating SPL and U-Boot partitions..."
+  sgdisk -n 4:4096:6143 -c 4:spl -t 4:2e54b353-1271-4842-806f-e436d6af6985 \
+	 -n 5:6144:16383 -c 5:uboot -t 5:5b193300-fc78-40cd-8002-e86c45580b47 \
+	 -s $diskname
+  echo "Installing SPL..."
+  LOOPDEV=$(partx -av $diskname | sed -n '/^\//{s/:.*//p;q;}')
+  if ! dd if=usr/share/visionfive2-firmware/u-boot-spl.bin.normal.out of=${LOOPDEV}p1 bs=2k; then
+    echo "Couldn't install SPL on $diskname"
+    exit 1
+  fi
+  echo "Installing U-Boot..."
+  if ! dd if=usr/share/visionfive2-firmware/u-boot.itb of=${LOOPDEV}p2 bs=2k; then
+    echo "Couldn't install U-Boot on $diskname"
+    exit 1
+  fi
+  partx -dv $LOOPDEV
+  losetup -d $LOOPDEV
+  if test -f config.partids; then
+    # Fix up partition numbers
+    sed -ie s/3/5/ -e s/2/4/ -e s/1/3/ config.partids
+  fi
+fi
--- uboot-image-bananapiR2-install.orig
+++ uboot-image-bananapiR2-install
@@ -705,3 +705,28 @@ if [ "$flavor" = "hifiveunleashed" -o "$
   partx -dv $LOOPDEV
   losetup -d $LOOPDEV
 fi
+
+if [ "$flavor" = "starfivevisionfive2" ]; then
+  # create two additional partitions
+  echo "Creating SPL and U-Boot partitions..."
+  sgdisk -n 4:4096:6143 -c 4:spl -t 4:2e54b353-1271-4842-806f-e436d6af6985 \
+	 -n 5:6144:16383 -c 5:uboot -t 5:5b193300-fc78-40cd-8002-e86c45580b47 \
+	 -s $diskname
+  echo "Installing SPL..."
+  LOOPDEV=$(partx -av $diskname | sed -n '/^\//{s/:.*//p;q;}')
+  if ! dd if=usr/share/visionfive2-firmware/u-boot-spl.bin.normal.out of=${LOOPDEV}p1 bs=2k; then
+    echo "Couldn't install SPL on $diskname"
+    exit 1
+  fi
+  echo "Installing U-Boot..."
+  if ! dd if=usr/share/visionfive2-firmware/u-boot.itb of=${LOOPDEV}p2 bs=2k; then
+    echo "Couldn't install U-Boot on $diskname"
+    exit 1
+  fi
+  partx -dv $LOOPDEV
+  losetup -d $LOOPDEV
+  if test -f config.partids; then
+    # Fix up partition numbers
+    sed -ie s/3/5/ -e s/2/4/ -e s/1/3/ config.partids
+  fi
+fi
--- uboot-image-beagle-install.orig
+++ uboot-image-beagle-install
@@ -705,3 +705,28 @@ if [ "$flavor" = "hifiveunleashed" -o "$
   partx -dv $LOOPDEV
   losetup -d $LOOPDEV
 fi
+
+if [ "$flavor" = "starfivevisionfive2" ]; then
+  # create two additional partitions
+  echo "Creating SPL and U-Boot partitions..."
+  sgdisk -n 4:4096:6143 -c 4:spl -t 4:2e54b353-1271-4842-806f-e436d6af6985 \
+	 -n 5:6144:16383 -c 5:uboot -t 5:5b193300-fc78-40cd-8002-e86c45580b47 \
+	 -s $diskname
+  echo "Installing SPL..."
+  LOOPDEV=$(partx -av $diskname | sed -n '/^\//{s/:.*//p;q;}')
+  if ! dd if=usr/share/visionfive2-firmware/u-boot-spl.bin.normal.out of=${LOOPDEV}p1 bs=2k; then
+    echo "Couldn't install SPL on $diskname"
+    exit 1
+  fi
+  echo "Installing U-Boot..."
+  if ! dd if=usr/share/visionfive2-firmware/u-boot.itb of=${LOOPDEV}p2 bs=2k; then
+    echo "Couldn't install U-Boot on $diskname"
+    exit 1
+  fi
+  partx -dv $LOOPDEV
+  losetup -d $LOOPDEV
+  if test -f config.partids; then
+    # Fix up partition numbers
+    sed -ie s/3/5/ -e s/2/4/ -e s/1/3/ config.partids
+  fi
+fi
--- uboot-image-beaglebone-install.orig
+++ uboot-image-beaglebone-install
@@ -705,3 +705,28 @@ if [ "$flavor" = "hifiveunleashed" -o "$
   partx -dv $LOOPDEV
   losetup -d $LOOPDEV
 fi
+
+if [ "$flavor" = "starfivevisionfive2" ]; then
+  # create two additional partitions
+  echo "Creating SPL and U-Boot partitions..."
+  sgdisk -n 4:4096:6143 -c 4:spl -t 4:2e54b353-1271-4842-806f-e436d6af6985 \
+	 -n 5:6144:16383 -c 5:uboot -t 5:5b193300-fc78-40cd-8002-e86c45580b47 \
+	 -s $diskname
+  echo "Installing SPL..."
+  LOOPDEV=$(partx -av $diskname | sed -n '/^\//{s/:.*//p;q;}')
+  if ! dd if=usr/share/visionfive2-firmware/u-boot-spl.bin.normal.out of=${LOOPDEV}p1 bs=2k; then
+    echo "Couldn't install SPL on $diskname"
+    exit 1
+  fi
+  echo "Installing U-Boot..."
+  if ! dd if=usr/share/visionfive2-firmware/u-boot.itb of=${LOOPDEV}p2 bs=2k; then
+    echo "Couldn't install U-Boot on $diskname"
+    exit 1
+  fi
+  partx -dv $LOOPDEV
+  losetup -d $LOOPDEV
+  if test -f config.partids; then
+    # Fix up partition numbers
+    sed -ie s/3/5/ -e s/2/4/ -e s/1/3/ config.partids
+  fi
+fi
--- uboot-image-chromebook-install.orig
+++ uboot-image-chromebook-install
@@ -705,3 +705,28 @@ if [ "$flavor" = "hifiveunleashed" -o "$
   partx -dv $LOOPDEV
   losetup -d $LOOPDEV
 fi
+
+if [ "$flavor" = "starfivevisionfive2" ]; then
+  # create two additional partitions
+  echo "Creating SPL and U-Boot partitions..."
+  sgdisk -n 4:4096:6143 -c 4:spl -t 4:2e54b353-1271-4842-806f-e436d6af6985 \
+	 -n 5:6144:16383 -c 5:uboot -t 5:5b193300-fc78-40cd-8002-e86c45580b47 \
+	 -s $diskname
+  echo "Installing SPL..."
+  LOOPDEV=$(partx -av $diskname | sed -n '/^\//{s/:.*//p;q;}')
+  if ! dd if=usr/share/visionfive2-firmware/u-boot-spl.bin.normal.out of=${LOOPDEV}p1 bs=2k; then
+    echo "Couldn't install SPL on $diskname"
+    exit 1
+  fi
+  echo "Installing U-Boot..."
+  if ! dd if=usr/share/visionfive2-firmware/u-boot.itb of=${LOOPDEV}p2 bs=2k; then
+    echo "Couldn't install U-Boot on $diskname"
+    exit 1
+  fi
+  partx -dv $LOOPDEV
+  losetup -d $LOOPDEV
+  if test -f config.partids; then
+    # Fix up partition numbers
+    sed -ie s/3/5/ -e s/2/4/ -e s/1/3/ config.partids
+  fi
+fi
--- uboot-image-clearfog-install.orig
+++ uboot-image-clearfog-install
@@ -705,3 +705,28 @@ if [ "$flavor" = "hifiveunleashed" -o "$
   partx -dv $LOOPDEV
   losetup -d $LOOPDEV
 fi
+
+if [ "$flavor" = "starfivevisionfive2" ]; then
+  # create two additional partitions
+  echo "Creating SPL and U-Boot partitions..."
+  sgdisk -n 4:4096:6143 -c 4:spl -t 4:2e54b353-1271-4842-806f-e436d6af6985 \
+	 -n 5:6144:16383 -c 5:uboot -t 5:5b193300-fc78-40cd-8002-e86c45580b47 \
+	 -s $diskname
+  echo "Installing SPL..."
+  LOOPDEV=$(partx -av $diskname | sed -n '/^\//{s/:.*//p;q;}')
+  if ! dd if=usr/share/visionfive2-firmware/u-boot-spl.bin.normal.out of=${LOOPDEV}p1 bs=2k; then
+    echo "Couldn't install SPL on $diskname"
+    exit 1
+  fi
+  echo "Installing U-Boot..."
+  if ! dd if=usr/share/visionfive2-firmware/u-boot.itb of=${LOOPDEV}p2 bs=2k; then
+    echo "Couldn't install U-Boot on $diskname"
+    exit 1
+  fi
+  partx -dv $LOOPDEV
+  losetup -d $LOOPDEV
+  if test -f config.partids; then
+    # Fix up partition numbers
+    sed -ie s/3/5/ -e s/2/4/ -e s/1/3/ config.partids
+  fi
+fi
--- uboot-image-cubieboard-install.orig
+++ uboot-image-cubieboard-install
@@ -705,3 +705,28 @@ if [ "$flavor" = "hifiveunleashed" -o "$
   partx -dv $LOOPDEV
   losetup -d $LOOPDEV
 fi
+
+if [ "$flavor" = "starfivevisionfive2" ]; then
+  # create two additional partitions
+  echo "Creating SPL and U-Boot partitions..."
+  sgdisk -n 4:4096:6143 -c 4:spl -t 4:2e54b353-1271-4842-806f-e436d6af6985 \
+	 -n 5:6144:16383 -c 5:uboot -t 5:5b193300-fc78-40cd-8002-e86c45580b47 \
+	 -s $diskname
+  echo "Installing SPL..."
+  LOOPDEV=$(partx -av $diskname | sed -n '/^\//{s/:.*//p;q;}')
+  if ! dd if=usr/share/visionfive2-firmware/u-boot-spl.bin.normal.out of=${LOOPDEV}p1 bs=2k; then
+    echo "Couldn't install SPL on $diskname"
+    exit 1
+  fi
+  echo "Installing U-Boot..."
+  if ! dd if=usr/share/visionfive2-firmware/u-boot.itb of=${LOOPDEV}p2 bs=2k; then
+    echo "Couldn't install U-Boot on $diskname"
+    exit 1
+  fi
+  partx -dv $LOOPDEV
+  losetup -d $LOOPDEV
+  if test -f config.partids; then
+    # Fix up partition numbers
+    sed -ie s/3/5/ -e s/2/4/ -e s/1/3/ config.partids
+  fi
+fi
--- uboot-image-cubieboard2-install.orig
+++ uboot-image-cubieboard2-install
@@ -705,3 +705,28 @@ if [ "$flavor" = "hifiveunleashed" -o "$
   partx -dv $LOOPDEV
   losetup -d $LOOPDEV
 fi
+
+if [ "$flavor" = "starfivevisionfive2" ]; then
+  # create two additional partitions
+  echo "Creating SPL and U-Boot partitions..."
+  sgdisk -n 4:4096:6143 -c 4:spl -t 4:2e54b353-1271-4842-806f-e436d6af6985 \
+	 -n 5:6144:16383 -c 5:uboot -t 5:5b193300-fc78-40cd-8002-e86c45580b47 \
+	 -s $diskname
+  echo "Installing SPL..."
+  LOOPDEV=$(partx -av $diskname | sed -n '/^\//{s/:.*//p;q;}')
+  if ! dd if=usr/share/visionfive2-firmware/u-boot-spl.bin.normal.out of=${LOOPDEV}p1 bs=2k; then
+    echo "Couldn't install SPL on $diskname"
+    exit 1
+  fi
+  echo "Installing U-Boot..."
+  if ! dd if=usr/share/visionfive2-firmware/u-boot.itb of=${LOOPDEV}p2 bs=2k; then
+    echo "Couldn't install U-Boot on $diskname"
+    exit 1
+  fi
+  partx -dv $LOOPDEV
+  losetup -d $LOOPDEV
+  if test -f config.partids; then
+    # Fix up partition numbers
+    sed -ie s/3/5/ -e s/2/4/ -e s/1/3/ config.partids
+  fi
+fi
--- uboot-image-cubietruck-install.orig
+++ uboot-image-cubietruck-install
@@ -705,3 +705,28 @@ if [ "$flavor" = "hifiveunleashed" -o "$
   partx -dv $LOOPDEV
   losetup -d $LOOPDEV
 fi
+
+if [ "$flavor" = "starfivevisionfive2" ]; then
+  # create two additional partitions
+  echo "Creating SPL and U-Boot partitions..."
+  sgdisk -n 4:4096:6143 -c 4:spl -t 4:2e54b353-1271-4842-806f-e436d6af6985 \
+	 -n 5:6144:16383 -c 5:uboot -t 5:5b193300-fc78-40cd-8002-e86c45580b47 \
+	 -s $diskname
+  echo "Installing SPL..."
+  LOOPDEV=$(partx -av $diskname | sed -n '/^\//{s/:.*//p;q;}')
+  if ! dd if=usr/share/visionfive2-firmware/u-boot-spl.bin.normal.out of=${LOOPDEV}p1 bs=2k; then
+    echo "Couldn't install SPL on $diskname"
+    exit 1
+  fi
+  echo "Installing U-Boot..."
+  if ! dd if=usr/share/visionfive2-firmware/u-boot.itb of=${LOOPDEV}p2 bs=2k; then
+    echo "Couldn't install U-Boot on $diskname"
+    exit 1
+  fi
+  partx -dv $LOOPDEV
+  losetup -d $LOOPDEV
+  if test -f config.partids; then
+    # Fix up partition numbers
+    sed -ie s/3/5/ -e s/2/4/ -e s/1/3/ config.partids
+  fi
+fi
--- uboot-image-cubox-install.orig
+++ uboot-image-cubox-install
@@ -705,3 +705,28 @@ if [ "$flavor" = "hifiveunleashed" -o "$
   partx -dv $LOOPDEV
   losetup -d $LOOPDEV
 fi
+
+if [ "$flavor" = "starfivevisionfive2" ]; then
+  # create two additional partitions
+  echo "Creating SPL and U-Boot partitions..."
+  sgdisk -n 4:4096:6143 -c 4:spl -t 4:2e54b353-1271-4842-806f-e436d6af6985 \
+	 -n 5:6144:16383 -c 5:uboot -t 5:5b193300-fc78-40cd-8002-e86c45580b47 \
+	 -s $diskname
+  echo "Installing SPL..."
+  LOOPDEV=$(partx -av $diskname | sed -n '/^\//{s/:.*//p;q;}')
+  if ! dd if=usr/share/visionfive2-firmware/u-boot-spl.bin.normal.out of=${LOOPDEV}p1 bs=2k; then
+    echo "Couldn't install SPL on $diskname"
+    exit 1
+  fi
+  echo "Installing U-Boot..."
+  if ! dd if=usr/share/visionfive2-firmware/u-boot.itb of=${LOOPDEV}p2 bs=2k; then
+    echo "Couldn't install U-Boot on $diskname"
+    exit 1
+  fi
+  partx -dv $LOOPDEV
+  losetup -d $LOOPDEV
+  if test -f config.partids; then
+    # Fix up partition numbers
+    sed -ie s/3/5/ -e s/2/4/ -e s/1/3/ config.partids
+  fi
+fi
--- uboot-image-cuboxi-install.orig
+++ uboot-image-cuboxi-install
@@ -705,3 +705,28 @@ if [ "$flavor" = "hifiveunleashed" -o "$
   partx -dv $LOOPDEV
   losetup -d $LOOPDEV
 fi
+
+if [ "$flavor" = "starfivevisionfive2" ]; then
+  # create two additional partitions
+  echo "Creating SPL and U-Boot partitions..."
+  sgdisk -n 4:4096:6143 -c 4:spl -t 4:2e54b353-1271-4842-806f-e436d6af6985 \
+	 -n 5:6144:16383 -c 5:uboot -t 5:5b193300-fc78-40cd-8002-e86c45580b47 \
+	 -s $diskname
+  echo "Installing SPL..."
+  LOOPDEV=$(partx -av $diskname | sed -n '/^\//{s/:.*//p;q;}')
+  if ! dd if=usr/share/visionfive2-firmware/u-boot-spl.bin.normal.out of=${LOOPDEV}p1 bs=2k; then
+    echo "Couldn't install SPL on $diskname"
+    exit 1
+  fi
+  echo "Installing U-Boot..."
+  if ! dd if=usr/share/visionfive2-firmware/u-boot.itb of=${LOOPDEV}p2 bs=2k; then
+    echo "Couldn't install U-Boot on $diskname"
+    exit 1
+  fi
+  partx -dv $LOOPDEV
+  losetup -d $LOOPDEV
+  if test -f config.partids; then
+    # Fix up partition numbers
+    sed -ie s/3/5/ -e s/2/4/ -e s/1/3/ config.partids
+  fi
+fi
--- uboot-image-efi-install.orig
+++ uboot-image-efi-install
@@ -705,3 +705,28 @@ if [ "$flavor" = "hifiveunleashed" -o "$
   partx -dv $LOOPDEV
   losetup -d $LOOPDEV
 fi
+
+if [ "$flavor" = "starfivevisionfive2" ]; then
+  # create two additional partitions
+  echo "Creating SPL and U-Boot partitions..."
+  sgdisk -n 4:4096:6143 -c 4:spl -t 4:2e54b353-1271-4842-806f-e436d6af6985 \
+	 -n 5:6144:16383 -c 5:uboot -t 5:5b193300-fc78-40cd-8002-e86c45580b47 \
+	 -s $diskname
+  echo "Installing SPL..."
+  LOOPDEV=$(partx -av $diskname | sed -n '/^\//{s/:.*//p;q;}')
+  if ! dd if=usr/share/visionfive2-firmware/u-boot-spl.bin.normal.out of=${LOOPDEV}p1 bs=2k; then
+    echo "Couldn't install SPL on $diskname"
+    exit 1
+  fi
+  echo "Installing U-Boot..."
+  if ! dd if=usr/share/visionfive2-firmware/u-boot.itb of=${LOOPDEV}p2 bs=2k; then
+    echo "Couldn't install U-Boot on $diskname"
+    exit 1
+  fi
+  partx -dv $LOOPDEV
+  losetup -d $LOOPDEV
+  if test -f config.partids; then
+    # Fix up partition numbers
+    sed -ie s/3/5/ -e s/2/4/ -e s/1/3/ config.partids
+  fi
+fi
--- uboot-image-fireflyrk3288-install.orig
+++ uboot-image-fireflyrk3288-install
@@ -705,3 +705,28 @@ if [ "$flavor" = "hifiveunleashed" -o "$
   partx -dv $LOOPDEV
   losetup -d $LOOPDEV
 fi
+
+if [ "$flavor" = "starfivevisionfive2" ]; then
+  # create two additional partitions
+  echo "Creating SPL and U-Boot partitions..."
+  sgdisk -n 4:4096:6143 -c 4:spl -t 4:2e54b353-1271-4842-806f-e436d6af6985 \
+	 -n 5:6144:16383 -c 5:uboot -t 5:5b193300-fc78-40cd-8002-e86c45580b47 \
+	 -s $diskname
+  echo "Installing SPL..."
+  LOOPDEV=$(partx -av $diskname | sed -n '/^\//{s/:.*//p;q;}')
+  if ! dd if=usr/share/visionfive2-firmware/u-boot-spl.bin.normal.out of=${LOOPDEV}p1 bs=2k; then
+    echo "Couldn't install SPL on $diskname"
+    exit 1
+  fi
+  echo "Installing U-Boot..."
+  if ! dd if=usr/share/visionfive2-firmware/u-boot.itb of=${LOOPDEV}p2 bs=2k; then
+    echo "Couldn't install U-Boot on $diskname"
+    exit 1
+  fi
+  partx -dv $LOOPDEV
+  losetup -d $LOOPDEV
+  if test -f config.partids; then
+    # Fix up partition numbers
+    sed -ie s/3/5/ -e s/2/4/ -e s/1/3/ config.partids
+  fi
+fi
--- uboot-image-hifiveunleashed-install.orig
+++ uboot-image-hifiveunleashed-install
@@ -705,3 +705,28 @@ if [ "$flavor" = "hifiveunleashed" -o "$
   partx -dv $LOOPDEV
   losetup -d $LOOPDEV
 fi
+
+if [ "$flavor" = "starfivevisionfive2" ]; then
+  # create two additional partitions
+  echo "Creating SPL and U-Boot partitions..."
+  sgdisk -n 4:4096:6143 -c 4:spl -t 4:2e54b353-1271-4842-806f-e436d6af6985 \
+	 -n 5:6144:16383 -c 5:uboot -t 5:5b193300-fc78-40cd-8002-e86c45580b47 \
+	 -s $diskname
+  echo "Installing SPL..."
+  LOOPDEV=$(partx -av $diskname | sed -n '/^\//{s/:.*//p;q;}')
+  if ! dd if=usr/share/visionfive2-firmware/u-boot-spl.bin.normal.out of=${LOOPDEV}p1 bs=2k; then
+    echo "Couldn't install SPL on $diskname"
+    exit 1
+  fi
+  echo "Installing U-Boot..."
+  if ! dd if=usr/share/visionfive2-firmware/u-boot.itb of=${LOOPDEV}p2 bs=2k; then
+    echo "Couldn't install U-Boot on $diskname"
+    exit 1
+  fi
+  partx -dv $LOOPDEV
+  losetup -d $LOOPDEV
+  if test -f config.partids; then
+    # Fix up partition numbers
+    sed -ie s/3/5/ -e s/2/4/ -e s/1/3/ config.partids
+  fi
+fi
--- uboot-image-hifiveunmatched-install.orig
+++ uboot-image-hifiveunmatched-install
@@ -705,3 +705,28 @@ if [ "$flavor" = "hifiveunleashed" -o "$
   partx -dv $LOOPDEV
   losetup -d $LOOPDEV
 fi
+
+if [ "$flavor" = "starfivevisionfive2" ]; then
+  # create two additional partitions
+  echo "Creating SPL and U-Boot partitions..."
+  sgdisk -n 4:4096:6143 -c 4:spl -t 4:2e54b353-1271-4842-806f-e436d6af6985 \
+	 -n 5:6144:16383 -c 5:uboot -t 5:5b193300-fc78-40cd-8002-e86c45580b47 \
+	 -s $diskname
+  echo "Installing SPL..."
+  LOOPDEV=$(partx -av $diskname | sed -n '/^\//{s/:.*//p;q;}')
+  if ! dd if=usr/share/visionfive2-firmware/u-boot-spl.bin.normal.out of=${LOOPDEV}p1 bs=2k; then
+    echo "Couldn't install SPL on $diskname"
+    exit 1
+  fi
+  echo "Installing U-Boot..."
+  if ! dd if=usr/share/visionfive2-firmware/u-boot.itb of=${LOOPDEV}p2 bs=2k; then
+    echo "Couldn't install U-Boot on $diskname"
+    exit 1
+  fi
+  partx -dv $LOOPDEV
+  losetup -d $LOOPDEV
+  if test -f config.partids; then
+    # Fix up partition numbers
+    sed -ie s/3/5/ -e s/2/4/ -e s/1/3/ config.partids
+  fi
+fi
--- uboot-image-hikey-install.orig
+++ uboot-image-hikey-install
@@ -705,3 +705,28 @@ if [ "$flavor" = "hifiveunleashed" -o "$
   partx -dv $LOOPDEV
   losetup -d $LOOPDEV
 fi
+
+if [ "$flavor" = "starfivevisionfive2" ]; then
+  # create two additional partitions
+  echo "Creating SPL and U-Boot partitions..."
+  sgdisk -n 4:4096:6143 -c 4:spl -t 4:2e54b353-1271-4842-806f-e436d6af6985 \
+	 -n 5:6144:16383 -c 5:uboot -t 5:5b193300-fc78-40cd-8002-e86c45580b47 \
+	 -s $diskname
+  echo "Installing SPL..."
+  LOOPDEV=$(partx -av $diskname | sed -n '/^\//{s/:.*//p;q;}')
+  if ! dd if=usr/share/visionfive2-firmware/u-boot-spl.bin.normal.out of=${LOOPDEV}p1 bs=2k; then
+    echo "Couldn't install SPL on $diskname"
+    exit 1
+  fi
+  echo "Installing U-Boot..."
+  if ! dd if=usr/share/visionfive2-firmware/u-boot.itb of=${LOOPDEV}p2 bs=2k; then
+    echo "Couldn't install U-Boot on $diskname"
+    exit 1
+  fi
+  partx -dv $LOOPDEV
+  losetup -d $LOOPDEV
+  if test -f config.partids; then
+    # Fix up partition numbers
+    sed -ie s/3/5/ -e s/2/4/ -e s/1/3/ config.partids
+  fi
+fi
--- uboot-image-hikey960-install.orig
+++ uboot-image-hikey960-install
@@ -705,3 +705,28 @@ if [ "$flavor" = "hifiveunleashed" -o "$
   partx -dv $LOOPDEV
   losetup -d $LOOPDEV
 fi
+
+if [ "$flavor" = "starfivevisionfive2" ]; then
+  # create two additional partitions
+  echo "Creating SPL and U-Boot partitions..."
+  sgdisk -n 4:4096:6143 -c 4:spl -t 4:2e54b353-1271-4842-806f-e436d6af6985 \
+	 -n 5:6144:16383 -c 5:uboot -t 5:5b193300-fc78-40cd-8002-e86c45580b47 \
+	 -s $diskname
+  echo "Installing SPL..."
+  LOOPDEV=$(partx -av $diskname | sed -n '/^\//{s/:.*//p;q;}')
+  if ! dd if=usr/share/visionfive2-firmware/u-boot-spl.bin.normal.out of=${LOOPDEV}p1 bs=2k; then
+    echo "Couldn't install SPL on $diskname"
+    exit 1
+  fi
+  echo "Installing U-Boot..."
+  if ! dd if=usr/share/visionfive2-firmware/u-boot.itb of=${LOOPDEV}p2 bs=2k; then
+    echo "Couldn't install U-Boot on $diskname"
+    exit 1
+  fi
+  partx -dv $LOOPDEV
+  losetup -d $LOOPDEV
+  if test -f config.partids; then
+    # Fix up partition numbers
+    sed -ie s/3/5/ -e s/2/4/ -e s/1/3/ config.partids
+  fi
+fi
--- uboot-image-install.in.orig
+++ uboot-image-install.in
@@ -705,3 +705,28 @@ if [ "$flavor" = "hifiveunleashed" -o "$
   partx -dv $LOOPDEV
   losetup -d $LOOPDEV
 fi
+
+if [ "$flavor" = "starfivevisionfive2" ]; then
+  # create two additional partitions
+  echo "Creating SPL and U-Boot partitions..."
+  sgdisk -n 4:4096:6143 -c 4:spl -t 4:2e54b353-1271-4842-806f-e436d6af6985 \
+	 -n 5:6144:16383 -c 5:uboot -t 5:5b193300-fc78-40cd-8002-e86c45580b47 \
+	 -s $diskname
+  echo "Installing SPL..."
+  LOOPDEV=$(partx -av $diskname | sed -n '/^\//{s/:.*//p;q;}')
+  if ! dd if=usr/share/visionfive2-firmware/u-boot-spl.bin.normal.out of=${LOOPDEV}p1 bs=2k; then
+    echo "Couldn't install SPL on $diskname"
+    exit 1
+  fi
+  echo "Installing U-Boot..."
+  if ! dd if=usr/share/visionfive2-firmware/u-boot.itb of=${LOOPDEV}p2 bs=2k; then
+    echo "Couldn't install U-Boot on $diskname"
+    exit 1
+  fi
+  partx -dv $LOOPDEV
+  losetup -d $LOOPDEV
+  if test -f config.partids; then
+    # Fix up partition numbers
+    sed -ie s/3/5/ -e s/2/4/ -e s/1/3/ config.partids
+  fi
+fi
--- uboot-image-loco-install.orig
+++ uboot-image-loco-install
@@ -705,3 +705,28 @@ if [ "$flavor" = "hifiveunleashed" -o "$
   partx -dv $LOOPDEV
   losetup -d $LOOPDEV
 fi
+
+if [ "$flavor" = "starfivevisionfive2" ]; then
+  # create two additional partitions
+  echo "Creating SPL and U-Boot partitions..."
+  sgdisk -n 4:4096:6143 -c 4:spl -t 4:2e54b353-1271-4842-806f-e436d6af6985 \
+	 -n 5:6144:16383 -c 5:uboot -t 5:5b193300-fc78-40cd-8002-e86c45580b47 \
+	 -s $diskname
+  echo "Installing SPL..."
+  LOOPDEV=$(partx -av $diskname | sed -n '/^\//{s/:.*//p;q;}')
+  if ! dd if=usr/share/visionfive2-firmware/u-boot-spl.bin.normal.out of=${LOOPDEV}p1 bs=2k; then
+    echo "Couldn't install SPL on $diskname"
+    exit 1
+  fi
+  echo "Installing U-Boot..."
+  if ! dd if=usr/share/visionfive2-firmware/u-boot.itb of=${LOOPDEV}p2 bs=2k; then
+    echo "Couldn't install U-Boot on $diskname"
+    exit 1
+  fi
+  partx -dv $LOOPDEV
+  losetup -d $LOOPDEV
+  if test -f config.partids; then
+    # Fix up partition numbers
+    sed -ie s/3/5/ -e s/2/4/ -e s/1/3/ config.partids
+  fi
+fi
--- uboot-image-m400-install.orig
+++ uboot-image-m400-install
@@ -705,3 +705,28 @@ if [ "$flavor" = "hifiveunleashed" -o "$
   partx -dv $LOOPDEV
   losetup -d $LOOPDEV
 fi
+
+if [ "$flavor" = "starfivevisionfive2" ]; then
+  # create two additional partitions
+  echo "Creating SPL and U-Boot partitions..."
+  sgdisk -n 4:4096:6143 -c 4:spl -t 4:2e54b353-1271-4842-806f-e436d6af6985 \
+	 -n 5:6144:16383 -c 5:uboot -t 5:5b193300-fc78-40cd-8002-e86c45580b47 \
+	 -s $diskname
+  echo "Installing SPL..."
+  LOOPDEV=$(partx -av $diskname | sed -n '/^\//{s/:.*//p;q;}')
+  if ! dd if=usr/share/visionfive2-firmware/u-boot-spl.bin.normal.out of=${LOOPDEV}p1 bs=2k; then
+    echo "Couldn't install SPL on $diskname"
+    exit 1
+  fi
+  echo "Installing U-Boot..."
+  if ! dd if=usr/share/visionfive2-firmware/u-boot.itb of=${LOOPDEV}p2 bs=2k; then
+    echo "Couldn't install U-Boot on $diskname"
+    exit 1
+  fi
+  partx -dv $LOOPDEV
+  losetup -d $LOOPDEV
+  if test -f config.partids; then
+    # Fix up partition numbers
+    sed -ie s/3/5/ -e s/2/4/ -e s/1/3/ config.partids
+  fi
+fi
--- uboot-image-midway-install.orig
+++ uboot-image-midway-install
@@ -705,3 +705,28 @@ if [ "$flavor" = "hifiveunleashed" -o "$
   partx -dv $LOOPDEV
   losetup -d $LOOPDEV
 fi
+
+if [ "$flavor" = "starfivevisionfive2" ]; then
+  # create two additional partitions
+  echo "Creating SPL and U-Boot partitions..."
+  sgdisk -n 4:4096:6143 -c 4:spl -t 4:2e54b353-1271-4842-806f-e436d6af6985 \
+	 -n 5:6144:16383 -c 5:uboot -t 5:5b193300-fc78-40cd-8002-e86c45580b47 \
+	 -s $diskname
+  echo "Installing SPL..."
+  LOOPDEV=$(partx -av $diskname | sed -n '/^\//{s/:.*//p;q;}')
+  if ! dd if=usr/share/visionfive2-firmware/u-boot-spl.bin.normal.out of=${LOOPDEV}p1 bs=2k; then
+    echo "Couldn't install SPL on $diskname"
+    exit 1
+  fi
+  echo "Installing U-Boot..."
+  if ! dd if=usr/share/visionfive2-firmware/u-boot.itb of=${LOOPDEV}p2 bs=2k; then
+    echo "Couldn't install U-Boot on $diskname"
+    exit 1
+  fi
+  partx -dv $LOOPDEV
+  losetup -d $LOOPDEV
+  if test -f config.partids; then
+    # Fix up partition numbers
+    sed -ie s/3/5/ -e s/2/4/ -e s/1/3/ config.partids
+  fi
+fi
--- uboot-image-nanopct4-install.orig
+++ uboot-image-nanopct4-install
@@ -705,3 +705,28 @@ if [ "$flavor" = "hifiveunleashed" -o "$
   partx -dv $LOOPDEV
   losetup -d $LOOPDEV
 fi
+
+if [ "$flavor" = "starfivevisionfive2" ]; then
+  # create two additional partitions
+  echo "Creating SPL and U-Boot partitions..."
+  sgdisk -n 4:4096:6143 -c 4:spl -t 4:2e54b353-1271-4842-806f-e436d6af6985 \
+	 -n 5:6144:16383 -c 5:uboot -t 5:5b193300-fc78-40cd-8002-e86c45580b47 \
+	 -s $diskname
+  echo "Installing SPL..."
+  LOOPDEV=$(partx -av $diskname | sed -n '/^\//{s/:.*//p;q;}')
+  if ! dd if=usr/share/visionfive2-firmware/u-boot-spl.bin.normal.out of=${LOOPDEV}p1 bs=2k; then
+    echo "Couldn't install SPL on $diskname"
+    exit 1
+  fi
+  echo "Installing U-Boot..."
+  if ! dd if=usr/share/visionfive2-firmware/u-boot.itb of=${LOOPDEV}p2 bs=2k; then
+    echo "Couldn't install U-Boot on $diskname"
+    exit 1
+  fi
+  partx -dv $LOOPDEV
+  losetup -d $LOOPDEV
+  if test -f config.partids; then
+    # Fix up partition numbers
+    sed -ie s/3/5/ -e s/2/4/ -e s/1/3/ config.partids
+  fi
+fi
--- uboot-image-nanopik2-install.orig
+++ uboot-image-nanopik2-install
@@ -705,3 +705,28 @@ if [ "$flavor" = "hifiveunleashed" -o "$
   partx -dv $LOOPDEV
   losetup -d $LOOPDEV
 fi
+
+if [ "$flavor" = "starfivevisionfive2" ]; then
+  # create two additional partitions
+  echo "Creating SPL and U-Boot partitions..."
+  sgdisk -n 4:4096:6143 -c 4:spl -t 4:2e54b353-1271-4842-806f-e436d6af6985 \
+	 -n 5:6144:16383 -c 5:uboot -t 5:5b193300-fc78-40cd-8002-e86c45580b47 \
+	 -s $diskname
+  echo "Installing SPL..."
+  LOOPDEV=$(partx -av $diskname | sed -n '/^\//{s/:.*//p;q;}')
+  if ! dd if=usr/share/visionfive2-firmware/u-boot-spl.bin.normal.out of=${LOOPDEV}p1 bs=2k; then
+    echo "Couldn't install SPL on $diskname"
+    exit 1
+  fi
+  echo "Installing U-Boot..."
+  if ! dd if=usr/share/visionfive2-firmware/u-boot.itb of=${LOOPDEV}p2 bs=2k; then
+    echo "Couldn't install U-Boot on $diskname"
+    exit 1
+  fi
+  partx -dv $LOOPDEV
+  losetup -d $LOOPDEV
+  if test -f config.partids; then
+    # Fix up partition numbers
+    sed -ie s/3/5/ -e s/2/4/ -e s/1/3/ config.partids
+  fi
+fi
--- uboot-image-nanopim4b-install.orig
+++ uboot-image-nanopim4b-install
@@ -705,3 +705,28 @@ if [ "$flavor" = "hifiveunleashed" -o "$
   partx -dv $LOOPDEV
   losetup -d $LOOPDEV
 fi
+
+if [ "$flavor" = "starfivevisionfive2" ]; then
+  # create two additional partitions
+  echo "Creating SPL and U-Boot partitions..."
+  sgdisk -n 4:4096:6143 -c 4:spl -t 4:2e54b353-1271-4842-806f-e436d6af6985 \
+	 -n 5:6144:16383 -c 5:uboot -t 5:5b193300-fc78-40cd-8002-e86c45580b47 \
+	 -s $diskname
+  echo "Installing SPL..."
+  LOOPDEV=$(partx -av $diskname | sed -n '/^\//{s/:.*//p;q;}')
+  if ! dd if=usr/share/visionfive2-firmware/u-boot-spl.bin.normal.out of=${LOOPDEV}p1 bs=2k; then
+    echo "Couldn't install SPL on $diskname"
+    exit 1
+  fi
+  echo "Installing U-Boot..."
+  if ! dd if=usr/share/visionfive2-firmware/u-boot.itb of=${LOOPDEV}p2 bs=2k; then
+    echo "Couldn't install U-Boot on $diskname"
+    exit 1
+  fi
+  partx -dv $LOOPDEV
+  losetup -d $LOOPDEV
+  if test -f config.partids; then
+    # Fix up partition numbers
+    sed -ie s/3/5/ -e s/2/4/ -e s/1/3/ config.partids
+  fi
+fi
--- uboot-image-nanopineo-install.orig
+++ uboot-image-nanopineo-install
@@ -705,3 +705,28 @@ if [ "$flavor" = "hifiveunleashed" -o "$
   partx -dv $LOOPDEV
   losetup -d $LOOPDEV
 fi
+
+if [ "$flavor" = "starfivevisionfive2" ]; then
+  # create two additional partitions
+  echo "Creating SPL and U-Boot partitions..."
+  sgdisk -n 4:4096:6143 -c 4:spl -t 4:2e54b353-1271-4842-806f-e436d6af6985 \
+	 -n 5:6144:16383 -c 5:uboot -t 5:5b193300-fc78-40cd-8002-e86c45580b47 \
+	 -s $diskname
+  echo "Installing SPL..."
+  LOOPDEV=$(partx -av $diskname | sed -n '/^\//{s/:.*//p;q;}')
+  if ! dd if=usr/share/visionfive2-firmware/u-boot-spl.bin.normal.out of=${LOOPDEV}p1 bs=2k; then
+    echo "Couldn't install SPL on $diskname"
+    exit 1
+  fi
+  echo "Installing U-Boot..."
+  if ! dd if=usr/share/visionfive2-firmware/u-boot.itb of=${LOOPDEV}p2 bs=2k; then
+    echo "Couldn't install U-Boot on $diskname"
+    exit 1
+  fi
+  partx -dv $LOOPDEV
+  losetup -d $LOOPDEV
+  if test -f config.partids; then
+    # Fix up partition numbers
+    sed -ie s/3/5/ -e s/2/4/ -e s/1/3/ config.partids
+  fi
+fi
--- uboot-image-nanopineoair-install.orig
+++ uboot-image-nanopineoair-install
@@ -705,3 +705,28 @@ if [ "$flavor" = "hifiveunleashed" -o "$
   partx -dv $LOOPDEV
   losetup -d $LOOPDEV
 fi
+
+if [ "$flavor" = "starfivevisionfive2" ]; then
+  # create two additional partitions
+  echo "Creating SPL and U-Boot partitions..."
+  sgdisk -n 4:4096:6143 -c 4:spl -t 4:2e54b353-1271-4842-806f-e436d6af6985 \
+	 -n 5:6144:16383 -c 5:uboot -t 5:5b193300-fc78-40cd-8002-e86c45580b47 \
+	 -s $diskname
+  echo "Installing SPL..."
+  LOOPDEV=$(partx -av $diskname | sed -n '/^\//{s/:.*//p;q;}')
+  if ! dd if=usr/share/visionfive2-firmware/u-boot-spl.bin.normal.out of=${LOOPDEV}p1 bs=2k; then
+    echo "Couldn't install SPL on $diskname"
+    exit 1
+  fi
+  echo "Installing U-Boot..."
+  if ! dd if=usr/share/visionfive2-firmware/u-boot.itb of=${LOOPDEV}p2 bs=2k; then
+    echo "Couldn't install U-Boot on $diskname"
+    exit 1
+  fi
+  partx -dv $LOOPDEV
+  losetup -d $LOOPDEV
+  if test -f config.partids; then
+    # Fix up partition numbers
+    sed -ie s/3/5/ -e s/2/4/ -e s/1/3/ config.partids
+  fi
+fi
--- uboot-image-odroid-install.orig
+++ uboot-image-odroid-install
@@ -705,3 +705,28 @@ if [ "$flavor" = "hifiveunleashed" -o "$
   partx -dv $LOOPDEV
   losetup -d $LOOPDEV
 fi
+
+if [ "$flavor" = "starfivevisionfive2" ]; then
+  # create two additional partitions
+  echo "Creating SPL and U-Boot partitions..."
+  sgdisk -n 4:4096:6143 -c 4:spl -t 4:2e54b353-1271-4842-806f-e436d6af6985 \
+	 -n 5:6144:16383 -c 5:uboot -t 5:5b193300-fc78-40cd-8002-e86c45580b47 \
+	 -s $diskname
+  echo "Installing SPL..."
+  LOOPDEV=$(partx -av $diskname | sed -n '/^\//{s/:.*//p;q;}')
+  if ! dd if=usr/share/visionfive2-firmware/u-boot-spl.bin.normal.out of=${LOOPDEV}p1 bs=2k; then
+    echo "Couldn't install SPL on $diskname"
+    exit 1
+  fi
+  echo "Installing U-Boot..."
+  if ! dd if=usr/share/visionfive2-firmware/u-boot.itb of=${LOOPDEV}p2 bs=2k; then
+    echo "Couldn't install U-Boot on $diskname"
+    exit 1
+  fi
+  partx -dv $LOOPDEV
+  losetup -d $LOOPDEV
+  if test -f config.partids; then
+    # Fix up partition numbers
+    sed -ie s/3/5/ -e s/2/4/ -e s/1/3/ config.partids
+  fi
+fi
--- uboot-image-odroidc2-install.orig
+++ uboot-image-odroidc2-install
@@ -705,3 +705,28 @@ if [ "$flavor" = "hifiveunleashed" -o "$
   partx -dv $LOOPDEV
   losetup -d $LOOPDEV
 fi
+
+if [ "$flavor" = "starfivevisionfive2" ]; then
+  # create two additional partitions
+  echo "Creating SPL and U-Boot partitions..."
+  sgdisk -n 4:4096:6143 -c 4:spl -t 4:2e54b353-1271-4842-806f-e436d6af6985 \
+	 -n 5:6144:16383 -c 5:uboot -t 5:5b193300-fc78-40cd-8002-e86c45580b47 \
+	 -s $diskname
+  echo "Installing SPL..."
+  LOOPDEV=$(partx -av $diskname | sed -n '/^\//{s/:.*//p;q;}')
+  if ! dd if=usr/share/visionfive2-firmware/u-boot-spl.bin.normal.out of=${LOOPDEV}p1 bs=2k; then
+    echo "Couldn't install SPL on $diskname"
+    exit 1
+  fi
+  echo "Installing U-Boot..."
+  if ! dd if=usr/share/visionfive2-firmware/u-boot.itb of=${LOOPDEV}p2 bs=2k; then
+    echo "Couldn't install U-Boot on $diskname"
+    exit 1
+  fi
+  partx -dv $LOOPDEV
+  losetup -d $LOOPDEV
+  if test -f config.partids; then
+    # Fix up partition numbers
+    sed -ie s/3/5/ -e s/2/4/ -e s/1/3/ config.partids
+  fi
+fi
--- uboot-image-odroidc4-install.orig
+++ uboot-image-odroidc4-install
@@ -705,3 +705,28 @@ if [ "$flavor" = "hifiveunleashed" -o "$
   partx -dv $LOOPDEV
   losetup -d $LOOPDEV
 fi
+
+if [ "$flavor" = "starfivevisionfive2" ]; then
+  # create two additional partitions
+  echo "Creating SPL and U-Boot partitions..."
+  sgdisk -n 4:4096:6143 -c 4:spl -t 4:2e54b353-1271-4842-806f-e436d6af6985 \
+	 -n 5:6144:16383 -c 5:uboot -t 5:5b193300-fc78-40cd-8002-e86c45580b47 \
+	 -s $diskname
+  echo "Installing SPL..."
+  LOOPDEV=$(partx -av $diskname | sed -n '/^\//{s/:.*//p;q;}')
+  if ! dd if=usr/share/visionfive2-firmware/u-boot-spl.bin.normal.out of=${LOOPDEV}p1 bs=2k; then
+    echo "Couldn't install SPL on $diskname"
+    exit 1
+  fi
+  echo "Installing U-Boot..."
+  if ! dd if=usr/share/visionfive2-firmware/u-boot.itb of=${LOOPDEV}p2 bs=2k; then
+    echo "Couldn't install U-Boot on $diskname"
+    exit 1
+  fi
+  partx -dv $LOOPDEV
+  losetup -d $LOOPDEV
+  if test -f config.partids; then
+    # Fix up partition numbers
+    sed -ie s/3/5/ -e s/2/4/ -e s/1/3/ config.partids
+  fi
+fi
--- uboot-image-odroidxu3-install.orig
+++ uboot-image-odroidxu3-install
@@ -705,3 +705,28 @@ if [ "$flavor" = "hifiveunleashed" -o "$
   partx -dv $LOOPDEV
   losetup -d $LOOPDEV
 fi
+
+if [ "$flavor" = "starfivevisionfive2" ]; then
+  # create two additional partitions
+  echo "Creating SPL and U-Boot partitions..."
+  sgdisk -n 4:4096:6143 -c 4:spl -t 4:2e54b353-1271-4842-806f-e436d6af6985 \
+	 -n 5:6144:16383 -c 5:uboot -t 5:5b193300-fc78-40cd-8002-e86c45580b47 \
+	 -s $diskname
+  echo "Installing SPL..."
+  LOOPDEV=$(partx -av $diskname | sed -n '/^\//{s/:.*//p;q;}')
+  if ! dd if=usr/share/visionfive2-firmware/u-boot-spl.bin.normal.out of=${LOOPDEV}p1 bs=2k; then
+    echo "Couldn't install SPL on $diskname"
+    exit 1
+  fi
+  echo "Installing U-Boot..."
+  if ! dd if=usr/share/visionfive2-firmware/u-boot.itb of=${LOOPDEV}p2 bs=2k; then
+    echo "Couldn't install U-Boot on $diskname"
+    exit 1
+  fi
+  partx -dv $LOOPDEV
+  losetup -d $LOOPDEV
+  if test -f config.partids; then
+    # Fix up partition numbers
+    sed -ie s/3/5/ -e s/2/4/ -e s/1/3/ config.partids
+  fi
+fi
--- uboot-image-olinuxinolime-install.orig
+++ uboot-image-olinuxinolime-install
@@ -705,3 +705,28 @@ if [ "$flavor" = "hifiveunleashed" -o "$
   partx -dv $LOOPDEV
   losetup -d $LOOPDEV
 fi
+
+if [ "$flavor" = "starfivevisionfive2" ]; then
+  # create two additional partitions
+  echo "Creating SPL and U-Boot partitions..."
+  sgdisk -n 4:4096:6143 -c 4:spl -t 4:2e54b353-1271-4842-806f-e436d6af6985 \
+	 -n 5:6144:16383 -c 5:uboot -t 5:5b193300-fc78-40cd-8002-e86c45580b47 \
+	 -s $diskname
+  echo "Installing SPL..."
+  LOOPDEV=$(partx -av $diskname | sed -n '/^\//{s/:.*//p;q;}')
+  if ! dd if=usr/share/visionfive2-firmware/u-boot-spl.bin.normal.out of=${LOOPDEV}p1 bs=2k; then
+    echo "Couldn't install SPL on $diskname"
+    exit 1
+  fi
+  echo "Installing U-Boot..."
+  if ! dd if=usr/share/visionfive2-firmware/u-boot.itb of=${LOOPDEV}p2 bs=2k; then
+    echo "Couldn't install U-Boot on $diskname"
+    exit 1
+  fi
+  partx -dv $LOOPDEV
+  losetup -d $LOOPDEV
+  if test -f config.partids; then
+    # Fix up partition numbers
+    sed -ie s/3/5/ -e s/2/4/ -e s/1/3/ config.partids
+  fi
+fi
--- uboot-image-olinuxinolime2-install.orig
+++ uboot-image-olinuxinolime2-install
@@ -705,3 +705,28 @@ if [ "$flavor" = "hifiveunleashed" -o "$
   partx -dv $LOOPDEV
   losetup -d $LOOPDEV
 fi
+
+if [ "$flavor" = "starfivevisionfive2" ]; then
+  # create two additional partitions
+  echo "Creating SPL and U-Boot partitions..."
+  sgdisk -n 4:4096:6143 -c 4:spl -t 4:2e54b353-1271-4842-806f-e436d6af6985 \
+	 -n 5:6144:16383 -c 5:uboot -t 5:5b193300-fc78-40cd-8002-e86c45580b47 \
+	 -s $diskname
+  echo "Installing SPL..."
+  LOOPDEV=$(partx -av $diskname | sed -n '/^\//{s/:.*//p;q;}')
+  if ! dd if=usr/share/visionfive2-firmware/u-boot-spl.bin.normal.out of=${LOOPDEV}p1 bs=2k; then
+    echo "Couldn't install SPL on $diskname"
+    exit 1
+  fi
+  echo "Installing U-Boot..."
+  if ! dd if=usr/share/visionfive2-firmware/u-boot.itb of=${LOOPDEV}p2 bs=2k; then
+    echo "Couldn't install U-Boot on $diskname"
+    exit 1
+  fi
+  partx -dv $LOOPDEV
+  losetup -d $LOOPDEV
+  if test -f config.partids; then
+    # Fix up partition numbers
+    sed -ie s/3/5/ -e s/2/4/ -e s/1/3/ config.partids
+  fi
+fi
--- uboot-image-orangepizero2-install.orig
+++ uboot-image-orangepizero2-install
@@ -705,3 +705,28 @@ if [ "$flavor" = "hifiveunleashed" -o "$
   partx -dv $LOOPDEV
   losetup -d $LOOPDEV
 fi
+
+if [ "$flavor" = "starfivevisionfive2" ]; then
+  # create two additional partitions
+  echo "Creating SPL and U-Boot partitions..."
+  sgdisk -n 4:4096:6143 -c 4:spl -t 4:2e54b353-1271-4842-806f-e436d6af6985 \
+	 -n 5:6144:16383 -c 5:uboot -t 5:5b193300-fc78-40cd-8002-e86c45580b47 \
+	 -s $diskname
+  echo "Installing SPL..."
+  LOOPDEV=$(partx -av $diskname | sed -n '/^\//{s/:.*//p;q;}')
+  if ! dd if=usr/share/visionfive2-firmware/u-boot-spl.bin.normal.out of=${LOOPDEV}p1 bs=2k; then
+    echo "Couldn't install SPL on $diskname"
+    exit 1
+  fi
+  echo "Installing U-Boot..."
+  if ! dd if=usr/share/visionfive2-firmware/u-boot.itb of=${LOOPDEV}p2 bs=2k; then
+    echo "Couldn't install U-Boot on $diskname"
+    exit 1
+  fi
+  partx -dv $LOOPDEV
+  losetup -d $LOOPDEV
+  if test -f config.partids; then
+    # Fix up partition numbers
+    sed -ie s/3/5/ -e s/2/4/ -e s/1/3/ config.partids
+  fi
+fi
--- uboot-image-panda-install.orig
+++ uboot-image-panda-install
@@ -705,3 +705,28 @@ if [ "$flavor" = "hifiveunleashed" -o "$
   partx -dv $LOOPDEV
   losetup -d $LOOPDEV
 fi
+
+if [ "$flavor" = "starfivevisionfive2" ]; then
+  # create two additional partitions
+  echo "Creating SPL and U-Boot partitions..."
+  sgdisk -n 4:4096:6143 -c 4:spl -t 4:2e54b353-1271-4842-806f-e436d6af6985 \
+	 -n 5:6144:16383 -c 5:uboot -t 5:5b193300-fc78-40cd-8002-e86c45580b47 \
+	 -s $diskname
+  echo "Installing SPL..."
+  LOOPDEV=$(partx -av $diskname | sed -n '/^\//{s/:.*//p;q;}')
+  if ! dd if=usr/share/visionfive2-firmware/u-boot-spl.bin.normal.out of=${LOOPDEV}p1 bs=2k; then
+    echo "Couldn't install SPL on $diskname"
+    exit 1
+  fi
+  echo "Installing U-Boot..."
+  if ! dd if=usr/share/visionfive2-firmware/u-boot.itb of=${LOOPDEV}p2 bs=2k; then
+    echo "Couldn't install U-Boot on $diskname"
+    exit 1
+  fi
+  partx -dv $LOOPDEV
+  losetup -d $LOOPDEV
+  if test -f config.partids; then
+    # Fix up partition numbers
+    sed -ie s/3/5/ -e s/2/4/ -e s/1/3/ config.partids
+  fi
+fi
--- uboot-image-paz00-install.orig
+++ uboot-image-paz00-install
@@ -705,3 +705,28 @@ if [ "$flavor" = "hifiveunleashed" -o "$
   partx -dv $LOOPDEV
   losetup -d $LOOPDEV
 fi
+
+if [ "$flavor" = "starfivevisionfive2" ]; then
+  # create two additional partitions
+  echo "Creating SPL and U-Boot partitions..."
+  sgdisk -n 4:4096:6143 -c 4:spl -t 4:2e54b353-1271-4842-806f-e436d6af6985 \
+	 -n 5:6144:16383 -c 5:uboot -t 5:5b193300-fc78-40cd-8002-e86c45580b47 \
+	 -s $diskname
+  echo "Installing SPL..."
+  LOOPDEV=$(partx -av $diskname | sed -n '/^\//{s/:.*//p;q;}')
+  if ! dd if=usr/share/visionfive2-firmware/u-boot-spl.bin.normal.out of=${LOOPDEV}p1 bs=2k; then
+    echo "Couldn't install SPL on $diskname"
+    exit 1
+  fi
+  echo "Installing U-Boot..."
+  if ! dd if=usr/share/visionfive2-firmware/u-boot.itb of=${LOOPDEV}p2 bs=2k; then
+    echo "Couldn't install U-Boot on $diskname"
+    exit 1
+  fi
+  partx -dv $LOOPDEV
+  losetup -d $LOOPDEV
+  if test -f config.partids; then
+    # Fix up partition numbers
+    sed -ie s/3/5/ -e s/2/4/ -e s/1/3/ config.partids
+  fi
+fi
--- uboot-image-pine64-install.orig
+++ uboot-image-pine64-install
@@ -705,3 +705,28 @@ if [ "$flavor" = "hifiveunleashed" -o "$
   partx -dv $LOOPDEV
   losetup -d $LOOPDEV
 fi
+
+if [ "$flavor" = "starfivevisionfive2" ]; then
+  # create two additional partitions
+  echo "Creating SPL and U-Boot partitions..."
+  sgdisk -n 4:4096:6143 -c 4:spl -t 4:2e54b353-1271-4842-806f-e436d6af6985 \
+	 -n 5:6144:16383 -c 5:uboot -t 5:5b193300-fc78-40cd-8002-e86c45580b47 \
+	 -s $diskname
+  echo "Installing SPL..."
+  LOOPDEV=$(partx -av $diskname | sed -n '/^\//{s/:.*//p;q;}')
+  if ! dd if=usr/share/visionfive2-firmware/u-boot-spl.bin.normal.out of=${LOOPDEV}p1 bs=2k; then
+    echo "Couldn't install SPL on $diskname"
+    exit 1
+  fi
+  echo "Installing U-Boot..."
+  if ! dd if=usr/share/visionfive2-firmware/u-boot.itb of=${LOOPDEV}p2 bs=2k; then
+    echo "Couldn't install U-Boot on $diskname"
+    exit 1
+  fi
+  partx -dv $LOOPDEV
+  losetup -d $LOOPDEV
+  if test -f config.partids; then
+    # Fix up partition numbers
+    sed -ie s/3/5/ -e s/2/4/ -e s/1/3/ config.partids
+  fi
+fi
--- uboot-image-pinebookpro-install.orig
+++ uboot-image-pinebookpro-install
@@ -705,3 +705,28 @@ if [ "$flavor" = "hifiveunleashed" -o "$
   partx -dv $LOOPDEV
   losetup -d $LOOPDEV
 fi
+
+if [ "$flavor" = "starfivevisionfive2" ]; then
+  # create two additional partitions
+  echo "Creating SPL and U-Boot partitions..."
+  sgdisk -n 4:4096:6143 -c 4:spl -t 4:2e54b353-1271-4842-806f-e436d6af6985 \
+	 -n 5:6144:16383 -c 5:uboot -t 5:5b193300-fc78-40cd-8002-e86c45580b47 \
+	 -s $diskname
+  echo "Installing SPL..."
+  LOOPDEV=$(partx -av $diskname | sed -n '/^\//{s/:.*//p;q;}')
+  if ! dd if=usr/share/visionfive2-firmware/u-boot-spl.bin.normal.out of=${LOOPDEV}p1 bs=2k; then
+    echo "Couldn't install SPL on $diskname"
+    exit 1
+  fi
+  echo "Installing U-Boot..."
+  if ! dd if=usr/share/visionfive2-firmware/u-boot.itb of=${LOOPDEV}p2 bs=2k; then
+    echo "Couldn't install U-Boot on $diskname"
+    exit 1
+  fi
+  partx -dv $LOOPDEV
+  losetup -d $LOOPDEV
+  if test -f config.partids; then
+    # Fix up partition numbers
+    sed -ie s/3/5/ -e s/2/4/ -e s/1/3/ config.partids
+  fi
+fi
--- uboot-image-pinephone-install.orig
+++ uboot-image-pinephone-install
@@ -705,3 +705,28 @@ if [ "$flavor" = "hifiveunleashed" -o "$
   partx -dv $LOOPDEV
   losetup -d $LOOPDEV
 fi
+
+if [ "$flavor" = "starfivevisionfive2" ]; then
+  # create two additional partitions
+  echo "Creating SPL and U-Boot partitions..."
+  sgdisk -n 4:4096:6143 -c 4:spl -t 4:2e54b353-1271-4842-806f-e436d6af6985 \
+	 -n 5:6144:16383 -c 5:uboot -t 5:5b193300-fc78-40cd-8002-e86c45580b47 \
+	 -s $diskname
+  echo "Installing SPL..."
+  LOOPDEV=$(partx -av $diskname | sed -n '/^\//{s/:.*//p;q;}')
+  if ! dd if=usr/share/visionfive2-firmware/u-boot-spl.bin.normal.out of=${LOOPDEV}p1 bs=2k; then
+    echo "Couldn't install SPL on $diskname"
+    exit 1
+  fi
+  echo "Installing U-Boot..."
+  if ! dd if=usr/share/visionfive2-firmware/u-boot.itb of=${LOOPDEV}p2 bs=2k; then
+    echo "Couldn't install U-Boot on $diskname"
+    exit 1
+  fi
+  partx -dv $LOOPDEV
+  losetup -d $LOOPDEV
+  if test -f config.partids; then
+    # Fix up partition numbers
+    sed -ie s/3/5/ -e s/2/4/ -e s/1/3/ config.partids
+  fi
+fi
--- uboot-image-radxazero-install.orig
+++ uboot-image-radxazero-install
@@ -705,3 +705,28 @@ if [ "$flavor" = "hifiveunleashed" -o "$
   partx -dv $LOOPDEV
   losetup -d $LOOPDEV
 fi
+
+if [ "$flavor" = "starfivevisionfive2" ]; then
+  # create two additional partitions
+  echo "Creating SPL and U-Boot partitions..."
+  sgdisk -n 4:4096:6143 -c 4:spl -t 4:2e54b353-1271-4842-806f-e436d6af6985 \
+	 -n 5:6144:16383 -c 5:uboot -t 5:5b193300-fc78-40cd-8002-e86c45580b47 \
+	 -s $diskname
+  echo "Installing SPL..."
+  LOOPDEV=$(partx -av $diskname | sed -n '/^\//{s/:.*//p;q;}')
+  if ! dd if=usr/share/visionfive2-firmware/u-boot-spl.bin.normal.out of=${LOOPDEV}p1 bs=2k; then
+    echo "Couldn't install SPL on $diskname"
+    exit 1
+  fi
+  echo "Installing U-Boot..."
+  if ! dd if=usr/share/visionfive2-firmware/u-boot.itb of=${LOOPDEV}p2 bs=2k; then
+    echo "Couldn't install U-Boot on $diskname"
+    exit 1
+  fi
+  partx -dv $LOOPDEV
+  losetup -d $LOOPDEV
+  if test -f config.partids; then
+    # Fix up partition numbers
+    sed -ie s/3/5/ -e s/2/4/ -e s/1/3/ config.partids
+  fi
+fi
--- uboot-image-raspberrypi-install.orig
+++ uboot-image-raspberrypi-install
@@ -705,3 +705,28 @@ if [ "$flavor" = "hifiveunleashed" -o "$
   partx -dv $LOOPDEV
   losetup -d $LOOPDEV
 fi
+
+if [ "$flavor" = "starfivevisionfive2" ]; then
+  # create two additional partitions
+  echo "Creating SPL and U-Boot partitions..."
+  sgdisk -n 4:4096:6143 -c 4:spl -t 4:2e54b353-1271-4842-806f-e436d6af6985 \
+	 -n 5:6144:16383 -c 5:uboot -t 5:5b193300-fc78-40cd-8002-e86c45580b47 \
+	 -s $diskname
+  echo "Installing SPL..."
+  LOOPDEV=$(partx -av $diskname | sed -n '/^\//{s/:.*//p;q;}')
+  if ! dd if=usr/share/visionfive2-firmware/u-boot-spl.bin.normal.out of=${LOOPDEV}p1 bs=2k; then
+    echo "Couldn't install SPL on $diskname"
+    exit 1
+  fi
+  echo "Installing U-Boot..."
+  if ! dd if=usr/share/visionfive2-firmware/u-boot.itb of=${LOOPDEV}p2 bs=2k; then
+    echo "Couldn't install U-Boot on $diskname"
+    exit 1
+  fi
+  partx -dv $LOOPDEV
+  losetup -d $LOOPDEV
+  if test -f config.partids; then
+    # Fix up partition numbers
+    sed -ie s/3/5/ -e s/2/4/ -e s/1/3/ config.partids
+  fi
+fi
--- uboot-image-raspberrypi1-install.orig
+++ uboot-image-raspberrypi1-install
@@ -705,3 +705,28 @@ if [ "$flavor" = "hifiveunleashed" -o "$
   partx -dv $LOOPDEV
   losetup -d $LOOPDEV
 fi
+
+if [ "$flavor" = "starfivevisionfive2" ]; then
+  # create two additional partitions
+  echo "Creating SPL and U-Boot partitions..."
+  sgdisk -n 4:4096:6143 -c 4:spl -t 4:2e54b353-1271-4842-806f-e436d6af6985 \
+	 -n 5:6144:16383 -c 5:uboot -t 5:5b193300-fc78-40cd-8002-e86c45580b47 \
+	 -s $diskname
+  echo "Installing SPL..."
+  LOOPDEV=$(partx -av $diskname | sed -n '/^\//{s/:.*//p;q;}')
+  if ! dd if=usr/share/visionfive2-firmware/u-boot-spl.bin.normal.out of=${LOOPDEV}p1 bs=2k; then
+    echo "Couldn't install SPL on $diskname"
+    exit 1
+  fi
+  echo "Installing U-Boot..."
+  if ! dd if=usr/share/visionfive2-firmware/u-boot.itb of=${LOOPDEV}p2 bs=2k; then
+    echo "Couldn't install U-Boot on $diskname"
+    exit 1
+  fi
+  partx -dv $LOOPDEV
+  losetup -d $LOOPDEV
+  if test -f config.partids; then
+    # Fix up partition numbers
+    sed -ie s/3/5/ -e s/2/4/ -e s/1/3/ config.partids
+  fi
+fi
--- uboot-image-raspberrypi2-install.orig
+++ uboot-image-raspberrypi2-install
@@ -705,3 +705,28 @@ if [ "$flavor" = "hifiveunleashed" -o "$
   partx -dv $LOOPDEV
   losetup -d $LOOPDEV
 fi
+
+if [ "$flavor" = "starfivevisionfive2" ]; then
+  # create two additional partitions
+  echo "Creating SPL and U-Boot partitions..."
+  sgdisk -n 4:4096:6143 -c 4:spl -t 4:2e54b353-1271-4842-806f-e436d6af6985 \
+	 -n 5:6144:16383 -c 5:uboot -t 5:5b193300-fc78-40cd-8002-e86c45580b47 \
+	 -s $diskname
+  echo "Installing SPL..."
+  LOOPDEV=$(partx -av $diskname | sed -n '/^\//{s/:.*//p;q;}')
+  if ! dd if=usr/share/visionfive2-firmware/u-boot-spl.bin.normal.out of=${LOOPDEV}p1 bs=2k; then
+    echo "Couldn't install SPL on $diskname"
+    exit 1
+  fi
+  echo "Installing U-Boot..."
+  if ! dd if=usr/share/visionfive2-firmware/u-boot.itb of=${LOOPDEV}p2 bs=2k; then
+    echo "Couldn't install U-Boot on $diskname"
+    exit 1
+  fi
+  partx -dv $LOOPDEV
+  losetup -d $LOOPDEV
+  if test -f config.partids; then
+    # Fix up partition numbers
+    sed -ie s/3/5/ -e s/2/4/ -e s/1/3/ config.partids
+  fi
+fi
--- uboot-image-rock64-install.orig
+++ uboot-image-rock64-install
@@ -705,3 +705,28 @@ if [ "$flavor" = "hifiveunleashed" -o "$
   partx -dv $LOOPDEV
   losetup -d $LOOPDEV
 fi
+
+if [ "$flavor" = "starfivevisionfive2" ]; then
+  # create two additional partitions
+  echo "Creating SPL and U-Boot partitions..."
+  sgdisk -n 4:4096:6143 -c 4:spl -t 4:2e54b353-1271-4842-806f-e436d6af6985 \
+	 -n 5:6144:16383 -c 5:uboot -t 5:5b193300-fc78-40cd-8002-e86c45580b47 \
+	 -s $diskname
+  echo "Installing SPL..."
+  LOOPDEV=$(partx -av $diskname | sed -n '/^\//{s/:.*//p;q;}')
+  if ! dd if=usr/share/visionfive2-firmware/u-boot-spl.bin.normal.out of=${LOOPDEV}p1 bs=2k; then
+    echo "Couldn't install SPL on $diskname"
+    exit 1
+  fi
+  echo "Installing U-Boot..."
+  if ! dd if=usr/share/visionfive2-firmware/u-boot.itb of=${LOOPDEV}p2 bs=2k; then
+    echo "Couldn't install U-Boot on $diskname"
+    exit 1
+  fi
+  partx -dv $LOOPDEV
+  losetup -d $LOOPDEV
+  if test -f config.partids; then
+    # Fix up partition numbers
+    sed -ie s/3/5/ -e s/2/4/ -e s/1/3/ config.partids
+  fi
+fi
--- uboot-image-rockpi4-install.orig
+++ uboot-image-rockpi4-install
@@ -705,3 +705,28 @@ if [ "$flavor" = "hifiveunleashed" -o "$
   partx -dv $LOOPDEV
   losetup -d $LOOPDEV
 fi
+
+if [ "$flavor" = "starfivevisionfive2" ]; then
+  # create two additional partitions
+  echo "Creating SPL and U-Boot partitions..."
+  sgdisk -n 4:4096:6143 -c 4:spl -t 4:2e54b353-1271-4842-806f-e436d6af6985 \
+	 -n 5:6144:16383 -c 5:uboot -t 5:5b193300-fc78-40cd-8002-e86c45580b47 \
+	 -s $diskname
+  echo "Installing SPL..."
+  LOOPDEV=$(partx -av $diskname | sed -n '/^\//{s/:.*//p;q;}')
+  if ! dd if=usr/share/visionfive2-firmware/u-boot-spl.bin.normal.out of=${LOOPDEV}p1 bs=2k; then
+    echo "Couldn't install SPL on $diskname"
+    exit 1
+  fi
+  echo "Installing U-Boot..."
+  if ! dd if=usr/share/visionfive2-firmware/u-boot.itb of=${LOOPDEV}p2 bs=2k; then
+    echo "Couldn't install U-Boot on $diskname"
+    exit 1
+  fi
+  partx -dv $LOOPDEV
+  losetup -d $LOOPDEV
+  if test -f config.partids; then
+    # Fix up partition numbers
+    sed -ie s/3/5/ -e s/2/4/ -e s/1/3/ config.partids
+  fi
+fi
--- uboot-image-rockpro64-install.orig
+++ uboot-image-rockpro64-install
@@ -705,3 +705,28 @@ if [ "$flavor" = "hifiveunleashed" -o "$
   partx -dv $LOOPDEV
   losetup -d $LOOPDEV
 fi
+
+if [ "$flavor" = "starfivevisionfive2" ]; then
+  # create two additional partitions
+  echo "Creating SPL and U-Boot partitions..."
+  sgdisk -n 4:4096:6143 -c 4:spl -t 4:2e54b353-1271-4842-806f-e436d6af6985 \
+	 -n 5:6144:16383 -c 5:uboot -t 5:5b193300-fc78-40cd-8002-e86c45580b47 \
+	 -s $diskname
+  echo "Installing SPL..."
+  LOOPDEV=$(partx -av $diskname | sed -n '/^\//{s/:.*//p;q;}')
+  if ! dd if=usr/share/visionfive2-firmware/u-boot-spl.bin.normal.out of=${LOOPDEV}p1 bs=2k; then
+    echo "Couldn't install SPL on $diskname"
+    exit 1
+  fi
+  echo "Installing U-Boot..."
+  if ! dd if=usr/share/visionfive2-firmware/u-boot.itb of=${LOOPDEV}p2 bs=2k; then
+    echo "Couldn't install U-Boot on $diskname"
+    exit 1
+  fi
+  partx -dv $LOOPDEV
+  losetup -d $LOOPDEV
+  if test -f config.partids; then
+    # Fix up partition numbers
+    sed -ie s/3/5/ -e s/2/4/ -e s/1/3/ config.partids
+  fi
+fi
--- uboot-image-sabrelite-install.orig
+++ uboot-image-sabrelite-install
@@ -705,3 +705,28 @@ if [ "$flavor" = "hifiveunleashed" -o "$
   partx -dv $LOOPDEV
   losetup -d $LOOPDEV
 fi
+
+if [ "$flavor" = "starfivevisionfive2" ]; then
+  # create two additional partitions
+  echo "Creating SPL and U-Boot partitions..."
+  sgdisk -n 4:4096:6143 -c 4:spl -t 4:2e54b353-1271-4842-806f-e436d6af6985 \
+	 -n 5:6144:16383 -c 5:uboot -t 5:5b193300-fc78-40cd-8002-e86c45580b47 \
+	 -s $diskname
+  echo "Installing SPL..."
+  LOOPDEV=$(partx -av $diskname | sed -n '/^\//{s/:.*//p;q;}')
+  if ! dd if=usr/share/visionfive2-firmware/u-boot-spl.bin.normal.out of=${LOOPDEV}p1 bs=2k; then
+    echo "Couldn't install SPL on $diskname"
+    exit 1
+  fi
+  echo "Installing U-Boot..."
+  if ! dd if=usr/share/visionfive2-firmware/u-boot.itb of=${LOOPDEV}p2 bs=2k; then
+    echo "Couldn't install U-Boot on $diskname"
+    exit 1
+  fi
+  partx -dv $LOOPDEV
+  losetup -d $LOOPDEV
+  if test -f config.partids; then
+    # Fix up partition numbers
+    sed -ie s/3/5/ -e s/2/4/ -e s/1/3/ config.partids
+  fi
+fi
--- uboot-image-sinovoipbpim2plus-install.orig
+++ uboot-image-sinovoipbpim2plus-install
@@ -705,3 +705,28 @@ if [ "$flavor" = "hifiveunleashed" -o "$
   partx -dv $LOOPDEV
   losetup -d $LOOPDEV
 fi
+
+if [ "$flavor" = "starfivevisionfive2" ]; then
+  # create two additional partitions
+  echo "Creating SPL and U-Boot partitions..."
+  sgdisk -n 4:4096:6143 -c 4:spl -t 4:2e54b353-1271-4842-806f-e436d6af6985 \
+	 -n 5:6144:16383 -c 5:uboot -t 5:5b193300-fc78-40cd-8002-e86c45580b47 \
+	 -s $diskname
+  echo "Installing SPL..."
+  LOOPDEV=$(partx -av $diskname | sed -n '/^\//{s/:.*//p;q;}')
+  if ! dd if=usr/share/visionfive2-firmware/u-boot-spl.bin.normal.out of=${LOOPDEV}p1 bs=2k; then
+    echo "Couldn't install SPL on $diskname"
+    exit 1
+  fi
+  echo "Installing U-Boot..."
+  if ! dd if=usr/share/visionfive2-firmware/u-boot.itb of=${LOOPDEV}p2 bs=2k; then
+    echo "Couldn't install U-Boot on $diskname"
+    exit 1
+  fi
+  partx -dv $LOOPDEV
+  losetup -d $LOOPDEV
+  if test -f config.partids; then
+    # Fix up partition numbers
+    sed -ie s/3/5/ -e s/2/4/ -e s/1/3/ config.partids
+  fi
+fi
--- uboot-image-sinovoipbpim2zero-install.orig
+++ uboot-image-sinovoipbpim2zero-install
@@ -705,3 +705,28 @@ if [ "$flavor" = "hifiveunleashed" -o "$
   partx -dv $LOOPDEV
   losetup -d $LOOPDEV
 fi
+
+if [ "$flavor" = "starfivevisionfive2" ]; then
+  # create two additional partitions
+  echo "Creating SPL and U-Boot partitions..."
+  sgdisk -n 4:4096:6143 -c 4:spl -t 4:2e54b353-1271-4842-806f-e436d6af6985 \
+	 -n 5:6144:16383 -c 5:uboot -t 5:5b193300-fc78-40cd-8002-e86c45580b47 \
+	 -s $diskname
+  echo "Installing SPL..."
+  LOOPDEV=$(partx -av $diskname | sed -n '/^\//{s/:.*//p;q;}')
+  if ! dd if=usr/share/visionfive2-firmware/u-boot-spl.bin.normal.out of=${LOOPDEV}p1 bs=2k; then
+    echo "Couldn't install SPL on $diskname"
+    exit 1
+  fi
+  echo "Installing U-Boot..."
+  if ! dd if=usr/share/visionfive2-firmware/u-boot.itb of=${LOOPDEV}p2 bs=2k; then
+    echo "Couldn't install U-Boot on $diskname"
+    exit 1
+  fi
+  partx -dv $LOOPDEV
+  losetup -d $LOOPDEV
+  if test -f config.partids; then
+    # Fix up partition numbers
+    sed -ie s/3/5/ -e s/2/4/ -e s/1/3/ config.partids
+  fi
+fi
--- uboot-image-socfpgade0nanosoc-install.orig
+++ uboot-image-socfpgade0nanosoc-install
@@ -705,3 +705,28 @@ if [ "$flavor" = "hifiveunleashed" -o "$
   partx -dv $LOOPDEV
   losetup -d $LOOPDEV
 fi
+
+if [ "$flavor" = "starfivevisionfive2" ]; then
+  # create two additional partitions
+  echo "Creating SPL and U-Boot partitions..."
+  sgdisk -n 4:4096:6143 -c 4:spl -t 4:2e54b353-1271-4842-806f-e436d6af6985 \
+	 -n 5:6144:16383 -c 5:uboot -t 5:5b193300-fc78-40cd-8002-e86c45580b47 \
+	 -s $diskname
+  echo "Installing SPL..."
+  LOOPDEV=$(partx -av $diskname | sed -n '/^\//{s/:.*//p;q;}')
+  if ! dd if=usr/share/visionfive2-firmware/u-boot-spl.bin.normal.out of=${LOOPDEV}p1 bs=2k; then
+    echo "Couldn't install SPL on $diskname"
+    exit 1
+  fi
+  echo "Installing U-Boot..."
+  if ! dd if=usr/share/visionfive2-firmware/u-boot.itb of=${LOOPDEV}p2 bs=2k; then
+    echo "Couldn't install U-Boot on $diskname"
+    exit 1
+  fi
+  partx -dv $LOOPDEV
+  losetup -d $LOOPDEV
+  if test -f config.partids; then
+    # Fix up partition numbers
+    sed -ie s/3/5/ -e s/2/4/ -e s/1/3/ config.partids
+  fi
+fi
--- uboot-image-starfivejh7100-install.orig
+++ uboot-image-starfivejh7100-install
@@ -705,3 +705,28 @@ if [ "$flavor" = "hifiveunleashed" -o "$
   partx -dv $LOOPDEV
   losetup -d $LOOPDEV
 fi
+
+if [ "$flavor" = "starfivevisionfive2" ]; then
+  # create two additional partitions
+  echo "Creating SPL and U-Boot partitions..."
+  sgdisk -n 4:4096:6143 -c 4:spl -t 4:2e54b353-1271-4842-806f-e436d6af6985 \
+	 -n 5:6144:16383 -c 5:uboot -t 5:5b193300-fc78-40cd-8002-e86c45580b47 \
+	 -s $diskname
+  echo "Installing SPL..."
+  LOOPDEV=$(partx -av $diskname | sed -n '/^\//{s/:.*//p;q;}')
+  if ! dd if=usr/share/visionfive2-firmware/u-boot-spl.bin.normal.out of=${LOOPDEV}p1 bs=2k; then
+    echo "Couldn't install SPL on $diskname"
+    exit 1
+  fi
+  echo "Installing U-Boot..."
+  if ! dd if=usr/share/visionfive2-firmware/u-boot.itb of=${LOOPDEV}p2 bs=2k; then
+    echo "Couldn't install U-Boot on $diskname"
+    exit 1
+  fi
+  partx -dv $LOOPDEV
+  losetup -d $LOOPDEV
+  if test -f config.partids; then
+    # Fix up partition numbers
+    sed -ie s/3/5/ -e s/2/4/ -e s/1/3/ config.partids
+  fi
+fi
--- uboot-image-tinker-install.orig
+++ uboot-image-tinker-install
@@ -705,3 +705,28 @@ if [ "$flavor" = "hifiveunleashed" -o "$
   partx -dv $LOOPDEV
   losetup -d $LOOPDEV
 fi
+
+if [ "$flavor" = "starfivevisionfive2" ]; then
+  # create two additional partitions
+  echo "Creating SPL and U-Boot partitions..."
+  sgdisk -n 4:4096:6143 -c 4:spl -t 4:2e54b353-1271-4842-806f-e436d6af6985 \
+	 -n 5:6144:16383 -c 5:uboot -t 5:5b193300-fc78-40cd-8002-e86c45580b47 \
+	 -s $diskname
+  echo "Installing SPL..."
+  LOOPDEV=$(partx -av $diskname | sed -n '/^\//{s/:.*//p;q;}')
+  if ! dd if=usr/share/visionfive2-firmware/u-boot-spl.bin.normal.out of=${LOOPDEV}p1 bs=2k; then
+    echo "Couldn't install SPL on $diskname"
+    exit 1
+  fi
+  echo "Installing U-Boot..."
+  if ! dd if=usr/share/visionfive2-firmware/u-boot.itb of=${LOOPDEV}p2 bs=2k; then
+    echo "Couldn't install U-Boot on $diskname"
+    exit 1
+  fi
+  partx -dv $LOOPDEV
+  losetup -d $LOOPDEV
+  if test -f config.partids; then
+    # Fix up partition numbers
+    sed -ie s/3/5/ -e s/2/4/ -e s/1/3/ config.partids
+  fi
+fi
--- uboot-image-udooneo-install.orig
+++ uboot-image-udooneo-install
@@ -705,3 +705,28 @@ if [ "$flavor" = "hifiveunleashed" -o "$
   partx -dv $LOOPDEV
   losetup -d $LOOPDEV
 fi
+
+if [ "$flavor" = "starfivevisionfive2" ]; then
+  # create two additional partitions
+  echo "Creating SPL and U-Boot partitions..."
+  sgdisk -n 4:4096:6143 -c 4:spl -t 4:2e54b353-1271-4842-806f-e436d6af6985 \
+	 -n 5:6144:16383 -c 5:uboot -t 5:5b193300-fc78-40cd-8002-e86c45580b47 \
+	 -s $diskname
+  echo "Installing SPL..."
+  LOOPDEV=$(partx -av $diskname | sed -n '/^\//{s/:.*//p;q;}')
+  if ! dd if=usr/share/visionfive2-firmware/u-boot-spl.bin.normal.out of=${LOOPDEV}p1 bs=2k; then
+    echo "Couldn't install SPL on $diskname"
+    exit 1
+  fi
+  echo "Installing U-Boot..."
+  if ! dd if=usr/share/visionfive2-firmware/u-boot.itb of=${LOOPDEV}p2 bs=2k; then
+    echo "Couldn't install U-Boot on $diskname"
+    exit 1
+  fi
+  partx -dv $LOOPDEV
+  losetup -d $LOOPDEV
+  if test -f config.partids; then
+    # Fix up partition numbers
+    sed -ie s/3/5/ -e s/2/4/ -e s/1/3/ config.partids
+  fi
+fi
--- uboot-image-ultra96-install.orig
+++ uboot-image-ultra96-install
@@ -705,3 +705,28 @@ if [ "$flavor" = "hifiveunleashed" -o "$
   partx -dv $LOOPDEV
   losetup -d $LOOPDEV
 fi
+
+if [ "$flavor" = "starfivevisionfive2" ]; then
+  # create two additional partitions
+  echo "Creating SPL and U-Boot partitions..."
+  sgdisk -n 4:4096:6143 -c 4:spl -t 4:2e54b353-1271-4842-806f-e436d6af6985 \
+	 -n 5:6144:16383 -c 5:uboot -t 5:5b193300-fc78-40cd-8002-e86c45580b47 \
+	 -s $diskname
+  echo "Installing SPL..."
+  LOOPDEV=$(partx -av $diskname | sed -n '/^\//{s/:.*//p;q;}')
+  if ! dd if=usr/share/visionfive2-firmware/u-boot-spl.bin.normal.out of=${LOOPDEV}p1 bs=2k; then
+    echo "Couldn't install SPL on $diskname"
+    exit 1
+  fi
+  echo "Installing U-Boot..."
+  if ! dd if=usr/share/visionfive2-firmware/u-boot.itb of=${LOOPDEV}p2 bs=2k; then
+    echo "Couldn't install U-Boot on $diskname"
+    exit 1
+  fi
+  partx -dv $LOOPDEV
+  losetup -d $LOOPDEV
+  if test -f config.partids; then
+    # Fix up partition numbers
+    sed -ie s/3/5/ -e s/2/4/ -e s/1/3/ config.partids
+  fi
+fi
--- uboot-image-wega-install.orig
+++ uboot-image-wega-install
@@ -705,3 +705,28 @@ if [ "$flavor" = "hifiveunleashed" -o "$
   partx -dv $LOOPDEV
   losetup -d $LOOPDEV
 fi
+
+if [ "$flavor" = "starfivevisionfive2" ]; then
+  # create two additional partitions
+  echo "Creating SPL and U-Boot partitions..."
+  sgdisk -n 4:4096:6143 -c 4:spl -t 4:2e54b353-1271-4842-806f-e436d6af6985 \
+	 -n 5:6144:16383 -c 5:uboot -t 5:5b193300-fc78-40cd-8002-e86c45580b47 \
+	 -s $diskname
+  echo "Installing SPL..."
+  LOOPDEV=$(partx -av $diskname | sed -n '/^\//{s/:.*//p;q;}')
+  if ! dd if=usr/share/visionfive2-firmware/u-boot-spl.bin.normal.out of=${LOOPDEV}p1 bs=2k; then
+    echo "Couldn't install SPL on $diskname"
+    exit 1
+  fi
+  echo "Installing U-Boot..."
+  if ! dd if=usr/share/visionfive2-firmware/u-boot.itb of=${LOOPDEV}p2 bs=2k; then
+    echo "Couldn't install U-Boot on $diskname"
+    exit 1
+  fi
+  partx -dv $LOOPDEV
+  losetup -d $LOOPDEV
+  if test -f config.partids; then
+    # Fix up partition numbers
+    sed -ie s/3/5/ -e s/2/4/ -e s/1/3/ config.partids
+  fi
+fi
--- uboot-image-zturn-install.orig
+++ uboot-image-zturn-install
@@ -705,3 +705,28 @@ if [ "$flavor" = "hifiveunleashed" -o "$
   partx -dv $LOOPDEV
   losetup -d $LOOPDEV
 fi
+
+if [ "$flavor" = "starfivevisionfive2" ]; then
+  # create two additional partitions
+  echo "Creating SPL and U-Boot partitions..."
+  sgdisk -n 4:4096:6143 -c 4:spl -t 4:2e54b353-1271-4842-806f-e436d6af6985 \
+	 -n 5:6144:16383 -c 5:uboot -t 5:5b193300-fc78-40cd-8002-e86c45580b47 \
+	 -s $diskname
+  echo "Installing SPL..."
+  LOOPDEV=$(partx -av $diskname | sed -n '/^\//{s/:.*//p;q;}')
+  if ! dd if=usr/share/visionfive2-firmware/u-boot-spl.bin.normal.out of=${LOOPDEV}p1 bs=2k; then
+    echo "Couldn't install SPL on $diskname"
+    exit 1
+  fi
+  echo "Installing U-Boot..."
+  if ! dd if=usr/share/visionfive2-firmware/u-boot.itb of=${LOOPDEV}p2 bs=2k; then
+    echo "Couldn't install U-Boot on $diskname"
+    exit 1
+  fi
+  partx -dv $LOOPDEV
+  losetup -d $LOOPDEV
+  if test -f config.partids; then
+    # Fix up partition numbers
+    sed -ie s/3/5/ -e s/2/4/ -e s/1/3/ config.partids
+  fi
+fi
--- uboot-image-zynqmp-install.orig
+++ uboot-image-zynqmp-install
@@ -705,3 +705,28 @@ if [ "$flavor" = "hifiveunleashed" -o "$
   partx -dv $LOOPDEV
   losetup -d $LOOPDEV
 fi
+
+if [ "$flavor" = "starfivevisionfive2" ]; then
+  # create two additional partitions
+  echo "Creating SPL and U-Boot partitions..."
+  sgdisk -n 4:4096:6143 -c 4:spl -t 4:2e54b353-1271-4842-806f-e436d6af6985 \
+	 -n 5:6144:16383 -c 5:uboot -t 5:5b193300-fc78-40cd-8002-e86c45580b47 \
+	 -s $diskname
+  echo "Installing SPL..."
+  LOOPDEV=$(partx -av $diskname | sed -n '/^\//{s/:.*//p;q;}')
+  if ! dd if=usr/share/visionfive2-firmware/u-boot-spl.bin.normal.out of=${LOOPDEV}p1 bs=2k; then
+    echo "Couldn't install SPL on $diskname"
+    exit 1
+  fi
+  echo "Installing U-Boot..."
+  if ! dd if=usr/share/visionfive2-firmware/u-boot.itb of=${LOOPDEV}p2 bs=2k; then
+    echo "Couldn't install U-Boot on $diskname"
+    exit 1
+  fi
+  partx -dv $LOOPDEV
+  losetup -d $LOOPDEV
+  if test -f config.partids; then
+    # Fix up partition numbers
+    sed -ie s/3/5/ -e s/2/4/ -e s/1/3/ config.partids
+  fi
+fi

Places

File project.diff of Package JeOS-starfivevisionfive2 (Revision 155f583180a0c06f59894ba12e9e2197)

Places