summaryrefslogtreecommitdiffstats
path: root/firmware
diff options
context:
space:
mode:
authorRobert Kukla <roolku@rockbox.org>2009-12-07 16:12:49 +0000
committerRobert Kukla <roolku@rockbox.org>2009-12-07 16:12:49 +0000
commit2d722a17ec1d7b99c4e23d97784f77abbfb128e3 (patch)
tree14eae5327c40f121e5cd74060cbc3f7765b7751e /firmware
parent0e74fceb8fd5a047acd4d2413b87d155b1f7f5de (diff)
downloadrockbox-2d722a17ec1d7b99c4e23d97784f77abbfb128e3.tar.gz
rockbox-2d722a17ec1d7b99c4e23d97784f77abbfb128e3.tar.bz2
rockbox-2d722a17ec1d7b99c4e23d97784f77abbfb128e3.zip
make tpj1022 bootloader compile again
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23892 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware')
-rw-r--r--firmware/SOURCES4
-rw-r--r--firmware/export/config.h4
-rw-r--r--firmware/export/config/tatungtpj1022.h2
-rw-r--r--firmware/kernel.c2
-rw-r--r--firmware/target/arm/system-pp502x.c2
-rw-r--r--firmware/target/arm/usb-fw-pp502x.c2
6 files changed, 8 insertions, 8 deletions
diff --git a/firmware/SOURCES b/firmware/SOURCES
index 1a078ada29..36f4c2762c 100644
--- a/firmware/SOURCES
+++ b/firmware/SOURCES
@@ -946,7 +946,7 @@ target/arm/usb-fw-pp502x.c
#endif /* SIMULATOR */
#endif /* MROBE_100 */
-#ifdef ELIO_TPJ1022
+#ifdef TATUNG_TPJ1022
#ifndef SIMULATOR
target/arm/ata-as-arm.S
target/arm/ata-pp5020.c
@@ -960,7 +960,7 @@ target/arm/tatung/tpj1022/power-tpj1022.c
target/arm/tatung/tpj1022/powermgmt-tpj1022.c
target/arm/usb-fw-pp502x.c
#endif /* SIMULATOR */
-#endif /* ELIO_TPJ1022 */
+#endif /* TATUNG_TPJ1022 */
#ifdef IPOD_4G
#ifndef SIMULATOR
diff --git a/firmware/export/config.h b/firmware/export/config.h
index 438d98116f..303e5645df 100644
--- a/firmware/export/config.h
+++ b/firmware/export/config.h
@@ -87,7 +87,7 @@
#define IRIVER_H10_PAD 12
#define SANSA_E200_PAD 13
#define SANSA_C200_PAD 14
-#define ELIO_TPJ1022_PAD 15
+#define TATUNG_TPJ1022_PAD 15
#define ARCHOS_AV300_PAD 16
#define MROBE100_PAD 17
#define MROBE500_PAD 18
@@ -337,7 +337,7 @@ Lyre prototype 1 */
#include "config/sansac200.h"
#elif defined(SANSA_M200)
#include "config/sansam200.h"
-#elif defined(ELIO_TPJ1022)
+#elif defined(TATUNG_TPJ1022)
#include "config/tatungtpj1022.h"
#elif defined(MROBE_100)
#include "config/mrobe100.h"
diff --git a/firmware/export/config/tatungtpj1022.h b/firmware/export/config/tatungtpj1022.h
index 89e3d6dff1..079be73c86 100644
--- a/firmware/export/config/tatungtpj1022.h
+++ b/firmware/export/config/tatungtpj1022.h
@@ -43,7 +43,7 @@
/* #define IRAM_LCDFRAMEBUFFER IDATA_ATTR *//* put the lcd frame buffer in IRAM */
-#define CONFIG_KEYPAD ELIO_TPJ1022_PAD
+#define CONFIG_KEYPAD TATUNG_TPJ1022_PAD
/* Define this if you do software codec */
#define CONFIG_CODEC SWCODEC
diff --git a/firmware/kernel.c b/firmware/kernel.c
index d076d6defc..fbc5a2905c 100644
--- a/firmware/kernel.c
+++ b/firmware/kernel.c
@@ -272,7 +272,7 @@ void sleep(int ticks)
void yield(void)
{
-#if ((defined(ELIO_TPJ1022)) && defined(BOOTLOADER))
+#if ((defined(TATUNG_TPJ1022)) && defined(BOOTLOADER))
/* Some targets don't like yielding in the bootloader */
#else
switch_thread();
diff --git a/firmware/target/arm/system-pp502x.c b/firmware/target/arm/system-pp502x.c
index 6ce45a12f3..61d4d7cb59 100644
--- a/firmware/target/arm/system-pp502x.c
+++ b/firmware/target/arm/system-pp502x.c
@@ -459,7 +459,7 @@ void system_init(void)
/* to be done */
#elif defined (MROBE_100)
/* to be done */
-#elif defined (ELIO_TPJ1022)
+#elif defined (TATUNG_TPJ1022)
/* to be done */
#endif
diff --git a/firmware/target/arm/usb-fw-pp502x.c b/firmware/target/arm/usb-fw-pp502x.c
index 0dbb965eaa..e234e61031 100644
--- a/firmware/target/arm/usb-fw-pp502x.c
+++ b/firmware/target/arm/usb-fw-pp502x.c
@@ -82,7 +82,7 @@
#define USB_GPIO_MASK 0x10
#define USB_GPIO_VAL 0x10
-#elif defined(ELIO_TPJ1022)
+#elif defined(TATUNG_TPJ1022)
/* GPIO ? bit ? is usb detect (dummy value)*/
#define USB_GPIO GPIOD
#define USB_GPIO_MASK 0x10