diff --git a/arch/arm/src/armv7-a/arm_cpuhead.S b/arch/arm/src/armv7-a/arm_cpuhead.S
index 3ed001656d..095b7fd1e2 100644
--- a/arch/arm/src/armv7-a/arm_cpuhead.S
+++ b/arch/arm/src/armv7-a/arm_cpuhead.S
@@ -50,6 +50,8 @@
 #include "chip.h"
 #include "up_internal.h"
 
+#ifdef CONFIG_SMP
+
 	.file	"arm_cpuhead.S"
 
 /**********************************************************************************
@@ -492,5 +494,5 @@ g_cpu3_idlestack:
 #endif /* CONFIG_SMP_NCPUS > 3 */
 #endif /* CONFIG_SMP_NCPUS > 2 */
 #endif /* CONFIG_SMP_NCPUS > 1 */
-
+#endif
 	.end
diff --git a/arch/arm/src/armv7-a/arm_fpuconfig.S b/arch/arm/src/armv7-a/arm_fpuconfig.S
index 9ae1c66fd4..83db825189 100644
--- a/arch/arm/src/armv7-a/arm_fpuconfig.S
+++ b/arch/arm/src/armv7-a/arm_fpuconfig.S
@@ -40,6 +40,8 @@
 #include <nuttx/config.h>
 #include "cp15.h"
 
+#ifdef CONFIG_ARCH_FPU
+
 	.file	"arm_fpuconfig.S"
 
 /****************************************************************************
@@ -95,4 +97,5 @@ arm_fpuconfig:
 	fmxr	fpexc, r0
 	bx		lr
 	.size	arm_fpuconfig, . - arm_fpuconfig
+#endif
 	.end
diff --git a/arch/arm/src/armv7-a/arm_head.S b/arch/arm/src/armv7-a/arm_head.S
index 2038433296..15fe8395a5 100644
--- a/arch/arm/src/armv7-a/arm_head.S
+++ b/arch/arm/src/armv7-a/arm_head.S
@@ -48,6 +48,8 @@
 #include "chip.h"
 #include "up_internal.h"
 
+#ifndef CONFIG_PAGING
+
 	.file	"arm_head.S"
 
 /**********************************************************************************
@@ -799,4 +801,5 @@ g_idle_topstack:
 	.long	_ebss+CONFIG_IDLETHREAD_STACKSIZE
 #endif
 	.size	g_idle_topstack, .-g_idle_topstack
+#endif
 	.end
diff --git a/arch/arm/src/armv7-a/arm_pghead.S b/arch/arm/src/armv7-a/arm_pghead.S
index a027fafd95..917c69ee8e 100644
--- a/arch/arm/src/armv7-a/arm_pghead.S
+++ b/arch/arm/src/armv7-a/arm_pghead.S
@@ -50,6 +50,8 @@
 #include "chip.h"
 #include "up_internal.h"
 
+#ifdef CONFIG_PAGING
+
 	.file	"arm_pghead.S"
 
 /**********************************************************************************
@@ -835,4 +837,5 @@ g_idle_topstack:
 	.long	_ebss+CONFIG_IDLETHREAD_STACKSIZE
 #endif
 	.size	g_idle_topstack, .-g_idle_topstack
+#endif
 	.end