diff options
author | Marcoen Hirschberg <marcoen@gmail.com> | 2007-04-19 10:14:55 +0000 |
---|---|---|
committer | Marcoen Hirschberg <marcoen@gmail.com> | 2007-04-19 10:14:55 +0000 |
commit | 6ffbe3896b89ce86cccfe3b1f492f60e34d89603 (patch) | |
tree | b6b845fc876b0d98b793aefa906f5d5eab6993f5 | |
parent | 710a9ca194316d3a269a3c3dd2e603768da5a780 (diff) | |
download | rockbox-6ffbe3896b89ce86cccfe3b1f492f60e34d89603.tar.gz rockbox-6ffbe3896b89ce86cccfe3b1f492f60e34d89603.zip |
move the iriver ifp7xx and other pnx0101 related files together in the target tree
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@13207 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r-- | firmware/FILES | 2 | ||||
-rw-r--r-- | firmware/SOURCES | 16 | ||||
-rw-r--r-- | firmware/app.lds | 2 | ||||
-rw-r--r-- | firmware/target/arm/pnx0101/backlight-target.h | 26 | ||||
-rw-r--r-- | firmware/target/arm/pnx0101/crt0-pnx0101.S (renamed from firmware/target/arm/crt0-pnx0101.S) | 0 | ||||
-rw-r--r-- | firmware/target/arm/pnx0101/iriver-ifp7xx/adc-ifp7xx.c (renamed from firmware/target/arm/iriver/ifp7xx/adc-ifp7xx.c) | 0 | ||||
-rw-r--r-- | firmware/target/arm/pnx0101/iriver-ifp7xx/adc-target.h (renamed from firmware/target/arm/iriver/ifp7xx/adc-target.h) | 0 | ||||
-rw-r--r-- | firmware/target/arm/pnx0101/iriver-ifp7xx/backlight-ifp7xx.c (renamed from firmware/target/arm/iriver/ifp7xx/backlight-ifp7xx.c) | 0 | ||||
-rw-r--r-- | firmware/target/arm/pnx0101/iriver-ifp7xx/button-ifp7xx.c (renamed from firmware/target/arm/iriver/ifp7xx/button-ifp7xx.c) | 0 | ||||
-rw-r--r-- | firmware/target/arm/pnx0101/iriver-ifp7xx/button-target.h (renamed from firmware/target/arm/iriver/ifp7xx/button-target.h) | 0 | ||||
-rw-r--r-- | firmware/target/arm/pnx0101/iriver-ifp7xx/lcd-ifp7xx.c (renamed from firmware/target/arm/iriver/ifp7xx/lcd-ifp7xx.c) | 0 | ||||
-rw-r--r-- | firmware/target/arm/pnx0101/iriver-ifp7xx/power-ifp7xx.c (renamed from firmware/target/arm/iriver/ifp7xx/power-ifp7xx.c) | 0 | ||||
-rw-r--r-- | firmware/target/arm/pnx0101/iriver-ifp7xx/system-target.h (renamed from firmware/target/arm/iriver/ifp7xx/system-target.h) | 0 | ||||
-rw-r--r-- | firmware/target/arm/pnx0101/iriver-ifp7xx/usb-ifp7xx.c (renamed from firmware/target/arm/iriver/ifp7xx/usb-ifp7xx.c) | 0 | ||||
-rw-r--r-- | firmware/target/arm/pnx0101/system-pnx0101.c (renamed from firmware/target/arm/system-pnx0101.c) | 0 | ||||
-rw-r--r-- | firmware/target/arm/pnx0101/usb-target.h | 27 | ||||
-rwxr-xr-x | tools/configure | 4 |
17 files changed, 65 insertions, 12 deletions
diff --git a/firmware/FILES b/firmware/FILES index f44d5f28b7..f68e0cbb01 100644 --- a/firmware/FILES +++ b/firmware/FILES | |||
@@ -19,7 +19,7 @@ target/arm/archos/av300/*.[chS] | |||
19 | target/arm/s3c2440/gigabeat-fx/*.[chS] | 19 | target/arm/s3c2440/gigabeat-fx/*.[chS] |
20 | target/arm/iriver/*.[chS] | 20 | target/arm/iriver/*.[chS] |
21 | target/arm/iriver/h10/*.[chS] | 21 | target/arm/iriver/h10/*.[chS] |
22 | target/arm/iriver/ifp7xx/*.[chS] | 22 | target/arm/pnx0101/iriver-ifp7xx/*.[chS] |
23 | target/arm/ipod/*.[chS] | 23 | target/arm/ipod/*.[chS] |
24 | target/arm/ipod/3g/*.[chS] | 24 | target/arm/ipod/3g/*.[chS] |
25 | target/arm/ipod/video/*.[chS] | 25 | target/arm/ipod/video/*.[chS] |
diff --git a/firmware/SOURCES b/firmware/SOURCES index d8d495c89c..d8e3d7e2ed 100644 --- a/firmware/SOURCES +++ b/firmware/SOURCES | |||
@@ -279,7 +279,7 @@ drivers/i2c-pnx0101.c | |||
279 | /* no i2c driver yet */ | 279 | /* no i2c driver yet */ |
280 | #endif | 280 | #endif |
281 | #if CONFIG_CPU == PNX0101 | 281 | #if CONFIG_CPU == PNX0101 |
282 | target/arm/system-pnx0101.c | 282 | target/arm/pnx0101/system-pnx0101.c |
283 | #endif | 283 | #endif |
284 | #if defined(CPU_PP) | 284 | #if defined(CPU_PP) |
285 | #ifdef BOOTLOADER | 285 | #ifdef BOOTLOADER |
@@ -290,7 +290,7 @@ target/arm/audio-pp.c | |||
290 | target/arm/crt0-pp.S | 290 | target/arm/crt0-pp.S |
291 | #endif | 291 | #endif |
292 | #elif CONFIG_CPU == PNX0101 | 292 | #elif CONFIG_CPU == PNX0101 |
293 | target/arm/crt0-pnx0101.S | 293 | target/arm/pnx0101/crt0-pnx0101.S |
294 | #elif defined(CPU_ARM) | 294 | #elif defined(CPU_ARM) |
295 | target/arm/crt0.S | 295 | target/arm/crt0.S |
296 | #endif /* defined(CPU_*) */ | 296 | #endif /* defined(CPU_*) */ |
@@ -642,12 +642,12 @@ target/arm/usb-pp.c | |||
642 | #endif /* IPOD_MINI2G */ | 642 | #endif /* IPOD_MINI2G */ |
643 | 643 | ||
644 | #ifdef IRIVER_IFP7XX | 644 | #ifdef IRIVER_IFP7XX |
645 | target/arm/iriver/ifp7xx/power-ifp7xx.c | 645 | target/arm/pnx0101/iriver-ifp7xx/power-ifp7xx.c |
646 | #ifndef SIMULATOR | 646 | #ifndef SIMULATOR |
647 | target/arm/iriver/ifp7xx/adc-ifp7xx.c | 647 | target/arm/pnx0101/iriver-ifp7xx/adc-ifp7xx.c |
648 | target/arm/iriver/ifp7xx/backlight-ifp7xx.c | 648 | target/arm/pnx0101/iriver-ifp7xx/backlight-ifp7xx.c |
649 | target/arm/iriver/ifp7xx/button-ifp7xx.c | 649 | target/arm/pnx0101/iriver-ifp7xx/button-ifp7xx.c |
650 | target/arm/iriver/ifp7xx/lcd-ifp7xx.c | 650 | target/arm/pnx0101/iriver-ifp7xx/lcd-ifp7xx.c |
651 | target/arm/iriver/ifp7xx/usb-ifp7xx.c | 651 | target/arm/pnx0101/iriver-ifp7xx/usb-ifp7xx.c |
652 | #endif | 652 | #endif |
653 | #endif | 653 | #endif |
diff --git a/firmware/app.lds b/firmware/app.lds index f1a02b56d7..8b0bed31d2 100644 --- a/firmware/app.lds +++ b/firmware/app.lds | |||
@@ -10,7 +10,7 @@ OUTPUT_ARCH(arm) | |||
10 | #ifdef CPU_PP | 10 | #ifdef CPU_PP |
11 | INPUT(target/arm/crt0-pp.o) | 11 | INPUT(target/arm/crt0-pp.o) |
12 | #elif CONFIG_CPU == PNX0101 | 12 | #elif CONFIG_CPU == PNX0101 |
13 | INPUT(target/arm/crt0-pnx0101.o) | 13 | INPUT(target/arm/pnx0101/crt0-pnx0101.o) |
14 | #elif defined(CPU_ARM) | 14 | #elif defined(CPU_ARM) |
15 | INPUT(target/arm/crt0.o) | 15 | INPUT(target/arm/crt0.o) |
16 | #endif | 16 | #endif |
diff --git a/firmware/target/arm/pnx0101/backlight-target.h b/firmware/target/arm/pnx0101/backlight-target.h new file mode 100644 index 0000000000..04236880ee --- /dev/null +++ b/firmware/target/arm/pnx0101/backlight-target.h | |||
@@ -0,0 +1,26 @@ | |||
1 | /*************************************************************************** | ||
2 | * __________ __ ___. | ||
3 | * Open \______ \ ____ ____ | | _\_ |__ _______ ___ | ||
4 | * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / | ||
5 | * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < | ||
6 | * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ | ||
7 | * \/ \/ \/ \/ \/ | ||
8 | * $Id: backlight-target.h 13136 2007-04-12 22:12:13Z amiconn $ | ||
9 | * | ||
10 | * Copyright (C) 2006 by Barry Wardell | ||
11 | * | ||
12 | * All files in this archive are subject to the GNU General Public License. | ||
13 | * See the file COPYING in the source tree root for full license agreement. | ||
14 | * | ||
15 | * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY | ||
16 | * KIND, either express or implied. | ||
17 | * | ||
18 | ****************************************************************************/ | ||
19 | #ifndef BACKLIGHT_TARGET_H | ||
20 | #define BACKLIGHT_TARGET_H | ||
21 | |||
22 | #define __backlight_init() true | ||
23 | void __backlight_on(void); | ||
24 | void __backlight_off(void); | ||
25 | |||
26 | #endif | ||
diff --git a/firmware/target/arm/crt0-pnx0101.S b/firmware/target/arm/pnx0101/crt0-pnx0101.S index d11546edaa..d11546edaa 100644 --- a/firmware/target/arm/crt0-pnx0101.S +++ b/firmware/target/arm/pnx0101/crt0-pnx0101.S | |||
diff --git a/firmware/target/arm/iriver/ifp7xx/adc-ifp7xx.c b/firmware/target/arm/pnx0101/iriver-ifp7xx/adc-ifp7xx.c index 79b1ad0fcb..79b1ad0fcb 100644 --- a/firmware/target/arm/iriver/ifp7xx/adc-ifp7xx.c +++ b/firmware/target/arm/pnx0101/iriver-ifp7xx/adc-ifp7xx.c | |||
diff --git a/firmware/target/arm/iriver/ifp7xx/adc-target.h b/firmware/target/arm/pnx0101/iriver-ifp7xx/adc-target.h index 8e5e6edbc5..8e5e6edbc5 100644 --- a/firmware/target/arm/iriver/ifp7xx/adc-target.h +++ b/firmware/target/arm/pnx0101/iriver-ifp7xx/adc-target.h | |||
diff --git a/firmware/target/arm/iriver/ifp7xx/backlight-ifp7xx.c b/firmware/target/arm/pnx0101/iriver-ifp7xx/backlight-ifp7xx.c index c0dc3974c0..c0dc3974c0 100644 --- a/firmware/target/arm/iriver/ifp7xx/backlight-ifp7xx.c +++ b/firmware/target/arm/pnx0101/iriver-ifp7xx/backlight-ifp7xx.c | |||
diff --git a/firmware/target/arm/iriver/ifp7xx/button-ifp7xx.c b/firmware/target/arm/pnx0101/iriver-ifp7xx/button-ifp7xx.c index 52e29fdfdf..52e29fdfdf 100644 --- a/firmware/target/arm/iriver/ifp7xx/button-ifp7xx.c +++ b/firmware/target/arm/pnx0101/iriver-ifp7xx/button-ifp7xx.c | |||
diff --git a/firmware/target/arm/iriver/ifp7xx/button-target.h b/firmware/target/arm/pnx0101/iriver-ifp7xx/button-target.h index 954a2dfe9c..954a2dfe9c 100644 --- a/firmware/target/arm/iriver/ifp7xx/button-target.h +++ b/firmware/target/arm/pnx0101/iriver-ifp7xx/button-target.h | |||
diff --git a/firmware/target/arm/iriver/ifp7xx/lcd-ifp7xx.c b/firmware/target/arm/pnx0101/iriver-ifp7xx/lcd-ifp7xx.c index 0aacd8af67..0aacd8af67 100644 --- a/firmware/target/arm/iriver/ifp7xx/lcd-ifp7xx.c +++ b/firmware/target/arm/pnx0101/iriver-ifp7xx/lcd-ifp7xx.c | |||
diff --git a/firmware/target/arm/iriver/ifp7xx/power-ifp7xx.c b/firmware/target/arm/pnx0101/iriver-ifp7xx/power-ifp7xx.c index 4e4f585298..4e4f585298 100644 --- a/firmware/target/arm/iriver/ifp7xx/power-ifp7xx.c +++ b/firmware/target/arm/pnx0101/iriver-ifp7xx/power-ifp7xx.c | |||
diff --git a/firmware/target/arm/iriver/ifp7xx/system-target.h b/firmware/target/arm/pnx0101/iriver-ifp7xx/system-target.h index dc11bb74da..dc11bb74da 100644 --- a/firmware/target/arm/iriver/ifp7xx/system-target.h +++ b/firmware/target/arm/pnx0101/iriver-ifp7xx/system-target.h | |||
diff --git a/firmware/target/arm/iriver/ifp7xx/usb-ifp7xx.c b/firmware/target/arm/pnx0101/iriver-ifp7xx/usb-ifp7xx.c index a22a227b15..a22a227b15 100644 --- a/firmware/target/arm/iriver/ifp7xx/usb-ifp7xx.c +++ b/firmware/target/arm/pnx0101/iriver-ifp7xx/usb-ifp7xx.c | |||
diff --git a/firmware/target/arm/system-pnx0101.c b/firmware/target/arm/pnx0101/system-pnx0101.c index 9d8bb405a8..9d8bb405a8 100644 --- a/firmware/target/arm/system-pnx0101.c +++ b/firmware/target/arm/pnx0101/system-pnx0101.c | |||
diff --git a/firmware/target/arm/pnx0101/usb-target.h b/firmware/target/arm/pnx0101/usb-target.h new file mode 100644 index 0000000000..fb263b2419 --- /dev/null +++ b/firmware/target/arm/pnx0101/usb-target.h | |||
@@ -0,0 +1,27 @@ | |||
1 | /*************************************************************************** | ||
2 | * __________ __ ___. | ||
3 | * Open \______ \ ____ ____ | | _\_ |__ _______ ___ | ||
4 | * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / | ||
5 | * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < | ||
6 | * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ | ||
7 | * \/ \/ \/ \/ \/ | ||
8 | * $Id: usb-target.h 11494 2006-11-10 07:43:36Z tomal $ | ||
9 | * | ||
10 | * Copyright (C) 2006 by Barry Wardelll | ||
11 | * | ||
12 | * All files in this archive are subject to the GNU General Public License. | ||
13 | * See the file COPYING in the source tree root for full license agreement. | ||
14 | * | ||
15 | * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY | ||
16 | * KIND, either express or implied. | ||
17 | * | ||
18 | ****************************************************************************/ | ||
19 | |||
20 | /* Based off x5 version */ | ||
21 | |||
22 | #ifndef USB_TARGET_H | ||
23 | #define USB_TARGET_H | ||
24 | |||
25 | bool usb_init_device(void); | ||
26 | |||
27 | #endif | ||
diff --git a/tools/configure b/tools/configure index ab7b6e8968..ba464472b5 100755 --- a/tools/configure +++ b/tools/configure | |||
@@ -1105,8 +1105,8 @@ EOF | |||
1105 | # this particular target. | 1105 | # this particular target. |
1106 | toolset=$genericbitmaptools | 1106 | toolset=$genericbitmaptools |
1107 | t_cpu="arm" | 1107 | t_cpu="arm" |
1108 | t_manufacturer="iriver" | 1108 | t_manufacturer="pnx0101" |
1109 | t_model="ifp7xx" | 1109 | t_model="iriver-ifp7xx" |
1110 | ;; | 1110 | ;; |
1111 | 1111 | ||
1112 | 40|gigabeatf) | 1112 | 40|gigabeatf) |