diff options
Diffstat (limited to 'firmware/export/config.h')
-rw-r--r-- | firmware/export/config.h | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/firmware/export/config.h b/firmware/export/config.h index 89918f57b2..4d9636f3f9 100644 --- a/firmware/export/config.h +++ b/firmware/export/config.h | |||
@@ -317,7 +317,6 @@ Lyre prototype 1 */ | |||
317 | #define USBOTG_ARC 5020 /* PortalPlayer 502x and IMX233 */ | 317 | #define USBOTG_ARC 5020 /* PortalPlayer 502x and IMX233 */ |
318 | #define USBOTG_JZ4740 4740 /* Ingenic Jz4740/Jz4732 */ | 318 | #define USBOTG_JZ4740 4740 /* Ingenic Jz4740/Jz4732 */ |
319 | #define USBOTG_AS3525 3525 /* AMS AS3525 */ | 319 | #define USBOTG_AS3525 3525 /* AMS AS3525 */ |
320 | #define USBOTG_AS3525v2 3535 /* AMS AS3525v2 FIXME : same as S3C6400X */ | ||
321 | #define USBOTG_S3C6400X 6400 /* Samsung S3C6400X, also used in the S5L8701/S5L8702/S5L8720 */ | 320 | #define USBOTG_S3C6400X 6400 /* Samsung S3C6400X, also used in the S5L8701/S5L8702/S5L8720 */ |
322 | #define USBOTG_RK27XX 2700 /* Rockchip rk27xx */ | 321 | #define USBOTG_RK27XX 2700 /* Rockchip rk27xx */ |
323 | #define USBOTG_TNETV105 105 /* TI TNETV105 */ | 322 | #define USBOTG_TNETV105 105 /* TI TNETV105 */ |
@@ -803,7 +802,7 @@ Lyre prototype 1 */ | |||
803 | #elif CONFIG_USBOTG == USBOTG_AS3525 | 802 | #elif CONFIG_USBOTG == USBOTG_AS3525 |
804 | #define USB_STATUS_BY_EVENT | 803 | #define USB_STATUS_BY_EVENT |
805 | #define USB_DETECT_BY_CORE | 804 | #define USB_DETECT_BY_CORE |
806 | #elif CONFIG_USBOTG == USBOTG_AS3525v2 | 805 | #elif CONFIG_USBOTG == USBOTG_S3C6400X /* FIXME */ && CONFIG_CPU == AS3525v2 |
807 | #define USB_STATUS_BY_EVENT | 806 | #define USB_STATUS_BY_EVENT |
808 | #define USB_DETECT_BY_CORE | 807 | #define USB_DETECT_BY_CORE |
809 | #elif CONFIG_USBOTG == USBOTG_RK27XX | 808 | #elif CONFIG_USBOTG == USBOTG_RK27XX |
@@ -1046,7 +1045,7 @@ Lyre prototype 1 */ | |||
1046 | #define USB_HAS_INTERRUPT | 1045 | #define USB_HAS_INTERRUPT |
1047 | #elif defined(CPU_TCC780X) || defined(CPU_TCC77X) | 1046 | #elif defined(CPU_TCC780X) || defined(CPU_TCC77X) |
1048 | #define USB_HAS_BULK | 1047 | #define USB_HAS_BULK |
1049 | #elif CONFIG_USBOTG == USBOTG_S3C6400X || CONFIG_USBOTG == USBOTG_AS3525v2 | 1048 | #elif CONFIG_USBOTG == USBOTG_S3C6400X |
1050 | #define USB_HAS_BULK | 1049 | #define USB_HAS_BULK |
1051 | //#define USB_HAS_INTERRUPT -- seems to be broken | 1050 | //#define USB_HAS_INTERRUPT -- seems to be broken |
1052 | #endif /* CONFIG_USBOTG */ | 1051 | #endif /* CONFIG_USBOTG */ |
@@ -1061,10 +1060,9 @@ Lyre prototype 1 */ | |||
1061 | 1060 | ||
1062 | /* enable usb storage for targets that do bootloader usb */ | 1061 | /* enable usb storage for targets that do bootloader usb */ |
1063 | #if defined(HAVE_BOOTLOADER_USB_MODE) || \ | 1062 | #if defined(HAVE_BOOTLOADER_USB_MODE) || \ |
1064 | ((defined(CREATIVE_ZVx) || \ | 1063 | defined(CREATIVE_ZVx) || defined(CPU_TCC77X) || defined(CPU_TCC780X) || \ |
1065 | defined(CPU_TCC77X) || defined(CPU_TCC780X))) || \ | 1064 | CONFIG_USBOTG == USBOTG_JZ4740 || CONFIG_USBOTG == USBOTG_AS3525 || \ |
1066 | (CONFIG_USBOTG == USBOTG_JZ4740) || defined(IPOD_NANO2G) || \ | 1065 | CONFIG_USBOTG == USBOTG_S3C6400x |
1067 | CONFIG_USBOTG == USBOTG_AS3525 || CONFIG_USBOTG == USBOTG_AS3525v2 | ||
1068 | #define USB_ENABLE_STORAGE | 1066 | #define USB_ENABLE_STORAGE |
1069 | #endif | 1067 | #endif |
1070 | 1068 | ||