4 files changed, 6 insertions, 9 deletions
diff --git a/hw/bsp/board_mcu.h b/hw/bsp/board_mcu.h
index 6585ef9a6..eedae43f7 100644
--- a/hw/bsp/board_mcu.h
+++ b/hw/bsp/board_mcu.h
@@ -53,14 +53,9 @@
   #include "nrf.h"
 
 #elif CFG_TUSB_MCU == OPT_MCU_SAMD11 || CFG_TUSB_MCU == OPT_MCU_SAMD21 || \
-      CFG_TUSB_MCU == OPT_MCU_SAMD51 || CFG_TUSB_MCU == OPT_MCU_SAME5X || \
-      CFG_TUSB_MCU == OPT_MCU_SAME51
+      CFG_TUSB_MCU == OPT_MCU_SAMD51 || CFG_TUSB_MCU == OPT_MCU_SAME5X
   #include "sam.h"
 
-  #if CFG_TUSB_MCU == OPT_MCU_SAME51
-    #define SVC_Handler SVCall_Handler
-  #endif
-
 #elif CFG_TUSB_MCU == OPT_MCU_SAMG
   #undef LITTLE_ENDIAN // hack to suppress "LITTLE_ENDIAN" redefined
   #include "sam.h"
diff --git a/hw/bsp/d5035-01/board.mk b/hw/bsp/d5035_01/board.mk
index ac2146475..1f2b467a0 100644
--- a/hw/bsp/d5035-01/board.mk
+++ b/hw/bsp/d5035_01/board.mk
@@ -9,14 +9,16 @@ CFLAGS += \
   -D__SAME51J19A__ \
   -DCONF_CPU_FREQUENCY=80000000 \
   -DCONF_GCLK_USB_FREQUENCY=48000000 \
-  -DCFG_TUSB_MCU=OPT_MCU_SAME51 \
+  -DCFG_TUSB_MCU=OPT_MCU_SAME5X \
   -DD5035_01=1 \
-  -DBOARD_NAME="\"D5035-01\""
+  -DBOARD_NAME="\"D5035-01\"" \
+  -DSVC_Handler=SVCall_Handler
 
-HWREV ?= 1
+HWRED ?= 1
 
 CFLAGS += -DHWREV=$(HWREV)
 
+
 # All source paths should be relative to the top level.
 LD_FILE = hw/bsp/$(BOARD)/same51j19a_flash.ld
 
diff --git a/hw/bsp/d5035-01/d5035_01.c b/hw/bsp/d5035_01/d5035_01.c
index 5685ff16f..5685ff16f 100644
--- a/hw/bsp/d5035-01/d5035_01.c
+++ b/hw/bsp/d5035_01/d5035_01.c
diff --git a/hw/bsp/d5035-01/same51j19a_flash.ld b/hw/bsp/d5035_01/same51j19a_flash.ld
index 328d1c72f..328d1c72f 100644
--- a/hw/bsp/d5035-01/same51j19a_flash.ld
+++ b/hw/bsp/d5035_01/same51j19a_flash.ld