diff options
author | Robert Kukla <roolku@rockbox.org> | 2009-12-07 16:12:49 +0000 |
---|---|---|
committer | Robert Kukla <roolku@rockbox.org> | 2009-12-07 16:12:49 +0000 |
commit | 2d722a17ec1d7b99c4e23d97784f77abbfb128e3 (patch) | |
tree | 14eae5327c40f121e5cd74060cbc3f7765b7751e /firmware | |
parent | 0e74fceb8fd5a047acd4d2413b87d155b1f7f5de (diff) | |
download | rockbox-2d722a17ec1d7b99c4e23d97784f77abbfb128e3.tar.gz 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/SOURCES | 4 | ||||
-rw-r--r-- | firmware/export/config.h | 4 | ||||
-rw-r--r-- | firmware/export/config/tatungtpj1022.h | 2 | ||||
-rw-r--r-- | firmware/kernel.c | 2 | ||||
-rw-r--r-- | firmware/target/arm/system-pp502x.c | 2 | ||||
-rw-r--r-- | firmware/target/arm/usb-fw-pp502x.c | 2 |
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 | |||
946 | #endif /* SIMULATOR */ | 946 | #endif /* SIMULATOR */ |
947 | #endif /* MROBE_100 */ | 947 | #endif /* MROBE_100 */ |
948 | 948 | ||
949 | #ifdef ELIO_TPJ1022 | 949 | #ifdef TATUNG_TPJ1022 |
950 | #ifndef SIMULATOR | 950 | #ifndef SIMULATOR |
951 | target/arm/ata-as-arm.S | 951 | target/arm/ata-as-arm.S |
952 | target/arm/ata-pp5020.c | 952 | target/arm/ata-pp5020.c |
@@ -960,7 +960,7 @@ target/arm/tatung/tpj1022/power-tpj1022.c | |||
960 | target/arm/tatung/tpj1022/powermgmt-tpj1022.c | 960 | target/arm/tatung/tpj1022/powermgmt-tpj1022.c |
961 | target/arm/usb-fw-pp502x.c | 961 | target/arm/usb-fw-pp502x.c |
962 | #endif /* SIMULATOR */ | 962 | #endif /* SIMULATOR */ |
963 | #endif /* ELIO_TPJ1022 */ | 963 | #endif /* TATUNG_TPJ1022 */ |
964 | 964 | ||
965 | #ifdef IPOD_4G | 965 | #ifdef IPOD_4G |
966 | #ifndef SIMULATOR | 966 | #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 @@ | |||
87 | #define IRIVER_H10_PAD 12 | 87 | #define IRIVER_H10_PAD 12 |
88 | #define SANSA_E200_PAD 13 | 88 | #define SANSA_E200_PAD 13 |
89 | #define SANSA_C200_PAD 14 | 89 | #define SANSA_C200_PAD 14 |
90 | #define ELIO_TPJ1022_PAD 15 | 90 | #define TATUNG_TPJ1022_PAD 15 |
91 | #define ARCHOS_AV300_PAD 16 | 91 | #define ARCHOS_AV300_PAD 16 |
92 | #define MROBE100_PAD 17 | 92 | #define MROBE100_PAD 17 |
93 | #define MROBE500_PAD 18 | 93 | #define MROBE500_PAD 18 |
@@ -337,7 +337,7 @@ Lyre prototype 1 */ | |||
337 | #include "config/sansac200.h" | 337 | #include "config/sansac200.h" |
338 | #elif defined(SANSA_M200) | 338 | #elif defined(SANSA_M200) |
339 | #include "config/sansam200.h" | 339 | #include "config/sansam200.h" |
340 | #elif defined(ELIO_TPJ1022) | 340 | #elif defined(TATUNG_TPJ1022) |
341 | #include "config/tatungtpj1022.h" | 341 | #include "config/tatungtpj1022.h" |
342 | #elif defined(MROBE_100) | 342 | #elif defined(MROBE_100) |
343 | #include "config/mrobe100.h" | 343 | #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 @@ | |||
43 | 43 | ||
44 | /* #define IRAM_LCDFRAMEBUFFER IDATA_ATTR *//* put the lcd frame buffer in IRAM */ | 44 | /* #define IRAM_LCDFRAMEBUFFER IDATA_ATTR *//* put the lcd frame buffer in IRAM */ |
45 | 45 | ||
46 | #define CONFIG_KEYPAD ELIO_TPJ1022_PAD | 46 | #define CONFIG_KEYPAD TATUNG_TPJ1022_PAD |
47 | 47 | ||
48 | /* Define this if you do software codec */ | 48 | /* Define this if you do software codec */ |
49 | #define CONFIG_CODEC SWCODEC | 49 | #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) | |||
272 | 272 | ||
273 | void yield(void) | 273 | void yield(void) |
274 | { | 274 | { |
275 | #if ((defined(ELIO_TPJ1022)) && defined(BOOTLOADER)) | 275 | #if ((defined(TATUNG_TPJ1022)) && defined(BOOTLOADER)) |
276 | /* Some targets don't like yielding in the bootloader */ | 276 | /* Some targets don't like yielding in the bootloader */ |
277 | #else | 277 | #else |
278 | switch_thread(); | 278 | 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) | |||
459 | /* to be done */ | 459 | /* to be done */ |
460 | #elif defined (MROBE_100) | 460 | #elif defined (MROBE_100) |
461 | /* to be done */ | 461 | /* to be done */ |
462 | #elif defined (ELIO_TPJ1022) | 462 | #elif defined (TATUNG_TPJ1022) |
463 | /* to be done */ | 463 | /* to be done */ |
464 | #endif | 464 | #endif |
465 | 465 | ||
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 @@ | |||
82 | #define USB_GPIO_MASK 0x10 | 82 | #define USB_GPIO_MASK 0x10 |
83 | #define USB_GPIO_VAL 0x10 | 83 | #define USB_GPIO_VAL 0x10 |
84 | 84 | ||
85 | #elif defined(ELIO_TPJ1022) | 85 | #elif defined(TATUNG_TPJ1022) |
86 | /* GPIO ? bit ? is usb detect (dummy value)*/ | 86 | /* GPIO ? bit ? is usb detect (dummy value)*/ |
87 | #define USB_GPIO GPIOD | 87 | #define USB_GPIO GPIOD |
88 | #define USB_GPIO_MASK 0x10 | 88 | #define USB_GPIO_MASK 0x10 |