diff --git a/elfloader-tool/include/arch-riscv/elfloader.h b/elfloader-tool/include/arch-riscv/elfloader.h
index 8be726d0..3b9697a0 100644
--- a/elfloader-tool/include/arch-riscv/elfloader.h
+++ b/elfloader-tool/include/arch-riscv/elfloader.h
@@ -18,10 +18,6 @@ typedef void (*init_riscv_kernel_t)(word_t ui_p_reg_start,
                                     word_t pv_offset,
                                     word_t v_entry,
                                     word_t dtb_addr_p,
-                                    word_t dtb_size
-#if CONFIG_MAX_NUM_NODES > 1
-                                    ,
+                                    word_t dtb_size,
                                     word_t hart_id,
-                                    word_t core_id
-#endif
-                                   );
+                                    word_t core_id);
diff --git a/elfloader-tool/src/arch-riscv/boot.c b/elfloader-tool/src/arch-riscv/boot.c
index f485594a..e636fc60 100644
--- a/elfloader-tool/src/arch-riscv/boot.c
+++ b/elfloader-tool/src/arch-riscv/boot.c
@@ -244,13 +244,9 @@ static int run_elfloader(UNUSED int hart_id, void *bootloader_dtb)
                                                   user_info.phys_virt_offset,
                                                   user_info.virt_entry,
                                                   (word_t)dtb,
-                                                  dtb_size
-#if CONFIG_MAX_NUM_NODES > 1
-                                                  ,
+                                                  dtb_size,
                                                   hart_id,
-                                                  0
-#endif
-                                                 );
+                                                  0);
 
     /* We should never get here. */
     printf("ERROR: Kernel returned back to the ELF Loader\n");