update microchipo driver submodule

12 files changed, 162 insertions, 162 deletions

diff --git a/hw/bsp/atsamd21_xpro/board.mk b/hw/bsp/atsamd21_xpro/board.mk
index a00bceda2..733457f6a 100644
--- a/hw/bsp/atsamd21_xpro/board.mk
+++ b/hw/bsp/atsamd21_xpro/board.mk
@@ -12,23 +12,23 @@ CFLAGS += \
 LD_FILE = hw/bsp/atsamd21_xpro/samd21j18a_flash.ld
 
 SRC_C += \
-  hw/mcu/microchip/samd/asf4/samd21/gcc/gcc/startup_samd21.c \
-  hw/mcu/microchip/samd/asf4/samd21/gcc/system_samd21.c \
-  hw/mcu/microchip/samd/asf4/samd21/hpl/gclk/hpl_gclk.c \
-  hw/mcu/microchip/samd/asf4/samd21/hpl/pm/hpl_pm.c \
-  hw/mcu/microchip/samd/asf4/samd21/hpl/sysctrl/hpl_sysctrl.c \
-  hw/mcu/microchip/samd/asf4/samd21/hal/src/hal_atomic.c
+  hw/mcu/microchip/asf4/samd21/gcc/gcc/startup_samd21.c \
+  hw/mcu/microchip/asf4/samd21/gcc/system_samd21.c \
+  hw/mcu/microchip/asf4/samd21/hpl/gclk/hpl_gclk.c \
+  hw/mcu/microchip/asf4/samd21/hpl/pm/hpl_pm.c \
+  hw/mcu/microchip/asf4/samd21/hpl/sysctrl/hpl_sysctrl.c \
+  hw/mcu/microchip/asf4/samd21/hal/src/hal_atomic.c
 
 INC += \
-  $(TOP)/hw/mcu/microchip/samd/asf4/samd21/ \
-  $(TOP)/hw/mcu/microchip/samd/asf4/samd21/config \
-  $(TOP)/hw/mcu/microchip/samd/asf4/samd21/include \
-  $(TOP)/hw/mcu/microchip/samd/asf4/samd21/hal/include \
-  $(TOP)/hw/mcu/microchip/samd/asf4/samd21/hal/utils/include \
-  $(TOP)/hw/mcu/microchip/samd/asf4/samd21/hpl/pm/ \
-  $(TOP)/hw/mcu/microchip/samd/asf4/samd21/hpl/port \
-  $(TOP)/hw/mcu/microchip/samd/asf4/samd21/hri \
-  $(TOP)/hw/mcu/microchip/samd/asf4/samd21/CMSIS/Include
+  $(TOP)/hw/mcu/microchip/asf4/samd21/ \
+  $(TOP)/hw/mcu/microchip/asf4/samd21/config \
+  $(TOP)/hw/mcu/microchip/asf4/samd21/include \
+  $(TOP)/hw/mcu/microchip/asf4/samd21/hal/include \
+  $(TOP)/hw/mcu/microchip/asf4/samd21/hal/utils/include \
+  $(TOP)/hw/mcu/microchip/asf4/samd21/hpl/pm/ \
+  $(TOP)/hw/mcu/microchip/asf4/samd21/hpl/port \
+  $(TOP)/hw/mcu/microchip/asf4/samd21/hri \
+  $(TOP)/hw/mcu/microchip/asf4/samd21/CMSIS/Include
 
 # For TinyUSB port source 
 VENDOR = microchip
diff --git a/hw/bsp/circuitplayground_express/board.mk b/hw/bsp/circuitplayground_express/board.mk
index 09b7b53a5..2a36b8335 100644
--- a/hw/bsp/circuitplayground_express/board.mk
+++ b/hw/bsp/circuitplayground_express/board.mk
@@ -11,23 +11,23 @@ CFLAGS += \
 LD_FILE = hw/bsp/$(BOARD)/samd21g18a_flash.ld
 
 SRC_C += \
-  hw/mcu/microchip/samd/asf4/samd21/gcc/gcc/startup_samd21.c \
-  hw/mcu/microchip/samd/asf4/samd21/gcc/system_samd21.c \
-  hw/mcu/microchip/samd/asf4/samd21/hpl/gclk/hpl_gclk.c \
-  hw/mcu/microchip/samd/asf4/samd21/hpl/pm/hpl_pm.c \
-  hw/mcu/microchip/samd/asf4/samd21/hpl/sysctrl/hpl_sysctrl.c \
-  hw/mcu/microchip/samd/asf4/samd21/hal/src/hal_atomic.c
+  hw/mcu/microchip/asf4/samd21/gcc/gcc/startup_samd21.c \
+  hw/mcu/microchip/asf4/samd21/gcc/system_samd21.c \
+  hw/mcu/microchip/asf4/samd21/hpl/gclk/hpl_gclk.c \
+  hw/mcu/microchip/asf4/samd21/hpl/pm/hpl_pm.c \
+  hw/mcu/microchip/asf4/samd21/hpl/sysctrl/hpl_sysctrl.c \
+  hw/mcu/microchip/asf4/samd21/hal/src/hal_atomic.c
 
 INC += \
-  $(TOP)/hw/mcu/microchip/samd/asf4/samd21/ \
-  $(TOP)/hw/mcu/microchip/samd/asf4/samd21/config \
-  $(TOP)/hw/mcu/microchip/samd/asf4/samd21/include \
-  $(TOP)/hw/mcu/microchip/samd/asf4/samd21/hal/include \
-  $(TOP)/hw/mcu/microchip/samd/asf4/samd21/hal/utils/include \
-  $(TOP)/hw/mcu/microchip/samd/asf4/samd51/hpl/pm/ \
-  $(TOP)/hw/mcu/microchip/samd/asf4/samd21/hpl/port \
-  $(TOP)/hw/mcu/microchip/samd/asf4/samd21/hri \
-  $(TOP)/hw/mcu/microchip/samd/asf4/samd21/CMSIS/Include
+  $(TOP)/hw/mcu/microchip/asf4/samd21/ \
+  $(TOP)/hw/mcu/microchip/asf4/samd21/config \
+  $(TOP)/hw/mcu/microchip/asf4/samd21/include \
+  $(TOP)/hw/mcu/microchip/asf4/samd21/hal/include \
+  $(TOP)/hw/mcu/microchip/asf4/samd21/hal/utils/include \
+  $(TOP)/hw/mcu/microchip/asf4/samd51/hpl/pm/ \
+  $(TOP)/hw/mcu/microchip/asf4/samd21/hpl/port \
+  $(TOP)/hw/mcu/microchip/asf4/samd21/hri \
+  $(TOP)/hw/mcu/microchip/asf4/samd21/CMSIS/Include
 
 # For TinyUSB port source 
 VENDOR = microchip
diff --git a/hw/bsp/d5035_01/board.mk b/hw/bsp/d5035_01/board.mk
index 4c3917d26..4d126dc41 100644
--- a/hw/bsp/d5035_01/board.mk
+++ b/hw/bsp/d5035_01/board.mk
@@ -21,30 +21,30 @@ CFLAGS += \
 LD_FILE = hw/bsp/$(BOARD)/same51j19a_flash.ld
 
 SRC_C += \
-	hw/mcu/microchip/samd/asf4/same51/gcc/gcc/startup_same51.c \
-  hw/mcu/microchip/samd/asf4/same51/gcc/system_same51.c \
+	hw/mcu/microchip/asf4/same51/gcc/gcc/startup_same51.c \
+  hw/mcu/microchip/asf4/same51/gcc/system_same51.c \
 
 ifdef SYSCALLS
 ifneq ($(SYSCALLS),0)
-  SRC_C += hw/mcu/microchip/samd/asf4/same51/hal/utils/src/utils_syscalls.c
+  SRC_C += hw/mcu/microchip/asf4/same51/hal/utils/src/utils_syscalls.c
 endif
 endif
 
 ifdef LOG
 ifneq ($(LOG),0)
-  SRC_C += hw/mcu/microchip/samd/asf4/same51/hal/utils/src/utils_syscalls.c
+  SRC_C += hw/mcu/microchip/asf4/same51/hal/utils/src/utils_syscalls.c
 endif
 endif
 
 INC += \
-	$(TOP)/hw/mcu/microchip/samd/asf4/same51/ \
-	$(TOP)/hw/mcu/microchip/samd/asf4/same51/config \
-	$(TOP)/hw/mcu/microchip/samd/asf4/same51/include \
-	$(TOP)/hw/mcu/microchip/samd/asf4/same51/hal/include \
-	$(TOP)/hw/mcu/microchip/samd/asf4/same51/hal/utils/include \
-	$(TOP)/hw/mcu/microchip/samd/asf4/same51/hpl/port \
-	$(TOP)/hw/mcu/microchip/samd/asf4/same51/hri \
-	$(TOP)/hw/mcu/microchip/samd/asf4/same51/CMSIS/Include
+	$(TOP)/hw/mcu/microchip/asf4/same51/ \
+	$(TOP)/hw/mcu/microchip/asf4/same51/config \
+	$(TOP)/hw/mcu/microchip/asf4/same51/include \
+	$(TOP)/hw/mcu/microchip/asf4/same51/hal/include \
+	$(TOP)/hw/mcu/microchip/asf4/same51/hal/utils/include \
+	$(TOP)/hw/mcu/microchip/asf4/same51/hpl/port \
+	$(TOP)/hw/mcu/microchip/asf4/same51/hri \
+	$(TOP)/hw/mcu/microchip/asf4/same51/CMSIS/Include
 
 # For TinyUSB port source
 VENDOR = microchip
diff --git a/hw/bsp/feather_m0_express/board.mk b/hw/bsp/feather_m0_express/board.mk
index 4128ed264..61dc7c665 100644
--- a/hw/bsp/feather_m0_express/board.mk
+++ b/hw/bsp/feather_m0_express/board.mk
@@ -12,23 +12,23 @@ CFLAGS += \
 LD_FILE = hw/bsp/$(BOARD)/samd21g18a_flash.ld
 
 SRC_C += \
-	hw/mcu/microchip/samd/asf4/samd21/gcc/gcc/startup_samd21.c \
-	hw/mcu/microchip/samd/asf4/samd21/gcc/system_samd21.c \
-	hw/mcu/microchip/samd/asf4/samd21/hpl/gclk/hpl_gclk.c \
-	hw/mcu/microchip/samd/asf4/samd21/hpl/pm/hpl_pm.c \
-	hw/mcu/microchip/samd/asf4/samd21/hpl/sysctrl/hpl_sysctrl.c \
-	hw/mcu/microchip/samd/asf4/samd21/hal/src/hal_atomic.c
+	hw/mcu/microchip/asf4/samd21/gcc/gcc/startup_samd21.c \
+	hw/mcu/microchip/asf4/samd21/gcc/system_samd21.c \
+	hw/mcu/microchip/asf4/samd21/hpl/gclk/hpl_gclk.c \
+	hw/mcu/microchip/asf4/samd21/hpl/pm/hpl_pm.c \
+	hw/mcu/microchip/asf4/samd21/hpl/sysctrl/hpl_sysctrl.c \
+	hw/mcu/microchip/asf4/samd21/hal/src/hal_atomic.c
 
 INC += \
-	$(TOP)/hw/mcu/microchip/samd/asf4/samd21/ \
-	$(TOP)/hw/mcu/microchip/samd/asf4/samd21/config \
-	$(TOP)/hw/mcu/microchip/samd/asf4/samd21/include \
-	$(TOP)/hw/mcu/microchip/samd/asf4/samd21/hal/include \
-	$(TOP)/hw/mcu/microchip/samd/asf4/samd21/hal/utils/include \
-	$(TOP)/hw/mcu/microchip/samd/asf4/samd21/hpl/pm/ \
-	$(TOP)/hw/mcu/microchip/samd/asf4/samd21/hpl/port \
-	$(TOP)/hw/mcu/microchip/samd/asf4/samd21/hri \
-	$(TOP)/hw/mcu/microchip/samd/asf4/samd21/CMSIS/Include
+	$(TOP)/hw/mcu/microchip/asf4/samd21/ \
+	$(TOP)/hw/mcu/microchip/asf4/samd21/config \
+	$(TOP)/hw/mcu/microchip/asf4/samd21/include \
+	$(TOP)/hw/mcu/microchip/asf4/samd21/hal/include \
+	$(TOP)/hw/mcu/microchip/asf4/samd21/hal/utils/include \
+	$(TOP)/hw/mcu/microchip/asf4/samd21/hpl/pm/ \
+	$(TOP)/hw/mcu/microchip/asf4/samd21/hpl/port \
+	$(TOP)/hw/mcu/microchip/asf4/samd21/hri \
+	$(TOP)/hw/mcu/microchip/asf4/samd21/CMSIS/Include
 
 # For TinyUSB port source 
 VENDOR = microchip
diff --git a/hw/bsp/feather_m4_express/board.mk b/hw/bsp/feather_m4_express/board.mk
index fadf65307..6cc6a9091 100644
--- a/hw/bsp/feather_m4_express/board.mk
+++ b/hw/bsp/feather_m4_express/board.mk
@@ -15,23 +15,23 @@ CFLAGS += -Wno-error=undef
 LD_FILE = hw/bsp/$(BOARD)/samd51g19a_flash.ld
 
 SRC_C += \
-	hw/mcu/microchip/samd/asf4/samd51/gcc/gcc/startup_samd51.c \
-	hw/mcu/microchip/samd/asf4/samd51/gcc/system_samd51.c \
-	hw/mcu/microchip/samd/asf4/samd51/hpl/gclk/hpl_gclk.c \
-	hw/mcu/microchip/samd/asf4/samd51/hpl/mclk/hpl_mclk.c \
-	hw/mcu/microchip/samd/asf4/samd51/hpl/osc32kctrl/hpl_osc32kctrl.c \
-	hw/mcu/microchip/samd/asf4/samd51/hpl/oscctrl/hpl_oscctrl.c \
-	hw/mcu/microchip/samd/asf4/samd51/hal/src/hal_atomic.c
+	hw/mcu/microchip/asf4/samd51/gcc/gcc/startup_samd51.c \
+	hw/mcu/microchip/asf4/samd51/gcc/system_samd51.c \
+	hw/mcu/microchip/asf4/samd51/hpl/gclk/hpl_gclk.c \
+	hw/mcu/microchip/asf4/samd51/hpl/mclk/hpl_mclk.c \
+	hw/mcu/microchip/asf4/samd51/hpl/osc32kctrl/hpl_osc32kctrl.c \
+	hw/mcu/microchip/asf4/samd51/hpl/oscctrl/hpl_oscctrl.c \
+	hw/mcu/microchip/asf4/samd51/hal/src/hal_atomic.c
 
 INC += \
-	$(TOP)/hw/mcu/microchip/samd/asf4/samd51/ \
-	$(TOP)/hw/mcu/microchip/samd/asf4/samd51/config \
-	$(TOP)/hw/mcu/microchip/samd/asf4/samd51/include \
-	$(TOP)/hw/mcu/microchip/samd/asf4/samd51/hal/include \
-	$(TOP)/hw/mcu/microchip/samd/asf4/samd51/hal/utils/include \
-	$(TOP)/hw/mcu/microchip/samd/asf4/samd51/hpl/port \
-	$(TOP)/hw/mcu/microchip/samd/asf4/samd51/hri \
-	$(TOP)/hw/mcu/microchip/samd/asf4/samd51/CMSIS/Include
+	$(TOP)/hw/mcu/microchip/asf4/samd51/ \
+	$(TOP)/hw/mcu/microchip/asf4/samd51/config \
+	$(TOP)/hw/mcu/microchip/asf4/samd51/include \
+	$(TOP)/hw/mcu/microchip/asf4/samd51/hal/include \
+	$(TOP)/hw/mcu/microchip/asf4/samd51/hal/utils/include \
+	$(TOP)/hw/mcu/microchip/asf4/samd51/hpl/port \
+	$(TOP)/hw/mcu/microchip/asf4/samd51/hri \
+	$(TOP)/hw/mcu/microchip/asf4/samd51/CMSIS/Include
 
 # For TinyUSB port source
 VENDOR = microchip
diff --git a/hw/bsp/itsybitsy_m0/board.mk b/hw/bsp/itsybitsy_m0/board.mk
index 4128ed264..61dc7c665 100644
--- a/hw/bsp/itsybitsy_m0/board.mk
+++ b/hw/bsp/itsybitsy_m0/board.mk
@@ -12,23 +12,23 @@ CFLAGS += \
 LD_FILE = hw/bsp/$(BOARD)/samd21g18a_flash.ld
 
 SRC_C += \
-	hw/mcu/microchip/samd/asf4/samd21/gcc/gcc/startup_samd21.c \
-	hw/mcu/microchip/samd/asf4/samd21/gcc/system_samd21.c \
-	hw/mcu/microchip/samd/asf4/samd21/hpl/gclk/hpl_gclk.c \
-	hw/mcu/microchip/samd/asf4/samd21/hpl/pm/hpl_pm.c \
-	hw/mcu/microchip/samd/asf4/samd21/hpl/sysctrl/hpl_sysctrl.c \
-	hw/mcu/microchip/samd/asf4/samd21/hal/src/hal_atomic.c
+	hw/mcu/microchip/asf4/samd21/gcc/gcc/startup_samd21.c \
+	hw/mcu/microchip/asf4/samd21/gcc/system_samd21.c \
+	hw/mcu/microchip/asf4/samd21/hpl/gclk/hpl_gclk.c \
+	hw/mcu/microchip/asf4/samd21/hpl/pm/hpl_pm.c \
+	hw/mcu/microchip/asf4/samd21/hpl/sysctrl/hpl_sysctrl.c \
+	hw/mcu/microchip/asf4/samd21/hal/src/hal_atomic.c
 
 INC += \
-	$(TOP)/hw/mcu/microchip/samd/asf4/samd21/ \
-	$(TOP)/hw/mcu/microchip/samd/asf4/samd21/config \
-	$(TOP)/hw/mcu/microchip/samd/asf4/samd21/include \
-	$(TOP)/hw/mcu/microchip/samd/asf4/samd21/hal/include \
-	$(TOP)/hw/mcu/microchip/samd/asf4/samd21/hal/utils/include \
-	$(TOP)/hw/mcu/microchip/samd/asf4/samd21/hpl/pm/ \
-	$(TOP)/hw/mcu/microchip/samd/asf4/samd21/hpl/port \
-	$(TOP)/hw/mcu/microchip/samd/asf4/samd21/hri \
-	$(TOP)/hw/mcu/microchip/samd/asf4/samd21/CMSIS/Include
+	$(TOP)/hw/mcu/microchip/asf4/samd21/ \
+	$(TOP)/hw/mcu/microchip/asf4/samd21/config \
+	$(TOP)/hw/mcu/microchip/asf4/samd21/include \
+	$(TOP)/hw/mcu/microchip/asf4/samd21/hal/include \
+	$(TOP)/hw/mcu/microchip/asf4/samd21/hal/utils/include \
+	$(TOP)/hw/mcu/microchip/asf4/samd21/hpl/pm/ \
+	$(TOP)/hw/mcu/microchip/asf4/samd21/hpl/port \
+	$(TOP)/hw/mcu/microchip/asf4/samd21/hri \
+	$(TOP)/hw/mcu/microchip/asf4/samd21/CMSIS/Include
 
 # For TinyUSB port source 
 VENDOR = microchip
diff --git a/hw/bsp/itsybitsy_m4/board.mk b/hw/bsp/itsybitsy_m4/board.mk
index fadf65307..6cc6a9091 100644
--- a/hw/bsp/itsybitsy_m4/board.mk
+++ b/hw/bsp/itsybitsy_m4/board.mk
@@ -15,23 +15,23 @@ CFLAGS += -Wno-error=undef
 LD_FILE = hw/bsp/$(BOARD)/samd51g19a_flash.ld
 
 SRC_C += \
-	hw/mcu/microchip/samd/asf4/samd51/gcc/gcc/startup_samd51.c \
-	hw/mcu/microchip/samd/asf4/samd51/gcc/system_samd51.c \
-	hw/mcu/microchip/samd/asf4/samd51/hpl/gclk/hpl_gclk.c \
-	hw/mcu/microchip/samd/asf4/samd51/hpl/mclk/hpl_mclk.c \
-	hw/mcu/microchip/samd/asf4/samd51/hpl/osc32kctrl/hpl_osc32kctrl.c \
-	hw/mcu/microchip/samd/asf4/samd51/hpl/oscctrl/hpl_oscctrl.c \
-	hw/mcu/microchip/samd/asf4/samd51/hal/src/hal_atomic.c
+	hw/mcu/microchip/asf4/samd51/gcc/gcc/startup_samd51.c \
+	hw/mcu/microchip/asf4/samd51/gcc/system_samd51.c \
+	hw/mcu/microchip/asf4/samd51/hpl/gclk/hpl_gclk.c \
+	hw/mcu/microchip/asf4/samd51/hpl/mclk/hpl_mclk.c \
+	hw/mcu/microchip/asf4/samd51/hpl/osc32kctrl/hpl_osc32kctrl.c \
+	hw/mcu/microchip/asf4/samd51/hpl/oscctrl/hpl_oscctrl.c \
+	hw/mcu/microchip/asf4/samd51/hal/src/hal_atomic.c
 
 INC += \
-	$(TOP)/hw/mcu/microchip/samd/asf4/samd51/ \
-	$(TOP)/hw/mcu/microchip/samd/asf4/samd51/config \
-	$(TOP)/hw/mcu/microchip/samd/asf4/samd51/include \
-	$(TOP)/hw/mcu/microchip/samd/asf4/samd51/hal/include \
-	$(TOP)/hw/mcu/microchip/samd/asf4/samd51/hal/utils/include \
-	$(TOP)/hw/mcu/microchip/samd/asf4/samd51/hpl/port \
-	$(TOP)/hw/mcu/microchip/samd/asf4/samd51/hri \
-	$(TOP)/hw/mcu/microchip/samd/asf4/samd51/CMSIS/Include
+	$(TOP)/hw/mcu/microchip/asf4/samd51/ \
+	$(TOP)/hw/mcu/microchip/asf4/samd51/config \
+	$(TOP)/hw/mcu/microchip/asf4/samd51/include \
+	$(TOP)/hw/mcu/microchip/asf4/samd51/hal/include \
+	$(TOP)/hw/mcu/microchip/asf4/samd51/hal/utils/include \
+	$(TOP)/hw/mcu/microchip/asf4/samd51/hpl/port \
+	$(TOP)/hw/mcu/microchip/asf4/samd51/hri \
+	$(TOP)/hw/mcu/microchip/asf4/samd51/CMSIS/Include
 
 # For TinyUSB port source
 VENDOR = microchip
diff --git a/hw/bsp/luna/board.mk b/hw/bsp/luna/board.mk
index 9969b97fe..272c9f4e1 100644
--- a/hw/bsp/luna/board.mk
+++ b/hw/bsp/luna/board.mk
@@ -12,23 +12,23 @@ CFLAGS += \
 LD_FILE = hw/bsp/$(BOARD)/samd21g18a_flash.ld
 
 SRC_C += \
-	hw/mcu/microchip/samd/asf4/samd21/gcc/gcc/startup_samd21.c \
-	hw/mcu/microchip/samd/asf4/samd21/gcc/system_samd21.c \
-	hw/mcu/microchip/samd/asf4/samd21/hpl/gclk/hpl_gclk.c \
-	hw/mcu/microchip/samd/asf4/samd21/hpl/pm/hpl_pm.c \
-	hw/mcu/microchip/samd/asf4/samd21/hpl/sysctrl/hpl_sysctrl.c \
-	hw/mcu/microchip/samd/asf4/samd21/hal/src/hal_atomic.c
+	hw/mcu/microchip/asf4/samd21/gcc/gcc/startup_samd21.c \
+	hw/mcu/microchip/asf4/samd21/gcc/system_samd21.c \
+	hw/mcu/microchip/asf4/samd21/hpl/gclk/hpl_gclk.c \
+	hw/mcu/microchip/asf4/samd21/hpl/pm/hpl_pm.c \
+	hw/mcu/microchip/asf4/samd21/hpl/sysctrl/hpl_sysctrl.c \
+	hw/mcu/microchip/asf4/samd21/hal/src/hal_atomic.c
 
 INC += \
-	$(TOP)/hw/mcu/microchip/samd/asf4/samd21/ \
-	$(TOP)/hw/mcu/microchip/samd/asf4/samd21/config \
-	$(TOP)/hw/mcu/microchip/samd/asf4/samd21/include \
-	$(TOP)/hw/mcu/microchip/samd/asf4/samd21/hal/include \
-	$(TOP)/hw/mcu/microchip/samd/asf4/samd21/hal/utils/include \
-	$(TOP)/hw/mcu/microchip/samd/asf4/samd21/hpl/pm/ \
-	$(TOP)/hw/mcu/microchip/samd/asf4/samd21/hpl/port \
-	$(TOP)/hw/mcu/microchip/samd/asf4/samd21/hri \
-	$(TOP)/hw/mcu/microchip/samd/asf4/samd21/CMSIS/Include
+	$(TOP)/hw/mcu/microchip/asf4/samd21/ \
+	$(TOP)/hw/mcu/microchip/asf4/samd21/config \
+	$(TOP)/hw/mcu/microchip/asf4/samd21/include \
+	$(TOP)/hw/mcu/microchip/asf4/samd21/hal/include \
+	$(TOP)/hw/mcu/microchip/asf4/samd21/hal/utils/include \
+	$(TOP)/hw/mcu/microchip/asf4/samd21/hpl/pm/ \
+	$(TOP)/hw/mcu/microchip/asf4/samd21/hpl/port \
+	$(TOP)/hw/mcu/microchip/asf4/samd21/hri \
+	$(TOP)/hw/mcu/microchip/asf4/samd21/CMSIS/Include
 
 # For TinyUSB port source
 VENDOR = microchip
diff --git a/hw/bsp/metro_m0_express/board.mk b/hw/bsp/metro_m0_express/board.mk
index 4128ed264..61dc7c665 100644
--- a/hw/bsp/metro_m0_express/board.mk
+++ b/hw/bsp/metro_m0_express/board.mk
@@ -12,23 +12,23 @@ CFLAGS += \
 LD_FILE = hw/bsp/$(BOARD)/samd21g18a_flash.ld
 
 SRC_C += \
-	hw/mcu/microchip/samd/asf4/samd21/gcc/gcc/startup_samd21.c \
-	hw/mcu/microchip/samd/asf4/samd21/gcc/system_samd21.c \
-	hw/mcu/microchip/samd/asf4/samd21/hpl/gclk/hpl_gclk.c \
-	hw/mcu/microchip/samd/asf4/samd21/hpl/pm/hpl_pm.c \
-	hw/mcu/microchip/samd/asf4/samd21/hpl/sysctrl/hpl_sysctrl.c \
-	hw/mcu/microchip/samd/asf4/samd21/hal/src/hal_atomic.c
+	hw/mcu/microchip/asf4/samd21/gcc/gcc/startup_samd21.c \
+	hw/mcu/microchip/asf4/samd21/gcc/system_samd21.c \
+	hw/mcu/microchip/asf4/samd21/hpl/gclk/hpl_gclk.c \
+	hw/mcu/microchip/asf4/samd21/hpl/pm/hpl_pm.c \
+	hw/mcu/microchip/asf4/samd21/hpl/sysctrl/hpl_sysctrl.c \
+	hw/mcu/microchip/asf4/samd21/hal/src/hal_atomic.c
 
 INC += \
-	$(TOP)/hw/mcu/microchip/samd/asf4/samd21/ \
-	$(TOP)/hw/mcu/microchip/samd/asf4/samd21/config \
-	$(TOP)/hw/mcu/microchip/samd/asf4/samd21/include \
-	$(TOP)/hw/mcu/microchip/samd/asf4/samd21/hal/include \
-	$(TOP)/hw/mcu/microchip/samd/asf4/samd21/hal/utils/include \
-	$(TOP)/hw/mcu/microchip/samd/asf4/samd21/hpl/pm/ \
-	$(TOP)/hw/mcu/microchip/samd/asf4/samd21/hpl/port \
-	$(TOP)/hw/mcu/microchip/samd/asf4/samd21/hri \
-	$(TOP)/hw/mcu/microchip/samd/asf4/samd21/CMSIS/Include
+	$(TOP)/hw/mcu/microchip/asf4/samd21/ \
+	$(TOP)/hw/mcu/microchip/asf4/samd21/config \
+	$(TOP)/hw/mcu/microchip/asf4/samd21/include \
+	$(TOP)/hw/mcu/microchip/asf4/samd21/hal/include \
+	$(TOP)/hw/mcu/microchip/asf4/samd21/hal/utils/include \
+	$(TOP)/hw/mcu/microchip/asf4/samd21/hpl/pm/ \
+	$(TOP)/hw/mcu/microchip/asf4/samd21/hpl/port \
+	$(TOP)/hw/mcu/microchip/asf4/samd21/hri \
+	$(TOP)/hw/mcu/microchip/asf4/samd21/CMSIS/Include
 
 # For TinyUSB port source 
 VENDOR = microchip
diff --git a/hw/bsp/metro_m4_express/board.mk b/hw/bsp/metro_m4_express/board.mk
index fadf65307..6cc6a9091 100644
--- a/hw/bsp/metro_m4_express/board.mk
+++ b/hw/bsp/metro_m4_express/board.mk
@@ -15,23 +15,23 @@ CFLAGS += -Wno-error=undef
 LD_FILE = hw/bsp/$(BOARD)/samd51g19a_flash.ld
 
 SRC_C += \
-	hw/mcu/microchip/samd/asf4/samd51/gcc/gcc/startup_samd51.c \
-	hw/mcu/microchip/samd/asf4/samd51/gcc/system_samd51.c \
-	hw/mcu/microchip/samd/asf4/samd51/hpl/gclk/hpl_gclk.c \
-	hw/mcu/microchip/samd/asf4/samd51/hpl/mclk/hpl_mclk.c \
-	hw/mcu/microchip/samd/asf4/samd51/hpl/osc32kctrl/hpl_osc32kctrl.c \
-	hw/mcu/microchip/samd/asf4/samd51/hpl/oscctrl/hpl_oscctrl.c \
-	hw/mcu/microchip/samd/asf4/samd51/hal/src/hal_atomic.c
+	hw/mcu/microchip/asf4/samd51/gcc/gcc/startup_samd51.c \
+	hw/mcu/microchip/asf4/samd51/gcc/system_samd51.c \
+	hw/mcu/microchip/asf4/samd51/hpl/gclk/hpl_gclk.c \
+	hw/mcu/microchip/asf4/samd51/hpl/mclk/hpl_mclk.c \
+	hw/mcu/microchip/asf4/samd51/hpl/osc32kctrl/hpl_osc32kctrl.c \
+	hw/mcu/microchip/asf4/samd51/hpl/oscctrl/hpl_oscctrl.c \
+	hw/mcu/microchip/asf4/samd51/hal/src/hal_atomic.c
 
 INC += \
-	$(TOP)/hw/mcu/microchip/samd/asf4/samd51/ \
-	$(TOP)/hw/mcu/microchip/samd/asf4/samd51/config \
-	$(TOP)/hw/mcu/microchip/samd/asf4/samd51/include \
-	$(TOP)/hw/mcu/microchip/samd/asf4/samd51/hal/include \
-	$(TOP)/hw/mcu/microchip/samd/asf4/samd51/hal/utils/include \
-	$(TOP)/hw/mcu/microchip/samd/asf4/samd51/hpl/port \
-	$(TOP)/hw/mcu/microchip/samd/asf4/samd51/hri \
-	$(TOP)/hw/mcu/microchip/samd/asf4/samd51/CMSIS/Include
+	$(TOP)/hw/mcu/microchip/asf4/samd51/ \
+	$(TOP)/hw/mcu/microchip/asf4/samd51/config \
+	$(TOP)/hw/mcu/microchip/asf4/samd51/include \
+	$(TOP)/hw/mcu/microchip/asf4/samd51/hal/include \
+	$(TOP)/hw/mcu/microchip/asf4/samd51/hal/utils/include \
+	$(TOP)/hw/mcu/microchip/asf4/samd51/hpl/port \
+	$(TOP)/hw/mcu/microchip/asf4/samd51/hri \
+	$(TOP)/hw/mcu/microchip/asf4/samd51/CMSIS/Include
 
 # For TinyUSB port source
 VENDOR = microchip
diff --git a/hw/bsp/seeeduino_xiao/board.mk b/hw/bsp/seeeduino_xiao/board.mk
index 172f6f537..c954dbc29 100644
--- a/hw/bsp/seeeduino_xiao/board.mk
+++ b/hw/bsp/seeeduino_xiao/board.mk
@@ -12,23 +12,23 @@ CFLAGS += \
 LD_FILE = hw/bsp/$(BOARD)/samd21g18a_flash.ld
 
 SRC_C += \
-	hw/mcu/microchip/samd/asf4/samd21/gcc/gcc/startup_samd21.c \
-	hw/mcu/microchip/samd/asf4/samd21/gcc/system_samd21.c \
-	hw/mcu/microchip/samd/asf4/samd21/hpl/gclk/hpl_gclk.c \
-	hw/mcu/microchip/samd/asf4/samd21/hpl/pm/hpl_pm.c \
-	hw/mcu/microchip/samd/asf4/samd21/hpl/sysctrl/hpl_sysctrl.c \
-	hw/mcu/microchip/samd/asf4/samd21/hal/src/hal_atomic.c
+	hw/mcu/microchip/asf4/samd21/gcc/gcc/startup_samd21.c \
+	hw/mcu/microchip/asf4/samd21/gcc/system_samd21.c \
+	hw/mcu/microchip/asf4/samd21/hpl/gclk/hpl_gclk.c \
+	hw/mcu/microchip/asf4/samd21/hpl/pm/hpl_pm.c \
+	hw/mcu/microchip/asf4/samd21/hpl/sysctrl/hpl_sysctrl.c \
+	hw/mcu/microchip/asf4/samd21/hal/src/hal_atomic.c
 
 INC += \
-	$(TOP)/hw/mcu/microchip/samd/asf4/samd21/ \
-	$(TOP)/hw/mcu/microchip/samd/asf4/samd21/config \
-	$(TOP)/hw/mcu/microchip/samd/asf4/samd21/include \
-	$(TOP)/hw/mcu/microchip/samd/asf4/samd21/hal/include \
-	$(TOP)/hw/mcu/microchip/samd/asf4/samd21/hal/utils/include \
-	$(TOP)/hw/mcu/microchip/samd/asf4/samd21/hpl/pm/ \
-	$(TOP)/hw/mcu/microchip/samd/asf4/samd21/hpl/port \
-	$(TOP)/hw/mcu/microchip/samd/asf4/samd21/hri \
-	$(TOP)/hw/mcu/microchip/samd/asf4/samd21/CMSIS/Include
+	$(TOP)/hw/mcu/microchip/asf4/samd21/ \
+	$(TOP)/hw/mcu/microchip/asf4/samd21/config \
+	$(TOP)/hw/mcu/microchip/asf4/samd21/include \
+	$(TOP)/hw/mcu/microchip/asf4/samd21/hal/include \
+	$(TOP)/hw/mcu/microchip/asf4/samd21/hal/utils/include \
+	$(TOP)/hw/mcu/microchip/asf4/samd21/hpl/pm/ \
+	$(TOP)/hw/mcu/microchip/asf4/samd21/hpl/port \
+	$(TOP)/hw/mcu/microchip/asf4/samd21/hri \
+	$(TOP)/hw/mcu/microchip/asf4/samd21/CMSIS/Include
 
 # For TinyUSB port source 
 VENDOR = microchip
diff --git a/hw/mcu/microchip b/hw/mcu/microchip
-Subproject 434e384e8f1c6a05377f82e1f0796467a2267ad
+Subproject 8e48da5bd5461f4aadd199ddd324a4217217fa5