diff --git a/src/main/cli/cli.c b/src/main/cli/cli.c
index 1c9f2f7e9b..6a8aac7538 100644
--- a/src/main/cli/cli.c
+++ b/src/main/cli/cli.c
@@ -4680,7 +4680,7 @@ static void cliStatus(const char *cmdName, char *cmdline)
 
     cliPrintf("MCU %s Clock=%dMHz", getMcuTypeName(), (SystemCoreClock / 1000000));
 
-#if defined(STM32F4) || defined(STM32G4) || defined(APM32F4)
+#if PLATFORM_TRAIT_CONFIG_HSE
     // Only F4 and G4 is capable of switching between HSE/HSI (for now)
     int sysclkSource = SystemSYSCLKSource();
 
@@ -5402,15 +5402,11 @@ dmaoptEntry_t dmaoptEntryTable[] = {
 #define DMA_OPT_UI_INDEX(i) ((i) + 1)
 #define DMA_OPT_STRING_BUFSIZE 5
 
-#if defined(STM32H7) || defined(STM32G4) || defined(AT32F435)
-#define DMA_CHANREQ_STRING "Request"
-#else
+#if !defined(DMA_CHANREQ_STRING)
 #define DMA_CHANREQ_STRING "Channel"
 #endif
 
-#if defined(STM32F4) || defined(STM32F7) || defined(STM32H7) || defined(APM32F4)
-#define DMA_STCH_STRING    "Stream"
-#else
+#if !defined(DMA_STCH_STRING)
 #define DMA_STCH_STRING    "Channel"
 #endif
 
diff --git a/src/platform/APM32/include/platform/platform.h b/src/platform/APM32/include/platform/platform.h
index 1f6e9cef42..89697bf23d 100644
--- a/src/platform/APM32/include/platform/platform.h
+++ b/src/platform/APM32/include/platform/platform.h
@@ -209,4 +209,6 @@
 #define USB_DP_PIN PA12
 
 #define FLASH_CONFIG_BUFFER_TYPE uint32_t
+
+#define DMA_STCH_STRING    "Stream"
 #endif
diff --git a/src/platform/AT32/include/platform/platform.h b/src/platform/AT32/include/platform/platform.h
index 7e0a352450..f5c31dbc0d 100644
--- a/src/platform/AT32/include/platform/platform.h
+++ b/src/platform/AT32/include/platform/platform.h
@@ -162,3 +162,7 @@ typedef enum {DISABLE = 0, ENABLE = !DISABLE} FunctionalState;
 #define FLASH_CONFIG_BUFFER_TYPE      uint32_t
 
 #define USB_DP_PIN PA12
+
+#if defined(AT32F435)
+#define DMA_CHANREQ_STRING "Request"
+#endif
diff --git a/src/platform/STM32/include/platform/platform.h b/src/platform/STM32/include/platform/platform.h
index d2b51c0008..eb7d303710 100644
--- a/src/platform/STM32/include/platform/platform.h
+++ b/src/platform/STM32/include/platform/platform.h
@@ -463,3 +463,11 @@ extern uint8_t _dmaram_end__;
 #define MCO_SOURCE_COUNT   8
 #define MCO_DIVIDER_COUNT  5
 #endif
+
+#if defined(STM32H7) || defined(STM32G4)
+#define DMA_CHANREQ_STRING "Request"
+#endif
+
+#if defined(STM32F4) || defined(STM32F7) || defined(STM32H7)
+#define DMA_STCH_STRING    "Stream"
+#endif