diff options
author | Michael Sparmann <theseven@rockbox.org> | 2010-12-12 01:03:14 +0000 |
---|---|---|
committer | Michael Sparmann <theseven@rockbox.org> | 2010-12-12 01:03:14 +0000 |
commit | cb8b6ad36992e26ef9efdb688045cb5f35aeebd1 (patch) | |
tree | ef13235196053bb11fd185f79e63f475ad4ce116 /firmware | |
parent | 40d640eb47be47ce6515ad92bb6baeceb52ac9af (diff) | |
download | rockbox-cb8b6ad36992e26ef9efdb688045cb5f35aeebd1.tar.gz rockbox-cb8b6ad36992e26ef9efdb688045cb5f35aeebd1.zip |
Really fix yellow this time, SVN only committed half of what I wanted...
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@28802 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware')
-rw-r--r-- | firmware/export/config.h | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/firmware/export/config.h b/firmware/export/config.h index 2618cf5c0b..0cc3251c70 100644 --- a/firmware/export/config.h +++ b/firmware/export/config.h | |||
@@ -69,6 +69,7 @@ | |||
69 | #define TCC7801 7801 | 69 | #define TCC7801 7801 |
70 | #define S5L8700 8700 | 70 | #define S5L8700 8700 |
71 | #define S5L8701 8701 | 71 | #define S5L8701 8701 |
72 | #define S5L8702 8702 | ||
72 | #define JZ4732 4732 | 73 | #define JZ4732 4732 |
73 | #define AS3525 3525 | 74 | #define AS3525 3525 |
74 | #define AT91SAM9260 9260 | 75 | #define AT91SAM9260 9260 |
@@ -213,6 +214,7 @@ | |||
213 | #define LCD_MINI2440 37 /* as used by the Mini2440 */ | 214 | #define LCD_MINI2440 37 /* as used by the Mini2440 */ |
214 | #define LCD_HDD6330 38 /* as used by the Philips HDD6330 */ | 215 | #define LCD_HDD6330 38 /* as used by the Philips HDD6330 */ |
215 | #define LCD_VIBE500 39 /* as used by the Packard Bell Vibe 500 */ | 216 | #define LCD_VIBE500 39 /* as used by the Packard Bell Vibe 500 */ |
217 | #define LCD_IPOD6G 40 /* as used by the iPod Nano 2nd Generation */ | ||
216 | 218 | ||
217 | /* LCD_PIXELFORMAT */ | 219 | /* LCD_PIXELFORMAT */ |
218 | #define HORIZONTAL_PACKING 1 | 220 | #define HORIZONTAL_PACKING 1 |
@@ -249,6 +251,7 @@ Lyre prototype 1 */ | |||
249 | #define I2C_S5L8700 13 | 251 | #define I2C_S5L8700 13 |
250 | #define I2C_JZ47XX 14 /* Ingenic Jz47XX style */ | 252 | #define I2C_JZ47XX 14 /* Ingenic Jz47XX style */ |
251 | #define I2C_AS3525 15 | 253 | #define I2C_AS3525 15 |
254 | #define I2C_S5L8702 16 /* Same as S5L8700, but with two channels */ | ||
252 | 255 | ||
253 | /* CONFIG_LED */ | 256 | /* CONFIG_LED */ |
254 | #define LED_REAL 1 /* SW controlled LED (Archos recorders, player) */ | 257 | #define LED_REAL 1 /* SW controlled LED (Archos recorders, player) */ |
@@ -290,8 +293,8 @@ Lyre prototype 1 */ | |||
290 | #define USBOTG_ARC 5020 /* PortalPlayer 502x */ | 293 | #define USBOTG_ARC 5020 /* PortalPlayer 502x */ |
291 | #define USBOTG_JZ4740 4740 /* Ingenic Jz4740/Jz4732 */ | 294 | #define USBOTG_JZ4740 4740 /* Ingenic Jz4740/Jz4732 */ |
292 | #define USBOTG_AS3525 3525 /* AMS AS3525 */ | 295 | #define USBOTG_AS3525 3525 /* AMS AS3525 */ |
293 | #define USBOTG_AS3525v2 3535 /* AMS AS3525v2 FIXME : same than S3C6400X */ | 296 | #define USBOTG_AS3525v2 3535 /* AMS AS3525v2 FIXME : same as S3C6400X */ |
294 | #define USBOTG_S3C6400X 6400 /* Samsung S3C6400X, also used in the S5L8701 */ | 297 | #define USBOTG_S3C6400X 6400 /* Samsung S3C6400X, also used in the S5L8701/S5L8702/S5L8720 */ |
295 | 298 | ||
296 | /* Multiple cores */ | 299 | /* Multiple cores */ |
297 | #define CPU 0 | 300 | #define CPU 0 |
@@ -338,6 +341,8 @@ Lyre prototype 1 */ | |||
338 | #include "config/ipod4g.h" | 341 | #include "config/ipod4g.h" |
339 | #elif defined(IPOD_NANO2G) | 342 | #elif defined(IPOD_NANO2G) |
340 | #include "config/ipodnano2g.h" | 343 | #include "config/ipodnano2g.h" |
344 | #elif defined(IPOD_6G) | ||
345 | #include "config/ipod6g.h" | ||
341 | #elif defined(IRIVER_IFP7XX) | 346 | #elif defined(IRIVER_IFP7XX) |
342 | #include "config/iriverifp7xx.h" | 347 | #include "config/iriverifp7xx.h" |
343 | #elif defined(GIGABEAT_F) | 348 | #elif defined(GIGABEAT_F) |
@@ -475,7 +480,7 @@ Lyre prototype 1 */ | |||
475 | #endif | 480 | #endif |
476 | 481 | ||
477 | /* define for all cpus from S5L870X family */ | 482 | /* define for all cpus from S5L870X family */ |
478 | #if (CONFIG_CPU == S5L8700) || (CONFIG_CPU == S5L8701) | 483 | #if (CONFIG_CPU == S5L8700) || (CONFIG_CPU == S5L8701) || (CONFIG_CPU == S5L8702) |
479 | #define CPU_S5L870X | 484 | #define CPU_S5L870X |
480 | #endif | 485 | #endif |
481 | 486 | ||
@@ -501,7 +506,7 @@ Lyre prototype 1 */ | |||
501 | 506 | ||
502 | #elif defined(CPU_TCC77X) || defined(CPU_TCC780X) || (CONFIG_CPU == DM320) \ | 507 | #elif defined(CPU_TCC77X) || defined(CPU_TCC780X) || (CONFIG_CPU == DM320) \ |
503 | || (CONFIG_CPU == AT91SAM9260) || (CONFIG_CPU == AS3525v2) \ | 508 | || (CONFIG_CPU == AT91SAM9260) || (CONFIG_CPU == AS3525v2) \ |
504 | || (CONFIG_PLATFORM & PLATFORM_ANDROID) | 509 | || (CONFIG_CPU == S5L8702) || (CONFIG_PLATFORM & PLATFORM_ANDROID) |
505 | #define CPU_ARM | 510 | #define CPU_ARM |
506 | #define ARM_ARCH 5 /* ARMv5 */ | 511 | #define ARM_ARCH 5 /* ARMv5 */ |
507 | 512 | ||