1 files changed, 19 insertions, 5 deletions

diff --git a/firmware/SOURCES b/firmware/SOURCES
index ac9fe132a7..374210e30b 100644
--- a/firmware/SOURCES
+++ b/firmware/SOURCES
@@ -29,7 +29,6 @@ usb.c
 #if defined(ROCKBOX_HAS_LOGF) || defined(ROCKBOX_HAS_LOGDISKF)
 logf.c
 #endif /* ROCKBOX_HAS_LOGF */
-kernel.c
 #if (CONFIG_PLATFORM & PLATFORM_NATIVE)
 load_code.c
 #ifdef RB_PROFILE
@@ -41,7 +40,6 @@ common/rb-loader.c
 #if !defined(BOOTLOADER) || defined(CPU_SH)
 rolo.c
 #endif /* !defined(BOOTLOADER) || defined(CPU_SH) */
-thread.c
 timer.c
 debug.c
 #endif /* PLATFORM_NATIVE */
@@ -63,7 +61,6 @@ target/hosted/sdl/system-sdl.c
 #ifdef HAVE_SDL_THREADS
 target/hosted/sdl/thread-sdl.c
 #else
-thread.c
 #endif
 target/hosted/sdl/timer-sdl.c
 #ifdef HAVE_TOUCHSCREEN
@@ -78,7 +75,6 @@ target/hosted/sdl/app/button-application.c
 target/hosted/kernel-unix.c
 target/hosted/filesystem-unix.c
 target/hosted/lc-unix.c
-thread.c
 drivers/lcd-memframe.c
 target/hosted/samsungypr/lcd-ypr.c
 target/hosted/samsungypr/gpio-ypr.c
@@ -1813,7 +1809,6 @@ target/hosted/android/telephony-android.c
 target/hosted/android/app/button-application.c
 #endif
 drivers/audio/android.c
-thread.c
 #endif
 
 #endif /* defined(SIMULATOR) */
@@ -1821,3 +1816,22 @@ thread.c
 #if defined(HAVE_TOUCHPAD) && !defined(HAS_BUTTON_HOLD)
 drivers/touchpad.c
 #endif
+
+/* firmware/kernel section */
+#ifdef HAVE_CORELOCK_OBJECT
+kernel/corelock.c
+#endif
+kernel/mutex.c
+kernel/queue.c
+#ifdef HAVE_SEMAPHORE_OBJECTS
+kernel/semaphore.c
+#endif
+#if defined(HAVE_SDL_THREADS)
+target/hosted/sdl/thread-sdl.c
+#else
+kernel/thread.c
+#endif
+kernel/tick.c
+#ifdef INCLUDE_TIMEOUT_API
+kernel/timeout.c
+#endif