diff options
| author | Wini-Buh <[email protected]> | 2021-06-29 00:19:30 +0200 |
|---|---|---|
| committer | Wini-Buh <[email protected]> | 2021-06-29 00:19:30 +0200 |
| commit | cb0f1d98db3c4bcfdcba231a78b1c18805483ad8 (patch) | |
| tree | fa88fc9cb41a59a2089ea2e43d8feac2b8987474 /src/tusb_option.h | |
| parent | 970da35fb303f1aa44e6279b14b80418f3250f60 (diff) | |
| parent | 6e939de9d673979721b83b0b3ab724ebd652770c (diff) | |
Merge remote-tracking branch 'origin/master' into CCRX_Port
# Conflicts:
# src/portable/renesas/usba/dcd_usba.c
# src/tusb_option.h
Diffstat (limited to 'src/tusb_option.h')
| -rw-r--r-- | src/tusb_option.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/tusb_option.h b/src/tusb_option.h index bf2ca4d69..2a68dcbc1 100644 --- a/src/tusb_option.h +++ b/src/tusb_option.h @@ -113,7 +113,11 @@ // Renesas RX #define OPT_MCU_RX63X 1400 ///< Renesas RX63N/631 +<<<<<<< HEAD #define OPT_MCU_RX72N 1401 ///< Renesas RX72N +======= +#define OPT_MCU_RX65X 1401 ///< Renesas RX65N/RX651 +>>>>>>> origin/master // Mind Motion #define OPT_MCU_MM32F327X 1500 ///< Mind Motion MM32F327 |