4 files changed, 16 insertions, 8 deletions

diff --git a/firmware/SOURCES b/firmware/SOURCES
index a68d10ec76..1471eb7b94 100644
--- a/firmware/SOURCES
+++ b/firmware/SOURCES
@@ -436,7 +436,9 @@ drivers/audio/audiohw-swcodec.c
 #endif /* BOOTLOADER */
 
 /* Audio codec */
-#if (CONFIG_PLATFORM & PLATFORM_NATIVE) && !defined(BOOTLOADER)
+#if !defined(BOOTLOADER)
+
+#if (CONFIG_PLATFORM & PLATFORM_NATIVE)
 #if defined(HAVE_UDA1380)
 drivers/audio/uda1380.c
 #elif defined(HAVE_WM8740)
@@ -506,7 +508,9 @@ target/hosted/sdl/pcm-sdl.c
 #endif /* (CONFIG_PLATFORM & PLATFORM_MAEMO) */
 
 #endif
-#endif /* (CONFIG_PLATFORM & PLATFORM_NATIVE) && !defined(BOOTLOADER) */
+#endif /* (CONFIG_PLATFORM & PLATFORM_NATIVE) */
+
+#endif /* !defined(BOOTLOADER) */
 
 /* CPU Specific - By class then particular chip if applicable */
 #if defined(CPU_COLDFIRE)
diff --git a/firmware/target/hosted/agptek/rocker.make b/firmware/target/hosted/agptek/rocker.make
index dd6be88f57..d159db77f3 100644
--- a/firmware/target/hosted/agptek/rocker.make
+++ b/firmware/target/hosted/agptek/rocker.make
@@ -43,7 +43,7 @@ $(BUILDDIR)/rockbox.elf : $$(OBJ) $(FIRMLIB) $(VOICESPEEXLIB) $(CORE_LIBS)
                 -L$(BUILDDIR)/lib $(call a2lnk,$(CORE_LIBS)) \
                 $(LDOPTS) $(GLOBAL_LDOPTS) -Wl,-Map,$(BUILDDIR)/rockbox.map
 
-$(BUILDDIR)/rockbox.rocker : $(BUILDDIR)/rockbox.elf
+$(BUILDDIR)/$(BINARY): $(BUILDDIR)/rockbox.elf
         $(call PRINTS,OC $(@F))$(call objcopy,$^,$@)
 
 endif
diff --git a/firmware/target/hosted/xduoo/button-xduoo.c b/firmware/target/hosted/xduoo/button-xduoo.c
index 99b0908378..503e49e001 100644
--- a/firmware/target/hosted/xduoo/button-xduoo.c
+++ b/firmware/target/hosted/xduoo/button-xduoo.c
@@ -138,15 +138,22 @@ int button_read_device(void)
 
 bool headphones_inserted(void)
 {
+#ifdef BOOTLOADER
+    int ps = 0;
+#else
     int ps = xduoo_get_outputs();
+#endif
 
     return (ps == 2 || ps == 3);
 }
 
 bool lineout_inserted(void)
 {
+#ifdef BOOTLOADER
+    int ps = 0;
+#else
     int ps = xduoo_get_outputs();
-
+#endif
     return (ps == 1);
 }
 
diff --git a/firmware/target/hosted/xduoo/xduoo.make b/firmware/target/hosted/xduoo/xduoo.make
index 5c37d27412..d159db77f3 100644
--- a/firmware/target/hosted/xduoo/xduoo.make
+++ b/firmware/target/hosted/xduoo/xduoo.make
@@ -43,10 +43,7 @@ $(BUILDDIR)/rockbox.elf : $$(OBJ) $(FIRMLIB) $(VOICESPEEXLIB) $(CORE_LIBS)
                 -L$(BUILDDIR)/lib $(call a2lnk,$(CORE_LIBS)) \
                 $(LDOPTS) $(GLOBAL_LDOPTS) -Wl,-Map,$(BUILDDIR)/rockbox.map
 
-$(BUILDDIR)/rockbox.x3ii : $(BUILDDIR)/rockbox.elf
-        $(call PRINTS,OC $(@F))$(call objcopy,$^,$@)
-
-$(BUILDDIR)/rockbox.x20 : $(BUILDDIR)/rockbox.elf
+$(BUILDDIR)/$(BINARY): $(BUILDDIR)/rockbox.elf
         $(call PRINTS,OC $(@F))$(call objcopy,$^,$@)
 
 endif