Make the gigabeat S bootloader compile again. Don't know if it still works.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@17119 a1c6a512-1295-4272-9138-f99709370657

1 files changed, 11 insertions, 2 deletions

diff --git a/firmware/export/config.h b/firmware/export/config.h
index a93152b5e7..778e50f2c5 100644
--- a/firmware/export/config.h
+++ b/firmware/export/config.h
@@ -328,15 +328,24 @@
 #define HAVE_EXTENDED_MESSAGING_AND_NAME
 #endif
 
-#if (CONFIG_CODEC == SWCODEC) && !defined(BOOTLOADER)
+#if (CONFIG_CODEC == SWCODEC)
+#ifndef BOOTLOADER
+
 #ifndef SIMULATOR
 #define HAVE_PRIORITY_SCHEDULING
 #define HAVE_SCHEDULER_BOOSTCTRL
 #endif /* SIMULATOR */
+
 #define HAVE_SEMAPHORE_OBJECTS
 #define HAVE_EVENT_OBJECTS
 
-#if defined (TOSHIBA_GIGABEAT_F) || defined (TOSHIBA_GIGABEAT_S)
+#ifdef TOSHIBA_GIGABEAT_F
+#define HAVE_WAKEUP_OBJECTS
+#endif
+
+#endif /* BOOTLOADER */
+
+#ifdef TOSHIBA_GIGABEAT_S
 #define HAVE_WAKEUP_OBJECTS
 #endif
 #endif