diff --git a/hw/bsp/brtmm90x/boards/mm900ev1b/board.h b/hw/bsp/brtmm90x/boards/mm900evxb/board.h
similarity index 85%
rename from hw/bsp/brtmm90x/boards/mm900ev1b/board.h
rename to hw/bsp/brtmm90x/boards/mm900evxb/board.h
index 67f61237f..57936fda5 100644
--- a/hw/bsp/brtmm90x/boards/mm900ev1b/board.h
+++ b/hw/bsp/brtmm90x/boards/mm900evxb/board.h
@@ -27,27 +27,21 @@
 #ifndef BOARD_H_
 #define BOARD_H_
 
+// Note: This definition file covers all MM900EV1B, MM900EV2B, and MM900EV3B boards.
+// Each of these boards has an FT900 device.
+
 #ifdef __cplusplus
  extern "C" {
 #endif
 
-#if defined(__FT900__)
 #define GPIO_UART0_TX 48
 #define GPIO_UART0_RX 49
 #define GPIO_ETH_LED0 61
 #define GPIO_ETH_LED1 62
 #define GPIO_REMOTE_WAKEUP_PIN 18
 #define USBD_VBUS_DTC_PIN 3
-#elif defined(__FT930__)
-#define GPIO_UART0_TX 23
-#define GPIO_UART0_RX 22
-#define GPIO_ETH_LED0 4
-#define GPIO_ETH_LED1 5
-#define GPIO_REMOTE_WAKEUP_PIN 12
-#define USBD_VBUS_DTC_PIN 39
-#endif
 
-//#define GPIO_REMOTE_WAKEUP
+#define GPIO_REMOTE_WAKEUP
 
 #ifdef __cplusplus
  }
diff --git a/hw/bsp/brtmm90x/family.c b/hw/bsp/brtmm90x/family.c
index 3bd16b817..ed169655e 100644
--- a/hw/bsp/brtmm90x/family.c
+++ b/hw/bsp/brtmm90x/family.c
@@ -24,10 +24,10 @@
  * This file is part of the TinyUSB stack.
  */
 
+#include "board.h"
+#include "bsp/board.h"
 #include <registers/ft900_registers.h>
 #include <ft900.h>
-#include "bsp/board.h"
-#include "board.h"
 
 #if TUSB_OPT_DEVICE_ENABLED
 int8_t board_ft90x_vbus(void); // Board specific implementation of VBUS detection for USB device.
@@ -42,7 +42,7 @@ volatile unsigned int timer_ms = 0;
 void board_pm_ISR(void);
 
 #define WELCOME_MSG "\x1B[2J\x1B[H" \
-                    "MM900EV1B board\r\n"
+                    "MM900EVxB board\r\n"
 
 // Initialize on-board peripherals : led, button, uart and USB
 void board_init(void)
diff --git a/src/portable/bridgetek/ft9xx/dcd_ft9xx.c b/src/portable/bridgetek/ft9xx/dcd_ft9xx.c
index 6dbef1614..9b08702ed 100644
--- a/src/portable/bridgetek/ft9xx/dcd_ft9xx.c
+++ b/src/portable/bridgetek/ft9xx/dcd_ft9xx.c
@@ -24,8 +24,9 @@
  * This file is part of the TinyUSB stack.
  */
 
-#include "tusb_option.h"
+#include "board.h"
 #include "bsp/board.h"
+#include "tusb_option.h"
 
 #if TUSB_OPT_DEVICE_ENABLED && CFG_TUSB_MCU == OPT_MCU_FT90X