diff --git a/arch/arm/configs/micro_fsl_frdm_k64f_defconfig b/arch/arm/configs/micro_fsl_frdm_k64f_defconfig
index 3429074cb82..7774cf346f7 100644
--- a/arch/arm/configs/micro_fsl_frdm_k64f_defconfig
+++ b/arch/arm/configs/micro_fsl_frdm_k64f_defconfig
@@ -93,7 +93,6 @@ CONFIG_CPU_CORTEXM4=y
 CONFIG_LDREX_STREX_AVAILABLE=y
 CONFIG_DATA_ENDIANNESS_LITTLE=y
 CONFIG_STACK_ALIGN_DOUBLE_WORD=y
-CONFIG_NUM_IRQS=1
 CONFIG_STACK_GROWS_DOWN=y
 CONFIG_NUM_IRQ_PRIO_BITS=4
 # CONFIG_RUNTIME_NMI is not set
@@ -110,6 +109,7 @@ CONFIG_IRQ_VECTOR_TABLE_BSP=y
 CONFIG_ARCH_HAS_TASK_ABORT=y
 CONFIG_ARCH_HAS_NANO_FIBER_ABORT=y
 CONFIG_BSP_DIR="fsl_frdm_k64f"
+CONFIG_NUM_IRQS=34
 CONFIG_WDOG_INIT=y
 
 #
diff --git a/arch/arm/configs/micro_ti_lm3s6965_defconfig b/arch/arm/configs/micro_ti_lm3s6965_defconfig
index 162d82d6d01..9f401cef70f 100644
--- a/arch/arm/configs/micro_ti_lm3s6965_defconfig
+++ b/arch/arm/configs/micro_ti_lm3s6965_defconfig
@@ -93,7 +93,6 @@ CONFIG_CPU_CORTEXM3=y
 CONFIG_LDREX_STREX_AVAILABLE=y
 CONFIG_DATA_ENDIANNESS_LITTLE=y
 CONFIG_STACK_ALIGN_DOUBLE_WORD=y
-CONFIG_NUM_IRQS=7
 CONFIG_STACK_GROWS_DOWN=y
 CONFIG_NUM_IRQ_PRIO_BITS=3
 # CONFIG_RUNTIME_NMI is not set
@@ -110,6 +109,7 @@ CONFIG_IRQ_VECTOR_TABLE_BSP=y
 CONFIG_ARCH_HAS_TASK_ABORT=y
 CONFIG_ARCH_HAS_NANO_FIBER_ABORT=y
 CONFIG_BSP_DIR="ti_lm3s6965"
+CONFIG_NUM_IRQS=7
 CONFIG_BSP_TI_LM3S6965_QEMU=y
 
 #
diff --git a/arch/arm/configs/nano_fsl_frdm_k64f_defconfig b/arch/arm/configs/nano_fsl_frdm_k64f_defconfig
index f4a33cf9a95..1622b4bc8ee 100644
--- a/arch/arm/configs/nano_fsl_frdm_k64f_defconfig
+++ b/arch/arm/configs/nano_fsl_frdm_k64f_defconfig
@@ -72,7 +72,6 @@ CONFIG_CPU_CORTEXM4=y
 CONFIG_LDREX_STREX_AVAILABLE=y
 CONFIG_DATA_ENDIANNESS_LITTLE=y
 CONFIG_STACK_ALIGN_DOUBLE_WORD=y
-CONFIG_NUM_IRQS=1
 CONFIG_STACK_GROWS_DOWN=y
 CONFIG_NUM_IRQ_PRIO_BITS=4
 # CONFIG_RUNTIME_NMI is not set
@@ -89,6 +88,7 @@ CONFIG_IRQ_VECTOR_TABLE_BSP=y
 CONFIG_ARCH_HAS_TASK_ABORT=y
 CONFIG_ARCH_HAS_NANO_FIBER_ABORT=y
 CONFIG_BSP_DIR="fsl_frdm_k64f"
+CONFIG_NUM_IRQS=34
 CONFIG_WDOG_INIT=y
 
 #
diff --git a/arch/arm/configs/nano_ti_lm3s6965_defconfig b/arch/arm/configs/nano_ti_lm3s6965_defconfig
index fbb0826b3dc..0dbdbe46d5d 100644
--- a/arch/arm/configs/nano_ti_lm3s6965_defconfig
+++ b/arch/arm/configs/nano_ti_lm3s6965_defconfig
@@ -72,7 +72,6 @@ CONFIG_CPU_CORTEXM3=y
 CONFIG_LDREX_STREX_AVAILABLE=y
 CONFIG_DATA_ENDIANNESS_LITTLE=y
 CONFIG_STACK_ALIGN_DOUBLE_WORD=y
-CONFIG_NUM_IRQS=7
 CONFIG_STACK_GROWS_DOWN=y
 CONFIG_NUM_IRQ_PRIO_BITS=3
 # CONFIG_RUNTIME_NMI is not set
@@ -89,6 +88,7 @@ CONFIG_IRQ_VECTOR_TABLE_BSP=y
 CONFIG_ARCH_HAS_TASK_ABORT=y
 CONFIG_ARCH_HAS_NANO_FIBER_ABORT=y
 CONFIG_BSP_DIR="ti_lm3s6965"
+CONFIG_NUM_IRQS=7
 CONFIG_BSP_TI_LM3S6965_QEMU=y
 
 #