diff --git a/firmware/SOURCES b/firmware/SOURCES
index 50f68d4e94..9c41194a5b 100644
--- a/firmware/SOURCES
+++ b/firmware/SOURCES
@@ -1276,6 +1276,7 @@ target/arm/tcc780x/cowond2/audio-cowond2.c
 #endif /* COWON_D2 */
 
 #ifdef CPU_S5L870X
+target/arm/mmu-arm.S
 target/arm/s5l8700/system-s5l8700.c
 #ifndef SIMULATOR
 #ifndef BOOTLOADER
diff --git a/firmware/target/arm/mmu-arm.S b/firmware/target/arm/mmu-arm.S
index 2223be2210..ef595ac3d8 100644
--- a/firmware/target/arm/mmu-arm.S
+++ b/firmware/target/arm/mmu-arm.S
@@ -155,6 +155,9 @@ cpucache_invalidate:
     .size   invalidate_idcache, .-invalidate_idcache
 
 #else /* !IMX31L */
+
+/* S5L870X doesn't have a MMU */
+#ifndef CPU_S5L870X
 /** MMU setup **/
 
 /*
@@ -243,6 +246,8 @@ enable_mmu:
     bx      lr                      @
     .size   enable_mmu, .-enable_mmu
     .ltorg
+    
+#endif /* S5L870X */
 
 /** Cache coherency **/
 
diff --git a/firmware/target/arm/s5l8700/system-target.h b/firmware/target/arm/s5l8700/system-target.h
index aa3cc7aa4f..6d4b69135d 100644
--- a/firmware/target/arm/s5l8700/system-target.h
+++ b/firmware/target/arm/s5l8700/system-target.h
@@ -22,6 +22,7 @@
 #define SYSTEM_TARGET_H
 
 #include "system-arm.h"
+#include "mmu-arm.h"
 
 #define CPUFREQ_DEFAULT 32000000
 #define CPUFREQ_NORMAL  48000000