diff --git a/hw/bsp/d5035-01/board.mk b/hw/bsp/d5035-01/board.mk
index cbc653d19..20ce0fac3 100644
--- a/hw/bsp/d5035-01/board.mk
+++ b/hw/bsp/d5035-01/board.mk
@@ -15,36 +15,38 @@ CFLAGS += \
 
 ifdef HWREV
   CFLAGS += -DHWREV=$(HWREV)
+else
+  CFLAGS += -DHWREV=1
 endif
 
 # All source paths should be relative to the top level.
 LD_FILE = hw/bsp/$(BOARD)/same51j19a_flash.ld
 
 SRC_C += \
-	hw/mcu/microchip/same/asf4/same51/gcc/gcc/startup_same51.c \
-  hw/mcu/microchip/same/asf4/same51/gcc/system_same51.c \
+	hw/mcu/microchip/same51/gcc/gcc/startup_same51.c \
+  hw/mcu/microchip/same51/gcc/system_same51.c \
 
 ifdef SYSCALLS
 ifneq ($(SYSCALLS),0)
-  SRC_C += hw/mcu/microchip/same/asf4/same51/hal/utils/src/utils_syscalls.c
+  SRC_C += hw/mcu/microchip/same51/hal/utils/src/utils_syscalls.c
 endif
 endif
 
 ifdef LOG
 ifneq ($(LOG),0)
-  SRC_C += hw/mcu/microchip/same/asf4/same51/hal/utils/src/utils_syscalls.c
+  SRC_C += hw/mcu/microchip/same51/hal/utils/src/utils_syscalls.c
 endif
 endif
 
 INC += \
-	$(TOP)/hw/mcu/microchip/same/asf4/same51/ \
-	$(TOP)/hw/mcu/microchip/same/asf4/same51/config \
-	$(TOP)/hw/mcu/microchip/same/asf4/same51/include \
-	$(TOP)/hw/mcu/microchip/same/asf4/same51/hal/include \
-	$(TOP)/hw/mcu/microchip/same/asf4/same51/hal/utils/include \
-	$(TOP)/hw/mcu/microchip/same/asf4/same51/hpl/port \
-	$(TOP)/hw/mcu/microchip/same/asf4/same51/hri \
-	$(TOP)/hw/mcu/microchip/same/asf4/same51/CMSIS/Core/Include
+	$(TOP)/hw/mcu/microchip/same51/ \
+	$(TOP)/hw/mcu/microchip/same51/config \
+	$(TOP)/hw/mcu/microchip/same51/include \
+	$(TOP)/hw/mcu/microchip/same51/hal/include \
+	$(TOP)/hw/mcu/microchip/same51/hal/utils/include \
+	$(TOP)/hw/mcu/microchip/same51/hpl/port \
+	$(TOP)/hw/mcu/microchip/same51/hri \
+	$(TOP)/hw/mcu/microchip/same51/CMSIS/Core/Include
 
 # For TinyUSB port source
 VENDOR = microchip