diff --git a/arch/arm/include/armv6-m/irq.h b/arch/arm/include/armv6-m/irq.h
index 6aedf6e592..185e45d4b5 100644
--- a/arch/arm/include/armv6-m/irq.h
+++ b/arch/arm/include/armv6-m/irq.h
@@ -311,17 +311,6 @@ static inline uint32_t getipsr(void)
   return ipsr;
 }
 
-static inline void setipsr(uint32_t ipsr) inline_function;
-static inline void setipsr(uint32_t ipsr)
-{
-  __asm__ __volatile__
-    (
-      "\tmsr ipsr, %0\n"
-      :
-      : "r" (ipsr)
-      : "memory");
-}
-
 /* Get/set CONTROL */
 
 static inline uint32_t getcontrol(void) inline_function;
diff --git a/arch/arm/include/armv7-m/irq.h b/arch/arm/include/armv7-m/irq.h
index 3c0cb14175..e6a1d67e5b 100644
--- a/arch/arm/include/armv7-m/irq.h
+++ b/arch/arm/include/armv7-m/irq.h
@@ -327,17 +327,6 @@ static inline uint32_t getipsr(void)
   return ipsr;
 }
 
-static inline void setipsr(uint32_t ipsr) inline_function;
-static inline void setipsr(uint32_t ipsr)
-{
-  __asm__ __volatile__
-    (
-      "\tmsr ipsr, %0\n"
-      :
-      : "r" (ipsr)
-      : "memory");
-}
-
 /* Get/set CONTROL */
 
 static inline uint32_t getcontrol(void) inline_function;
diff --git a/arch/arm/include/stm32f7/stm32f74xx75xx_irq.h b/arch/arm/include/stm32f7/stm32f74xx75xx_irq.h
index df838b5469..24c792ee6a 100644
--- a/arch/arm/include/stm32f7/stm32f74xx75xx_irq.h
+++ b/arch/arm/include/stm32f7/stm32f74xx75xx_irq.h
@@ -157,7 +157,7 @@
 #define STM32_IRQ_LTDCINT     (STM32_IRQ_FIRST+88) /* 88: LCD-TFT global interrupt */
 #define STM32_IRQ_LTDCERRINT  (STM32_IRQ_FIRST+89) /* 89: LCD-TFT global Error interrupt */
 #define STM32_IRQ_DMA2D       (STM32_IRQ_FIRST+90) /* 90: DMA2D global interrupt */
-#define STM32_IRQ_SAI1        (STM32_IRQ_FIRST+91) /* 91: SAI2 global interrupt */
+#define STM32_IRQ_SAI2        (STM32_IRQ_FIRST+91) /* 91: SAI2 global interrupt */
 #define STM32_IRQ_QUADSPI     (STM32_IRQ_FIRST+92) /* 92: QuadSPI global interrupt */
 #define STM32_IRQ_LPTIMER1    (STM32_IRQ_FIRST+93) /* 93: LP Timer1 global interrupt */
 #define STM32_IRQ_HDMICEC     (STM32_IRQ_FIRST+94) /* 94: HDMI-CEC global interrupt */
diff --git a/arch/arm/src/stm32f7/stm32_uart.h b/arch/arm/src/stm32f7/stm32_uart.h
index 2a9b848928..9b1bce0b4e 100644
--- a/arch/arm/src/stm32f7/stm32_uart.h
+++ b/arch/arm/src/stm32f7/stm32_uart.h
@@ -51,16 +51,16 @@
  * device.
  */
 
-#if CONFIG_STM32F7_ < 4
+#if STM32F7_NUART < 4
 #  undef CONFIG_STM32F7_UART8
 #endif
-#if CONFIG_STM32F7_ < 4
+#if STM32F7_NUART < 3
 #  undef CONFIG_STM32F7_UART7
 #endif
-#if CONFIG_STM32F7_ < 3
+#if STM32F7_NUART < 2
 #  undef CONFIG_STM32F7_UART5
 #endif
-#if CONFIG_STM32F7_ < 1
+#if STM32F7_NUART < 1
 #  undef CONFIG_STM32F7_UART4
 #endif