diff --git a/scripts/do-qemuriscv b/scripts/do-qemuriscv
index 0547a766..cb51bf52 100755
--- a/scripts/do-qemuriscv
+++ b/scripts/do-qemuriscv
@@ -10,7 +10,8 @@ function HELP {
     echo "-n a virtio network device"
     echo "-t a virtio tap network device"
     echo "-d a virtio display"
-    echo "-e embeded platform"
+    echo "-e sifive e platform"
+    echo "-u sifive u platform"
     echo "-6 64bit"
     echo "-S supervisor mode (using OpenSBI)"
     echo "   currently only works in 64bit mode"
@@ -26,6 +27,7 @@ DO_NET_TAP=0
 DO_BLOCK=0
 DO_64BIT=0
 DO_EMBEDDED=0
+DO_UNLEASHED=0
 DO_DISPLAY=0
 DO_CMPCTMALLOC=0
 DO_MINIHEAP=0
@@ -36,7 +38,7 @@ SUDO=""
 PROJECT=""
 BIOS="none"
 
-while getopts bdhm:cMmnte6p:s:S FLAG; do
+while getopts bdhm:cMmnteu6p:s:S FLAG; do
     case $FLAG in
         b) DO_BLOCK=1;;
         c) DO_CMPCTMALLOC=1;;
@@ -45,6 +47,7 @@ while getopts bdhm:cMmnte6p:s:S FLAG; do
         n) DO_NET=1;;
         t) DO_NET_TAP=1;;
         e) DO_EMBEDDED=1;;
+        u) DO_UNLEASHED=1;;
         6) DO_64BIT=1;;
         m) MEMSIZE=$OPTARG;;
         s) SMP=$OPTARG;;
@@ -59,7 +62,23 @@ done
 
 shift $((OPTIND-1))
 
-if (( $DO_64BIT )); then
+if (( $DO_UNLEASHED == 1 )); then
+    QEMU="qemu-system-riscv64"
+    MACHINE="sifive_u"
+    _PROJECT="qemu-sifive-u-test"
+    if (( $SMP == 1 )); then
+        SMP=2
+    fi
+    if (( $MEMSIZE == 512 )); then
+        MEMSIZE=8192
+    fi
+    CPU="sifive-u54"
+    BIOS="default"
+elif (( $DO_EMBEDDED == 1 )); then
+    QEMU="qemu-system-riscv32"
+    MACHINE="sifive_e"
+    _PROJECT="sifive-e-test"
+elif (( $DO_64BIT )); then
     QEMU="qemu-system-riscv64"
     CPU="rv64"
     MACHINE="virt"
@@ -69,10 +88,6 @@ if (( $DO_64BIT )); then
     else
         _PROJECT="qemu-virt-riscv64-test"
     fi
-elif (( $DO_EMBEDDED == 1 )); then
-    QEMU="qemu-system-riscv32"
-    MACHINE="sifive_e"
-    _PROJECT="sifive-e-test"
 else
     QEMU="qemu-system-riscv32"
     CPU="rv32"
diff --git a/target/qemu-sifive-u/include/platform/sifive.h b/target/qemu-sifive-u/include/platform/sifive.h
index c53e1613..c05ba0f3 100644
--- a/target/qemu-sifive-u/include/platform/sifive.h
+++ b/target/qemu-sifive-u/include/platform/sifive.h
@@ -5,7 +5,6 @@
  * license that can be found in the LICENSE file or at
  * https://opensource.org/licenses/MIT
  */
-
 #pragma once
 
 #define SIFIVE_IRQ_UART0 4
@@ -19,7 +18,7 @@
 #define UART1_BASE 0x10011000
 
 #if RISCV_XMODE_OFFSET == RISCV_MACH_OFFSET
-#define PLIC_HART_IDX(hart)    (2 * (hart))
+#define PLIC_HART_IDX(hart)    ((hart) ? ((2 * (hart)) - 1) : 0)
 #elif RISCV_XMODE_OFFSET == RISCV_SUPER_OFFSET
-#define PLIC_HART_IDX(hart)    ((2 * (hart)) + 1)
-#endif
\ No newline at end of file
+#define PLIC_HART_IDX(hart)    ((hart) ? (2 * (hart)) : ~0U)
+#endif
diff --git a/target/qemu-sifive-u/rules.mk b/target/qemu-sifive-u/rules.mk
index 7db20c0b..7032859c 100644
--- a/target/qemu-sifive-u/rules.mk
+++ b/target/qemu-sifive-u/rules.mk
@@ -7,16 +7,16 @@ VARIANT := sifive_u
 
 GLOBAL_DEFINES += SIFIVE_FREQ=5000000 # 5 MHz
 
-RISCV_MODE ?= machine
+RISCV_MODE ?= supervisor
 
 ifeq ($(RISCV_MODE),supervisor)
-MEMBASE ?= 0x080200000
+MEMBASE ?= 0x080300000
 else
 MEMBASE ?= 0x080000000
 endif
 MEMSIZE ?= 0x200000000 # 8 GiB
 
-WITH_SMP := 0
+WITH_SMP := 1
 SMP_MAX_CPUS := 4
 
 MODULE_SRCS := $(LOCAL_DIR)/target.c
diff --git a/target/sifive-unleashed/target.c b/target/sifive-unleashed/target.c
index 3a5ca735..cea84441 100644
--- a/target/sifive-unleashed/target.c
+++ b/target/sifive-unleashed/target.c
@@ -10,6 +10,9 @@
 #include <arch/arch_ops.h>
 #include <platform/sifive.h>
 
+// NOTE: set to 0 if trying to boot on qemu
+#define ENABLE_DEBUG_LED 1
+
 static volatile struct {
     volatile uint32_t pwmcfg;
     volatile uint32_t res0;
@@ -21,18 +24,22 @@ static volatile struct {
 } *const pwm0_base = (void*)PWM0_BASE;
 
 void target_early_init(void) {
-    pwm0_base->pwmcfg = 0x100f; // enable always and max scaling
-    target_set_debug_led(0, false);
-    target_set_debug_led(1, false);
-    target_set_debug_led(2, false);
-    target_set_debug_led(3, false);
+    if (ENABLE_DEBUG_LED) {
+        pwm0_base->pwmcfg = 0x100f; // enable always and max scaling
+        target_set_debug_led(0, false);
+        target_set_debug_led(1, false);
+        target_set_debug_led(2, false);
+        target_set_debug_led(3, false);
+    }
 }
 
 void target_init(void) {
 }
 
 void target_set_debug_led(unsigned int led, bool on) {
-    if(led > 3)
-        return;
-    pwm0_base->pwmcmp[led] = (0xffff + on) & 0xffff;
+    if (ENABLE_DEBUG_LED) {
+        if(led > 3)
+            return;
+        pwm0_base->pwmcmp[led] = (0xffff + on) & 0xffff;
+    }
 }