nicer check for PP and now using crt0.o for ARMs that aren't ipod archs

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@10431 a1c6a512-1295-4272-9138-f99709370657

1 files changed, 7 insertions, 2 deletions

diff --git a/firmware/boot.lds b/firmware/boot.lds
index 5694d83490..78dd40bf92 100644
--- a/firmware/boot.lds
+++ b/firmware/boot.lds
@@ -7,6 +7,11 @@ INPUT(crt0.o)
 #elif defined (CPU_ARM)
 OUTPUT_FORMAT(elf32-littlearm)
 OUTPUT_ARCH(arm)
+#ifndef IPOD_ARCH
+/* the ipods can't have the crt0.o mentioned here, but the others can't do
+   without it! */
+INPUT(crt0.o)
+#endif
 #else
 OUTPUT_FORMAT(elf32-sh)
 INPUT(crt0.o)
@@ -64,7 +69,7 @@ INPUT(crt0.o)
 #define FLASHSIZE 256K - ROM_START
 #endif
 
-#if (CONFIG_CPU!=PP5002) && (CONFIG_CPU!=PP5020) && (CONFIG_CPU!=PP5024)
+#ifndef CPU_PP
 MEMORY
 {
    DRAM : ORIGIN = DRAMORIG, LENGTH = DRAMSIZE
@@ -74,7 +79,7 @@ MEMORY
 #endif
 
 SECTIONS
-#if (CONFIG_CPU==PP5002) || (CONFIG_CPU==PP5020) || (CONFIG_CPU==PP5024)
+#ifdef CPU_PP
 {
   . = IRAMORIG;