summaryrefslogtreecommitdiff
path: root/firmware/export
diff options
context:
space:
mode:
authorCástor Muñoz <cmvidal@gmail.com>2016-02-05 02:02:02 +0100
committerCástor Muñoz <cmvidal@gmail.com>2017-02-09 20:47:16 +0100
commit882921efb64218e9b8cc3a7d9c7308734f9b12f3 (patch)
treefca2e1b77104419156a07c6b6d80fa7af9fa3969 /firmware/export
parent0d0b163dd15c35a427c8bb2bbd7b906afe9c491d (diff)
downloadrockbox-882921efb64218e9b8cc3a7d9c7308734f9b12f3.tar.gz
rockbox-882921efb64218e9b8cc3a7d9c7308734f9b12f3.zip
ipod6g: bootloader v1bootloader_ipod6g_v1
- dual boot - USB mode - battery trap Change-Id: I8586cfeb21ee63f45ab965430725225fdfc4212d
Diffstat (limited to 'firmware/export')
-rw-r--r--firmware/export/config.h4
-rw-r--r--firmware/export/config/ipod6g.h13
2 files changed, 17 insertions, 0 deletions
diff --git a/firmware/export/config.h b/firmware/export/config.h
index e7cfc698df..efad75f1b2 100644
--- a/firmware/export/config.h
+++ b/firmware/export/config.h
@@ -872,8 +872,12 @@ Lyre prototype 1 */
872#ifdef HAVE_BOOTLOADER_USB_MODE 872#ifdef HAVE_BOOTLOADER_USB_MODE
873/* Priority in bootloader is wanted */ 873/* Priority in bootloader is wanted */
874#define HAVE_PRIORITY_SCHEDULING 874#define HAVE_PRIORITY_SCHEDULING
875#if (CONFIG_CPU == S5L8702)
876#define USB_DRIVER_CLOSE
877#else
875#define USB_STATUS_BY_EVENT 878#define USB_STATUS_BY_EVENT
876#define USB_DETECT_BY_REQUEST 879#define USB_DETECT_BY_REQUEST
880#endif
877#if defined(HAVE_USBSTACK) && CONFIG_USBOTG == USBOTG_ARC 881#if defined(HAVE_USBSTACK) && CONFIG_USBOTG == USBOTG_ARC
878#define INCLUDE_TIMEOUT_API 882#define INCLUDE_TIMEOUT_API
879#define USB_DRIVER_CLOSE 883#define USB_DRIVER_CLOSE
diff --git a/firmware/export/config/ipod6g.h b/firmware/export/config/ipod6g.h
index 01934a0cc2..5494cf387a 100644
--- a/firmware/export/config/ipod6g.h
+++ b/firmware/export/config/ipod6g.h
@@ -248,14 +248,27 @@
248#define USB_VENDOR_ID 0x05AC 248#define USB_VENDOR_ID 0x05AC
249#define USB_PRODUCT_ID 0x1261 249#define USB_PRODUCT_ID 0x1261
250#define USB_DEVBSS_ATTR __attribute__((aligned(32))) 250#define USB_DEVBSS_ATTR __attribute__((aligned(32)))
251#define HAVE_BOOTLOADER_USB_MODE
252#ifdef BOOTLOADER
253#define USBPOWER_BTN_IGNORE (~0)
254#endif
251 255
252#define USB_READ_BUFFER_SIZE (1024*24) 256#define USB_READ_BUFFER_SIZE (1024*24)
253 257
258/* Serial */
259#ifdef BOOTLOADER
260#if 0 /* Enable/disable LOGF_SERIAL for bootloader */
261#define HAVE_SERIAL
262#define ROCKBOX_HAS_LOGF
263#define LOGF_SERIAL
264#endif
265#else /* !BOOTLOADER */
254#define HAVE_SERIAL 266#define HAVE_SERIAL
255/* Disable iAP when LOGF_SERIAL is enabled to avoid conflicts */ 267/* Disable iAP when LOGF_SERIAL is enabled to avoid conflicts */
256#ifndef LOGF_SERIAL 268#ifndef LOGF_SERIAL
257#define IPOD_ACCESSORY_PROTOCOL 269#define IPOD_ACCESSORY_PROTOCOL
258#endif 270#endif
271#endif
259 272
260/* Define this if you can switch on/off the accessory power supply */ 273/* Define this if you can switch on/off the accessory power supply */
261#define HAVE_ACCESSORY_SUPPLY 274#define HAVE_ACCESSORY_SUPPLY