diff options
| -rw-r--r-- | hw/bsp/board_mcu.h | 7 | ||||
| -rw-r--r-- | hw/bsp/d5035_01/board.mk (renamed from hw/bsp/d5035-01/board.mk) | 8 | ||||
| -rw-r--r-- | hw/bsp/d5035_01/d5035_01.c (renamed from hw/bsp/d5035-01/d5035_01.c) | 0 | ||||
| -rw-r--r-- | hw/bsp/d5035_01/same51j19a_flash.ld (renamed from hw/bsp/d5035-01/same51j19a_flash.ld) | 0 | ||||
| -rw-r--r-- | src/portable/microchip/samd/dcd_samd.c | 6 | ||||
| -rw-r--r-- | src/tusb_option.h | 1 |
6 files changed, 8 insertions, 14 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 diff --git a/src/portable/microchip/samd/dcd_samd.c b/src/portable/microchip/samd/dcd_samd.c index 460be3ac2..f1dca88a5 100644 --- a/src/portable/microchip/samd/dcd_samd.c +++ b/src/portable/microchip/samd/dcd_samd.c @@ -28,8 +28,7 @@ #if TUSB_OPT_DEVICE_ENABLED && \ (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" #include "device/dcd.h" @@ -95,8 +94,7 @@ void dcd_init (uint8_t rhport) USB->DEVICE.INTENSET.reg = /* USB_DEVICE_INTENSET_SOF | */ USB_DEVICE_INTENSET_EORST; } -#if CFG_TUSB_MCU == OPT_MCU_SAMD51 || CFG_TUSB_MCU == OPT_MCU_SAME5X || \ - CFG_TUSB_MCU == OPT_MCU_SAME51 +#if CFG_TUSB_MCU == OPT_MCU_SAMD51 || CFG_TUSB_MCU == OPT_MCU_SAME5X void dcd_int_enable(uint8_t rhport) { diff --git a/src/tusb_option.h b/src/tusb_option.h index 70ef4de8c..7e486bff0 100644 --- a/src/tusb_option.h +++ b/src/tusb_option.h @@ -59,7 +59,6 @@ #define OPT_MCU_SAMD21 200 ///< MicroChip SAMD21 #define OPT_MCU_SAMD51 201 ///< MicroChip SAMD51 #define OPT_MCU_SAME5X 203 ///< MicroChip SAM E5x -#define OPT_MCU_SAME51 205 ///< MicroChip SAME51 #define OPT_MCU_SAMG 202 ///< MicroChip SAMDG series // STM32 |