xduoox3: Completely strip USB support out of the bootloader.

Change-Id: I7167e051a56a3be3c285c209b1c8fca7de251b09

3 files changed, 4 insertions, 21 deletions

diff --git a/bootloader/xduoox3.c b/bootloader/xduoox3.c
index ff6b81aa25..ac2d648e61 100644
--- a/bootloader/xduoox3.c
+++ b/bootloader/xduoox3.c
@@ -160,25 +160,6 @@ static int boot_rockbox(void)
     }
 }
 
-#if 0
-static void reset_configuration(void)
-{
-    int rc;
-
-    rc = disk_mount_all();
-    if (rc <= 0)
-    {
-        verbose = true;
-        error(EDISK,rc, true);
-    }
-
-    if(rename(ROCKBOX_DIR "/config.cfg", ROCKBOX_DIR "/config.old") == 0)
-        show_splash(HZ/2, "Configuration reset successfully!");
-    else
-        show_splash(HZ/2, "Couldn't reset configuration!");
-}
-#endif
-
 int main(void)
 {
     int rc;
diff --git a/firmware/SOURCES b/firmware/SOURCES
index 75ea8b136e..4e6fcbf70c 100644
--- a/firmware/SOURCES
+++ b/firmware/SOURCES
@@ -1646,9 +1646,9 @@ target/mips/ingenic_jz47xx/kernel-jz4760.c
 target/mips/ingenic_jz47xx/i2c-jz4760.c
 target/mips/ingenic_jz47xx/lcd-jz4760.c
 target/mips/ingenic_jz47xx/system-jz4760.c
-target/mips/ingenic_jz47xx/usb-jz4760.c
 target/mips/ingenic_jz47xx/timer-jz4760.c
 #ifndef BOOTLOADER
+target/mips/ingenic_jz47xx/usb-jz4760.c
 target/mips/ingenic_jz47xx/codec-jz4760.c
 target/mips/ingenic_jz47xx/pcm-jz4760.c
 #endif /* BOOTLOADER */
diff --git a/firmware/export/config/xduoox3.h b/firmware/export/config/xduoox3.h
index 46e1a61712..0d413ad372 100644
--- a/firmware/export/config/xduoox3.h
+++ b/firmware/export/config/xduoox3.h
@@ -174,6 +174,7 @@
 /* Type of LCD */
 #define CONFIG_LCD LCD_XDUOOX3
 
+#ifndef BOOTLOADER
 /* USB On-the-go */
 #define CONFIG_USBOTG     USBOTG_JZ4760
 
@@ -189,6 +190,7 @@
 
 #define USB_NUM_ENDPOINTS  3
 #define USB_DEVBSS_ATTR    IBSS_ATTR
+#endif /* !BOOTLOADER */
 
 #define BOOTFILE_EXT "x3"
 #define BOOTFILE     "rockbox." BOOTFILE_EXT
@@ -198,7 +200,7 @@
 
 #define ICODE_ATTR_TREMOR_NOT_MDCT
 
-#endif /* SIMULATOR */
+#endif /* !SIMULATOR */
 
 /** Port-specific settings **/