Add e200v2 and m200v2 targets. Move the telechips lcd-ssd1815.c (currently used by Logik DAX and m200v1 ports) driver up in the target tree and share with the m200v2 - as2525 parts contributed by Rafael Carre. Includes the start (but is still very incomplete) of an LCD driver for the e200v2. m200v2 is not yet fully supported by mkamsboot - that will come soon. Also some minor cleanups for the Clip.

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

24 files changed, 1427 insertions, 54 deletions

diff --git a/bootloader/SOURCES b/bootloader/SOURCES
index f0c98a8bd3..c541efba89 100644
--- a/bootloader/SOURCES
+++ b/bootloader/SOURCES
@@ -39,7 +39,7 @@ meizu_m3.c
 ondavx747.c
 #elif defined(CREATIVE_ZVx)
 creativezvm.c
-#elif defined(HAVE_AS3525)
+#elif CONFIG_CPU==AS3525
 sansa_as3525.c
 show_logo.c
 #endif
diff --git a/bootloader/sansa_as3525.c b/bootloader/sansa_as3525.c
index 297fb2e769..b9975a9722 100644
--- a/bootloader/sansa_as3525.c
+++ b/bootloader/sansa_as3525.c
@@ -5,7 +5,7 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id:$
+ * $Id$
  *
  * Copyright (C) 2008 by Rafaël Carré
  *
@@ -37,7 +37,9 @@ void main(void)
 
     lcd_update();
 
+#ifdef HAVE_LCD_ENABLE
     lcd_enable(true);
+#endif
 
     show_logo();
 
diff --git a/firmware/SOURCES b/firmware/SOURCES
index 65bb2eb5b5..4407b0e8b9 100644
--- a/firmware/SOURCES
+++ b/firmware/SOURCES
@@ -327,10 +327,6 @@ target/arm/pnx0101/system-pnx0101.c
 
 #if CONFIG_CPU == AS3525
 target/arm/as3525/system-as3525.c
-#ifdef SANSA_CLIP
-target/arm/as3525/sansa-clip/lcd-ssd1303.c
-target/arm/as3525/sansa-clip/button-clip.c
-#endif
 #endif
 
 #if defined(CPU_PP)
@@ -978,9 +974,9 @@ target/arm/pnx0101/pcm-pnx0101.c
 #ifndef SIMULATOR
 drivers/nand_id.c
 target/arm/ata-nand-telechips.c
+target/arm/lcd-ssd1815.c
 target/arm/tcc77x/adc-tcc77x.c
 target/arm/tcc77x/kernel-tcc77x.c
-target/arm/tcc77x/lcd-ssd1815.c
 target/arm/tcc77x/powermgmt-tcc77x.c
 target/arm/tcc77x/system-tcc77x.c
 target/arm/tcc77x/timer-tcc77x.c
@@ -999,10 +995,10 @@ target/arm/tcc77x/logikdax/audio-logikdax.c
 #ifdef SANSA_M200
 #ifndef SIMULATOR
 drivers/nand_id.c
+target/arm/lcd-ssd1815.c
 target/arm/ata-nand-telechips.c
 target/arm/tcc77x/adc-tcc77x.c
 target/arm/tcc77x/kernel-tcc77x.c
-target/arm/tcc77x/lcd-ssd1815.c
 target/arm/tcc77x/powermgmt-tcc77x.c
 target/arm/tcc77x/system-tcc77x.c
 target/arm/tcc77x/timer-tcc77x.c
@@ -1038,6 +1034,27 @@ target/arm/pcm-telechips.c
 #endif /* SIMULATOR */
 #endif /* SANSA_C100 */
 
+#ifdef SANSA_CLIP
+#ifndef SIMULATOR
+target/arm/as3525/sansa-clip/lcd-ssd1303.c
+target/arm/as3525/sansa-clip/button-clip.c
+#endif /* !SIMULATOR */
+#endif /* SANSA_CLIP */
+
+#ifdef SANSA_E200V2
+#ifndef SIMULATOR
+target/arm/as3525/sansa-e200v2/lcd-e200v2.c
+target/arm/as3525/sansa-e200v2/button-e200v2.c
+#endif /* !SIMULATOR */
+#endif /* SANSA_E200V2 */
+
+#ifdef SANSA_M200V2
+#ifndef SIMULATOR
+target/arm/lcd-ssd1815.c
+target/arm/as3525/sansa-m200v2/button-m200v2.c
+#endif /* !SIMULATOR */
+#endif /* SANSA_M200V2 */
+
 #ifdef IAUDIO_7
 #ifndef SIMULATOR
 drivers/nand_id.c
diff --git a/firmware/export/config-clip.h b/firmware/export/config-clip.h
index 0685e45fd9..d2c2b51d18 100644
--- a/firmware/export/config-clip.h
+++ b/firmware/export/config-clip.h
@@ -4,7 +4,7 @@
 #define TARGET_TREE /* this target is using the target tree system */
 
 /* For Rolo and boot loader */
-#define MODEL_NUMBER 50
+#define MODEL_NUMBER 40
 #define MODEL_NAME   "Sandisk Sansa Clip"
 #define FIRMWARE_OFFSET_FILE_DATA 0
 #define FIRMWARE_OFFSET_FILE_CRC 0
@@ -69,11 +69,9 @@
 /* There is no hardware tone control */
 #define HAVE_SW_TONE_CONTROLS
 
-#define HAVE_AS3525
-
 /* define this if you have a real-time clock */
 #ifndef BOOTLOADER
-//#define CONFIG_RTC RTC_AS3525
+#define CONFIG_RTC RTC_AS3525
 #endif
 
 /* Define this if you have a software controlled poweroff */
@@ -148,7 +146,7 @@
 /* enable these for the experimental usb stack */
 #define HAVE_USBSTACK
 #define USB_VENDOR_ID 0x0781
-#define USB_PRODUCT_ID 0x7421
+#define USB_PRODUCT_ID 0x7433
 #endif /* BOOTLOADER */
 
 /* Virtual LED (icon) */
@@ -157,6 +155,11 @@
 /* Define this if you have adjustable CPU frequency */
 #define HAVE_ADJUSTABLE_CPU_FREQ
 
+#define MI4_FORMAT
+#define BOOTFILE_EXT    "sansa"
+#define BOOTFILE        "rockbox." BOOTFILE_EXT
+#define BOOTDIR "/.rockbox"
+
 #define ICODE_ATTR_TREMOR_NOT_MDCT
 
 #define INCLUDE_TIMEOUT_API
diff --git a/firmware/export/config-e200v2.h b/firmware/export/config-e200v2.h
new file mode 100644
index 0000000000..ac41cd33c4
--- /dev/null
+++ b/firmware/export/config-e200v2.h
@@ -0,0 +1,202 @@
+/*
+ * This config file is for the Sandisk Sansa e200v2
+ */
+#define TARGET_TREE /* this target is using the target tree system */
+
+/* For Rolo and boot loader */
+#define MODEL_NUMBER 41
+#define MODEL_NAME   "Sandisk Sansa e200v2 series"
+
+#define HW_SAMPR_CAPS       (SAMPR_CAP_44)
+
+/* define this if you have recording possibility */
+#define HAVE_RECORDING
+
+#define REC_SAMPR_CAPS      (SAMPR_CAP_22)
+#define REC_FREQ_DEFAULT    REC_FREQ_22 /* Default is not 44.1kHz */
+#define REC_SAMPR_DEFAULT   SAMPR_22
+
+/* Define bitmask of input sources - recordable bitmask can be defined
+   explicitly if different */
+#define INPUT_SRC_CAPS (SRC_CAP_MIC | SRC_CAP_FMRADIO)
+
+/* 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 if you have a light associated with the buttons */
+#define HAVE_BUTTON_LIGHT
+
+/* 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  176
+#define LCD_HEIGHT 220
+#define LCD_DEPTH  16   /* 65536 colours */
+#define LCD_PIXELFORMAT RGB565 /* rgb565 */
+
+/* define this if you have LCD enable function */
+#define HAVE_LCD_ENABLE
+
+/* Define this if your LCD can be put to sleep. HAVE_LCD_ENABLE
+   should be defined as well. */
+#define HAVE_LCD_SLEEP
+#define HAVE_LCD_SLEEP_SETTING
+
+/* define this if you can flip your LCD */
+#define HAVE_LCD_FLIP
+
+/* define this if you can invert the colours on your LCD */
+#define HAVE_LCD_INVERT
+
+/* #define IRAM_LCDFRAMEBUFFER IDATA_ATTR *//* put the lcd frame buffer in IRAM */
+
+#define CONFIG_KEYPAD SANSA_E200_PAD
+
+/* Define this if you do software codec */
+#define CONFIG_CODEC SWCODEC
+/* There is no hardware tone control */
+#define HAVE_SW_TONE_CONTROLS
+
+/* Define this if you have an AMS AS3525 */
+#define HAVE_AS3525
+
+/* define this if you have a real-time clock */
+#ifndef BOOTLOADER
+#define CONFIG_RTC RTC_AS3525
+#endif
+
+/* Define this if you have a software controlled poweroff */
+#define HAVE_SW_POWEROFF
+
+/* Some Sansa E200s seem to be FAT16 formatted */
+#define HAVE_FAT16SUPPORT
+
+/* 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 1
+
+/* FM Tuner */
+/* #define CONFIG_TUNER LV24020LP */
+/* #define HAVE_TUNER_PWR_CTRL */
+
+/* Define this for LCD backlight available */
+#define HAVE_BACKLIGHT
+#define HAVE_BACKLIGHT_BRIGHTNESS
+
+/* define this if the unit uses a scrollwheel for navigation */
+#define HAVE_SCROLLWHEEL
+/* define from which rotation speed [degree/sec] on the acceleration starts */
+#define WHEEL_ACCEL_START 540
+/* define type of acceleration (1 = ^2, 2 = ^3, 3 = ^4) */
+#define WHEEL_ACCELERATION 1
+
+/* define this if you have a flash memory storage */
+#define HAVE_FLASH_STORAGE
+
+/* define this if the flash memory uses the SecureDigital Memory Card protocol */
+#define HAVE_ATA_SD
+
+#define BATTERY_CAPACITY_DEFAULT 750    /* default battery capacity */
+#define BATTERY_CAPACITY_MIN 750        /* min. capacity selectable */
+#define BATTERY_CAPACITY_MAX 750        /* max. capacity selectable */
+#define BATTERY_CAPACITY_INC 0          /* capacity increment */
+#define BATTERY_TYPES_COUNT  1          /* only one type */
+
+/* Hardware controlled charging? FIXME */
+#define CONFIG_CHARGING CHARGING_SIMPLE
+
+/* define this if the unit can be powered or charged via USB */
+#define HAVE_USB_POWER
+
+/** Non-simulator section **/
+#ifndef SIMULATOR
+
+/* Define this if you have an AMS AS3525*/
+#define CONFIG_CPU AS3525
+
+/* Define this if you want to use the AS2525 i2c interface */
+#define CONFIG_I2C I2C_AS3525
+
+/* define this if the hardware can be powered off while charging */
+/* Sansa can't be powered off while charging */
+/* #define HAVE_POWEROFF_WHILE_CHARGING */
+
+/* The start address index for ROM builds */
+#define ROM_START 0x00000000
+
+/* Define this to the CPU frequency */
+#define CPU_FREQ      75000000
+
+/* Type of LCD TODO: hopefully the same as the x5 but check this*/
+#define CONFIG_LCD LCD_X5
+
+/* Offset ( in the firmware file's header ) to the file CRC and data. These are
+   only used when loading the old format rockbox.e200 file */
+#define FIRMWARE_OFFSET_FILE_CRC    0x0
+#define FIRMWARE_OFFSET_FILE_DATA   0x8
+
+#ifndef BOOTLOADER
+#define HAVE_MULTIVOLUME
+#define HAVE_HOTSWAP
+#endif
+
+/* #define USB_IPODSTYLE */
+
+/* USB On-the-go */
+#define CONFIG_USBOTG USBOTG_AS3525
+
+/* enable these for the experimental usb stack */
+#define HAVE_USBSTACK
+#define USB_VENDOR_ID 0x0781
+#define USB_PRODUCT_ID 0x7423
+
+/* Virtual LED (icon) */
+#define CONFIG_LED LED_VIRTUAL
+
+/* Define this if you have adjustable CPU frequency */
+#define HAVE_ADJUSTABLE_CPU_FREQ
+
+#define MI4_FORMAT
+#define BOOTFILE_EXT    "sansa"
+#define BOOTFILE        "rockbox." BOOTFILE_EXT
+#define BOOTDIR "/.rockbox"
+
+#define ICODE_ATTR_TREMOR_NOT_MDCT
+
+#define INCLUDE_TIMEOUT_API
+
+#endif /* SIMULATOR */
+
+/** Port-specific settings **/
+
+/* Main LCD backlight brightness range and defaults */
+#define MIN_BRIGHTNESS_SETTING      1
+#define MAX_BRIGHTNESS_SETTING     12
+#define DEFAULT_BRIGHTNESS_SETTING  6
+
+/* Default recording levels */
+#define DEFAULT_REC_MIC_GAIN    23
+#define DEFAULT_REC_LEFT_GAIN   23
+#define DEFAULT_REC_RIGHT_GAIN  23
+
+#ifdef E200R_INSTALLER
+#define IRAMORIG 0x40004000
+#endif
+
diff --git a/firmware/export/config-m200v2.h b/firmware/export/config-m200v2.h
new file mode 100644
index 0000000000..9386a157f6
--- /dev/null
+++ b/firmware/export/config-m200v2.h
@@ -0,0 +1,127 @@
+/*
+ * This config file is for the Sansa M200 series
+ */
+#define TARGET_TREE /* this target is using the target tree system */
+
+/* For Rolo and boot loader */
+#define MODEL_NUMBER 42
+
+#define MODEL_NAME   "Sandisk Sansa m200 series"
+
+/* Enable FAT16 support */
+#define HAVE_FAT16SUPPORT
+
+/* define this if you have recording possibility */
+//#define HAVE_RECORDING
+
+/* Define bitmask of input sources - recordable bitmask can be defined
+   explicitly if different */
+//#define INPUT_SRC_CAPS (SRC_CAP_MIC | SRC_CAP_LINEIN | SRC_CAP_SPDIF)
+
+/* define this if you have a bitmap LCD display */
+#define HAVE_LCD_BITMAP
+
+/* define this if you can flip your LCD */
+#define HAVE_LCD_FLIP
+
+/* define this if you can invert the colours on your LCD */
+#define HAVE_LCD_INVERT
+
+/* 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
+
+/* define this if you have a flash memory storage */
+#define HAVE_FLASH_STORAGE
+
+/* LCD dimensions */
+#define LCD_WIDTH  128
+#define LCD_HEIGHT 64
+#define LCD_DEPTH  1
+
+#define LCD_PIXELFORMAT VERTICAL_PACKING
+
+/* define this to indicate your device's keypad */
+#define CONFIG_KEYPAD SANSA_M200_PAD
+
+/* define this if you have a real-time clock */
+#define CONFIG_RTC RTC_AS3525
+
+/* define this if you have RTC RAM available for settings */
+//#define HAVE_RTC_RAM
+
+/* Define this if you have a software controlled poweroff */
+#define HAVE_SW_POWEROFF
+
+/* The number of bytes reserved for loadable codecs */
+#define CODEC_SIZE 0x38000
+
+/* The number of bytes reserved for loadable plugins */
+#define PLUGIN_BUFFER_SIZE 0x10000
+
+#define AB_REPEAT_ENABLE 1
+
+/* Define this if you do software codec */
+#define CONFIG_CODEC SWCODEC
+
+/* Define this if you have the TLV320 audio codec */
+/*#define HAVE_TLV320*/
+
+/* TLV320 has no tone controls, so we use the software ones */
+#define HAVE_SW_TONE_CONTROLS
+
+/* Define this for LCD backlight available */
+#define HAVE_BACKLIGHT
+
+#define CONFIG_I2C I2C_AS3525
+
+#define BATTERY_CAPACITY_DEFAULT 1500 /* default battery capacity */
+#define BATTERY_CAPACITY_MIN 1500 /* min. capacity selectable */
+#define BATTERY_CAPACITY_MAX 3200 /* max. capacity selectable */
+#define BATTERY_CAPACITY_INC 50   /* capacity increment */
+#define BATTERY_TYPES_COUNT  1    /* only one type */
+
+/* define this if the unit should not shut down on low battery. */
+#define NO_LOW_BATTERY_SHUTDOWN
+
+#ifndef SIMULATOR
+
+/* Define this if you have an AMS AS3525 */
+#define CONFIG_CPU AS3525
+
+/* Define this if you have ATA power-off control */
+#define HAVE_ATA_POWER_OFF
+
+/* Define this to the CPU frequency */
+#define CPU_FREQ      120000000
+
+/* 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
+
+/* Software controlled LED */
+#define CONFIG_LED LED_VIRTUAL
+
+#define CONFIG_LCD LCD_SSD1815
+
+#define BOOTFILE_EXT "sansa"
+#define BOOTFILE "rockbox." BOOTFILE_EXT
+#define BOOTDIR "/"
+
+#define IBSS_ATTR_VOICE_STACK
+#define ICODE_ATTR_TREMOR_NOT_MDCT
+#define ICODE_ATTR_TREMOR_MDCT
+#define ICODE_ATTR_FLAC
+#define IBSS_ATTR_FLAC_DECODED0
+#define ICONST_ATTR_MPA_HUFFMAN
+#define IBSS_ATTR_MPC_SAMPLE_BUF
+#define ICODE_ATTR_ALAC
+#define IBSS_ATTR_SHORTEN_DECODED0
+
+#endif /* SIMULATOR */
diff --git a/firmware/export/config.h b/firmware/export/config.h
index 7d36289ff2..73ecca1495 100644
--- a/firmware/export/config.h
+++ b/firmware/export/config.h
@@ -173,6 +173,7 @@
 #define I2C_DM320   12 /* DM320 style */
 #define I2C_S5L8700 13
 #define I2C_JZ47XX  14 /* Ingenic Jz47XX style */
+#define I2C_AS3525  15
 
 /* CONFIG_LED */
 #define LED_REAL     1 /* SW controlled LED (Archos recorders, player) */
@@ -199,6 +200,7 @@
 #define RTC_S5L8700  14
 #define RTC_S35390A  15
 #define RTC_JZ47XX   16 /* Ingenic Jz47XX */
+#define RTC_AS3525   17
 
 /* USB On-the-go */
 #define USBOTG_ISP1362 1362 /* iriver H300 */
@@ -206,6 +208,7 @@
 #define USBOTG_M5636   5636 /* iAudio X5 */
 #define USBOTG_ARC     5020 /* PortalPlayer 502x */
 #define USBOTG_JZ4740  4740 /* Ingenic Jz4740/Jz4732 */
+#define USBOTG_AS3525  3525 /* AMS AS3525 */
 
 /* Multiple cores */
 #define CPU 0
@@ -306,6 +309,10 @@
 #include "config-ondavx767.h"
 #elif defined(SANSA_CLIP)
 #include "config-clip.h"
+#elif defined(SANSA_E200V2)
+#include "config-e200v2.h"
+#elif defined(SANSA_M200V2)
+#include "config-m200v2.h"
 #else
 /* no known platform */
 #endif
diff --git a/firmware/target/arm/as3525/sansa-e200v2/adc-target.h b/firmware/target/arm/as3525/sansa-e200v2/adc-target.h
new file mode 100644
index 0000000000..bea0272496
--- /dev/null
+++ b/firmware/target/arm/as3525/sansa-e200v2/adc-target.h
@@ -0,0 +1,24 @@
+/***************************************************************************
+ *             __________               __   ___.
+ *   Open      \______   \ ____   ____ |  | _\_ |__   _______  ___
+ *   Source     |       _//  _ \_/ ___\|  |/ /| __ \ /  _ \  \/  /
+ *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
+ *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
+ *                     \/            \/     \/    \/            \/
+ * $Id$
+ *
+ * Copyright (C) 2008 ??
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+ * KIND, either express or implied.
+ *
+ ****************************************************************************/
+#ifndef _ADC_TARGET_H_
+#define _ADC_TARGET_H_
+
+#endif /* _ADC_TARGET_H_ */
diff --git a/firmware/target/arm/as3525/sansa-e200v2/backlight-target.h b/firmware/target/arm/as3525/sansa-e200v2/backlight-target.h
new file mode 100644
index 0000000000..9533d0a6b5
--- /dev/null
+++ b/firmware/target/arm/as3525/sansa-e200v2/backlight-target.h
@@ -0,0 +1,37 @@
+/***************************************************************************
+ *             __________               __   ___.
+ *   Open      \______   \ ____   ____ |  | _\_ |__   _______  ___
+ *   Source     |       _//  _ \_/ ___\|  |/ /| __ \ /  _ \  \/  /
+ *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
+ *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
+ *                     \/            \/     \/    \/            \/
+ * $Id$
+ *
+ * Copyright (C) 2008 ??
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+ * KIND, either express or implied.
+ *
+ ****************************************************************************/
+#ifndef BACKLIGHT_TARGET_H
+#define BACKLIGHT_TARGET_H
+
+static inline bool _backlight_init(void)
+{
+    return true;
+}
+
+static inline void _backlight_on(void)
+{
+}
+
+static inline void _backlight_off(void)
+{
+}
+
+#endif
diff --git a/firmware/target/arm/as3525/sansa-e200v2/button-e200v2.c b/firmware/target/arm/as3525/sansa-e200v2/button-e200v2.c
new file mode 100644
index 0000000000..fc2715216c
--- /dev/null
+++ b/firmware/target/arm/as3525/sansa-e200v2/button-e200v2.c
@@ -0,0 +1,98 @@
+/***************************************************************************
+ *             __________               __   ___.
+ *   Open      \______   \ ____   ____ |  | _\_ |__   _______  ___
+ *   Source     |       _//  _ \_/ ___\|  |/ /| __ \ /  _ \  \/  /
+ *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
+ *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
+ *                     \/            \/     \/    \/            \/
+ * $Id$
+ *
+ * Copyright (C) 2006 by Barry Wardell
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+ * KIND, either express or implied.
+ *
+ ****************************************************************************/
+
+/* Taken from button-h10.c by Barry Wardell and reverse engineering by MrH. */
+
+#include "system.h"
+#include "button.h"
+#include "backlight.h"
+#include "powermgmt.h"
+
+#define WHEEL_REPEAT_INTERVAL   300000
+#define WHEEL_FAST_ON_INTERVAL   20000
+#define WHEEL_FAST_OFF_INTERVAL  60000
+#define WHEELCLICKS_PER_ROTATION    48 /* wheelclicks per full rotation */
+
+/* Clickwheel */
+#ifndef BOOTLOADER
+static unsigned int  old_wheel_value   = 0;
+static unsigned int  wheel_repeat      = BUTTON_NONE;
+static unsigned int  wheel_click_count = 0;
+static unsigned int  wheel_delta       = 0;
+static          int  wheel_fast_mode   = 0;
+static unsigned long last_wheel_usec   = 0;
+static unsigned long wheel_velocity    = 0;
+static          long last_wheel_post   = 0;
+static          long next_backlight_on = 0;
+/* Buttons */
+static bool hold_button     = false;
+static bool hold_button_old = false;
+#define _button_hold() hold_button
+#else
+#define _button_hold() false  /* FIXME */
+#endif /* BOOTLOADER */
+static int  int_btn         = BUTTON_NONE;
+
+void button_init_device(void)
+{
+}
+
+bool button_hold(void)
+{
+    return _button_hold();
+}
+
+/* clickwheel */
+#ifndef BOOTLOADER
+void clickwheel_int(void)
+{
+}
+#endif /* BOOTLOADER */
+
+/* device buttons */
+void button_int(void)
+{
+    unsigned char state;
+
+    int_btn = BUTTON_NONE;
+
+}
+
+/*
+ * Get button pressed from hardware
+ */
+int button_read_device(void)
+{
+#ifdef BOOTLOADER
+    /* Read buttons directly in the bootloader */
+    button_int();
+#else
+    /* light handling */
+    if (hold_button != hold_button_old)
+    {
+        hold_button_old = hold_button;
+        backlight_hold_changed(hold_button);
+    }
+#endif /* BOOTLOADER */
+
+    /* The int_btn variable is set in the button interrupt handler */
+    return int_btn;
+}
diff --git a/firmware/target/arm/as3525/sansa-e200v2/button-target.h b/firmware/target/arm/as3525/sansa-e200v2/button-target.h
new file mode 100644
index 0000000000..969f91b143
--- /dev/null
+++ b/firmware/target/arm/as3525/sansa-e200v2/button-target.h
@@ -0,0 +1,60 @@
+/***************************************************************************
+ *             __________               __   ___.
+ *   Open      \______   \ ____   ____ |  | _\_ |__   _______  ___
+ *   Source     |       _//  _ \_/ ___\|  |/ /| __ \ /  _ \  \/  /
+ *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
+ *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
+ *                     \/            \/     \/    \/            \/
+ * $Id$
+ *
+ * Copyright (C) 2006 by Barry Wardell
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+ * KIND, either express or implied.
+ *
+ ****************************************************************************/
+
+#ifndef _BUTTON_TARGET_H_
+#define _BUTTON_TARGET_H_
+
+#include <stdbool.h>
+#include "config.h"
+
+#define HAS_BUTTON_HOLD
+
+bool button_hold(void);
+void button_init_device(void);
+int button_read_device(void);
+#ifndef BOOTLOADER
+void clickwheel_int(void);
+#endif
+void button_int(void);
+
+/* Sandisk Sansa E200 button codes */
+
+/* Main unit's buttons */
+#define BUTTON_REC          0x00000001
+#define BUTTON_DOWN         0x00000002
+#define BUTTON_RIGHT        0x00000004
+#define BUTTON_LEFT         0x00000008
+#define BUTTON_SELECT       0x00000010
+#define BUTTON_UP           0x00000020
+#define BUTTON_POWER        0x00000040
+
+#define BUTTON_SCROLL_BACK  0x00000080
+#define BUTTON_SCROLL_FWD   0x00000100
+
+#define BUTTON_MAIN         0x00000fff
+
+/* No Remote control */
+#define BUTTON_REMOTE 0
+
+#define POWEROFF_BUTTON BUTTON_POWER
+#define POWEROFF_COUNT 10
+
+#endif /* _BUTTON_TARGET_H_ */
diff --git a/firmware/target/arm/as3525/sansa-e200v2/lcd-e200v2.c b/firmware/target/arm/as3525/sansa-e200v2/lcd-e200v2.c
new file mode 100644
index 0000000000..e14ad21681
--- /dev/null
+++ b/firmware/target/arm/as3525/sansa-e200v2/lcd-e200v2.c
@@ -0,0 +1,385 @@
+/***************************************************************************
+ *             __________               __   ___.
+ *   Open      \______   \ ____   ____ |  | _\_ |__   _______  ___
+ *   Source     |       _//  _ \_/ ___\|  |/ /| __ \ /  _ \  \/  /
+ *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
+ *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
+ *                     \/            \/     \/    \/            \/
+ * $Id$
+ *
+ * Copyright (C) 2004 by Linus Nielsen Feltzing
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+ * KIND, either express or implied.
+ *
+ ****************************************************************************/
+#include "config.h"
+
+#include "cpu.h"
+#include "lcd.h"
+#include "kernel.h"
+#include "thread.h"
+#include <string.h>
+#include <stdlib.h>
+#include "file.h"
+#include "debug.h"
+#include "system.h"
+#include "font.h"
+#include "bidi.h"
+
+static bool display_on = false; /* is the display turned on? */
+static bool display_flipped = false;
+static int xoffset = 0; /* needed for flip */
+
+/* register defines */
+#define R_START_OSC             0x00
+#define R_DRV_OUTPUT_CONTROL    0x01
+#define R_DRV_WAVEFORM_CONTROL  0x02
+#define R_ENTRY_MODE            0x03
+#define R_COMPARE_REG1          0x04
+#define R_COMPARE_REG2          0x05
+
+#define R_DISP_CONTROL1     0x07
+#define R_DISP_CONTROL2     0x08
+#define R_DISP_CONTROL3     0x09
+
+#define R_FRAME_CYCLE_CONTROL 0x0b
+#define R_EXT_DISP_IF_CONTROL 0x0c
+
+#define R_POWER_CONTROL1    0x10
+#define R_POWER_CONTROL2    0x11
+#define R_POWER_CONTROL3    0x12
+#define R_POWER_CONTROL4    0x13
+
+#define R_RAM_ADDR_SET  0x21
+#define R_WRITE_DATA_2_GRAM 0x22
+
+#define R_GAMMA_FINE_ADJ_POS1   0x30
+#define R_GAMMA_FINE_ADJ_POS2   0x31
+#define R_GAMMA_FINE_ADJ_POS3   0x32
+#define R_GAMMA_GRAD_ADJ_POS    0x33
+
+#define R_GAMMA_FINE_ADJ_NEG1   0x34
+#define R_GAMMA_FINE_ADJ_NEG2   0x35
+#define R_GAMMA_FINE_ADJ_NEG3   0x36
+#define R_GAMMA_GRAD_ADJ_NEG    0x37
+
+#define R_GAMMA_AMP_ADJ_RES_POS     0x38
+#define R_GAMMA_AMP_AVG_ADJ_RES_NEG 0x39 
+
+#define R_GATE_SCAN_POS         0x40
+#define R_VERT_SCROLL_CONTROL   0x41
+#define R_1ST_SCR_DRV_POS       0x42
+#define R_2ND_SCR_DRV_POS       0x43
+#define R_HORIZ_RAM_ADDR_POS    0x44
+#define R_VERT_RAM_ADDR_POS     0x45
+
+#define LCD_CMD  (*(volatile unsigned short *)0xf0000000)
+#define LCD_DATA (*(volatile unsigned short *)0xf0000002)
+
+#define R_ENTRY_MODE_HORZ 0x7030
+#define R_ENTRY_MODE_VERT 0x7038
+
+/* TODO: Implement this function */
+static void lcd_delay(int x)
+{
+    (void)x;
+}
+
+/* DBOP initialisation, do what OF does */
+static void ams3525_dbop_init(void)
+{
+
+    /* TODO: More... */
+
+    DBOP_TIMPOL_01 = 0xe167e167;
+    DBOP_TIMPOL_23 = 0xe167006e;
+    DBOP_CTRL = 0x41008;
+
+    GPIOB_AFSEL = 0xfc;
+    GPIOC_AFSEL = 0xff;
+
+    DBOP_TIMPOL_23 = 0x6000e;
+    DBOP_CTRL = 0x51008;
+    DBOP_TIMPOL_01 = 0x6e167;
+    DBOP_TIMPOL_23 = 0xa167e06f;
+
+    /* TODO: More... */
+}
+
+static void lcd_write_reg(int reg, int value)
+{
+    DBOP_CTRL &= ~(1<<14);
+
+    DBOP_TIMPOL_23 = 0xa167006e;
+
+    DBOP_DOUT = reg;
+
+    /* Wait for fifo to empty */
+    while ((DBOP_STAT & (1<<10)) == 0);
+
+    DBOP_TIMPOL_23 = 0xa167e06f;
+
+
+    DBOP_DOUT = value;
+
+    /* Wait for fifo to empty */
+    while ((DBOP_STAT & (1<<10)) == 0);
+}
+
+void lcd_write_data(const fb_data* p_bytes, int count)
+{
+    (void)p_bytes;
+    (void)count;
+}
+
+
+/*** hardware configuration ***/
+
+void lcd_set_contrast(int val)
+{
+    (void)val;
+}
+
+void lcd_set_invert_display(bool yesno)
+{
+    (void)yesno;
+}
+
+static void flip_lcd(bool yesno)
+{
+    (void)yesno;
+}
+
+
+/* turn the display upside down (call lcd_update() afterwards) */
+void lcd_set_flip(bool yesno)
+{
+    display_flipped = yesno;
+    xoffset = yesno ? 4 : 0;
+
+    if (display_on)
+        flip_lcd(yesno);
+}
+
+static void _display_on(void)
+{
+    /* Initialisation the display the same way as the original firmware */
+
+    lcd_write_reg(R_START_OSC, 0x0001); /* Start Oscilation */
+
+    lcd_write_reg(R_DRV_OUTPUT_CONTROL, 0x011b); /* 220 lines, GS=0, SS=1 */
+
+    /* B/C = 1: n-line inversion form
+     * EOR = 1: polarity inversion occurs by applying an EOR to odd/even
+     *          frame select signal and an n-line inversion signal.
+     * FLD = 01b: 1 field interlaced scan, external display iface */
+    lcd_write_reg(R_DRV_WAVEFORM_CONTROL, 0x0700);
+
+    /* Address counter updated in horizontal direction; left to right;
+     * vertical increment horizontal increment.
+     * data format for 8bit transfer or spi = 65k (5,6,5) */
+    lcd_write_reg(R_ENTRY_MODE, 0x0030);
+
+    /* Replace data on writing to GRAM */
+    lcd_write_reg(R_COMPARE_REG1, 0);
+    lcd_write_reg(R_COMPARE_REG2, 0);
+
+    lcd_write_reg(R_DISP_CONTROL1, 0x0000);  /* GON = 0, DTE = 0, D1-0 = 00b */
+
+    /* Front porch lines: 2; Back porch lines: 2; */
+    lcd_write_reg(R_DISP_CONTROL2, 0x0203);
+
+    /* Scan cycle = 0 frames */
+    lcd_write_reg(R_DISP_CONTROL3, 0x0000);
+
+    /* 16 clocks */
+    lcd_write_reg(R_FRAME_CYCLE_CONTROL, 0x0000);
+
+    /* 18-bit RGB interface (one transfer/pixel)
+     * internal clock operation;
+     * System interface/VSYNC interface */
+    lcd_write_reg(R_EXT_DISP_IF_CONTROL, 0x0000);
+
+
+    /* zero everything*/
+    lcd_write_reg(R_POWER_CONTROL1, 0x0000); /* STB = 0, SLP = 0 */
+
+    lcd_delay(10);
+
+    /* initialise power supply */
+
+    /* DC12-10 = 000b: Step-up1 = clock/8,
+     * DC02-00 = 000b: Step-up2 = clock/16,
+     * VC2-0   = 010b: VciOUT = 0.87 * VciLVL */
+    lcd_write_reg(R_POWER_CONTROL2, 0x0002); 
+
+    /* VRH3-0 = 1000b: Vreg1OUT = REGP * 1.90 */
+    lcd_write_reg(R_POWER_CONTROL3, 0x0008);
+
+    lcd_delay(40);
+    
+    lcd_write_reg(R_POWER_CONTROL4, 0x0000); /* VCOMG = 0 */
+
+    /* This register is unknown */
+    lcd_write_reg(0x56, 0x80f);
+
+
+    lcd_write_reg(R_POWER_CONTROL1, 0x4140);
+
+    lcd_delay(10);
+
+    lcd_write_reg(R_POWER_CONTROL2, 0x0000); 
+    lcd_write_reg(R_POWER_CONTROL3, 0x0013); 
+
+    lcd_delay(20);
+
+    lcd_write_reg(R_POWER_CONTROL4, 0x6d0e);
+
+    lcd_delay(20);
+
+    lcd_write_reg(R_POWER_CONTROL4, 0x6d0e);
+
+    lcd_write_reg(R_GAMMA_FINE_ADJ_POS1, 0x0002);
+    lcd_write_reg(R_GAMMA_FINE_ADJ_POS2, 0x0707);
+    lcd_write_reg(R_GAMMA_FINE_ADJ_POS3, 0x0182);
+    lcd_write_reg(R_GAMMA_GRAD_ADJ_POS, 0x0203);
+    lcd_write_reg(R_GAMMA_FINE_ADJ_NEG1, 0x0706);
+    lcd_write_reg(R_GAMMA_FINE_ADJ_NEG2, 0x0006);
+    lcd_write_reg(R_GAMMA_FINE_ADJ_NEG3, 0x0706);
+    lcd_write_reg(R_GAMMA_GRAD_ADJ_NEG, 0x0000);
+    lcd_write_reg(R_GAMMA_AMP_ADJ_RES_POS, 0x030f);
+    lcd_write_reg(R_GAMMA_AMP_AVG_ADJ_RES_NEG, 0x0f08);
+
+
+    lcd_write_reg(R_RAM_ADDR_SET, 0);
+    lcd_write_reg(R_GATE_SCAN_POS, 0);
+    lcd_write_reg(R_VERT_SCROLL_CONTROL, 0);
+    
+    lcd_write_reg(R_1ST_SCR_DRV_POS, 219 << 8);
+    lcd_write_reg(R_2ND_SCR_DRV_POS, 219 << 8);
+
+    lcd_write_reg(R_HORIZ_RAM_ADDR_POS, 175 << 8);
+    lcd_write_reg(R_VERT_RAM_ADDR_POS, 219 << 8);
+
+
+    lcd_write_reg(R_DISP_CONTROL1, 0x0037);
+
+    display_on=true;  /* must be done before calling lcd_update() */
+    lcd_update();
+}
+
+/* LCD init */
+void lcd_init_device(void)
+{
+  ams3525_dbop_init();
+
+  /* Init GPIOs the same as the OF */
+
+  GPIOA_DIR |= (1<<5);
+  GPIOA_PIN(5) = 0;
+
+  GPIOA_PIN(3) = (1<<3);
+
+  GPIOA_DIR |= (3<<3);
+
+  GPIOA_PIN(3) = (1<<3);
+
+  GPIOA_PIN(4) = 0;  //c80b0040 := 0;
+
+  GPIOA_DIR |= (1<<7);
+  GPIOA_PIN(7) = 0;
+
+  CCU_IO &= ~(1<<2);
+  CCU_IO &= ~(1<<3);
+
+  GPIOD_DIR |= (1<<7);
+
+#if 0
+  /* TODO: This code is conditional on a variable in the OF init, we need to
+           work out what it means */
+
+  GPIOD_PIN(7) = (1<<7);
+  GPIOD_DIR |= (1<<7);
+#endif
+
+  lcd_delay(1);
+
+  GPIOA_PIN(5) = (1<<5);
+
+  lcd_delay(1);
+
+    _display_on();
+}
+
+void lcd_enable(bool on)
+{
+    if(display_on!=on)
+    {
+        if(on)
+        {
+            _display_on();
+            lcd_call_enable_hook();
+        }
+        else
+        {
+            /* TODO: Implement off sequence */
+            display_on=false;
+        }
+    }
+}
+
+bool lcd_enabled(void)
+{
+    return display_on;
+}
+
+/*** update functions ***/
+
+/* Performance function to blit a YUV bitmap directly to the LCD
+ * src_x, src_y, width and height should be even
+ * x, y, width and height have to be within LCD bounds
+ */
+void lcd_blit_yuv(unsigned char * const src[3],
+                  int src_x, int src_y, int stride,
+                  int x, int y, int width, int height)
+{
+    (void)src;
+    (void)src_x;
+    (void)src_y;
+    (void)stride;
+    (void)x;
+    (void)y;
+    (void)width;
+    (void)height;
+}
+
+/* Update the display.
+   This must be called after all other LCD functions that change the display. */
+void lcd_update(void) ICODE_ATTR;
+void lcd_update(void)
+{
+    if(display_on){
+        /* TODO */
+    }
+}
+
+
+/* Update a fraction of the display. */
+void lcd_update_rect(int, int, int, int) ICODE_ATTR;
+void lcd_update_rect(int x, int y, int width, int height)
+{
+    (void)x;
+    (void)y;
+    (void)width;
+    (void)height;
+
+    if(display_on) {
+        /* TODO */
+    }
+}
diff --git a/firmware/target/arm/as3525/sansa-e200v2/system-target.h b/firmware/target/arm/as3525/sansa-e200v2/system-target.h
new file mode 100644
index 0000000000..b712d1c124
--- /dev/null
+++ b/firmware/target/arm/as3525/sansa-e200v2/system-target.h
@@ -0,0 +1,28 @@
+/***************************************************************************
+ *             __________               __   ___.
+ *   Open      \______   \ ____   ____ |  | _\_ |__   _______  ___
+ *   Source     |       _//  _ \_/ ___\|  |/ /| __ \ /  _ \  \/  /
+ *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
+ *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
+ *                     \/            \/     \/    \/            \/
+ * $Id$
+ *
+ * Copyright (C) 2008 ??
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+ * KIND, either express or implied.
+ *
+ ****************************************************************************/
+#ifndef SYSTEM_TARGET_H
+#define SYSTEM_TARGET_H
+
+#include "system-arm.h"
+
+#define CPUFREQ_MAX    250000000
+
+#endif /* SYSTEM_TARGET_H */
diff --git a/firmware/target/arm/as3525/sansa-e200v2/timer-target.h b/firmware/target/arm/as3525/sansa-e200v2/timer-target.h
new file mode 100644
index 0000000000..b81da57885
--- /dev/null
+++ b/firmware/target/arm/as3525/sansa-e200v2/timer-target.h
@@ -0,0 +1,38 @@
+/***************************************************************************
+*             __________               __   ___.
+*   Open      \______   \ ____   ____ |  | _\_ |__   _______  ___
+*   Source     |       _//  _ \_/ ___\|  |/ /| __ \ /  _ \  \/  /
+*   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
+*   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
+*                     \/            \/     \/    \/            \/
+* $Id$
+*
+* Copyright (C) 2008 ??
+*
+* This program is free software; you can redistribute it and/or
+* modify it under the terms of the GNU General Public License
+* as published by the Free Software Foundation; either version 2
+* of the License, or (at your option) any later version.
+*
+* This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+* KIND, either express or implied.
+*
+****************************************************************************/
+#ifndef TIMER_TARGET_H
+#define TIMER_TARGET_H
+
+bool __timer_set(long cycles, bool set);
+bool __timer_register(void);
+void __timer_unregister(void);
+
+#define __TIMER_SET(cycles, set) \
+    __timer_set(cycles, set)
+
+#define __TIMER_REGISTER(reg_prio, unregister_callback, cycles, \
+                              int_prio, timer_callback) \
+    __timer_register()
+
+#define __TIMER_UNREGISTER(...) \
+    __timer_unregister()
+
+#endif /* TIMER_TARGET_H */
diff --git a/firmware/target/arm/as3525/sansa-m200v2/adc-target.h b/firmware/target/arm/as3525/sansa-m200v2/adc-target.h
new file mode 100644
index 0000000000..bea0272496
--- /dev/null
+++ b/firmware/target/arm/as3525/sansa-m200v2/adc-target.h
@@ -0,0 +1,24 @@
+/***************************************************************************
+ *             __________               __   ___.
+ *   Open      \______   \ ____   ____ |  | _\_ |__   _______  ___
+ *   Source     |       _//  _ \_/ ___\|  |/ /| __ \ /  _ \  \/  /
+ *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
+ *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
+ *                     \/            \/     \/    \/            \/
+ * $Id$
+ *
+ * Copyright (C) 2008 ??
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+ * KIND, either express or implied.
+ *
+ ****************************************************************************/
+#ifndef _ADC_TARGET_H_
+#define _ADC_TARGET_H_
+
+#endif /* _ADC_TARGET_H_ */
diff --git a/firmware/target/arm/as3525/sansa-m200v2/backlight-target.h b/firmware/target/arm/as3525/sansa-m200v2/backlight-target.h
new file mode 100644
index 0000000000..9533d0a6b5
--- /dev/null
+++ b/firmware/target/arm/as3525/sansa-m200v2/backlight-target.h
@@ -0,0 +1,37 @@
+/***************************************************************************
+ *             __________               __   ___.
+ *   Open      \______   \ ____   ____ |  | _\_ |__   _______  ___
+ *   Source     |       _//  _ \_/ ___\|  |/ /| __ \ /  _ \  \/  /
+ *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
+ *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
+ *                     \/            \/     \/    \/            \/
+ * $Id$
+ *
+ * Copyright (C) 2008 ??
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+ * KIND, either express or implied.
+ *
+ ****************************************************************************/
+#ifndef BACKLIGHT_TARGET_H
+#define BACKLIGHT_TARGET_H
+
+static inline bool _backlight_init(void)
+{
+    return true;
+}
+
+static inline void _backlight_on(void)
+{
+}
+
+static inline void _backlight_off(void)
+{
+}
+
+#endif
diff --git a/firmware/target/arm/as3525/sansa-m200v2/button-m200v2.c b/firmware/target/arm/as3525/sansa-m200v2/button-m200v2.c
new file mode 100644
index 0000000000..cd31d06720
--- /dev/null
+++ b/firmware/target/arm/as3525/sansa-m200v2/button-m200v2.c
@@ -0,0 +1,43 @@
+/***************************************************************************
+ *             __________               __   ___.
+ *   Open      \______   \ ____   ____ |  | _\_ |__   _______  ___
+ *   Source     |       _//  _ \_/ ___\|  |/ /| __ \ /  _ \  \/  /
+ *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
+ *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
+ *                     \/            \/     \/    \/            \/
+ * $Id$
+ *
+ * Copyright (C) 2008 by ??
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+ * KIND, either express or implied.
+ *
+ ****************************************************************************/
+
+#include "config.h"
+#include "cpu.h"
+#include "button.h"
+#include "adc.h"
+
+void button_init_device(void)
+{
+
+}
+
+int button_read_device(void)
+{
+    int btn = BUTTON_NONE;
+
+    return btn;
+}
+
+bool button_hold(void)
+{
+    /* TODO */
+    return false;
+}
diff --git a/firmware/target/arm/as3525/sansa-m200v2/button-target.h b/firmware/target/arm/as3525/sansa-m200v2/button-target.h
new file mode 100644
index 0000000000..acf80b2ed7
--- /dev/null
+++ b/firmware/target/arm/as3525/sansa-m200v2/button-target.h
@@ -0,0 +1,54 @@
+/***************************************************************************
+ *             __________               __   ___.
+ *   Open      \______   \ ____   ____ |  | _\_ |__   _______  ___
+ *   Source     |       _//  _ \_/ ___\|  |/ /| __ \ /  _ \  \/  /
+ *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
+ *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
+ *                     \/            \/     \/    \/            \/
+ * $Id$
+ *
+ * Copyright (C) 2007 by Dave Chapman
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+ * KIND, either express or implied.
+ *
+ ****************************************************************************/
+
+#ifndef _BUTTON_TARGET_H_
+#define _BUTTON_TARGET_H_
+
+#include <stdbool.h>
+#include "config.h"
+
+#define HAS_BUTTON_HOLD
+
+void button_init_device(void);
+int button_read_device(void);
+bool button_hold(void);
+
+/* Main unit's buttons */
+#define BUTTON_MENU         0x00000001
+#define BUTTON_VOLUP        0x00000002
+#define BUTTON_VOLDOWN      0x00000004
+#define BUTTON_PLAYPAUSE    0x00000008
+#define BUTTON_REPEATAB     0x00000010
+#define BUTTON_LEFT         0x00000020
+#define BUTTON_RIGHT        0x00000040
+#define BUTTON_SELECT       0x00000080
+
+#define BUTTON_MAIN (BUTTON_MENU|BUTTON_VOLUP|BUTTON_VOLDOWN\
+                    |BUTTON_PLAYPAUSE|BUTTON_REPEATAB|BUTTON_LEFT\
+                    |BUTTON_RIGHT|BUTTON_SELECT)
+
+#define BUTTON_REMOTE 0
+
+/* Software power-off */
+#define POWEROFF_BUTTON BUTTON_MENU
+#define POWEROFF_COUNT 40
+                
+#endif /* _BUTTON_TARGET_H_ */
diff --git a/firmware/target/arm/as3525/sansa-m200v2/system-target.h b/firmware/target/arm/as3525/sansa-m200v2/system-target.h
new file mode 100644
index 0000000000..b712d1c124
--- /dev/null
+++ b/firmware/target/arm/as3525/sansa-m200v2/system-target.h
@@ -0,0 +1,28 @@
+/***************************************************************************
+ *             __________               __   ___.
+ *   Open      \______   \ ____   ____ |  | _\_ |__   _______  ___
+ *   Source     |       _//  _ \_/ ___\|  |/ /| __ \ /  _ \  \/  /
+ *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
+ *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
+ *                     \/            \/     \/    \/            \/
+ * $Id$
+ *
+ * Copyright (C) 2008 ??
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+ * KIND, either express or implied.
+ *
+ ****************************************************************************/
+#ifndef SYSTEM_TARGET_H
+#define SYSTEM_TARGET_H
+
+#include "system-arm.h"
+
+#define CPUFREQ_MAX    250000000
+
+#endif /* SYSTEM_TARGET_H */
diff --git a/firmware/target/arm/as3525/sansa-m200v2/timer-target.h b/firmware/target/arm/as3525/sansa-m200v2/timer-target.h
new file mode 100644
index 0000000000..b81da57885
--- /dev/null
+++ b/firmware/target/arm/as3525/sansa-m200v2/timer-target.h
@@ -0,0 +1,38 @@
+/***************************************************************************
+*             __________               __   ___.
+*   Open      \______   \ ____   ____ |  | _\_ |__   _______  ___
+*   Source     |       _//  _ \_/ ___\|  |/ /| __ \ /  _ \  \/  /
+*   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
+*   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
+*                     \/            \/     \/    \/            \/
+* $Id$
+*
+* Copyright (C) 2008 ??
+*
+* This program is free software; you can redistribute it and/or
+* modify it under the terms of the GNU General Public License
+* as published by the Free Software Foundation; either version 2
+* of the License, or (at your option) any later version.
+*
+* This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+* KIND, either express or implied.
+*
+****************************************************************************/
+#ifndef TIMER_TARGET_H
+#define TIMER_TARGET_H
+
+bool __timer_set(long cycles, bool set);
+bool __timer_register(void);
+void __timer_unregister(void);
+
+#define __TIMER_SET(cycles, set) \
+    __timer_set(cycles, set)
+
+#define __TIMER_REGISTER(reg_prio, unregister_callback, cycles, \
+                              int_prio, timer_callback) \
+    __timer_register()
+
+#define __TIMER_UNREGISTER(...) \
+    __timer_unregister()
+
+#endif /* TIMER_TARGET_H */
diff --git a/firmware/target/arm/tcc77x/lcd-ssd1815.c b/firmware/target/arm/lcd-ssd1815.c
index b41c8d26ef..fc3db940ba 100644
--- a/firmware/target/arm/tcc77x/lcd-ssd1815.c
+++ b/firmware/target/arm/lcd-ssd1815.c
@@ -68,6 +68,82 @@
 #define LCD_CNTL_HIGHCOL        0x10    /* Upper column address */
 #define LCD_CNTL_LOWCOL         0x00    /* Lower column address */
 
+
+#if CONFIG_CPU == AS3525
+#include "as3525.h"
+
+void lcd_write_command(int byte)
+{
+    DBOP_TIMPOL_23 = 0x6006E;
+    DBOP_DOUT = byte;
+
+    /* While push fifo is not empty */
+    while ((DBOP_STAT & (1<<10)) == 0)
+                ;
+
+    DBOP_TIMPOL_23 = 0x6E06F;
+}
+
+void lcd_write_data(const fb_data* p_bytes, int count)
+{
+    while (count--)
+    {
+        /* Write pixels */
+        DBOP_DOUT = *p_bytes++;
+
+        /* While push fifo is not empty */
+        while ((DBOP_STAT & (1<<10)) == 0)
+            ;
+    }
+}
+
+static inline void ams3525_dbop_init(void)
+{
+    int clkdiv = 4 - 1;
+
+    CGU_DBOP |= (1<<3) /* clk enable */ | clkdiv /* clkdiv: 3 bits */ ;
+
+    GPIOB_AFSEL = 0x0f; /* DBOP on pin 3:0 */
+    GPIOC_AFSEL = 0xff; /* DBOP on pins 7:0 */
+
+    DBOP_CTRL      = 0x50008;
+    DBOP_TIMPOL_01 = 0xA167E167;
+    DBOP_TIMPOL_23 = 0x6E06F; /* this value is used for data (pixels) write */
+}
+
+
+/* LCD init, largely based on what OF does */
+void lcd_init_device(void)
+{
+    int delay;
+
+    ams3525_dbop_init();
+
+    GPIOB_DIR |= (1<<4);
+    GPIOD_DIR |= (1<<1)|(1<<3);
+
+    GPIOD_PIN(1) = (1<<1); /* backlight on */
+
+    GPIOD_PIN(3) = (1<<3);
+    delay = 10; while(delay--) ;
+
+    GPIOB_PIN(4) = (1<<4);
+    delay = 10; while(delay--) ;
+
+    lcd_write_command(LCD_SET_LCD_BIAS);
+    lcd_write_command(LCD_SET_SEGMENT_REMAP);
+    lcd_write_command(LCD_SET_COM_OUTPUT_SCAN_DIRECTION);
+    lcd_write_command(LCD_SET_INTERNAL_REGULATOR_RESISTOR_RATIO|0x5);
+    lcd_set_contrast(lcd_default_contrast());
+    lcd_write_command(LCD_SET_REVERSE_DISPLAY);
+    lcd_write_command(LCD_SET_POWER_CONTROL_REGISTER|0x7);
+    lcd_write_command(LCD_SET_DISPLAY_ON);
+    lcd_write_command(LCD_SET_DISPLAY_START_LINE);
+}
+
+
+#elif defined(CPU_TCC77X)
+
 /* TCC77x specific defines */
 #define LCD_BASE 0x50000000
 #define LCD_CMD   *(volatile unsigned char*)(LCD_BASE)
@@ -98,42 +174,6 @@ void lcd_write_data(const fb_data* p_bytes, int count)
     }
 }
 
-/* End of TCC77x specific defines */
-
-
-/** globals **/
-
-static int xoffset; /* needed for flip */
-
-/*** hardware configuration ***/
-
-int lcd_default_contrast(void)
-{
-    return 0x1f;
-}
-
-void lcd_set_contrast(int val)
-{
-    lcd_write_command(LCD_CNTL_CONTRAST);
-    lcd_write_command(val);
-}
-
-void lcd_set_invert_display(bool yesno)
-{
-    if (yesno) 
-        lcd_write_command(LCD_SET_REVERSE_DISPLAY);
-    else 
-        lcd_write_command(LCD_SET_NORMAL_DISPLAY);
-}
-
-/* turn the display upside down (call lcd_update() afterwards) */
-void lcd_set_flip(bool yesno)
-{
-    (void)yesno;
-    /* TODO */
-}
-
-
 /* LCD init */
 void lcd_init_device(void)
 {
@@ -175,6 +215,43 @@ void lcd_init_device(void)
     lcd_update();
 }
 
+/* End of TCC77x specific defines */
+#endif
+
+
+/** globals **/
+
+static int xoffset; /* needed for flip */
+
+/*** hardware configuration ***/
+
+int lcd_default_contrast(void)
+{
+    return 0x1f;
+}
+
+void lcd_set_contrast(int val)
+{
+    lcd_write_command(LCD_CNTL_CONTRAST);
+    lcd_write_command(val);
+}
+
+void lcd_set_invert_display(bool yesno)
+{
+    if (yesno) 
+        lcd_write_command(LCD_SET_REVERSE_DISPLAY);
+    else 
+        lcd_write_command(LCD_SET_NORMAL_DISPLAY);
+}
+
+/* turn the display upside down (call lcd_update() afterwards) */
+void lcd_set_flip(bool yesno)
+{
+    (void)yesno;
+    /* TODO */
+}
+
+
 /*** Update functions ***/
 
 /* Performance function that works with an external buffer
diff --git a/rbutil/mkamsboot/mkamsboot.c b/rbutil/mkamsboot/mkamsboot.c
index 17f894d77f..8f3da63b92 100644
--- a/rbutil/mkamsboot/mkamsboot.c
+++ b/rbutil/mkamsboot/mkamsboot.c
@@ -148,7 +148,7 @@ static const char* rb_model_names[] =
     "clip",
     NULL,
     "e2v2",
-    NULL,
+    "m2v2",
     NULL
 };
 
@@ -157,10 +157,10 @@ static const char* rb_model_names[] =
 static const int rb_model_num[] =
 {
     0,
-    50,
-    0,
-    51,
+    40,
     0,
+    41,
+    42,
     0
 };
 
diff --git a/tools/configure b/tools/configure
index c34ecec382..36597f524b 100755
--- a/tools/configure
+++ b/tools/configure
@@ -694,6 +694,8 @@ cat <<EOF
  33) Cowon D2                                    53) Sansa m200
  34) M3/M3L                                      54) Sansa c100
                                                  55) Sansa Clip
+                                                 56) Sansa e200v2
+                                                 57) Sansa m200v2
 
  ==Tatung==               ==Olympus==            ==Logik==
  60) Elio TPJ-1022        70) M:Robe 500         80) DAX 1GB MP3/DAB
@@ -1698,6 +1700,46 @@ fi
     ;;
 
 
+   56|e200v2)
+    target_id=51
+    modelname="e200v2"
+    target="-DSANSA_E200V2"
+    memory=2 # FIXME - a guess
+    arm9tdmicc
+    bmp2rb_mono="$rootdir/tools/bmp2rb -f 0"
+    bmp2rb_native="$bmp2rb_mono"
+    tool="$rootdir/tools/scramble -add=e2v2"
+    output="rockbox.sansa"
+    bootoutput="bootloader-e200v2.sansa"
+    appextra="recorder:gui"
+    plugins=""
+    toolset=$scramblebitmaptools
+    t_cpu="arm"
+    t_manufacturer="as3525"
+    t_model="sansa-clip"
+    ;;
+
+
+   57|m200v2)
+    target_id=52
+    modelname="m200v2"
+    target="-DSANSA_M200V2"
+    memory=2 # FIXME - A guess
+    arm9tdmicc
+    bmp2rb_mono="$rootdir/tools/bmp2rb -f 0"
+    bmp2rb_native="$bmp2rb_mono"
+    tool="$rootdir/tools/scramble -add=m2v2"
+    output="rockbox.sansa"
+    bootoutput="bootloader-m200v2.sansa"
+    appextra="recorder:gui"
+    plugins=""
+    toolset=$scramblebitmaptools
+    t_cpu="arm"
+    t_manufacturer="as3525"
+    t_model="sansa-m200v2"
+    ;;
+
+
    60|tpj1022)
     target_id=25
     modelname="tpj1022"
diff --git a/tools/scramble.c b/tools/scramble.c
index 429823aaa7..aaf3b9d232 100644
--- a/tools/scramble.c
+++ b/tools/scramble.c
@@ -122,7 +122,7 @@ void usage(void)
            "\t        (X values: h100, h120, h140, h300, ipco, nano, ipvd, mn2g\n"
            "\t                   ip3g, ip4g, mini, iax5, iam5, iam3, h10, h10_5gb,\n"
            "\t                   tpj2, c200, e200, giga, gigs, m100, m500, d2,\n");
-    printf("\t                   9200, 1630, ldax, m200, clip, e2v2)\n");
+    printf("\t                   9200, 1630, ldax, m200, clip, e2v2, m2v2)\n");
     printf("\nNo option results in Archos standard player/recorder format.\n");
 
     exit(1);
@@ -289,6 +289,8 @@ int main (int argc, char** argv)
             modelnum = 50;
         else if (!strcmp(&argv[1][5], "e2v2"))
             modelnum = 51;
+        else if (!strcmp(&argv[1][5], "m2v2"))
+            modelnum = 52;
         else {
             fprintf(stderr, "unsupported model: %s\n", &argv[1][5]);
             return 2;