diff options
| author | Jean Gressmann <[email protected]> | 2020-10-07 19:12:34 +0200 |
|---|---|---|
| committer | Jean Gressmann <[email protected]> | 2020-10-07 19:19:30 +0200 |
| commit | f02b5bfdfaf20a76054dc2f57d37c46de4be6534 (patch) | |
| tree | 4e034b89507cd63f90ab3682380ac4d159f1a5eb /hw | |
| parent | f92fe1e23e3e8689b6f001c5232a5960acdb3b7f (diff) | |
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
Diffstat (limited to 'hw')
| -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 |
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 |