Address various issues raised by TinyUSB maintainers

- remove OPT_MCU_SAME51 in favor of OPT_MCU_SAME5X and working around
  differences in the Atmel bsp locally in the D5035-01 bsp.

- rename board folder to d5035_01 for consistency with other boards
This commit is contained in:
Jean Gressmann 2020-10-07 19:12:34 +02:00
parent f92fe1e23e
commit f02b5bfdfa
6 changed files with 8 additions and 14 deletions

View File

@ -53,14 +53,9 @@
#include "nrf.h" #include "nrf.h"
#elif CFG_TUSB_MCU == OPT_MCU_SAMD11 || CFG_TUSB_MCU == OPT_MCU_SAMD21 || \ #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_SAMD51 || CFG_TUSB_MCU == OPT_MCU_SAME5X
CFG_TUSB_MCU == OPT_MCU_SAME51
#include "sam.h" #include "sam.h"
#if CFG_TUSB_MCU == OPT_MCU_SAME51
#define SVC_Handler SVCall_Handler
#endif
#elif CFG_TUSB_MCU == OPT_MCU_SAMG #elif CFG_TUSB_MCU == OPT_MCU_SAMG
#undef LITTLE_ENDIAN // hack to suppress "LITTLE_ENDIAN" redefined #undef LITTLE_ENDIAN // hack to suppress "LITTLE_ENDIAN" redefined
#include "sam.h" #include "sam.h"

View File

@ -9,14 +9,16 @@ CFLAGS += \
-D__SAME51J19A__ \ -D__SAME51J19A__ \
-DCONF_CPU_FREQUENCY=80000000 \ -DCONF_CPU_FREQUENCY=80000000 \
-DCONF_GCLK_USB_FREQUENCY=48000000 \ -DCONF_GCLK_USB_FREQUENCY=48000000 \
-DCFG_TUSB_MCU=OPT_MCU_SAME51 \ -DCFG_TUSB_MCU=OPT_MCU_SAME5X \
-DD5035_01=1 \ -DD5035_01=1 \
-DBOARD_NAME="\"D5035-01\"" -DBOARD_NAME="\"D5035-01\"" \
-DSVC_Handler=SVCall_Handler
HWREV ?= 1 HWRED ?= 1
CFLAGS += -DHWREV=$(HWREV) CFLAGS += -DHWREV=$(HWREV)
# All source paths should be relative to the top level. # All source paths should be relative to the top level.
LD_FILE = hw/bsp/$(BOARD)/same51j19a_flash.ld LD_FILE = hw/bsp/$(BOARD)/same51j19a_flash.ld

View File

@ -28,8 +28,7 @@
#if TUSB_OPT_DEVICE_ENABLED && \ #if TUSB_OPT_DEVICE_ENABLED && \
(CFG_TUSB_MCU == OPT_MCU_SAMD11 || CFG_TUSB_MCU == OPT_MCU_SAMD21 || \ (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_SAMD51 || CFG_TUSB_MCU == OPT_MCU_SAME5X)
CFG_TUSB_MCU == OPT_MCU_SAME51)
#include "sam.h" #include "sam.h"
#include "device/dcd.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; 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 || \ #if CFG_TUSB_MCU == OPT_MCU_SAMD51 || CFG_TUSB_MCU == OPT_MCU_SAME5X
CFG_TUSB_MCU == OPT_MCU_SAME51
void dcd_int_enable(uint8_t rhport) void dcd_int_enable(uint8_t rhport)
{ {

View File

@ -59,7 +59,6 @@
#define OPT_MCU_SAMD21 200 ///< MicroChip SAMD21 #define OPT_MCU_SAMD21 200 ///< MicroChip SAMD21
#define OPT_MCU_SAMD51 201 ///< MicroChip SAMD51 #define OPT_MCU_SAMD51 201 ///< MicroChip SAMD51
#define OPT_MCU_SAME5X 203 ///< MicroChip SAM E5x #define OPT_MCU_SAME5X 203 ///< MicroChip SAM E5x
#define OPT_MCU_SAME51 205 ///< MicroChip SAME51
#define OPT_MCU_SAMG 202 ///< MicroChip SAMDG series #define OPT_MCU_SAMG 202 ///< MicroChip SAMDG series
// STM32 // STM32