summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDave Chapman <dave@dchapman.com>2005-11-12 16:01:15 +0000
committerDave Chapman <dave@dchapman.com>2005-11-12 16:01:15 +0000
commitafbd4386ffdd402969cdeeeaa81e664860bb12da (patch)
treeda3ed9555d1b7bb1e24e7c2b2caaf6703cd246db
parent0cdd21e9dcddc36248eea34cd25a2de0d88412ad (diff)
downloadrockbox-afbd4386ffdd402969cdeeeaa81e664860bb12da.tar.gz
rockbox-afbd4386ffdd402969cdeeeaa81e664860bb12da.zip
iPod: Implement plugin.lds and enable codec building for all SWCODEC platforms, not just H100 series
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@7829 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--apps/codecs/SOURCES2
-rw-r--r--apps/plugins/plugin.lds20
2 files changed, 18 insertions, 4 deletions
diff --git a/apps/codecs/SOURCES b/apps/codecs/SOURCES
index 4ac9159643..69d925248b 100644
--- a/apps/codecs/SOURCES
+++ b/apps/codecs/SOURCES
@@ -1,4 +1,4 @@
1#ifdef IRIVER_H100_SERIES 1#if CONFIG_CODEC == SWCODEC
2vorbis.c 2vorbis.c
3mpa.c 3mpa.c
4flac.c 4flac.c
diff --git a/apps/plugins/plugin.lds b/apps/plugins/plugin.lds
index 3e7261f024..83825b9035 100644
--- a/apps/plugins/plugin.lds
+++ b/apps/plugins/plugin.lds
@@ -4,6 +4,8 @@
4 4
5#ifdef CPU_COLDFIRE 5#ifdef CPU_COLDFIRE
6OUTPUT_FORMAT(elf32-m68k) 6OUTPUT_FORMAT(elf32-m68k)
7#elif CONFIG_CPU==PP5020
8OUTPUT_FORMAT(elf32-littlearm)
7#else 9#else
8OUTPUT_FORMAT(elf32-sh) 10OUTPUT_FORMAT(elf32-sh)
9#endif 11#endif
@@ -18,10 +20,18 @@ OUTPUT_FORMAT(elf32-sh)
18#define ARCH_IRIVER 20#define ARCH_IRIVER
19#endif 21#endif
20 22
23#if CONFIG_CPU==PP5020
24#define ARCH_IPOD
25#endif
26
21#ifdef ARCH_IRIVER 27#ifdef ARCH_IRIVER
22#define DRAMORIG 0x31000000 28#define DRAMORIG 0x31000000
23#define IRAMORIG 0x1000c000 29#define IRAMORIG 0x1000c000
24#define IRAMSIZE 0xc000 30#define IRAMSIZE 0xc000
31#elif defined(ARCH_IPOD)
32#define DRAMORIG 0x10000000
33#define IRAMORIG 0x4000c000
34#define IRAMSIZE 0xc000
25#else 35#else
26#define DRAMORIG 0x09000000 + STUBOFFSET 36#define DRAMORIG 0x09000000 + STUBOFFSET
27#endif 37#endif
@@ -43,7 +53,7 @@ OUTPUT_FORMAT(elf32-sh)
43MEMORY 53MEMORY
44{ 54{
45 PLUGIN_RAM : ORIGIN = THIS_ORIGIN, LENGTH = THIS_LENGTH 55 PLUGIN_RAM : ORIGIN = THIS_ORIGIN, LENGTH = THIS_LENGTH
46#ifdef ARCH_IRIVER 56#if defined(ARCH_IRIVER) || defined(ARCH_IPOD)
47 PLUGIN_IRAM : ORIGIN = IRAMORIG, LENGTH = IRAMSIZE 57 PLUGIN_IRAM : ORIGIN = IRAMORIG, LENGTH = IRAMSIZE
48#endif 58#endif
49} 59}
@@ -53,6 +63,10 @@ SECTIONS
53 .text : { 63 .text : {
54 KEEP(*(.entry)) 64 KEEP(*(.entry))
55 *(.text*) 65 *(.text*)
66#if CONFIG_CPU==PP5020
67 *(.glue_7)
68 *(.glue_7t)
69#endif
56 } > PLUGIN_RAM 70 } > PLUGIN_RAM
57 71
58 .data : { 72 .data : {
@@ -70,12 +84,12 @@ SECTIONS
70 .rodata : { 84 .rodata : {
71 *(.rodata*) 85 *(.rodata*)
72 . = ALIGN(0x4); 86 . = ALIGN(0x4);
73#ifdef ARCH_IRIVER 87#if defined(ARCH_IRIVER) || defined(ARCH_IPOD)
74 iramcopy = .; 88 iramcopy = .;
75#endif 89#endif
76 } > PLUGIN_RAM 90 } > PLUGIN_RAM
77 91
78#ifdef ARCH_IRIVER 92#if defined(ARCH_IRIVER) || defined(ARCH_IPOD)
79 .iram IRAMORIG : AT ( iramcopy) 93 .iram IRAMORIG : AT ( iramcopy)
80 { 94 {
81 iramstart = .; 95 iramstart = .;