summaryrefslogtreecommitdiff
path: root/firmware/export/config.h
diff options
context:
space:
mode:
Diffstat (limited to 'firmware/export/config.h')
-rw-r--r--firmware/export/config.h15
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