summaryrefslogtreecommitdiffstats
path: root/firmware
diff options
context:
space:
mode:
authorDave Chapman <dave@dchapman.com>2011-02-27 11:37:39 +0000
committerDave Chapman <dave@dchapman.com>2011-02-27 11:37:39 +0000
commit376c9f3ad0c257ee97d7eba03962f232e85b36a7 (patch)
tree3323dfd60b82814af115b4c436ea8680ca9da978 /firmware
parent9501986047056c9f6ca954817ae597e302028f2e (diff)
downloadrockbox-376c9f3ad0c257ee97d7eba03962f232e85b36a7.tar.gz
rockbox-376c9f3ad0c257ee97d7eba03962f232e85b36a7.zip
FS#11966 - use separate modelnames and config files for RaaA. This adds an APPLICATION define that can be used in Makefiles, and target-name defines (-DSDLAPP, -DANDROID, -DNOKIAN8XX and -DNOKIAN900) for use elsewhere. LCD size is now hard-coded for the Nokia builds in their config files. A new --app parameter is passed to buildzip.pl to explicitly state that this is an application build - it was previously derived from the model name.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@29418 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware')
-rw-r--r--firmware/export/config.h16
-rw-r--r--firmware/export/config/android.h99
-rw-r--r--firmware/export/config/nokian8xx.h97
-rw-r--r--firmware/export/config/nokian900.h (renamed from firmware/export/config/application.h)36
-rw-r--r--firmware/export/config/sdlapp.h101
5 files changed, 312 insertions, 37 deletions
diff --git a/firmware/export/config.h b/firmware/export/config.h
index a870e5d815..1783cc137d 100644
--- a/firmware/export/config.h
+++ b/firmware/export/config.h
@@ -440,13 +440,21 @@ Lyre prototype 1 */
#include "config/mpiohd200.h"
#elif defined(MPIO_HD300)
#include "config/mpiohd300.h"
+#elif defined(SDLAPP)
+#include "config/sdlapp.h"
+#elif defined(ANDROID)
+#include "config/android.h"
+#elif defined(NOKIAN8XX)
+#include "config/nokian8xx.h"
+#elif defined(NOKIAN900)
+#include "config/nokian900.h"
+#else
+/* no known platform */
+#endif
-#elif defined(APPLICATION)
-#include "config/application.h"
+#ifdef APPLICATION
#define CONFIG_CPU 0
#define CONFIG_STORAGE 0
-#else
-/* no known platform */
#endif
/* keep this include after the target configs */
diff --git a/firmware/export/config/android.h b/firmware/export/config/android.h
new file mode 100644
index 0000000000..db214d28b1
--- /dev/null
+++ b/firmware/export/config/android.h
@@ -0,0 +1,99 @@
+/*
+ * This config file is for Rockbox as an application on Android
+ */
+#define TARGET_TREE /* this target is using the target tree system */
+
+/* We don't run on hardware directly */
+#define CONFIG_PLATFORM (PLATFORM_HOSTED|PLATFORM_ANDROID)
+
+/* For Rolo and boot loader */
+#define MODEL_NUMBER 100
+
+#define MODEL_NAME "Rockbox"
+
+#define USB_NONE
+
+/* define this if you have a bitmap LCD display */
+#define HAVE_LCD_BITMAP
+
+/* define this if you have a colour LCD */
+#define HAVE_LCD_COLOR
+
+/* define this if you want album art for this target */
+#define HAVE_ALBUMART
+
+/* define this to enable bitmap scaling */
+#define HAVE_BMP_SCALING
+
+/* define this to enable JPEG decoding */
+#define HAVE_JPEG
+
+/* define this if you have access to the quickscreen */
+#define HAVE_QUICKSCREEN
+/* define this if you have access to the pitchscreen */
+#define HAVE_PITCHSCREEN
+
+/* define this if you would like tagcache to build on this target */
+#define HAVE_TAGCACHE
+
+/* LCD dimensions
+ *
+ * overriden by configure for application builds */
+#ifndef LCD_WIDTH
+#define LCD_WIDTH 320
+#endif
+
+#ifndef LCD_HEIGHT
+#define LCD_HEIGHT 480
+#endif
+
+#define LCD_DEPTH 16
+#define LCD_PIXELFORMAT 565
+
+#define HAVE_LCD_ENABLE
+
+/* define this to indicate your device's keypad */
+#define HAVE_TOUCHSCREEN
+#define HAVE_BUTTON_DATA
+
+/* define this if you have RTC RAM available for settings */
+//#define HAVE_RTC_RAM
+
+/* The number of bytes reserved for loadable codecs */
+#define CODEC_SIZE 0x100000
+
+/* The number of bytes reserved for loadable plugins */
+#define PLUGIN_BUFFER_SIZE 0x80000
+
+#define AB_REPEAT_ENABLE
+
+/* Define this if you do software codec */
+#define CONFIG_CODEC SWCODEC
+
+#define HAVE_MULTIMEDIA_KEYS
+#define CONFIG_KEYPAD ANDROID_PAD
+
+#define HAVE_SW_TONE_CONTROLS
+
+/* Define current usage levels. */
+#define CURRENT_NORMAL 88 /* 18 hours from a 1600 mAh battery */
+#define CURRENT_BACKLIGHT 30 /* TBD */
+#define CURRENT_RECORD 0 /* no recording yet */
+
+/* Define this to the CPU frequency */
+/*
+#define CPU_FREQ 48000000
+*/
+
+/* Offset ( in the firmware file's header ) to the file CRC */
+#define FIRMWARE_OFFSET_FILE_CRC 0
+
+/* Offset ( in the firmware file's header ) to the real data */
+#define FIRMWARE_OFFSET_FILE_DATA 8
+
+#define CONFIG_LCD LCD_COWOND2
+
+/* Define this if a programmable hotkey is mapped */
+//#define HAVE_HOTKEY
+
+#define BOOTDIR "/.rockbox"
diff --git a/firmware/export/config/nokian8xx.h b/firmware/export/config/nokian8xx.h
new file mode 100644
index 0000000000..328d73145f
--- /dev/null
+++ b/firmware/export/config/nokian8xx.h
@@ -0,0 +1,97 @@
+/*
+ * This config file is for Rockbox as an application on the Nokia N8xx
+ */
+#define TARGET_TREE /* this target is using the target tree system */
+
+/* We don't run on hardware directly */
+#define CONFIG_PLATFORM (PLATFORM_HOSTED|PLATFORM_MAEMO4)
+
+/* For Rolo and boot loader */
+#define MODEL_NUMBER 100
+
+#define MODEL_NAME "Rockbox"
+
+#define USB_NONE
+
+/* define this if you have a bitmap LCD display */
+#define HAVE_LCD_BITMAP
+
+/* define this if you have a colour LCD */
+#define HAVE_LCD_COLOR
+
+/* define this if you want album art for this target */
+#define HAVE_ALBUMART
+
+/* define this to enable bitmap scaling */
+#define HAVE_BMP_SCALING
+
+/* define this to enable JPEG decoding */
+#define HAVE_JPEG
+
+/* define this if you have access to the quickscreen */
+#define HAVE_QUICKSCREEN
+/* define this if you have access to the pitchscreen */
+#define HAVE_PITCHSCREEN
+
+/* define this if you would like tagcache to build on this target */
+#define HAVE_TAGCACHE
+
+/* LCD dimensions */
+#define LCD_WIDTH 800
+#define LCD_HEIGHT 480
+#define LCD_DEPTH 16
+#define LCD_PIXELFORMAT 565
+
+/* define this to indicate your device's keypad */
+#define HAVE_TOUCHSCREEN
+#define HAVE_BUTTON_DATA
+
+/* define this if you have RTC RAM available for settings */
+//#define HAVE_RTC_RAM
+
+/* The number of bytes reserved for loadable codecs */
+#define CODEC_SIZE 0x100000
+
+/* The number of bytes reserved for loadable plugins */
+#define PLUGIN_BUFFER_SIZE 0x80000
+
+#define AB_REPEAT_ENABLE
+
+/* Define this if you do software codec */
+#define CONFIG_CODEC SWCODEC
+
+/* Work around debug macro expansion of strncmp in scratchbox */
+#define _HAVE_STRING_ARCH_strncmp
+
+#define HAVE_MULTIMEDIA_KEYS
+#define HAVE_SCROLLWHEEL
+#define CONFIG_KEYPAD SDL_PAD
+
+/* Use SDL audio/pcm in a SDL app build */
+#define HAVE_SDL
+#define HAVE_SDL_AUDIO
+
+#define HAVE_SW_TONE_CONTROLS
+
+/* Define current usage levels. */
+#define CURRENT_NORMAL 88 /* 18 hours from a 1600 mAh battery */
+#define CURRENT_BACKLIGHT 30 /* TBD */
+#define CURRENT_RECORD 0 /* no recording yet */
+
+/* Define this to the CPU frequency */
+/*
+#define CPU_FREQ 48000000
+*/
+
+/* Offset ( in the firmware file's header ) to the file CRC */
+#define FIRMWARE_OFFSET_FILE_CRC 0
+
+/* Offset ( in the firmware file's header ) to the real data */
+#define FIRMWARE_OFFSET_FILE_DATA 8
+
+#define CONFIG_LCD LCD_COWOND2
+
+/* Define this if a programmable hotkey is mapped */
+//#define HAVE_HOTKEY
+
+#define BOOTDIR "/.rockbox"
diff --git a/firmware/export/config/application.h b/firmware/export/config/nokian900.h
index 0aa4a3f54d..a65dc7260b 100644
--- a/firmware/export/config/application.h
+++ b/firmware/export/config/nokian900.h
@@ -1,18 +1,11 @@
/*
- * This config file is for Rockbox as an application!
+ * This config file is for Rockbox as an application on the Nokia N900
*/
#define TARGET_TREE /* this target is using the target tree system */
/* We don't run on hardware directly */
-#ifdef ANDROID
-#define CONFIG_PLATFORM (PLATFORM_HOSTED|PLATFORM_ANDROID)
-#elif MAEMO5
#define CONFIG_PLATFORM (PLATFORM_HOSTED|PLATFORM_MAEMO5)
-#elif MAEMO4
-#define CONFIG_PLATFORM (PLATFORM_HOSTED|PLATFORM_MAEMO4)
-#else
-#define CONFIG_PLATFORM (PLATFORM_HOSTED|PLATFORM_SDL)
-#endif
+
/* For Rolo and boot loader */
#define MODEL_NUMBER 100
@@ -46,21 +39,11 @@
/* LCD dimensions
*
* overriden by configure for application builds */
-#ifndef LCD_WIDTH
-#define LCD_WIDTH 320
-#endif
-
-#ifndef LCD_HEIGHT
+#define LCD_WIDTH 800
#define LCD_HEIGHT 480
-#endif
-
#define LCD_DEPTH 16
#define LCD_PIXELFORMAT 565
-#if (CONFIG_PLATFORM & PLATFORM_ANDROID)
-#define HAVE_LCD_ENABLE
-#endif
-
/* define this to indicate your device's keypad */
#define HAVE_TOUCHSCREEN
#define HAVE_BUTTON_DATA
@@ -80,28 +63,15 @@
#define CONFIG_CODEC SWCODEC
/* Work around debug macro expansion of strncmp in scratchbox */
-#if (CONFIG_PLATFORM & PLATFORM_MAEMO)
#define _HAVE_STRING_ARCH_strncmp
-#endif
-#if (CONFIG_PLATFORM & (PLATFORM_ANDROID|PLATFORM_MAEMO))
#define HAVE_MULTIMEDIA_KEYS
-#endif
-
-#if (CONFIG_PLATFORM & PLATFORM_ANDROID)
-#define CONFIG_KEYPAD ANDROID_PAD
-#elif (CONFIG_PLATFORM & (PLATFORM_SDL|PLATFORM_MAEMO))
#define HAVE_SCROLLWHEEL
#define CONFIG_KEYPAD SDL_PAD
-#else
-#error unknown platform
-#endif
-#if (CONFIG_PLATFORM & (PLATFORM_SDL|PLATFORM_MAEMO))
/* Use SDL audio/pcm in a SDL app build */
#define HAVE_SDL
#define HAVE_SDL_AUDIO
-#endif
#define HAVE_SW_TONE_CONTROLS
diff --git a/firmware/export/config/sdlapp.h b/firmware/export/config/sdlapp.h
new file mode 100644
index 0000000000..ef2710c999
--- /dev/null
+++ b/firmware/export/config/sdlapp.h
@@ -0,0 +1,101 @@
+/*
+ * This config file is for the SDL application
+ */
+#define TARGET_TREE /* this target is using the target tree system */
+
+/* We don't run on hardware directly */
+#define CONFIG_PLATFORM (PLATFORM_HOSTED|PLATFORM_SDL)
+
+/* For Rolo and boot loader */
+#define MODEL_NUMBER 100
+
+#define MODEL_NAME "Rockbox"
+
+#define USB_NONE
+
+/* define this if you have a bitmap LCD display */
+#define HAVE_LCD_BITMAP
+
+/* define this if you have a colour LCD */
+#define HAVE_LCD_COLOR
+
+/* define this if you want album art for this target */
+#define HAVE_ALBUMART
+
+/* define this to enable bitmap scaling */
+#define HAVE_BMP_SCALING
+
+/* define this to enable JPEG decoding */
+#define HAVE_JPEG
+
+/* define this if you have access to the quickscreen */
+#define HAVE_QUICKSCREEN
+/* define this if you have access to the pitchscreen */
+#define HAVE_PITCHSCREEN
+
+/* define this if you would like tagcache to build on this target */
+#define HAVE_TAGCACHE
+
+/* LCD dimensions
+ *
+ * overriden by configure for application builds */
+#ifndef LCD_WIDTH
+#define LCD_WIDTH 320
+#endif
+
+#ifndef LCD_HEIGHT
+#define LCD_HEIGHT 480
+#endif
+
+#define LCD_DEPTH 16
+#define LCD_PIXELFORMAT 565
+
+/* define this to indicate your device's keypad */
+#define HAVE_TOUCHSCREEN
+#define HAVE_BUTTON_DATA
+
+/* define this if you have RTC RAM available for settings */
+//#define HAVE_RTC_RAM
+
+/* The number of bytes reserved for loadable codecs */
+#define CODEC_SIZE 0x100000
+
+/* The number of bytes reserved for loadable plugins */
+#define PLUGIN_BUFFER_SIZE 0x80000
+
+#define AB_REPEAT_ENABLE
+
+/* Define this if you do software codec */
+#define CONFIG_CODEC SWCODEC
+
+#define HAVE_SCROLLWHEEL
+#define CONFIG_KEYPAD SDL_PAD
+
+/* Use SDL audio/pcm in a SDL app build */
+#define HAVE_SDL
+#define HAVE_SDL_AUDIO
+
+#define HAVE_SW_TONE_CONTROLS
+
+/* Define current usage levels. */
+#define CURRENT_NORMAL 88 /* 18 hours from a 1600 mAh battery */
+#define CURRENT_BACKLIGHT 30 /* TBD */
+#define CURRENT_RECORD 0 /* no recording yet */
+
+/* Define this to the CPU frequency */
+/*
+#define CPU_FREQ 48000000
+*/
+
+/* Offset ( in the firmware file's header ) to the file CRC */
+#define FIRMWARE_OFFSET_FILE_CRC 0
+
+/* Offset ( in the firmware file's header ) to the real data */
+#define FIRMWARE_OFFSET_FILE_DATA 8
+
+#define CONFIG_LCD LCD_COWOND2
+
+/* Define this if a programmable hotkey is mapped */
+//#define HAVE_HOTKEY
+
+#define BOOTDIR "/.rockbox"