nbmkubootimage is missing from the toolchain

[Rui-Xiang Guo <rxg%lavabit.com@localhost>]

Hi,
In -current build on NetBSD 9.3 amd64:
{/usr/src} ./build.sh -U -u -O /usr/builds/obj.riscv -T /usr/builds/tool.riscv -j2 -m riscv -a riscv64 tools

{/usr/builds} ls tool.riscv/bin/*image*
tool.riscv/bin/riscv64--netbsd-mdsetimage

How to fix it for generating the ub file?

BTW, the GENERIC64 kernel build error if "options MULTIPROCESSOR" is commented
out -
/usr/src/sys/arch/riscv/fdt/intc_fdt.c: In function 'intc_intr_handler':
/usr/src/sys/arch/riscv/fdt/intc_fdt.c:250:39: error: 'struct cpu_info' has no member named 'ci_intcsoftc'
  250 |  struct intc_fdt_softc * const sc = ci->ci_intcsoftc;
      |                                       ^~
/usr/src/sys/arch/riscv/fdt/intc_fdt.c: In function 'intc_attach':
/usr/src/sys/arch/riscv/fdt/intc_fdt.c:338:4: error: 'struct cpu_info' has no member named 'ci_intcsoftc'
  338 |  ci->ci_intcsoftc = sc;
      |    ^~

*** Failed target: intc_fdt.o

-rxg