1 files changed, 5 insertions, 7 deletions
diff --git a/src/neboot-start.c b/src/neboot-start.c
index 8384791..b72793e 100644
--- a/src/neboot-start.c
+++ b/src/neboot-start.c
@@ -113,7 +113,7 @@ void cb_start_exec(void) {
   } else {
     cb_put_string("CB> Trying EPM partition...\r\n");
 
-    part_block_t* blk = cb_parse_partition_block_at((voidptr_t) NB_BOOT_ADDR, EPM_PART_BLK_SZ, 0);
+    part_block_t* blk = cb_parse_partition_block_at((voidptr_t) NB_FLASH_BASE_ADDR, EPM_PART_BLK_SZ, 0);
 
     if (blk) {
       cb_pci_append_tree("@stage2-epm", (cb_pci_num_t) blk, sizeof(part_block_t) * blk->num_blocks);
@@ -144,12 +144,10 @@ void cb_start_exec(void) {
   }
 
   /// end of TODO
-
-  if (hart > 1) {
-    while (yes) {
-      if (__cb_hart_counter == 0) {
-        cb_restart_machine();
-      }
+  
+  while (yes) {
+    if (__cb_hart_counter == 0) {
+      cb_restart_machine();
     }
   }
 }