From afbd4386ffdd402969cdeeeaa81e664860bb12da Mon Sep 17 00:00:00 2001 From: Dave Chapman Date: Sat, 12 Nov 2005 16:01:15 +0000 Subject: [PATCH] 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 --- apps/codecs/SOURCES | 2 +- apps/plugins/plugin.lds | 20 +++++++++++++++++--- 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 @@ -#ifdef IRIVER_H100_SERIES +#if CONFIG_CODEC == SWCODEC vorbis.c mpa.c flac.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 @@ #ifdef CPU_COLDFIRE OUTPUT_FORMAT(elf32-m68k) +#elif CONFIG_CPU==PP5020 +OUTPUT_FORMAT(elf32-littlearm) #else OUTPUT_FORMAT(elf32-sh) #endif @@ -18,10 +20,18 @@ OUTPUT_FORMAT(elf32-sh) #define ARCH_IRIVER #endif +#if CONFIG_CPU==PP5020 +#define ARCH_IPOD +#endif + #ifdef ARCH_IRIVER #define DRAMORIG 0x31000000 #define IRAMORIG 0x1000c000 #define IRAMSIZE 0xc000 +#elif defined(ARCH_IPOD) +#define DRAMORIG 0x10000000 +#define IRAMORIG 0x4000c000 +#define IRAMSIZE 0xc000 #else #define DRAMORIG 0x09000000 + STUBOFFSET #endif @@ -43,7 +53,7 @@ OUTPUT_FORMAT(elf32-sh) MEMORY { PLUGIN_RAM : ORIGIN = THIS_ORIGIN, LENGTH = THIS_LENGTH -#ifdef ARCH_IRIVER +#if defined(ARCH_IRIVER) || defined(ARCH_IPOD) PLUGIN_IRAM : ORIGIN = IRAMORIG, LENGTH = IRAMSIZE #endif } @@ -53,6 +63,10 @@ SECTIONS .text : { KEEP(*(.entry)) *(.text*) +#if CONFIG_CPU==PP5020 + *(.glue_7) + *(.glue_7t) +#endif } > PLUGIN_RAM .data : { @@ -70,12 +84,12 @@ SECTIONS .rodata : { *(.rodata*) . = ALIGN(0x4); -#ifdef ARCH_IRIVER +#if defined(ARCH_IRIVER) || defined(ARCH_IPOD) iramcopy = .; #endif } > PLUGIN_RAM -#ifdef ARCH_IRIVER +#if defined(ARCH_IRIVER) || defined(ARCH_IPOD) .iram IRAMORIG : AT ( iramcopy) { iramstart = .;