Change if CONFIG_CPU==PP50XX to ifdef CPU_PP where appropriate

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

3 files changed, 5 insertions, 9 deletions

diff --git a/apps/debug_menu.c b/apps/debug_menu.c
index ecdbe26370..d127aefbfb 100644
--- a/apps/debug_menu.c
+++ b/apps/debug_menu.c
@@ -385,8 +385,8 @@ bool dbg_flash_id(unsigned* p_manufacturer, unsigned* p_device,
                   unsigned addr1, unsigned addr2)
 
 {
-#if (CONFIG_CPU == PP5002) || (CONFIG_CPU == PP5020)
-    /* TODO: Implement for iPod */
+#ifdef CPU_PP
+    /* TODO: Implement for PortalPlayer */
     (void)p_manufacturer;
     (void)p_device;
     (void)addr1;
diff --git a/apps/playback.c b/apps/playback.c
index 9bf6942e7f..9d03cd266c 100644
--- a/apps/playback.c
+++ b/apps/playback.c
@@ -167,7 +167,7 @@ enum {
 #endif
 
 /* As defined in plugin.lds */
-#if CONFIG_CPU == PP5020 || CONFIG_CPU == PP5002
+#if defined(CPU_PP)
 #define CODEC_IRAM_ORIGIN   0x4000c000
 #define CODEC_IRAM_SIZE     0xc000
 #elif defined(IAUDIO_X5)
diff --git a/apps/plugins/plugin.lds b/apps/plugins/plugin.lds
index f72059c107..ef0dece36f 100644
--- a/apps/plugins/plugin.lds
+++ b/apps/plugins/plugin.lds
@@ -20,10 +20,6 @@ OUTPUT_FORMAT(elf32-sh)
 #define ARCH_IRIVER
 #endif
 
-#if (CONFIG_CPU==PP5002) || (CONFIG_CPU==PP5020)
-#define ARCH_IPOD
-#endif
-
 #ifdef ARCH_IRIVER
 #define DRAMORIG 0x31000000
 #define IRAMORIG 0x1000c000
@@ -32,7 +28,7 @@ OUTPUT_FORMAT(elf32-sh)
 #define DRAMORIG 0x31000000
 #define IRAMORIG 0x10010000
 #define IRAMSIZE 0x10000
-#elif defined(ARCH_IPOD)
+#elif defined(CPU_PP)
 #define DRAMORIG 0x00000000
 #define IRAMORIG 0x4000c000
 #define IRAMSIZE 0xc000
@@ -77,7 +73,7 @@ SECTIONS
     .text :
     {
         *(.text*)
-#if (CONFIG_CPU==PP5020) || (CONFIG_CPU==PNX0101) || (CONFIG_CPU==PP5002)
+#if defined(CPU_PP) || (CONFIG_CPU==PNX0101)
         *(.glue_7)
         *(.glue_7t)
 #endif