summaryrefslogtreecommitdiff
path: root/firmware
diff options
context:
space:
mode:
authorRafaël Carré <rafael.carre@gmail.com>2011-12-15 20:16:05 +0000
committerRafaël Carré <rafael.carre@gmail.com>2011-12-15 20:16:05 +0000
commitc6b9d3dcc9602a82b279ccdc93933f655e04031c (patch)
tree289ff94eca5cac13bd1ddca26873bc7335debf15 /firmware
parent7aff922682c4dbbc7f04279da7c3f89c2ff96d28 (diff)
There's not much to be shared between gigabeatf and gigabeats lcd code
Give the gigabeats a new lcd type git-svn-id: svn://svn.rockbox.org/rockbox/trunk@31290 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware')
-rw-r--r--firmware/SOURCES2
-rw-r--r--firmware/export/config.h1
-rw-r--r--firmware/export/config/gigabeats.h2
3 files changed, 3 insertions, 2 deletions
diff --git a/firmware/SOURCES b/firmware/SOURCES
index 4ffb12abb0..352e44d9a2 100644
--- a/firmware/SOURCES
+++ b/firmware/SOURCES
@@ -612,7 +612,7 @@ target/arm/as3525/lcd-fuze.c
target/arm/ipod/lcd-color_nano.c
#elif CONFIG_LCD == LCD_IPODMINI || CONFIG_LCD == LCD_IPOD2BPP
target/arm/ipod/lcd-gray.c
-#elif defined(GIGABEAT_S) /* FIXME: LCD_GIGABEAT */
+#elif CONFIG_LCD == LCD_GIGABEATS
target/arm/imx31/gigabeat-s/lcd-gigabeat-s.c
#elif CONFIG_LCD == LCD_GIGABEAT
target/arm/s3c2440/lcd-s3c2440.c
diff --git a/firmware/export/config.h b/firmware/export/config.h
index de47e5ebc3..039b48a759 100644
--- a/firmware/export/config.h
+++ b/firmware/export/config.h
@@ -231,6 +231,7 @@
#define LCD_CLIPZIP 43 /* as used by the Sandisk Sansa Clip Zip */
#define LCD_HX8340B 44 /* as used by the HiFiMAN HM-601/HM-602/HM-801 */
#define LCD_CONNECT 45 /* as used by the Sandisk Sansa Connect */
+#define LCD_GIGABEATS 46
/* LCD_PIXELFORMAT */
#define HORIZONTAL_PACKING 1
diff --git a/firmware/export/config/gigabeats.h b/firmware/export/config/gigabeats.h
index dbeff4aa04..0171dd8942 100644
--- a/firmware/export/config/gigabeats.h
+++ b/firmware/export/config/gigabeats.h
@@ -230,7 +230,7 @@
/* Define this to add support for ATA DMA */
#define HAVE_ATA_DMA
-#define CONFIG_LCD LCD_GIGABEAT
+#define CONFIG_LCD LCD_GIGABEATS
/* Offset ( in the firmware file's header ) to the file CRC */
#define FIRMWARE_OFFSET_FILE_CRC 0