From 19768936ae6379b4c86947f70ab5cf2c0f8ed8f4 Mon Sep 17 00:00:00 2001
From: hathach <thach@tinyusb.org>
Date: Mon, 11 Jul 2022 14:01:18 +0700
Subject: [PATCH] bump up mcux-sdk for rt11xx, add back OPT_MCU_MIMXRT11XX

---
 examples/host/bare_api/only.txt           | 1 +
 examples/host/cdc_msc_hid/only.txt        | 1 +
 examples/host/hid_controller/only.txt     | 1 +
 hw/mcu/nxp/mcux-sdk                       | 2 +-
 src/portable/chipidea/ci_hs/ci_hs_imxrt.h | 3 +++
 src/tusb_option.h                         | 5 +++--
 6 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/examples/host/bare_api/only.txt b/examples/host/bare_api/only.txt
index 7fe4e3f5c..da3ffdd19 100644
--- a/examples/host/bare_api/only.txt
+++ b/examples/host/bare_api/only.txt
@@ -4,6 +4,7 @@ mcu:LPC18XX
 mcu:LPC40XX
 mcu:LPC43XX
 mcu:MIMXRT10XX
+mcu:MIMXRT11XX
 mcu:RP2040
 mcu:MSP432E4
 mcu:RX65X
diff --git a/examples/host/cdc_msc_hid/only.txt b/examples/host/cdc_msc_hid/only.txt
index 7fe4e3f5c..da3ffdd19 100644
--- a/examples/host/cdc_msc_hid/only.txt
+++ b/examples/host/cdc_msc_hid/only.txt
@@ -4,6 +4,7 @@ mcu:LPC18XX
 mcu:LPC40XX
 mcu:LPC43XX
 mcu:MIMXRT10XX
+mcu:MIMXRT11XX
 mcu:RP2040
 mcu:MSP432E4
 mcu:RX65X
diff --git a/examples/host/hid_controller/only.txt b/examples/host/hid_controller/only.txt
index 7fe4e3f5c..da3ffdd19 100644
--- a/examples/host/hid_controller/only.txt
+++ b/examples/host/hid_controller/only.txt
@@ -4,6 +4,7 @@ mcu:LPC18XX
 mcu:LPC40XX
 mcu:LPC43XX
 mcu:MIMXRT10XX
+mcu:MIMXRT11XX
 mcu:RP2040
 mcu:MSP432E4
 mcu:RX65X
diff --git a/hw/mcu/nxp/mcux-sdk b/hw/mcu/nxp/mcux-sdk
index cb21c6609..ae2ab01d9 160000
--- a/hw/mcu/nxp/mcux-sdk
+++ b/hw/mcu/nxp/mcux-sdk
@@ -1 +1 @@
-Subproject commit cb21c660991c92e90ece99ccb63a4bc611899c3a
+Subproject commit ae2ab01d9d70ad00cd0e935c2552bd5f0e5c0294
diff --git a/src/portable/chipidea/ci_hs/ci_hs_imxrt.h b/src/portable/chipidea/ci_hs/ci_hs_imxrt.h
index 53bc8bd00..2de0d9cb4 100644
--- a/src/portable/chipidea/ci_hs/ci_hs_imxrt.h
+++ b/src/portable/chipidea/ci_hs/ci_hs_imxrt.h
@@ -31,6 +31,9 @@
 
 #if !defined(USB1_BASE) && defined(USB_OTG1_BASE)
 #define USB1_BASE USB_OTG1_BASE
+#endif
+
+#if !defined(USB2_BASE) && defined(USB_OTG2_BASE)
 #define USB2_BASE USB_OTG2_BASE
 #endif
 
diff --git a/src/tusb_option.h b/src/tusb_option.h
index a030197f6..70ef1c399 100644
--- a/src/tusb_option.h
+++ b/src/tusb_option.h
@@ -98,8 +98,9 @@ typedef int make_iso_compilers_happy;
 #define OPT_MCU_VALENTYUSB_EPTRI  600 ///< Fomu eptri config
 
 // NXP iMX RT
-#define OPT_MCU_MIMXRT            700 ///< NXP iMX RT Series
-#define OPT_MCU_MIMXRT10XX        OPT_MCU_MIMXRT
+#define OPT_MCU_MIMXRT            700             ///< NXP iMX RT Series
+#define OPT_MCU_MIMXRT10XX        OPT_MCU_MIMXRT  ///< RT10xx
+#define OPT_MCU_MIMXRT11XX        OPT_MCU_MIMXRT  ///< RT11xx
 
 // Nuvoton
 #define OPT_MCU_NUC121            800