diff options
| author | Ha Thach <[email protected]> | 2022-07-11 15:53:24 +0700 |
|---|---|---|
| committer | GitHub <[email protected]> | 2022-07-11 15:53:24 +0700 |
| commit | 0bfb9d62de3a13b685437b503e2170550662bb96 (patch) | |
| tree | f4033fe91fe68653ab207c8f95b8ce9ad4eff3a1 /hw | |
| parent | ecb899408bb95c5c0d50ebe2d887cd746104c534 (diff) | |
| parent | 6da1e93edd4547a5ec5a1681cd1cb31803564993 (diff) | |
Merge pull request #1543 from robert-hh/1170_0.13.0
mimxrt: Change the definitions for MIMXRT boards.
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/bsp/board_mcu.h | 2 | ||||
| -rw-r--r-- | hw/bsp/f1c100s/README.md | 2 | ||||
| -rw-r--r-- | hw/bsp/imxrt/boards/mimxrt1050_evkb/board.h | 4 | ||||
| -rw-r--r-- | hw/bsp/imxrt/family.mk | 2 | ||||
| m--------- | hw/mcu/nxp/mcux-sdk | 0 |
5 files changed, 5 insertions, 5 deletions
diff --git a/hw/bsp/board_mcu.h b/hw/bsp/board_mcu.h index 8202479cb..5c309a21d 100644 --- a/hw/bsp/board_mcu.h +++ b/hw/bsp/board_mcu.h @@ -110,7 +110,7 @@ #elif CFG_TUSB_MCU == OPT_MCU_VALENTYUSB_EPTRI // no header needed -#elif CFG_TUSB_MCU == OPT_MCU_MIMXRT10XX +#elif CFG_TUSB_MCU == OPT_MCU_MIMXRT #include "fsl_device_registers.h" #elif CFG_TUSB_MCU == OPT_MCU_NUC120 diff --git a/hw/bsp/f1c100s/README.md b/hw/bsp/f1c100s/README.md index 325044716..4aa1e153b 100644 --- a/hw/bsp/f1c100s/README.md +++ b/hw/bsp/f1c100s/README.md @@ -17,4 +17,4 @@ Flash: `make BOARD=f1c100s flash` will write the image to SPI flash, and then re ## TODO -* Add F1C100s to `#if CFG_TUSB_MCU == OPT_MCU_LPC43XX || CFG_TUSB_MCU == OPT_MCU_LPC18XX || CFG_TUSB_MCU == OPT_MCU_MIMXRT10XX` high speed MCU check in examples (maybe we should extract the logic?)
\ No newline at end of file +* Add F1C100s to `#if CFG_TUSB_MCU == OPT_MCU_LPC43XX || CFG_TUSB_MCU == OPT_MCU_LPC18XX || CFG_TUSB_MCU == OPT_MCU_MIMXRT` high speed MCU check in examples (maybe we should extract the logic?)
\ No newline at end of file diff --git a/hw/bsp/imxrt/boards/mimxrt1050_evkb/board.h b/hw/bsp/imxrt/boards/mimxrt1050_evkb/board.h index 928fbd727..0472f608c 100644 --- a/hw/bsp/imxrt/boards/mimxrt1050_evkb/board.h +++ b/hw/bsp/imxrt/boards/mimxrt1050_evkb/board.h @@ -45,7 +45,7 @@ // UART #define UART_PORT LPUART1 -#define UART_RX_PINMUX IOMUXC_GPIO_AD_B0_13_LPUART1_RX -#define UART_TX_PINMUX IOMUXC_GPIO_AD_B0_12_LPUART1_TX +#define UART_RX_PINMUX IOMUXC_GPIO_AD_B0_13_LPUART1_RXD +#define UART_TX_PINMUX IOMUXC_GPIO_AD_B0_12_LPUART1_TXD #endif /* BOARD_H_ */ diff --git a/hw/bsp/imxrt/family.mk b/hw/bsp/imxrt/family.mk index 0a55b740b..846ecd255 100644 --- a/hw/bsp/imxrt/family.mk +++ b/hw/bsp/imxrt/family.mk @@ -13,7 +13,7 @@ CFLAGS += \ -D__ARMVFP__=0 -D__ARMFPV5__=0\ -DXIP_EXTERNAL_FLASH=1 \ -DXIP_BOOT_HEADER_ENABLE=1 \ - -DCFG_TUSB_MCU=OPT_MCU_MIMXRT10XX + -DCFG_TUSB_MCU=OPT_MCU_MIMXRT ifdef BOARD_TUD_RHPORT CFLAGS += -DBOARD_TUD_RHPORT=$(BOARD_TUD_RHPORT) diff --git a/hw/mcu/nxp/mcux-sdk b/hw/mcu/nxp/mcux-sdk -Subproject cb21c660991c92e90ece99ccb63a4bc611899c3 +Subproject ae2ab01d9d70ad00cd0e935c2552bd5f0e5c029 |