4 files changed, 12 insertions, 0 deletions

diff --git a/firmware/export/config-ipodcolor.h b/firmware/export/config-ipodcolor.h
index 6de461f952..778055f3d7 100644
--- a/firmware/export/config-ipodcolor.h
+++ b/firmware/export/config-ipodcolor.h
@@ -27,7 +27,9 @@
 #define CONFIG_CODEC SWCODEC
 
 /* define this if you have a real-time clock */
+#ifndef BOOTLOADER
 #define CONFIG_RTC RTC_PCF50605
+#endif
 
 /* Define this if you have a software controlled poweroff */
 #define HAVE_SW_POWEROFF
diff --git a/firmware/export/config-ipodnano.h b/firmware/export/config-ipodnano.h
index bf7362a168..86cc279bb8 100644
--- a/firmware/export/config-ipodnano.h
+++ b/firmware/export/config-ipodnano.h
@@ -27,7 +27,9 @@
 #define CONFIG_CODEC SWCODEC
 
 /* define this if you have a real-time clock */
+#ifndef BOOTLOADER
 #define CONFIG_RTC RTC_PCF50605
+#endif
 
 /* Define this if you have a software controlled poweroff */
 #define HAVE_SW_POWEROFF
diff --git a/firmware/export/config-ipodvideo.h b/firmware/export/config-ipodvideo.h
index 3c3f403983..e06e999e1c 100644
--- a/firmware/export/config-ipodvideo.h
+++ b/firmware/export/config-ipodvideo.h
@@ -27,7 +27,9 @@
 #define CONFIG_CODEC SWCODEC
 
 /* define this if you have a real-time clock */
+#ifndef BOOTLOADER
 #define CONFIG_RTC RTC_PCF50605
+#endif
 
 /* Define this if you have a software controlled poweroff */
 #define HAVE_SW_POWEROFF
diff --git a/firmware/export/kernel.h b/firmware/export/kernel.h
index 23c7bc7cb1..42d160bcea 100644
--- a/firmware/export/kernel.h
+++ b/firmware/export/kernel.h
@@ -66,7 +66,13 @@ struct mutex
 };
 
 /* global tick variable */
+#if (CONFIG_CPU == PP5020) && defined(BOOTLOADER)
+/* We don't enable interrupts in the iPod bootloader, so we need to fake
+   the current_tick variable */
+#define current_tick ((*((volatile long*)0x60005010))/10000)
+#else
 extern long current_tick;
+#endif
 
 #ifdef SIMULATOR
 #define sleep(x) sim_sleep(x)