Remove the (very) incomplete port for the Tatung TPJ-1102

It was barely even a stub, and hasn't seen any development since 2009

Change-Id: I0aa15d9a7b90ae8c771924d9f401380d4cc0fab9

23 files changed, 4 insertions, 776 deletions

diff --git a/apps/plugins/blackjack.c b/apps/plugins/blackjack.c
index 24cfbe583c..3065802716 100644
--- a/apps/plugins/blackjack.c
+++ b/apps/plugins/blackjack.c
@@ -185,22 +185,6 @@ enum {
 #define BJACK_RIGHT         BUTTON_RIGHT
 #define BJACK_LEFT          BUTTON_LEFT
 
-#elif CONFIG_KEYPAD == TATUNG_TPJ1022_PAD
-#define BJACK_SELECT_NAME    "MAIN"
-#define BJACK_STAY_NAME     "MENU"
-#define BJACK_QUIT_NAME     "POWER"
-#define BJACK_DOUBLE_NAME   "DOWN"
-#define BJACK_SELECT        BUTTON_MAIN
-#define BJACK_QUIT          BUTTON_POWER
-#define BJACK_MAX           (BUTTON_REC|BUTTON_UP)
-#define BJACK_MIN           (BUTTON_REC|BUTTON_DOWN)
-#define BJACK_STAY          BUTTON_MENU
-#define BJACK_DOUBLEDOWN    BUTTON_DOWN
-#define BJACK_UP            BUTTON_UP
-#define BJACK_DOWN          BUTTON_DOWN
-#define BJACK_RIGHT         BUTTON_RIGHT
-#define BJACK_LEFT          BUTTON_LEFT
-
 #elif CONFIG_KEYPAD == GIGABEAT_S_PAD
 #define BJACK_SELECT_NAME    "PLAY"
 #define BJACK_STAY_NAME     "VOL-"
diff --git a/apps/plugins/invadrox.c b/apps/plugins/invadrox.c
index 5eedb6ffc5..a164b95cf0 100644
--- a/apps/plugins/invadrox.c
+++ b/apps/plugins/invadrox.c
@@ -141,14 +141,6 @@
 #define RIGHT BUTTON_RIGHT
 #define FIRE BUTTON_SELECT
 
-#elif CONFIG_KEYPAD == TATUNG_TPJ1022_PAD
-
-/* TODO: Figure out which buttons to use for Tatung Elio TPJ-1022 */
-#define QUIT BUTTON_AB
-#define LEFT BUTTON_LEFT
-#define RIGHT BUTTON_RIGHT
-#define FIRE BUTTON_MENU
-
 #elif CONFIG_KEYPAD == GIGABEAT_S_PAD
 
 #define QUIT BUTTON_BACK
@@ -617,7 +609,7 @@ CONFIG_KEYPAD == MROBE500_PAD
 
 #elif (LCD_WIDTH == 220) && (LCD_HEIGHT == 176)
 
-/* TPJ1022, H300, iPod Color: 220x176x16
+/* H300, iPod Color: 220x176x16
  * ============================
  * X: 0p padding at left/right gives 220p playfield in middle.
  *    8p "border" gives 204p actual playfield. UFO use full 220p.
diff --git a/bootloader/SOURCES b/bootloader/SOURCES
index 86dd64d7d9..b721b12ce1 100644
--- a/bootloader/SOURCES
+++ b/bootloader/SOURCES
@@ -31,8 +31,6 @@ sansaview.c
 show_logo.c
 main-pp.c
 #endif
-#elif defined(TATUNG_TPJ1022)
-tpj1022.c
 #elif defined(IAUDIO_X5) || defined(IAUDIO_M5) || defined(IAUDIO_M3)
 iaudio_coldfire.c
 #elif defined(IRIVER_H100_SERIES)
diff --git a/bootloader/tpj1022.c b/bootloader/tpj1022.c
deleted file mode 100644
index 3590c7882d..0000000000
--- a/bootloader/tpj1022.c
+++ /dev/null
@@ -1,103 +0,0 @@
-/***************************************************************************
- *             __________               __   ___.
- *   Open      \______   \ ____   ____ |  | _\_ |__   _______  ___
- *   Source     |       _//  _ \_/ ___\|  |/ /| __ \ /  _ \  \/  /
- *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
- *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
- *                     \/            \/     \/    \/            \/
- * $Id$
- *
- * Copyright (C) 2006 by Dave Chapman
- *
- * Based on Rockbox iriver bootloader 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 <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include "cpu.h"
-#include "system.h"
-#include "lcd.h"
-#include "kernel.h"
-#include "thread.h"
-#include "storage.h"
-#include "file_internal.h"
-#include "disk.h"
-#include "font.h"
-#include "panic.h"
-#include "power.h"
-#include "file.h"
-#include "common.h"
-
-void* main(void)
-{
-    int i;
-    int rc;
-    int fd;
-    char buffer[80];
-    unsigned char* framebuffer = (unsigned char*)0x11e00000;
-
-#if 0
-    lcd_init();
-    font_init();
-
-    printf("Hello World!");
-#endif
-
-    i=storage_init();
-
-    filesystem_init();
-    rc = disk_mount_all();
-
-#if 0
-    /* Dump the flash */
-    fd=open("/flash.bin",O_CREAT|O_RDWR, 0666);
-    write(fd,(char*)0,1024*1024);
-    close(fd);
-#endif
-
-#if 1
-    /* Dump what may be the framebuffer */
-    fd=open("/framebuffer.bin",O_CREAT|O_RDWR|O_TRUNC, 0666);
-    write(fd,framebuffer,220*176*4);
-    close(fd);
-#endif
-
-
-    fd=open("/gpio.txt",O_CREAT|O_RDWR|O_TRUNC, 0666);
-    unsigned int gpio_a = GPIOA_INPUT_VAL;
-    unsigned int gpio_b = GPIOB_INPUT_VAL;
-    unsigned int gpio_c = GPIOC_INPUT_VAL;
-    unsigned int gpio_d = GPIOD_INPUT_VAL;
-    unsigned int gpio_e = GPIOE_INPUT_VAL;
-    unsigned int gpio_f = GPIOF_INPUT_VAL;
-    unsigned int gpio_g = GPIOG_INPUT_VAL;
-    unsigned int gpio_h = GPIOH_INPUT_VAL;
-    unsigned int gpio_i = GPIOI_INPUT_VAL;
-    unsigned int gpio_j = GPIOJ_INPUT_VAL;
-    unsigned int gpio_k = GPIOK_INPUT_VAL;
-    unsigned int gpio_l = GPIOL_INPUT_VAL;
-
-    snprintf(buffer, sizeof(buffer), "%02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x\n",gpio_a,gpio_b,gpio_c,gpio_d,gpio_e,gpio_f,gpio_g,gpio_h,gpio_i,gpio_j,gpio_k,gpio_l);
-    write(fd,buffer,strlen(buffer)+1);
-    close(fd);
-
-    /* Wait for FFWD button to be pressed */
-    while((GPIOA_INPUT_VAL & 0x04) != 0);
-
-
-    /* Now reboot */
-    DEV_RS |= 0x4;
-
-    return 0;
-}
diff --git a/firmware/SOURCES b/firmware/SOURCES
index e2f7e26f84..87db67d8fd 100644
--- a/firmware/SOURCES
+++ b/firmware/SOURCES
@@ -1301,14 +1301,6 @@ target/arm/olympus/mrobe-100/power-mr100.c
 target/arm/olympus/mrobe-100/powermgmt-mr100.c
 #endif /* MROBE_100 */
 
-#ifdef TATUNG_TPJ1022
-target/arm/tatung/tpj1022/backlight-tpj1022.c
-target/arm/tatung/tpj1022/button-tpj1022.c
-target/arm/tatung/tpj1022/lcd-tpj1022.c
-target/arm/tatung/tpj1022/power-tpj1022.c
-target/arm/tatung/tpj1022/powermgmt-tpj1022.c
-#endif /* TATUNG_TPJ1022 */
-
 #ifdef IPOD_4G
 target/arm/ipod/backlight-4g_color.c
 target/arm/ipod/button-clickwheel.c
diff --git a/firmware/export/config.h b/firmware/export/config.h
index 383677865f..5700fad37f 100644
--- a/firmware/export/config.h
+++ b/firmware/export/config.h
@@ -105,7 +105,6 @@
 #define IRIVER_H10_PAD     12
 #define SANSA_E200_PAD     13
 #define SANSA_C200_PAD     14
-#define TATUNG_TPJ1022_PAD 15
 #define MROBE100_PAD       17
 #define MROBE500_PAD       18
 #define GIGABEAT_S_PAD     19
@@ -224,7 +223,6 @@
 #define LCD_GIGABEAT 12
 #define LCD_H10_20GB 13 /* as used by iriver H10 20Gb */
 #define LCD_H10_5GB  14 /* as used by iriver H10 5Gb */
-#define LCD_TPJ1022  15 /* as used by Tatung Elio TPJ-1022 */
 #define LCD_C200     17 /* as used by Sandisk Sansa c200 */
 #define LCD_MROBE500 18 /* as used by Olympus M:Robe 500i */
 #define LCD_MROBE100 19 /* as used by Olympus M:Robe 100 */
@@ -425,8 +423,6 @@ Lyre prototype 1 */
 #include "config/sansae200.h"
 #elif defined(SANSA_C200)
 #include "config/sansac200.h"
-#elif defined(TATUNG_TPJ1022)
-#include "config/tatungtpj1022.h"
 #elif defined(MROBE_100)
 #include "config/mrobe100.h"
 #elif defined(MROBE_500)
diff --git a/firmware/export/config/tatungtpj1022.h b/firmware/export/config/tatungtpj1022.h
deleted file mode 100644
index 3865e8f87f..0000000000
--- a/firmware/export/config/tatungtpj1022.h
+++ /dev/null
@@ -1,151 +0,0 @@
-/*
- * This config file is for the Tatung Elio TPJ-1022
- */
-
-#define MODEL_NAME "Tatung Elio TPJ-1022"
-
-/* For Rolo and boot loader */
-#define MODEL_NUMBER 15
-
-/* define this if you use an ATA controller */
-#define CONFIG_STORAGE STORAGE_ATA
-
-/*define this if the ATA controller and method of USB access support LBA48 */
-#define HAVE_LBA48
-
-/* define this if you have recording possibility */
-/*#define HAVE_RECORDING*/ /* TODO: add support for this */
-
-/* define the bitmask of hardware sample rates */
-#define HW_SAMPR_CAPS   (SAMPR_CAP_96 | SAMPR_CAP_88 | SAMPR_CAP_48 | \
-                         SAMPR_CAP_44 | SAMPR_CAP_32 | SAMPR_CAP_8)
-
-/* define the bitmask of recording sample rates
-#define REC_SAMPR_CAPS  (SAMPR_CAP_96 | SAMPR_CAP_88 | SAMPR_CAP_48 | \
-                         SAMPR_CAP_44 | SAMPR_CAP_32 | SAMPR_CAP_8) */
-
-
-
-
-/* define this if you have a colour LCD */
-#define HAVE_LCD_COLOR
-
-/* define this if you have access to the quickscreen */
-#define HAVE_QUICKSCREEN
-
-/* LCD dimensions */
-#define LCD_WIDTH  220
-#define LCD_HEIGHT 176
-/* sqrt(220^2 + 176^2) / 2.2 = 128.1 */
-#define LCD_DPI 128
-#define LCD_DEPTH  16   /* 65536 colours */
-#define LCD_PIXELFORMAT RGB565 
-
-/* #define IRAM_LCDFRAMEBUFFER IDATA_ATTR *//* put the lcd frame buffer in IRAM */
-
-#define CONFIG_KEYPAD TATUNG_TPJ1022_PAD
-
-
-
-
-/* define this if you have a real-time clock */
-#ifndef BOOTLOADER
-//#define CONFIG_RTC RTC_E8564
-#endif
-
-/* Define this if you have a software controlled poweroff */
-#define HAVE_SW_POWEROFF
-
-/* 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 this if you have the WM8731 audio codec */
-#define HAVE_WM8731
-
-#define AB_REPEAT_ENABLE
-
-/* define this if you have a disk storage, i.e. something
-   that needs spinups and can cause skips when shaked */
-#define HAVE_DISK_STORAGE
-
-/* Define this for LCD backlight available */
-#define HAVE_BACKLIGHT
-
-#define BATTERY_CAPACITY_DEFAULT 1550 /* default battery capacity
-                                        TODO: check this, probably different
-                                        for different models too */
-#define BATTERY_CAPACITY_MIN 1500  /* min. capacity selectable */
-#define BATTERY_CAPACITY_MAX 1600 /* max. capacity selectable */
-#define BATTERY_CAPACITY_INC 10   /* capacity increment */
-#define BATTERY_TYPES_COUNT  1    /* only one type */
-
-#define CONFIG_BATTERY_MEASURE VOLTAGE_MEASURE
-
-/* 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*/
-
-/* Define this if you have a PortalPlayer PP5020 */
-#define CONFIG_CPU PP5020
-
-/* Define this if you want to use the PP5020 i2c interface */
-#define CONFIG_I2C I2C_PP5020
-
-/* define this if the hardware can be powered off while charging */
-/* TODO: should this be set for the H10? */
-//#define HAVE_POWEROFF_WHILE_CHARGING
-
-/* The start address index for ROM builds */
-#define ROM_START 0x00000000
-
-/* Define this to the CPU frequency */
-/* TODO: this is probably wrong */
-#define CPU_FREQ      11289600
-
-/* Type of LCD */
-#define CONFIG_LCD LCD_TPJ1022
-
-#define DEFAULT_CONTRAST_SETTING    19
-
-/* Offset ( in the firmware file's header ) to the file length */
-#define FIRMWARE_OFFSET_FILE_LENGTH 0
-
-/* 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
-
-/* USB On-the-go */
-#define CONFIG_USBOTG USBOTG_ARC
-
-/* define this if the unit can be powered or charged via USB */
-#define HAVE_USB_POWER
-
-/* enable these for the experimental usb stack ROOLKU */
-#define HAVE_USBSTACK
-#define USB_VENDOR_ID 0x07B4
-#define USB_PRODUCT_ID 0x0280
-
-/* Define this if you have adjustable CPU frequency */
-#define HAVE_ADJUSTABLE_CPU_FREQ
-
-#define BOOTFILE_EXT "elio"
-#define BOOTFILE "rockbox." BOOTFILE_EXT
-#define BOOTDIR "/.rockbox"
-
-
-/* DMA is used only for reading on PP502x because although reads are ~8x faster
- * writes appear to be ~25% slower.
- */
-#ifndef BOOTLOADER
-#define HAVE_ATA_DMA
-#endif
-
-/* Define this if a programmable hotkey is mapped */
-//#define HAVE_HOTKEY
diff --git a/firmware/target/arm/pp/system-pp502x.c b/firmware/target/arm/pp/system-pp502x.c
index d6dfad1b24..fb6fe28d91 100644
--- a/firmware/target/arm/pp/system-pp502x.c
+++ b/firmware/target/arm/pp/system-pp502x.c
@@ -559,8 +559,6 @@ void system_init(void)
         /* to be done */
 #elif defined (MROBE_100)
         /* to be done */
-#elif defined (TATUNG_TPJ1022)
-        /* to be done */
 #elif defined(PBELL_VIBE500)
         /* reset all allowed devices */
         DEV_RS         = 0x3ffffef8;
diff --git a/firmware/target/arm/pp/system-target.h b/firmware/target/arm/pp/system-target.h
index 1e947195bd..b00374e40e 100644
--- a/firmware/target/arm/pp/system-target.h
+++ b/firmware/target/arm/pp/system-target.h
@@ -175,14 +175,6 @@ extern unsigned char probed_ramsize;
 int battery_default_capacity(void);
 #endif
 
-
-#ifdef BOOTLOADER
-#if defined(TATUNG_TPJ1022)
-    /* Some targets don't like yielding in the bootloader - force
-     * yield() to return without a context switch. */
-#define YIELD_KERNEL_HOOK() true
-#endif
-
 #ifdef HAVE_BOOTLOADER_USB_MODE
 void tick_stop(void);
 void system_prepare_fw_start(void);
diff --git a/firmware/target/arm/pp/usb-fw-pp502x.c b/firmware/target/arm/pp/usb-fw-pp502x.c
index b0fcfb83a4..a4d8e28a06 100644
--- a/firmware/target/arm/pp/usb-fw-pp502x.c
+++ b/firmware/target/arm/pp/usb-fw-pp502x.c
@@ -81,12 +81,6 @@
 #define USB_GPIO_MASK   0x10
 #define USB_GPIO_VAL    0x10
 
-#elif defined(TATUNG_TPJ1022)
-    /* GPIO ? bit ? is usb detect (dummy value)*/
-#define USB_GPIO        GPIOD
-#define USB_GPIO_MASK   0x10
-#define USB_GPIO_VAL    0x10
-
 #elif defined(PBELL_VIBE500)
     /* GPIO L bit 3 is usb detect */
 #define USB_GPIO        GPIOL
diff --git a/firmware/target/arm/tatung/app.lds b/firmware/target/arm/tatung/app.lds
deleted file mode 100644
index 856cc52bb0..0000000000
--- a/firmware/target/arm/tatung/app.lds
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "config.h"
-#include "../pp/app-pp.lds"
diff --git a/firmware/target/arm/tatung/boot.lds b/firmware/target/arm/tatung/boot.lds
deleted file mode 100644
index 33b826bec8..0000000000
--- a/firmware/target/arm/tatung/boot.lds
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "config.h"
-#include "../pp/boot-pp.lds"
diff --git a/firmware/target/arm/tatung/tpj1022/adc-target.h b/firmware/target/arm/tatung/tpj1022/adc-target.h
deleted file mode 100644
index 026bb58089..0000000000
--- a/firmware/target/arm/tatung/tpj1022/adc-target.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/***************************************************************************
- *             __________               __   ___.
- *   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 _ADC_TARGET_H_
-#define _ADC_TARGET_H_
-
-#define NUM_ADC_CHANNELS 4
-
-#define ADC_BATTERY     0
-#define ADC_UNKNOWN_1   1
-#define ADC_UNKNOWN_2   2
-#define ADC_SCROLLPAD   3
-#define ADC_UNREG_POWER ADC_BATTERY /* For compatibility */
-
-/* Force a scan now */
-unsigned short adc_scan(int channel);
-
-#endif
diff --git a/firmware/target/arm/tatung/tpj1022/backlight-target.h b/firmware/target/arm/tatung/tpj1022/backlight-target.h
deleted file mode 100644
index 4a5e677599..0000000000
--- a/firmware/target/arm/tatung/tpj1022/backlight-target.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/***************************************************************************
- *             __________               __   ___.
- *   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 the x5's implementation */
-
-#ifndef BACKLIGHT_TARGET_H
-#define BACKLIGHT_TARGET_H
-
-#define backlight_hw_init() true
-void backlight_hw_on(void);
-void backlight_hw_off(void);
-
-#endif
diff --git a/firmware/target/arm/tatung/tpj1022/backlight-tpj1022.c b/firmware/target/arm/tatung/tpj1022/backlight-tpj1022.c
deleted file mode 100644
index d63387728b..0000000000
--- a/firmware/target/arm/tatung/tpj1022/backlight-tpj1022.c
+++ /dev/null
@@ -1,46 +0,0 @@
-/***************************************************************************
- *             __________               __   ___.
- *   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.
- *
- ****************************************************************************/
-
-/* The H10 display (and hence backlight) possibly identical to that of the X5,
-  so that code was used here but left #if 0'ed  out for the moment */
-   
-#include "config.h"
-#include "cpu.h"
-#include "system.h"
-#include "backlight.h"
-
-void backlight_hw_on(void)
-{
-#if 0
-    int level = disable_irq_save();
-    pcf50606_write(0x38, 0xb0); /* Backlight ON, GPO1INV=1, GPO1ACT=011 */
-    restore_irq(level);
-#endif
-}
-
-void backlight_hw_off(void)
-{
-#if 0
-    int level = disable_irq_save();
-    pcf50606_write(0x38, 0x80); /* Backlight OFF, GPO1INV=1, GPO1ACT=000 */
-    restore_irq(level);
-#endif
-}
diff --git a/firmware/target/arm/tatung/tpj1022/button-target.h b/firmware/target/arm/tatung/tpj1022/button-target.h
deleted file mode 100644
index 1143c1b1da..0000000000
--- a/firmware/target/arm/tatung/tpj1022/button-target.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/***************************************************************************
- *             __________               __   ___.
- *   Open      \______   \ ____   ____ |  | _\_ |__   _______  ___
- *   Source     |       _//  _ \_/ ___\|  |/ /| __ \ /  _ \  \/  /
- *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
- *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
- *                     \/            \/     \/    \/            \/
- * $Id$
- *
- * Copyright (C) 2006 by Robert Kukla
- *
- * 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_
-
-#define HAS_BUTTON_HOLD
-
-/* Main unit's buttons */
-
-#define BUTTON_VOL_DOWN     0x00000001
-
-/* bit position in GPIOA */
-#define BUTTON_REW          0x00000002
-#define BUTTON_FF           0x00000004
-#define BUTTON_POWER        0x00000008
-#define BUTTON_UP           0x00000010
-#define BUTTON_DOWN         0x00000020
-#define BUTTON_AB           0x00000040
-#define BUTTON_RIGHT        0x00000080
-
-/* still unknown */
-#define BUTTON_MENU         0x00000100
-#define BUTTON_REC          0x00000200
-#define BUTTON_VOL_UP       0x00000400
-#define BUTTON_LEFT         0x00000800
-
-#define BUTTON_MAIN         0x00000FFF
-
-#define POWEROFF_BUTTON BUTTON_POWER
-#define POWEROFF_COUNT 10
-
-#endif /* _BUTTON_TARGET_H_ */
diff --git a/firmware/target/arm/tatung/tpj1022/button-tpj1022.c b/firmware/target/arm/tatung/tpj1022/button-tpj1022.c
deleted file mode 100644
index ce9d7ab24d..0000000000
--- a/firmware/target/arm/tatung/tpj1022/button-tpj1022.c
+++ /dev/null
@@ -1,49 +0,0 @@
-/***************************************************************************
- *             __________               __   ___.
- *   Open      \______   \ ____   ____ |  | _\_ |__   _______  ___
- *   Source     |       _//  _ \_/ ___\|  |/ /| __ \ /  _ \  \/  /
- *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
- *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
- *                     \/            \/     \/    \/            \/
- * $Id$
- *
- * Copyright (C) 2006 by Robert Kukla
- *
- * 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 "system.h"
-#include "button.h"
-
-bool button_hold(void)
-{
-    return (GPIOK_INPUT_VAL & 0x40) ?  true : false; 
-}
-
-int button_read_device(void)
-{
-    int btn = BUTTON_NONE;
-
-    if (!button_hold())
-    {
-        btn = (GPIOA_INPUT_VAL & 0xfe) ^ 0xfe;
-
-        if ((GPIOK_INPUT_VAL & 0x20) == 0) btn |= BUTTON_VOL_DOWN;
-
-        /* to be found
-        if ((GPIO?_INPUT_VAL & 0x??) == 0) btn |= BUTTON_MENU;
-        if ((GPIO?_INPUT_VAL & 0x??) == 0) btn |= BUTTON_REC;
-        if ((GPIO?_INPUT_VAL & 0x??) == 0) btn |= BUTTON_VOL_UP;
-        if ((GPIO?_INPUT_VAL & 0x??) == 0) btn |= BUTTON_LEFT;
-         */  
-    }
-    
-    return btn;
-}
diff --git a/firmware/target/arm/tatung/tpj1022/lcd-tpj1022.c b/firmware/target/arm/tatung/tpj1022/lcd-tpj1022.c
deleted file mode 100644
index bf29ba092e..0000000000
--- a/firmware/target/arm/tatung/tpj1022/lcd-tpj1022.c
+++ /dev/null
@@ -1,85 +0,0 @@
-/***************************************************************************
- *             __________               __   ___.
- *   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.
- *
- ****************************************************************************/
-#include "config.h"
-#include "cpu.h"
-#include "lcd.h"
-#include "kernel.h"
-#include "system.h"
-
-/*** hardware configuration ***/
-
-void lcd_set_contrast(int val)
-{
-  /* TODO: Implement lcd_set_contrast() */
-  (void)val;
-}
-
-void lcd_set_invert_display(bool yesno)
-{
-  /* TODO: Implement lcd_set_invert_display() */
-  (void)yesno;
-}
-
-/* turn the display upside down (call lcd_update() afterwards) */
-void lcd_set_flip(bool yesno)
-{
-  /* TODO: Implement lcd_set_flip() */
-  (void)yesno;
-}
-
-/* LCD init */
-void lcd_init_device(void)
-{  
-
-}
-
-/*** update functions ***/
-
-/* Performance function to blit a YUV bitmap directly to the LCD */
-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 a fraction of the display. */
-void lcd_update_rect(int x0, int y0, int width, int height)
-{
-    (void)x0;
-    (void)y0;
-    (void)width;
-    (void)height;
-}
-
-/* Update the display.
-   This must be called after all other LCD functions that change the display. */
-void lcd_update(void)
-{
-    lcd_update_rect(0, 0, LCD_WIDTH, LCD_HEIGHT);
-}
diff --git a/firmware/target/arm/tatung/tpj1022/power-tpj1022.c b/firmware/target/arm/tatung/tpj1022/power-tpj1022.c
deleted file mode 100644
index fa46f34daa..0000000000
--- a/firmware/target/arm/tatung/tpj1022/power-tpj1022.c
+++ /dev/null
@@ -1,63 +0,0 @@
-/***************************************************************************
- *             __________               __   ___.
- *   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.
- *
- ****************************************************************************/
-
-/* Created from power.c using some iPod code, and some custom stuff based on 
-   GPIO analysis 
-*/
-
-#include "config.h"
-#include "cpu.h"
-#include <stdbool.h>
-#include "kernel.h"
-#include "system.h"
-#include "power.h"
-#include "logf.h"
-#include "usb.h"
-
-void power_init(void)
-{
-}
-
-unsigned int power_input_status(void)
-{
-    return POWER_INPUT_NONE;
-}
-
-void ide_power_enable(bool on)
-{
-    (void)on;
-    /* We do nothing on the iPod */
-}
-
-
-bool ide_powered(void)
-{
-    /* pretend we are always powered - we don't turn it off on the ipod */
-    return true;
-}
-
-void power_off(void)
-{
-    /* Give things a second to settle before cutting power */
-    sleep(HZ);
-    
-    //GPIOF_OUTPUT_VAL &=~ 0x20;
-}
diff --git a/firmware/target/arm/tatung/tpj1022/powermgmt-tpj1022.c b/firmware/target/arm/tatung/tpj1022/powermgmt-tpj1022.c
deleted file mode 100644
index cc91012fcd..0000000000
--- a/firmware/target/arm/tatung/tpj1022/powermgmt-tpj1022.c
+++ /dev/null
@@ -1,62 +0,0 @@
-/***************************************************************************
- *             __________               __   ___.
- *   Open      \______   \ ____   ____ |  | _\_ |__   _______  ___
- *   Source     |       _//  _ \_/ ___\|  |/ /| __ \ /  _ \  \/  /
- *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
- *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
- *                     \/            \/     \/    \/            \/
- * $Id$
- *
- * Copyright (C) 2002 by Heikki Hannikainen, Uwe Freese
- * Revisions copyright (C) 2005 by Gerald Van Baren
- *
- * 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 "adc.h"
-#include "powermgmt.h"
-
-/* FIXME: All voltages copied from H10 according to the battery type given
- * in config-tpj1022.h at the time of splitting. This probably needs changing
- * if that port ever gets up to speed. */
-
-const unsigned short battery_level_dangerous[BATTERY_TYPES_COUNT] =
-{
-    3760
-};
-
-const unsigned short battery_level_shutoff[BATTERY_TYPES_COUNT] =
-{
-    3650
-};
-
-/* voltages (millivolt) of 0%, 10%, ... 100% when charging disabled */
-const unsigned short percent_to_volt_discharge[BATTERY_TYPES_COUNT][11] =
-{
-    { 3760, 3800, 3850, 3870, 3900, 3950, 4020, 4070, 4110, 4180, 4240 }
-};
-
-#if CONFIG_CHARGING
-/* voltages (millivolt) of 0%, 10%, ... 100% when charging enabled */
-const unsigned short percent_to_volt_charge[11] =
-{
-    3990, 4030, 4060, 4080, 4100, 4120, 4150, 4180, 4220, 4260, 4310
-};
-#endif /* CONFIG_CHARGING */
-
-#define BATTERY_SCALE_FACTOR 6000
-/* full-scale ADC readout (2^10) in millivolt */
-
-/* Returns battery voltage from ADC [millivolts] */
-int _battery_voltage(void)
-{
-    return (adc_read(ADC_UNREG_POWER) * BATTERY_SCALE_FACTOR) >> 10;
-}
diff --git a/tools/builds.pm b/tools/builds.pm
index 037bd5c1f3..8de86ad388 100644
--- a/tools/builds.pm
+++ b/tools/builds.pm
@@ -321,10 +321,6 @@ $releasenotes="/wiki/ReleaseNotes315";
         name => 'SanDisk Sansa View',
         status => 1,
     },
-    'tatungtpj1022' => {
-        name => 'Tatung Elio TPJ-1022',
-        status => 1,
-    },
     'vibe500' => {
         name => 'Packard Bell Vibe 500',
         status => 3,
diff --git a/tools/configure b/tools/configure
index 91e7bb27be..a68e683cdd 100755
--- a/tools/configure
+++ b/tools/configure
@@ -1569,10 +1569,9 @@ cat <<EOF
  ==Samsung==              111) M6SP              61) Sansa View
  140) YH-820              112) M3                62) Sansa Clip+
  141) YH-920                                     63) Sansa Fuze v2
- 142) YH-925              ==Tatung==             64) Sansa Fuze+
- 143) YP-S3               150) Elio TPJ-1022     65) Sansa Clip Zip
-                                                 66) Sansa Connect
-                          ==Packard Bell==
+ 142) YH-925                                     64) Sansa Fuze+
+ 143) YP-S3                                      65) Sansa Clip Zip
+                          ==Packard Bell==       66) Sansa Connect
  ==Application==          160) Vibe 500
  200) SDL
  201) Android             ==MPIO==
@@ -2707,30 +2706,6 @@ fi
     arm926ejscc
     ;;
 
-   150|tatungtpj1022)
-    target_id=25
-    modelname="tatungtpj1022"
-    target="TATUNG_TPJ1022"
-    memory=32 # always
-    arm7tdmicc
-    tool="$rootdir/tools/scramble -add tpj2"
-    bmp2rb_mono="$rootdir/tools/bmp2rb -f 0"
-    bmp2rb_native="$rootdir/tools/bmp2rb -f 5"
-    output="rockbox.elio"
-    appextra="recorder:gui:radio"
-    plugins="yes"
-    boottool="$rootdir/tools/scramble -mi4v2"
-    bootoutput="pp5020.mi4"
-    # toolset is the tools within the tools directory that we build for
-    # this particular target.
-    toolset=$scramblebitmaptools
-    # architecture, manufacturer and model for the target-tree build
-    t_cpu="arm"
-    t_soc="pp"
-    t_manufacturer="tatung"
-    t_model="tpj1022"
-    ;;
-
    100|gogearsa9200)
     target_id=41
     modelname="gogearsa9200"
diff --git a/utils/themeeditor/resources/targetdb b/utils/themeeditor/resources/targetdb
index 5fab241371..4d94992953 100644
--- a/utils/themeeditor/resources/targetdb
+++ b/utils/themeeditor/resources/targetdb
@@ -814,15 +814,6 @@ sonynwzs750
     record : no
 }
 
-tatungtpj1022
-{
-    name   : Tatung Elio TPJ-1022
-    screen : 220 x 176 @ rgb
-    remote : no
-    fm     : no
-    record : no
-}
-
 gigabeats
 {
     name   : Toshiba Gigabeat S