From 2392bb41996963c6683253114bdfb3174146e7dc Mon Sep 17 00:00:00 2001 From: Rafaël Carré Date: Thu, 31 Dec 2009 19:15:20 +0000 Subject: 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 --- firmware/export/config.h | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) (limited to 'firmware/export/config.h') 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 @@ #define JZ4732 4732 #define AS3525 3525 #define AT91SAM9260 9260 +#define AS3525v2 35252 /* CONFIG_KEYPAD */ #define PLAYER_PAD 1 @@ -377,6 +378,8 @@ Lyre prototype 1 */ #include "config/ondavx767.h" #elif defined(SANSA_CLIP) #include "config/sansaclip.h" +#elif defined(SANSA_CLIPV2) +#include "config/sansaclipv2.h" #elif defined(SANSA_E200V2) #include "config/sansae200v2.h" #elif defined(SANSA_M200V4) @@ -456,15 +459,13 @@ Lyre prototype 1 */ #if (CONFIG_CPU == IMX31L) #define CPU_ARM #define ARM_ARCH 6 /* ARMv6 */ -#endif -#if defined(CPU_TCC77X) || defined(CPU_TCC780X) || (CONFIG_CPU == DM320) \ - || (CONFIG_CPU == AT91SAM9260) +#elif defined(CPU_TCC77X) || defined(CPU_TCC780X) || (CONFIG_CPU == DM320) \ + || (CONFIG_CPU == AT91SAM9260) || (CONFIG_CPU == AS3525v2) #define CPU_ARM #define ARM_ARCH 5 /* ARMv5 */ -#endif -#if defined(CPU_PP) || (CONFIG_CPU == PNX0101) || (CONFIG_CPU == S3C2440) \ +#elif defined(CPU_PP) || (CONFIG_CPU == PNX0101) || (CONFIG_CPU == S3C2440) \ || (CONFIG_CPU == DSC25) || defined(CPU_S5L870X) || (CONFIG_CPU == AS3525) #define CPU_ARM #define ARM_ARCH 4 /* ARMv4 */ @@ -675,8 +676,8 @@ Lyre prototype 1 */ #endif /* BOOTLOADER */ #if defined(HAVE_USBSTACK) || (CONFIG_CPU == JZ4732) \ - || (CONFIG_CPU == AS3525) || (CONFIG_CPU == S3C2440) \ - || defined(CPU_S5L870X) + || (CONFIG_CPU == AS3525) || (CONFIG_CPU == AS3525v2) \ + || defined(CPU_S5L870X) || (CONFIG_CPU == S3C2440) #define HAVE_WAKEUP_OBJECTS #endif -- cgit v1.2.3