diff -Nru flash-kernel-3.104ubuntu6/bootscript/riscv64/bootscr.uboot-generic flash-kernel-3.104ubuntu7/bootscript/riscv64/bootscr.uboot-generic
--- flash-kernel-3.104ubuntu6/bootscript/riscv64/bootscr.uboot-generic	1970-01-01 01:00:00.000000000 +0100
+++ flash-kernel-3.104ubuntu7/bootscript/riscv64/bootscr.uboot-generic	2022-03-08 10:05:15.000000000 +0100
@@ -0,0 +1,56 @@
+# Bootscript using the new unified bootcmd handling
+#
+# Expects to be called with the following environment variables set:
+#
+#  devtype              e.g. mmc/scsi etc
+#  devnum               The device number of the given type
+#  bootpart             The partition containing the boot files
+#  distro_bootpart      The partition containing the boot files
+#                       (introduced in u-boot mainline 2016.01)
+#  prefix               Prefix within the boot partiion to the boot files
+#  kernel_addr_r        Address to load the kernel to
+#  fdt_addr_r           Address to load the FDT to
+#  ramdisk_addr_r       Address to load the initrd to.
+#
+# The uboot must support the booti and generic filesystem load commands.
+
+if test -n "${console}"; then
+  setenv bootargs "${bootargs} console=${console}"
+fi
+
+setenv bootargs @@LINUX_KERNEL_CMDLINE_DEFAULTS@@ ${bootargs} @@LINUX_KERNEL_CMDLINE@@
+@@UBOOT_ENV_EXTRA@@
+
+if test -z "${fk_kvers}"; then
+   setenv fk_kvers '@@KERNEL_VERSION@@'
+fi
+
+# These two blocks should be the same apart from the use of
+# ${fk_kvers} in the first, the syntax supported by u-boot does not
+# lend itself to removing this duplication.
+
+if test -n "${fdtfile}"; then
+   setenv fdtpath dtbs/${fk_kvers}/${fdtfile}
+else
+   setenv fdtpath dtb-${fk_kvers}
+fi
+
+if test -z "${distro_bootpart}"; then
+  setenv partition ${bootpart}
+else
+  setenv partition ${distro_bootpart}
+fi
+
+@@UBOOT_PREBOOT_EXTRA@@
+
+load ${devtype} ${devnum}:${partition} ${kernel_addr_r} ${prefix}vmlinuz-${fk_kvers} \
+&& load ${devtype} ${devnum}:${partition} ${fdt_addr_r} ${prefix}${fdtpath} \
+&& load ${devtype} ${devnum}:${partition} ${ramdisk_addr_r} ${prefix}initrd.img-${fk_kvers} \
+&& echo "Booting Debian ${fk_kvers} from ${devtype} ${devnum}:${partition}..." \
+&& booti ${kernel_addr_r} ${ramdisk_addr_r}:${filesize} ${fdt_addr_r}
+
+load ${devtype} ${devnum}:${partition} ${kernel_addr_r} ${prefix}vmlinuz \
+&& load ${devtype} ${devnum}:${partition} ${fdt_addr_r} ${prefix}dtb \
+&& load ${devtype} ${devnum}:${partition} ${ramdisk_addr_r} ${prefix}initrd.img \
+&& echo "Booting Debian from ${devtype} ${devnum}:${partition}..." \
+&& booti ${kernel_addr_r} ${ramdisk_addr_r}:${filesize} ${fdt_addr_r}
diff -Nru flash-kernel-3.104ubuntu6/db/all.db flash-kernel-3.104ubuntu7/db/all.db
--- flash-kernel-3.104ubuntu6/db/all.db	2022-01-27 16:50:00.000000000 +0100
+++ flash-kernel-3.104ubuntu7/db/all.db	2022-03-08 10:05:15.000000000 +0100
@@ -115,6 +115,13 @@
 U-Boot-Script-Name: bootscr.sunxi
 Required-Packages: u-boot-tools
 
+Machine: BeagleV Starlight Beta
+Kernel-Flavors: generic riscv64
+DTB-Id: starfive/jh7100-beaglev-starlight.dtb
+Boot-Script-Path: /boot/boot.scr
+U-Boot-Script-Name: bootscr.uboot-generic
+Required-Packages: u-boot-tools
+
 Machine: Buffalo Linkstation LiveV3 (LS-CHL)
 Kernel-Flavors: orion5x marvell
 DTB-Append-From: 4.9.10
@@ -1836,6 +1843,13 @@
 Required-Packages: u-boot-tools
 Bootloader-Sets-Incorrect-Root: no
 
+Machine: SiFive HiFive Unmatched A00
+Kernel-Flavors: generic riscv64
+DTB-Id: sifive/hifive-unmatched-a00.dtb
+Boot-Script-Path: /boot/boot.scr
+U-Boot-Script-Name: bootscr.uboot-generic
+Required-Packages: u-boot-tools
+
 Machine: Sinlinx SinA31s Development Board
 Kernel-Flavors: armmp armmp-lpae
 Boot-Script-Path: /boot/boot.scr
diff -Nru flash-kernel-3.104ubuntu6/debian/changelog flash-kernel-3.104ubuntu7/debian/changelog
--- flash-kernel-3.104ubuntu6/debian/changelog	2022-01-31 17:47:18.000000000 +0100
+++ flash-kernel-3.104ubuntu7/debian/changelog	2022-03-08 10:05:15.000000000 +0100
@@ -1,3 +1,12 @@
+flash-kernel (3.104ubuntu7) jammy; urgency=medium
+
+  * Add riscv64 support (LP: #1966219)
+  * Add the following board to db/all.db
+    - SiFive HiFive Unmatched A00 
+    - BeagleV Starlight Beta
+
+ -- Heinrich Schuchardt <heinrich.schuchardt@canonical.com>  Tue, 08 Mar 2022 10:05:15 +0100
+
 flash-kernel (3.104ubuntu6) jammy; urgency=medium
 
   * Introduce "Boot-Kernel-Max-Size" and support for compressing kernel
diff -Nru flash-kernel-3.104ubuntu6/debian/control flash-kernel-3.104ubuntu7/debian/control
--- flash-kernel-3.104ubuntu6/debian/control	2022-01-27 16:50:00.000000000 +0100
+++ flash-kernel-3.104ubuntu7/debian/control	2022-03-08 10:05:15.000000000 +0100
@@ -12,7 +12,7 @@
 Rules-Requires-Root: no
 
 Package: flash-kernel
-Architecture: arm64 armel armhf
+Architecture: arm64 armel armhf riscv64
 Depends: ${misc:Depends},
          devio,
          initramfs-tools (>= 0.92f),
@@ -33,7 +33,7 @@
 Section: debian-installer
 Priority: standard
 Package-Type: udeb
-Architecture: arm64 armel armhf
+Architecture: arm64 armel armhf riscv64
 XB-Subarchitecture: armadaxp exynos5 generic-lpae kirkwood orion5x s3c24xx mx5 omap omap4 xgene generic
 Provides: bootable-system
 Depends: cdebconf-udeb, installed-base