diff options
| author | hathach <[email protected]> | 2021-11-08 17:24:58 +0700 |
|---|---|---|
| committer | hathach <[email protected]> | 2021-11-08 17:29:26 +0700 |
| commit | f65917f51a3046c828ced5fbb982348542b382a5 (patch) | |
| tree | dd4e6859923e89c45f6b1cdf071dd4aab67f891b | |
| parent | 6fea50f735d00dff23d958eec8cf4a386282c193 (diff) | |
rename to simply OPT_MCU_MSP432E4, add msp432e to ci
| -rw-r--r-- | .github/workflows/build_arm.yml | 1 | ||||
| -rw-r--r-- | hw/bsp/board_mcu.h | 2 | ||||
| -rw-r--r-- | hw/bsp/msp432e4/family.mk | 2 | ||||
| -rw-r--r-- | src/class/audio/audio_device.c | 2 | ||||
| -rw-r--r-- | src/device/dcd_attr.h | 2 | ||||
| -rw-r--r-- | src/portable/mentor/musb/dcd_musb.c | 4 | ||||
| -rw-r--r-- | src/tusb_option.h | 4 |
7 files changed, 9 insertions, 8 deletions
diff --git a/.github/workflows/build_arm.yml b/.github/workflows/build_arm.yml index 8db0fe04f..cf9246d52 100644 --- a/.github/workflows/build_arm.yml +++ b/.github/workflows/build_arm.yml @@ -45,6 +45,7 @@ jobs: - 'lpc54' - 'lpc55' - 'mm32' + - 'msp430e4' - 'nrf' - 'rp2040' - 'samd11' diff --git a/hw/bsp/board_mcu.h b/hw/bsp/board_mcu.h index 2928ea657..f8b5c061c 100644 --- a/hw/bsp/board_mcu.h +++ b/hw/bsp/board_mcu.h @@ -98,7 +98,7 @@ #elif CFG_TUSB_MCU == OPT_MCU_MSP430x5xx #include "msp430.h" -#elif CFG_TUSB_MCU == OPT_MCU_MSP432E4xx +#elif CFG_TUSB_MCU == OPT_MCU_MSP432E4 #include "msp.h" #elif CFG_TUSB_MCU == OPT_MCU_VALENTYUSB_EPTRI diff --git a/hw/bsp/msp432e4/family.mk b/hw/bsp/msp432e4/family.mk index ee7faa208..b664c4c1b 100644 --- a/hw/bsp/msp432e4/family.mk +++ b/hw/bsp/msp432e4/family.mk @@ -9,7 +9,7 @@ CFLAGS += \ -mfloat-abi=hard \ -mfpu=fpv4-sp-d16 \ -D__MSP432E401Y__ \ - -DCFG_TUSB_MCU=OPT_MCU_MSP432E4xx + -DCFG_TUSB_MCU=OPT_MCU_MSP432E4 # mcu driver cause following warnings CFLAGS += -Wno-error=cast-qual -Wno-error=format= diff --git a/src/class/audio/audio_device.c b/src/class/audio/audio_device.c index 38bfc023b..d9f2e284e 100644 --- a/src/class/audio/audio_device.c +++ b/src/class/audio/audio_device.c @@ -103,7 +103,7 @@ CFG_TUSB_MCU == OPT_MCU_LPC18XX || \ CFG_TUSB_MCU == OPT_MCU_LPC43XX || \ CFG_TUSB_MCU == OPT_MCU_MIMXRT10XX || \ - CFG_TUSB_MCU == OPT_MCU_MSP432E4xx + CFG_TUSB_MCU == OPT_MCU_MSP432E4 #if TUD_AUDIO_PREFER_RING_BUFFER #define USE_LINEAR_BUFFER 0 #else diff --git a/src/device/dcd_attr.h b/src/device/dcd_attr.h index 7254f3362..73d592e5c 100644 --- a/src/device/dcd_attr.h +++ b/src/device/dcd_attr.h @@ -146,7 +146,7 @@ #elif TU_CHECK_MCU(OPT_MCU_MSP430x5xx) #define DCD_ATTR_ENDPOINT_MAX 8 -#elif TU_CHECK_MCU(OPT_MCU_MSP432E4xx, OPT_MCU_TM4C123, OPT_MCU_TM4C129) +#elif TU_CHECK_MCU(OPT_MCU_MSP432E4, OPT_MCU_TM4C123, OPT_MCU_TM4C129) #define DCD_ATTR_ENDPOINT_MAX 8 //------------- ValentyUSB -------------// diff --git a/src/portable/mentor/musb/dcd_musb.c b/src/portable/mentor/musb/dcd_musb.c index c745b4969..4b4c2f9b2 100644 --- a/src/portable/mentor/musb/dcd_musb.c +++ b/src/portable/mentor/musb/dcd_musb.c @@ -26,7 +26,7 @@ #include "tusb_option.h" -#if TU_CHECK_MCU(OPT_MCU_MSP432E4xx, OPT_MCU_TM4C123, OPT_MCU_TM4C129) +#if TU_CHECK_MCU(OPT_MCU_MSP432E4, OPT_MCU_TM4C123, OPT_MCU_TM4C129) #if __GNUC__ > 8 && defined(__ARM_FEATURE_UNALIGNED) /* GCC warns that an address may be unaligned, even though @@ -36,7 +36,7 @@ _Pragma("GCC diagnostic ignored \"-Waddress-of-packed-member\""); #include "device/dcd.h" -#if TU_CHECK_MCU(OPT_MCU_MSP432E4xx) +#if TU_CHECK_MCU(OPT_MCU_MSP432E4) #include "musb_msp432e.h" #elif TU_CHECK_MCU(OPT_MCU_TM4C123, OPT_MCU_TM4C129) diff --git a/src/tusb_option.h b/src/tusb_option.h index 246893ddb..2edd310fa 100644 --- a/src/tusb_option.h +++ b/src/tusb_option.h @@ -84,9 +84,9 @@ // Sony #define OPT_MCU_CXD56 400 ///< SONY CXD56 -// TI MSP430 +// TI #define OPT_MCU_MSP430x5xx 500 ///< TI MSP430x5xx -#define OPT_MCU_MSP432E4xx 510 ///< TI MSP432E4xx +#define OPT_MCU_MSP432E4 510 ///< TI MSP432E4xx #define OPT_MCU_TM4C123 511 ///< TI Tiva-C 123x #define OPT_MCU_TM4C129 512 ///< TI Tiva-C 129x |