diff --git a/arch/arm/src/tms570/Make.defs b/arch/arm/src/tms570/Make.defs
index 0c6c3ee2612..6083ef9ba48 100644
--- a/arch/arm/src/tms570/Make.defs
+++ b/arch/arm/src/tms570/Make.defs
@@ -40,13 +40,18 @@ HEAD_ASRC  = arm_vectortab.S
 
 # Common assembly language files
 
-CMN_ASRCS += arm_vectors.S arm_fpuconfig.S arm_head.S arm_fullcontextrestore.S
+CMN_ASRCS += arm_vectors.S arm_head.S arm_fullcontextrestore.S
 CMN_ASRCS += arm_saveusercontext.S arm_vectoraddrexcptn.S arm_vfork.S
 CMN_ASRCS += cp15_coherent_dcache.S cp15_invalidate_dcache.S
-CMN_ASRCS += cp15_clean_dcache.S cp15_flush_dcache.S cp15_invalidate_dcache_all.S
+CMN_ASRCS += cp15_clean_dcache.S cp15_flush_dcache.S
+CMN_ASRCS += cp15_invalidate_dcache_all.S
 
 # Configuration dependent assembly language files
 
+ifeq ($(CONFIG_ARCH_FPU),y)
+CMN_ASRCS += arm_fpuconfig.S
+endif
+
 ifeq ($(CONFIG_ARCH_MEMCPY),y)
 CMN_ASRCS += arm_memcpy.S
 endif
diff --git a/arch/arm/src/tms570/tms570_irq.c b/arch/arm/src/tms570/tms570_irq.c
index 38906ddf52c..f5c342991ae 100644
--- a/arch/arm/src/tms570/tms570_irq.c
+++ b/arch/arm/src/tms570/tms570_irq.c
@@ -170,7 +170,6 @@ void up_irqinitialize(void)
    * disabled through ENABLE registers.
    */
 
-#warning Missing Logic
 #endif
 
 #ifndef CONFIG_SUPPRESS_INTERRUPTS