2 files changed, 7 insertions, 7 deletions

diff --git a/firmware/export/config-ipodvideo.h b/firmware/export/config-ipodvideo.h
index 6adcda9a1e..e115f2d786 100644
--- a/firmware/export/config-ipodvideo.h
+++ b/firmware/export/config-ipodvideo.h
@@ -91,9 +91,13 @@
 #define HAVE_BACKLIGHT
 #define HAVE_BACKLIGHT_BRIGHTNESS
 
+#ifndef BOOTLOADER
 /* Support for LCD sleep/BCM shutdown */
 #define HAVE_LCD_SLEEP
 #define HAVE_LCD_SLEEP_SETTING
+/* The same code may also be used when shutting down the iPod */
+#define HAVE_LCD_SHUTDOWN
+#endif
 
 /* We can fade the backlight by using PWM */
 #define CONFIG_BACKLIGHT_FADING BACKLIGHT_FADING_PWM
@@ -211,9 +215,4 @@
 #define IPOD_ACCESSORY_PROTOCOL
 #define HAVE_SERIAL
 
-#ifndef BOOTLOADER
-/* The same code may also be used when shutting down the iPod */
-#define HAVE_LCD_SHUTDOWN
-#endif
-
 #endif
diff --git a/uisimulator/uisimulator.make b/uisimulator/uisimulator.make
index 9aeb02cd3d..121f31e0f6 100644
--- a/uisimulator/uisimulator.make
+++ b/uisimulator/uisimulator.make
@@ -28,8 +28,9 @@ $(SIMLIB): $$(SIMOBJ) $(UIBMP)
         $(SILENT)$(shell rm -f $@)
         $(call PRINTS,AR $(@F))$(AR) rcs $@ $^ >/dev/null
 
-$(BUILDDIR)/$(BINARY): $$(OBJ) $(FIRMLIB) $(SIMLIB) $(VOICESPEEXLIB)
-        $(call PRINTS,LD $(BINARY))$(CC) -o $@ $^ $(LDOPTS) 
+# SIMLIB needs to be linked twice for some reason
+$(BUILDDIR)/$(BINARY): $$(OBJ) $(SIMLIB) $(VOICESPEEXLIB) $(FIRMLIB)
+        $(call PRINTS,LD $(BINARY))$(CC) -o $@ $^ $(SIMLIB) $(LDOPTS) 
 
 $(BUILDDIR)/uisimulator/%.o: $(ROOTDIR)/uisimulator/%.c
         $(SILENT)mkdir -p $(dir $@)