diff options
author | Solomon Peachy <pizza@shaftnet.org> | 2018-06-28 06:24:26 -0400 |
---|---|---|
committer | Michael Giacomelli <giac2000@hotmail.com> | 2018-07-28 10:56:31 -0400 |
commit | 0662793ca0050e823cd1207cc4689a1cba5068bd (patch) | |
tree | 08cd2ec59c9044c96b697b5bf8d0640841d044e0 /firmware/export/config.h | |
parent | b3e2bd619b1b7ea94ef29d32db48e80b347a1990 (diff) | |
download | rockbox-0662793ca0050e823cd1207cc4689a1cba5068bd.tar.gz rockbox-0662793ca0050e823cd1207cc4689a1cba5068bd.zip |
Add cleaned-up xDuoo X3 support
Cleaned up, rebased, and forward-ported from the xvortex fork.
(original credit to vsoftster@gmail.com)
Change-Id: Ibcc023a0271ea81e901450a88317708c2683236d
Signed-off-by: Solomon Peachy <pizza@shaftnet.org>
Diffstat (limited to 'firmware/export/config.h')
-rw-r--r-- | firmware/export/config.h | 23 |
1 files changed, 16 insertions, 7 deletions
diff --git a/firmware/export/config.h b/firmware/export/config.h index e362000c18..b7a355ce54 100644 --- a/firmware/export/config.h +++ b/firmware/export/config.h | |||
@@ -82,6 +82,7 @@ | |||
82 | #define S5L8701 8701 | 82 | #define S5L8701 8701 |
83 | #define S5L8702 8702 | 83 | #define S5L8702 8702 |
84 | #define JZ4732 4732 | 84 | #define JZ4732 4732 |
85 | #define JZ4760B 47602 | ||
85 | #define AS3525 3525 | 86 | #define AS3525 3525 |
86 | #define AT91SAM9260 9260 | 87 | #define AT91SAM9260 9260 |
87 | #define AS3525v2 35252 | 88 | #define AS3525v2 35252 |
@@ -162,11 +163,12 @@ | |||
162 | #define CREATIVE_ZEN_PAD 58 | 163 | #define CREATIVE_ZEN_PAD 58 |
163 | #define SAMSUNG_YPZ5_PAD 59 | 164 | #define SAMSUNG_YPZ5_PAD 59 |
164 | #define IHIFI_PAD 60 | 165 | #define IHIFI_PAD 60 |
165 | #define SAMSUNG_YPR1_PAD 61 | 166 | #define SAMSUNG_YPR1_PAD 61 |
166 | #define SAMSUNG_YH92X_PAD 62 | 167 | #define SAMSUNG_YH92X_PAD 62 |
167 | #define DX50_PAD 63 | 168 | #define DX50_PAD 63 |
168 | #define SONY_NWZA860_PAD 64 /* The NWZ-A860 is too different (touchscreen) */ | 169 | #define SONY_NWZA860_PAD 64 /* The NWZ-A860 is too different (touchscreen) */ |
169 | #define AGPTEK_ROCKER_PAD 65 | 170 | #define AGPTEK_ROCKER_PAD 65 |
171 | #define XDUOO_X3_PAD 66 | ||
170 | 172 | ||
171 | /* CONFIG_POWER_SAVE combinable bit flags*/ | 173 | /* CONFIG_POWER_SAVE combinable bit flags*/ |
172 | #define POWERSV_CPU 0x1 | 174 | #define POWERSV_CPU 0x1 |
@@ -287,6 +289,7 @@ | |||
287 | #define LCD_SAMSUNGYPR1 62 /* as used by Samsung YP-R1 */ | 289 | #define LCD_SAMSUNGYPR1 62 /* as used by Samsung YP-R1 */ |
288 | #define LCD_NWZ_LINUX 63 /* as used in the Linux-based NWZ series */ | 290 | #define LCD_NWZ_LINUX 63 /* as used in the Linux-based NWZ series */ |
289 | #define LCD_INGENIC_LINUX 64 | 291 | #define LCD_INGENIC_LINUX 64 |
292 | #define LCD_XDUOOX3 65 /* as used by the xDuoo X3 */ | ||
290 | 293 | ||
291 | /* LCD_PIXELFORMAT */ | 294 | /* LCD_PIXELFORMAT */ |
292 | #define HORIZONTAL_PACKING 1 | 295 | #define HORIZONTAL_PACKING 1 |
@@ -358,12 +361,13 @@ Lyre prototype 1 */ | |||
358 | #define RTC_MC13783 13 /* Freescale MC13783 PMIC */ | 361 | #define RTC_MC13783 13 /* Freescale MC13783 PMIC */ |
359 | #define RTC_S5L8700 14 | 362 | #define RTC_S5L8700 14 |
360 | #define RTC_S35390A 15 | 363 | #define RTC_S35390A 15 |
361 | #define RTC_JZ47XX 16 /* Ingenic Jz47XX */ | 364 | #define RTC_JZ4740 16 /* Ingenic Jz4740 */ |
362 | #define RTC_NANO2G 17 /* This seems to be a PCF5063x */ | 365 | #define RTC_NANO2G 17 /* This seems to be a PCF5063x */ |
363 | #define RTC_D2 18 /* Either PCF50606 or PCF50635 */ | 366 | #define RTC_D2 18 /* Either PCF50606 or PCF50635 */ |
364 | #define RTC_S35380A 19 | 367 | #define RTC_S35380A 19 |
365 | #define RTC_IMX233 20 | 368 | #define RTC_IMX233 20 |
366 | #define RTC_STM41T62 21 /* ST M41T62 */ | 369 | #define RTC_STM41T62 21 /* ST M41T62 */ |
370 | #define RTC_JZ4760 22 /* Ingenic Jz4760 */ | ||
367 | 371 | ||
368 | /* USB On-the-go */ | 372 | /* USB On-the-go */ |
369 | #define USBOTG_M66591 6591 /* M:Robe 500 */ | 373 | #define USBOTG_M66591 6591 /* M:Robe 500 */ |
@@ -372,6 +376,7 @@ Lyre prototype 1 */ | |||
372 | #define USBOTG_M5636 5636 /* iAudio X5 */ | 376 | #define USBOTG_M5636 5636 /* iAudio X5 */ |
373 | #define USBOTG_ARC 5020 /* PortalPlayer 502x and IMX233 */ | 377 | #define USBOTG_ARC 5020 /* PortalPlayer 502x and IMX233 */ |
374 | #define USBOTG_JZ4740 4740 /* Ingenic Jz4740/Jz4732 */ | 378 | #define USBOTG_JZ4740 4740 /* Ingenic Jz4740/Jz4732 */ |
379 | #define USBOTG_JZ4760 4760 /* Ingenic Jz4760/Jz4760B */ | ||
375 | #define USBOTG_AS3525 3525 /* AMS AS3525 */ | 380 | #define USBOTG_AS3525 3525 /* AMS AS3525 */ |
376 | #define USBOTG_S3C6400X 6400 /* Samsung S3C6400X, also used in the S5L8701/S5L8702/S5L8720 */ | 381 | #define USBOTG_S3C6400X 6400 /* Samsung S3C6400X, also used in the S5L8701/S5L8702/S5L8720 */ |
377 | #define USBOTG_DESIGNWARE 6401 /* Synopsys DesignWare OTG, used in S5L8701/S5L8702/S5L8720/AS3252v2 */ | 382 | #define USBOTG_DESIGNWARE 6401 /* Synopsys DesignWare OTG, used in S5L8701/S5L8702/S5L8720/AS3252v2 */ |
@@ -612,6 +617,8 @@ Lyre prototype 1 */ | |||
612 | #include "config/sonynwze350.h" | 617 | #include "config/sonynwze350.h" |
613 | #elif defined(AGPTEK_ROCKER) | 618 | #elif defined(AGPTEK_ROCKER) |
614 | #include "config/agptekrocker.h" | 619 | #include "config/agptekrocker.h" |
620 | #elif defined(XDUOO_X3) | ||
621 | #include "config/xduoox3.h" | ||
615 | #else | 622 | #else |
616 | /* no known platform */ | 623 | /* no known platform */ |
617 | #endif | 624 | #endif |
@@ -980,7 +987,7 @@ Lyre prototype 1 */ | |||
980 | 987 | ||
981 | #endif /* BOOTLOADER */ | 988 | #endif /* BOOTLOADER */ |
982 | 989 | ||
983 | #if defined(HAVE_USBSTACK) || (CONFIG_CPU == JZ4732) \ | 990 | #if defined(HAVE_USBSTACK) || (CONFIG_CPU == JZ4732) || (CONFIG_CPU == JZ4760B) \ |
984 | || (CONFIG_CPU == AS3525) || (CONFIG_CPU == AS3525v2) \ | 991 | || (CONFIG_CPU == AS3525) || (CONFIG_CPU == AS3525v2) \ |
985 | || defined(CPU_S5L870X) || (CONFIG_CPU == S3C2440) \ | 992 | || defined(CPU_S5L870X) || (CONFIG_CPU == S3C2440) \ |
986 | || defined(APPLICATION) || (CONFIG_CPU == PP5002) \ | 993 | || defined(APPLICATION) || (CONFIG_CPU == PP5002) \ |
@@ -1057,14 +1064,14 @@ Lyre prototype 1 */ | |||
1057 | (CONFIG_CPU == TCC7801) || \ | 1064 | (CONFIG_CPU == TCC7801) || \ |
1058 | (CONFIG_CPU == IMX233 && !defined(PLUGIN) && !defined(CODEC)) || /* IMX233: core only */ \ | 1065 | (CONFIG_CPU == IMX233 && !defined(PLUGIN) && !defined(CODEC)) || /* IMX233: core only */ \ |
1059 | defined(CPU_S5L870X)) || /* Samsung S5L8700: core, plugins, codecs */ \ | 1066 | defined(CPU_S5L870X)) || /* Samsung S5L8700: core, plugins, codecs */ \ |
1060 | (CONFIG_CPU == JZ4732 && !defined(PLUGIN) && !defined(CODEC)) /* Jz4740: core only */ | 1067 | ((CONFIG_CPU == JZ4732 || CONFIG_CPU == JZ4760B) && !defined(PLUGIN) && !defined(CODEC)) /* Jz47XX: core only */ |
1061 | #define ICODE_ATTR __attribute__ ((section(".icode"))) | 1068 | #define ICODE_ATTR __attribute__ ((section(".icode"))) |
1062 | #define ICONST_ATTR __attribute__ ((section(".irodata"))) | 1069 | #define ICONST_ATTR __attribute__ ((section(".irodata"))) |
1063 | #define IDATA_ATTR __attribute__ ((section(".idata"))) | 1070 | #define IDATA_ATTR __attribute__ ((section(".idata"))) |
1064 | #define IBSS_ATTR __attribute__ ((section(".ibss"))) | 1071 | #define IBSS_ATTR __attribute__ ((section(".ibss"))) |
1065 | #define USE_IRAM | 1072 | #define USE_IRAM |
1066 | #if CONFIG_CPU != SH7034 && (CONFIG_CPU != AS3525 || MEMORYSIZE > 2) \ | 1073 | #if CONFIG_CPU != SH7034 && (CONFIG_CPU != AS3525 || MEMORYSIZE > 2) \ |
1067 | && CONFIG_CPU != JZ4732 && CONFIG_CPU != AS3525v2 && CONFIG_CPU != IMX233 | 1074 | && CONFIG_CPU != JZ4732 && CONFIG_CPU != JZ4760B && CONFIG_CPU != AS3525v2 && CONFIG_CPU != IMX233 |
1068 | #define PLUGIN_USE_IRAM | 1075 | #define PLUGIN_USE_IRAM |
1069 | #endif | 1076 | #endif |
1070 | #else | 1077 | #else |
@@ -1207,6 +1214,7 @@ Lyre prototype 1 */ | |||
1207 | #define USB_HAS_BULK | 1214 | #define USB_HAS_BULK |
1208 | #elif (CONFIG_USBOTG == USBOTG_ARC) || \ | 1215 | #elif (CONFIG_USBOTG == USBOTG_ARC) || \ |
1209 | (CONFIG_USBOTG == USBOTG_JZ4740) || \ | 1216 | (CONFIG_USBOTG == USBOTG_JZ4740) || \ |
1217 | (CONFIG_USBOTG == USBOTG_JZ4760) || \ | ||
1210 | (CONFIG_USBOTG == USBOTG_M66591) || \ | 1218 | (CONFIG_USBOTG == USBOTG_M66591) || \ |
1211 | (CONFIG_USBOTG == USBOTG_DESIGNWARE) || \ | 1219 | (CONFIG_USBOTG == USBOTG_DESIGNWARE) || \ |
1212 | (CONFIG_USBOTG == USBOTG_AS3525) | 1220 | (CONFIG_USBOTG == USBOTG_AS3525) |
@@ -1231,7 +1239,8 @@ Lyre prototype 1 */ | |||
1231 | #if defined(HAVE_BOOTLOADER_USB_MODE) || \ | 1239 | #if defined(HAVE_BOOTLOADER_USB_MODE) || \ |
1232 | defined(CREATIVE_ZVx) || defined(CPU_TCC77X) || defined(CPU_TCC780X) || \ | 1240 | defined(CREATIVE_ZVx) || defined(CPU_TCC77X) || defined(CPU_TCC780X) || \ |
1233 | CONFIG_USBOTG == USBOTG_JZ4740 || CONFIG_USBOTG == USBOTG_AS3525 || \ | 1241 | CONFIG_USBOTG == USBOTG_JZ4740 || CONFIG_USBOTG == USBOTG_AS3525 || \ |
1234 | CONFIG_USBOTG == USBOTG_S3C6400X || CONFIG_USBOTG == USBOTG_DESIGNWARE | 1242 | CONFIG_USBOTG == USBOTG_S3C6400X || CONFIG_USBOTG == USBOTG_DESIGNWARE || \ |
1243 | CONFIG_USBOTG == USBOTG_JZ4760 | ||
1235 | #define USB_ENABLE_STORAGE | 1244 | #define USB_ENABLE_STORAGE |
1236 | #endif | 1245 | #endif |
1237 | 1246 | ||