From cb8b6ad36992e26ef9efdb688045cb5f35aeebd1 Mon Sep 17 00:00:00 2001
From: Michael Sparmann <theseven@rockbox.org>
Date: Sun, 12 Dec 2010 01:03:14 +0000
Subject: 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
---
 firmware/export/config.h | 13 +++++++++----
 1 file 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 @@
 #define TCC7801      7801
 #define S5L8700      8700
 #define S5L8701      8701
+#define S5L8702      8702
 #define JZ4732       4732
 #define AS3525       3525
 #define AT91SAM9260  9260
@@ -213,6 +214,7 @@
 #define LCD_MINI2440  37 /* as used by the Mini2440 */
 #define LCD_HDD6330   38 /* as used by the Philips HDD6330 */
 #define LCD_VIBE500   39 /* as used by the Packard Bell Vibe 500 */
+#define LCD_IPOD6G    40 /* as used by the iPod Nano 2nd Generation */
 
 /* LCD_PIXELFORMAT */
 #define HORIZONTAL_PACKING 1
@@ -249,6 +251,7 @@ Lyre prototype 1 */
 #define I2C_S5L8700 13
 #define I2C_JZ47XX  14 /* Ingenic Jz47XX style */
 #define I2C_AS3525  15
+#define I2C_S5L8702 16 /* Same as S5L8700, but with two channels */
 
 /* CONFIG_LED */
 #define LED_REAL     1 /* SW controlled LED (Archos recorders, player) */
@@ -290,8 +293,8 @@ Lyre prototype 1 */
 #define USBOTG_ARC      5020 /* PortalPlayer 502x */
 #define USBOTG_JZ4740   4740 /* Ingenic Jz4740/Jz4732 */
 #define USBOTG_AS3525   3525 /* AMS AS3525 */
-#define USBOTG_AS3525v2 3535 /* AMS AS3525v2 FIXME : same than S3C6400X */
-#define USBOTG_S3C6400X 6400 /* Samsung S3C6400X, also used in the S5L8701 */
+#define USBOTG_AS3525v2 3535 /* AMS AS3525v2 FIXME : same as S3C6400X */
+#define USBOTG_S3C6400X 6400 /* Samsung S3C6400X, also used in the S5L8701/S5L8702/S5L8720 */
 
 /* Multiple cores */
 #define CPU 0
@@ -338,6 +341,8 @@ Lyre prototype 1 */
 #include "config/ipod4g.h"
 #elif defined(IPOD_NANO2G)
 #include "config/ipodnano2g.h"
+#elif defined(IPOD_6G)
+#include "config/ipod6g.h"
 #elif defined(IRIVER_IFP7XX)
 #include "config/iriverifp7xx.h"
 #elif defined(GIGABEAT_F)
@@ -475,7 +480,7 @@ Lyre prototype 1 */
 #endif
 
 /* define for all cpus from S5L870X family */
-#if (CONFIG_CPU == S5L8700) || (CONFIG_CPU == S5L8701)
+#if (CONFIG_CPU == S5L8700) || (CONFIG_CPU == S5L8701) || (CONFIG_CPU == S5L8702)
 #define CPU_S5L870X
 #endif
 
@@ -501,7 +506,7 @@ Lyre prototype 1 */
 
 #elif defined(CPU_TCC77X) || defined(CPU_TCC780X) || (CONFIG_CPU == DM320) \
   || (CONFIG_CPU == AT91SAM9260) || (CONFIG_CPU == AS3525v2) \
-  || (CONFIG_PLATFORM & PLATFORM_ANDROID)
+  || (CONFIG_CPU == S5L8702) || (CONFIG_PLATFORM & PLATFORM_ANDROID)
 #define CPU_ARM
 #define ARM_ARCH 5 /* ARMv5 */
 
-- 
cgit v1.2.3