diff --git a/arch/arm/src/armv7-a/Make.defs b/arch/arm/src/armv7-a/Make.defs
index 19a60b3954a..e0809db2c11 100644
--- a/arch/arm/src/armv7-a/Make.defs
+++ b/arch/arm/src/armv7-a/Make.defs
@@ -36,7 +36,7 @@ endif
 
 # Common assembly language files
 
-CMN_ASRCS += arm_cpuhead.S arm_fpuconfig.S arm_vectoraddrexcptn.S
+CMN_ASRCS += arm_cpuhead.S arm_vectoraddrexcptn.S
 CMN_ASRCS += arm_vectors.S cp15_cache_size.S cp15_clean_dcache_all.S
 CMN_ASRCS += cp15_clean_dcache.S cp15_coherent_dcache.S
 CMN_ASRCS += cp15_flush_dcache_all.S cp15_flush_dcache.S
@@ -84,6 +84,7 @@ endif
 
 ifeq ($(CONFIG_ARCH_FPU),y)
   CMN_CSRCS += arm_fpucmp.c
+  CMN_ASRCS += arm_fpuconfig.S
 endif
 
 ifeq ($(CONFIG_SMP),y)
diff --git a/arch/arm/src/armv7-r/Make.defs b/arch/arm/src/armv7-r/Make.defs
index f6f29a67def..171eba7e5ca 100644
--- a/arch/arm/src/armv7-r/Make.defs
+++ b/arch/arm/src/armv7-r/Make.defs
@@ -36,7 +36,7 @@ CMN_CSRCS += arm_syscall.c arm_tcbinfo.c arm_undefinedinsn.c
 
 # Common C source files
 
-CMN_ASRCS += arm_fpuconfig.S arm_head.S arm_vectoraddrexcptn.S
+CMN_ASRCS += arm_head.S arm_vectoraddrexcptn.S
 CMN_ASRCS += arm_vectors.S arm_vectortab.S cp15_cache_size.S
 CMN_ASRCS += cp15_clean_dcache_all.S cp15_clean_dcache.S
 CMN_ASRCS += cp15_coherent_dcache.S cp15_flush_dcache_all.S