From 2eb378c66d783f1b3176bd9b6ccd63d5900c6dfc Mon Sep 17 00:00:00 2001
From: ASDosjani <62965528+ASDosjani@users.noreply.github.com>
Date: Thu, 22 Jun 2023 16:05:03 +0200
Subject: [PATCH] [AT32] Change evaluation order (#12903)

Change evaluation order
---
 src/main/target/AT32F435G/target.h | 9 +++++----
 src/main/target/AT32F435M/target.h | 9 +++++----
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/main/target/AT32F435G/target.h b/src/main/target/AT32F435G/target.h
index 81060cfc1e..6571e726ab 100644
--- a/src/main/target/AT32F435G/target.h
+++ b/src/main/target/AT32F435G/target.h
@@ -34,6 +34,10 @@
 #define HANG_ON_ERRORS
 #endif
 
+#define USE_VCP
+
+#define UNIFIED_SERIAL_PORT_COUNT       1
+
 #define USE_UART1
 #define USE_UART2
 #define USE_UART3
@@ -43,7 +47,7 @@
 #define USE_UART7
 #define USE_UART8
 
-#define SERIAL_PORT_COUNT       (UNIFIED_SERIAL_PORT_COUNT + 3)
+#define SERIAL_PORT_COUNT       (UNIFIED_SERIAL_PORT_COUNT + 8)
 
 #define TARGET_IO_PORTA         0xffff
 #define TARGET_IO_PORTB         0xffff
@@ -68,9 +72,6 @@
 
 #define USE_USB_DETECT
 #define USE_PERSISTENT_MSC_RTC
-#define USE_VCP
-
-#define UNIFIED_SERIAL_PORT_COUNT       6
 
 #define USE_ADC
 
diff --git a/src/main/target/AT32F435M/target.h b/src/main/target/AT32F435M/target.h
index 2419b8a60b..cf8c1580a1 100644
--- a/src/main/target/AT32F435M/target.h
+++ b/src/main/target/AT32F435M/target.h
@@ -34,6 +34,10 @@
 #define HANG_ON_ERRORS
 #endif
 
+#define USE_VCP
+
+#define UNIFIED_SERIAL_PORT_COUNT       1
+
 #define USE_UART1
 #define USE_UART2
 #define USE_UART3
@@ -43,7 +47,7 @@
 #define USE_UART7
 #define USE_UART8
 
-#define SERIAL_PORT_COUNT       (UNIFIED_SERIAL_PORT_COUNT + 3)
+#define SERIAL_PORT_COUNT       (UNIFIED_SERIAL_PORT_COUNT + 8)
 
 #define TARGET_IO_PORTA         0xffff
 #define TARGET_IO_PORTB         0xffff
@@ -68,9 +72,6 @@
 
 #define USE_USB_DETECT
 #define USE_PERSISTENT_MSC_RTC
-#define USE_VCP
-
-#define UNIFIED_SERIAL_PORT_COUNT       6
 
 #define USE_ADC