1 files changed, 4 insertions, 7 deletions

diff --git a/firmware/SOURCES b/firmware/SOURCES
index e827f964f5..75ea8b136e 100644
--- a/firmware/SOURCES
+++ b/firmware/SOURCES
@@ -94,14 +94,12 @@ target/hosted/filesystem-unix.c
 target/hosted/filesystem-app.c
 #endif /* APPLICATION */
 
-#if defined(SAMSUNG_YPR0) || defined(SAMSUNG_YPR1)
+#if (defined(SAMSUNG_YPR0) || defined(SAMSUNG_YPR1)) && !defined(SIMULATOR)
 target/hosted/kernel-unix.c
 target/hosted/filesystem-unix.c
-#ifndef SIMULATOR
 target/hosted/lc-unix.c
 drivers/lcd-memframe.c
 target/hosted/samsungypr/lcd-ypr.c
-#endif
 target/hosted/samsungypr/gpio-ypr.c
 #if CONFIG_TUNER
 target/hosted/samsungypr/radio-ypr.c
@@ -1568,6 +1566,9 @@ target/arm/s5l8702/clocking-s5l8702.c
 target/arm/s5l8702/ipod6g/lcd-6g.c
 target/arm/s5l8702/ipod6g/lcd-asm-6g.S
 target/arm/s5l8702/ipod6g/piezo-6g.c
+target/arm/s5l8702/spi-s5l8702.c
+target/arm/s5l8702/crypto-s5l8702.c
+target/arm/s5l8702/nor-s5l8702.c
 #if 0 //TODO
 target/arm/s5l8702/postmortemstub.S
 #endif
@@ -1587,10 +1588,6 @@ target/arm/s5l8702/debug-s5l8702.c
 target/arm/s5l8702/pcm-s5l8702.c
 target/arm/s5l8702/ipod6g/audio-6g.c
 target/arm/s5l8702/ipod6g/cscodec-6g.c
-#else
-target/arm/s5l8702/spi-s5l8702.c
-target/arm/s5l8702/crypto-s5l8702.c
-target/arm/s5l8702/nor-s5l8702.c
 #endif /* BOOTLOADER */
 #endif /* IPOD_6G */