diff --git a/0001-NR_CPUS-32-for-qemu-riscv64.patch b/0001-NR_CPUS-32-for-qemu-riscv64.patch
new file mode 100644
index 0000000..e027a1e
--- /dev/null
+++ b/0001-NR_CPUS-32-for-qemu-riscv64.patch
@@ -0,0 +1,34 @@
+From ceae1db6e0627a3cc47f1a98fb24b01a878d4358 Mon Sep 17 00:00:00 2001
+From: David Abdurachmanov <davidlt@rivosinc.com>
+Date: Wed, 1 Feb 2023 15:10:36 +0200
+Subject: [PATCH] NR_CPUS 32 for qemu riscv64
+
+Support max available CPUs on U-Boot side.
+
+Signed-off-by: David Abdurachmanov <davidlt@rivosinc.com>
+---
+ configs/qemu-riscv64_defconfig     | 1 +
+ configs/qemu-riscv64_spl_defconfig | 1 +
+ 2 files changed, 2 insertions(+)
+
+diff --git a/configs/qemu-riscv64_defconfig b/configs/qemu-riscv64_defconfig
+index b55e521b..12f42eee 100644
+--- a/configs/qemu-riscv64_defconfig
++++ b/configs/qemu-riscv64_defconfig
+@@ -28,3 +28,4 @@ CONFIG_CMD_POWEROFF=y
+ CONFIG_SYSRESET_CMD_POWEROFF=y
+ CONFIG_USE_PREBOOT=y
+ CONFIG_PREBOOT="cp.l ${fdtcontroladdr} ${fdt_addr_r} 0x20000;"
++CONFIG_NR_CPUS=32
+diff --git a/configs/qemu-riscv64_spl_defconfig b/configs/qemu-riscv64_spl_defconfig
+index 9e9f5b13..a39a878a 100644
+--- a/configs/qemu-riscv64_spl_defconfig
++++ b/configs/qemu-riscv64_spl_defconfig
+@@ -28,3 +28,4 @@ CONFIG_SYS_MAX_FLASH_BANKS=2
+ # CONFIG_BINMAN_FDT is not set
+ CONFIG_USE_PREBOOT=y
+ CONFIG_PREBOOT="cp.l ${fdtcontroladdr} ${fdt_addr_r} 0x20000;"
++CONFIG_NR_CPUS=32
+-- 
+2.37.1
+
diff --git a/uboot-tools.spec b/uboot-tools.spec
index 88962f3..3952977 100644
--- a/uboot-tools.spec
+++ b/uboot-tools.spec
@@ -10,7 +10,7 @@
 
 Name:     uboot-tools
 Version:  2023.01
-Release:  2%{?candidate:.%{candidate}}.3.riscv64%{?dist}
+Release:  2%{?candidate:.%{candidate}}.4.riscv64%{?dist}
 Summary:  U-Boot utilities
 License:  GPLv2+ BSD LGPL-2.1+ LGPL-2.0+
 URL:      http://www.denx.de/wiki/U-Boot
@@ -39,6 +39,7 @@ Patch20:  0001-board-sifive-spl-Initialized-the-PWM-setting-in-the-.patch
 Patch21:  0002-board-sifive-spl-Set-remote-thermal-of-TMP451-to-85-.patch
 Patch22:  0003-Enable-sbi-command-and-SBI-sysreset.patch
 Patch23:  0001-Enable-relocation-and-use-firmware-FDT-for-QEMU-targ.patch
+Patch24:  0001-NR_CPUS-32-for-qemu-riscv64.patch
 
 BuildRequires:  bc
 BuildRequires:  bison
@@ -256,6 +257,9 @@ cp -p board/sunxi/README.nand builds/docs/README.sunxi-nand
 %endif
 
 %changelog
+* Wed Feb 01 2023 David Abdurachmanov <davidlt@rivosinc.com> - 2023.01-2.4.riscv64
+- Set NR_CPUS=32 for qemu riscv64 targets
+
 * Thu Jan 26 2023 David Abdurachmanov <davidlt@rivosinc.com> - 2023.01-2.3.riscv64
 - Enable FDT and initrd relocation for QEMU targets (riscv64)
 - Copy FDT from fdtcontroladdr (firmware) to fdt_addr_r for QEMU targets (riscv64)