diff options
| author | Rafaël Carré <rafael.carre@gmail.com> | 2009-12-31 19:15:20 +0000 |
|---|---|---|
| committer | Rafaël Carré <rafael.carre@gmail.com> | 2009-12-31 19:15:20 +0000 |
| commit | 2392bb41996963c6683253114bdfb3174146e7dc (patch) | |
| tree | 3846475be5d2ac2f472fbac22781868ab0b0c60e /firmware/export/config.h | |
| parent | 822abc12360900030323560b92a440f425b5641a (diff) | |
| download | rockbox-2392bb41996963c6683253114bdfb3174146e7dc.tar.gz rockbox-2392bb41996963c6683253114bdfb3174146e7dc.zip | |
FS#10047 : Clipv2
Reuse some code from Clip (LCD) and a lot of code from AS3525
Add a new CPU type : AS3525v2, identical to AS3525 except it's an ARMv5 (arm926-ejs)
SD code still not working
For an unknown reason LCD doesn't work anymore (to be investigated)
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24131 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware/export/config.h')
| -rw-r--r-- | firmware/export/config.h | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/firmware/export/config.h b/firmware/export/config.h index 01933dadf2..2b7c6d8663 100644 --- a/firmware/export/config.h +++ b/firmware/export/config.h | |||
| @@ -71,6 +71,7 @@ | |||
| 71 | #define JZ4732 4732 | 71 | #define JZ4732 4732 |
| 72 | #define AS3525 3525 | 72 | #define AS3525 3525 |
| 73 | #define AT91SAM9260 9260 | 73 | #define AT91SAM9260 9260 |
| 74 | #define AS3525v2 35252 | ||
| 74 | 75 | ||
| 75 | /* CONFIG_KEYPAD */ | 76 | /* CONFIG_KEYPAD */ |
| 76 | #define PLAYER_PAD 1 | 77 | #define PLAYER_PAD 1 |
| @@ -377,6 +378,8 @@ Lyre prototype 1 */ | |||
| 377 | #include "config/ondavx767.h" | 378 | #include "config/ondavx767.h" |
| 378 | #elif defined(SANSA_CLIP) | 379 | #elif defined(SANSA_CLIP) |
| 379 | #include "config/sansaclip.h" | 380 | #include "config/sansaclip.h" |
| 381 | #elif defined(SANSA_CLIPV2) | ||
| 382 | #include "config/sansaclipv2.h" | ||
| 380 | #elif defined(SANSA_E200V2) | 383 | #elif defined(SANSA_E200V2) |
| 381 | #include "config/sansae200v2.h" | 384 | #include "config/sansae200v2.h" |
| 382 | #elif defined(SANSA_M200V4) | 385 | #elif defined(SANSA_M200V4) |
| @@ -456,15 +459,13 @@ Lyre prototype 1 */ | |||
| 456 | #if (CONFIG_CPU == IMX31L) | 459 | #if (CONFIG_CPU == IMX31L) |
| 457 | #define CPU_ARM | 460 | #define CPU_ARM |
| 458 | #define ARM_ARCH 6 /* ARMv6 */ | 461 | #define ARM_ARCH 6 /* ARMv6 */ |
| 459 | #endif | ||
| 460 | 462 | ||
| 461 | #if defined(CPU_TCC77X) || defined(CPU_TCC780X) || (CONFIG_CPU == DM320) \ | 463 | #elif defined(CPU_TCC77X) || defined(CPU_TCC780X) || (CONFIG_CPU == DM320) \ |
| 462 | || (CONFIG_CPU == AT91SAM9260) | 464 | || (CONFIG_CPU == AT91SAM9260) || (CONFIG_CPU == AS3525v2) |
| 463 | #define CPU_ARM | 465 | #define CPU_ARM |
| 464 | #define ARM_ARCH 5 /* ARMv5 */ | 466 | #define ARM_ARCH 5 /* ARMv5 */ |
| 465 | #endif | ||
| 466 | 467 | ||
| 467 | #if defined(CPU_PP) || (CONFIG_CPU == PNX0101) || (CONFIG_CPU == S3C2440) \ | 468 | #elif defined(CPU_PP) || (CONFIG_CPU == PNX0101) || (CONFIG_CPU == S3C2440) \ |
| 468 | || (CONFIG_CPU == DSC25) || defined(CPU_S5L870X) || (CONFIG_CPU == AS3525) | 469 | || (CONFIG_CPU == DSC25) || defined(CPU_S5L870X) || (CONFIG_CPU == AS3525) |
| 469 | #define CPU_ARM | 470 | #define CPU_ARM |
| 470 | #define ARM_ARCH 4 /* ARMv4 */ | 471 | #define ARM_ARCH 4 /* ARMv4 */ |
| @@ -675,8 +676,8 @@ Lyre prototype 1 */ | |||
| 675 | #endif /* BOOTLOADER */ | 676 | #endif /* BOOTLOADER */ |
| 676 | 677 | ||
| 677 | #if defined(HAVE_USBSTACK) || (CONFIG_CPU == JZ4732) \ | 678 | #if defined(HAVE_USBSTACK) || (CONFIG_CPU == JZ4732) \ |
| 678 | || (CONFIG_CPU == AS3525) || (CONFIG_CPU == S3C2440) \ | 679 | || (CONFIG_CPU == AS3525) || (CONFIG_CPU == AS3525v2) \ |
| 679 | || defined(CPU_S5L870X) | 680 | || defined(CPU_S5L870X) || (CONFIG_CPU == S3C2440) |
| 680 | #define HAVE_WAKEUP_OBJECTS | 681 | #define HAVE_WAKEUP_OBJECTS |
| 681 | #endif | 682 | #endif |
| 682 | 683 | ||