1) Use a separate config-<target>.h for Zen Vision(:M) (60GB)

2) Other unrelated cleanups


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@17503 a1c6a512-1295-4272-9138-f99709370657

1 files changed, 4 insertions, 12 deletions

diff --git a/firmware/export/config-creativezvm.h b/firmware/export/config-creativezvm.h
index 33a5105df7..ec5e1138e4 100644
--- a/firmware/export/config-creativezvm.h
+++ b/firmware/export/config-creativezvm.h
@@ -26,6 +26,9 @@
 
 #define CREATIVE_ZVM 1
 
+/* This makes it part of the Creative Zen Vision family :) */
+#define CREATIVE_ZVx 1
+
 /* For Rolo and boot loader */
 #define MODEL_NUMBER 26
 
@@ -56,13 +59,8 @@
 /* choose the lcd orientation. both work */
 #define CONFIG_ORIENTATION SCREEN_PORTRAIT
 
-#ifdef ZEN_VISION
-#define LCD_WIDTH  640
-#define LCD_HEIGHT 480
-#else
 #define LCD_WIDTH  320
 #define LCD_HEIGHT 240
-#endif
 
 #define LCD_DEPTH  16   /* 65k colours */
 #define LCD_PIXELFORMAT RGB565 /* rgb565 */
@@ -156,13 +154,7 @@
 /* Define this if you have adjustable CPU frequency */
 /* #define HAVE_ADJUSTABLE_CPU_FREQ */
 
-#ifdef ZEN_VISION
- #define BOOTFILE_EXT "zv"
-#elseif defined(ZVM_60GB)
- #define BOOTFILE_EXT "zvm60"
-#else
- #define BOOTFILE_EXT "zvm"
-#endif
+#define BOOTFILE_EXT "zvm"
 #define BOOTFILE "rockbox." BOOTFILE_EXT
 #define BOOTDIR "/.rockbox"