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, 3 insertions, 4 deletions

diff --git a/firmware/export/config.h b/firmware/export/config.h
index 74c7e924ff..95e3399690 100644
--- a/firmware/export/config.h
+++ b/firmware/export/config.h
@@ -275,8 +275,7 @@
 #if !defined(SIMULATOR) &&   /* Not for simulators */ \
     (((CONFIG_CPU == SH7034) && !defined(PLUGIN)) || /* SH1 archos: core only */ \
     defined(CPU_COLDFIRE) || /* Coldfire: core, plugins, codecs */ \
-    (CONFIG_CPU == PP5020) ||  /* iPod and H10: core, plugins, codecs */ \
-    (CONFIG_CPU == PP5002) ||  /* iPod: core, plugins, codecs */ \
+    defined(CPU_PP) ||  /* PortalPlayer: core, plugins, codecs */ \
     (CONFIG_CPU == PNX0101))
 #define ICODE_ATTR      __attribute__ ((section(".icode")))
 #define ICONST_ATTR     __attribute__ ((section(".irodata")))
diff --git a/firmware/export/kernel.h b/firmware/export/kernel.h
index 32c052a34d..2474c6dcac 100644
--- a/firmware/export/kernel.h
+++ b/firmware/export/kernel.h
@@ -70,7 +70,7 @@ struct mutex
 };
 
 /* global tick variable */
-#if ((CONFIG_CPU == PP5002) || (CONFIG_CPU == PP5020)) && defined(BOOTLOADER)
+#if defined(CPU_PP) && defined(BOOTLOADER)
 /* We don't enable interrupts in the iPod bootloader, so we need to fake
    the current_tick variable */
 #define current_tick (signed)(USEC_TIMER/10000)
diff --git a/firmware/export/timer.h b/firmware/export/timer.h
index 2fb7c6495f..f32a8a1790 100644
--- a/firmware/export/timer.h
+++ b/firmware/export/timer.h
@@ -26,7 +26,7 @@
 #ifndef SIMULATOR
 
 
-#if CONFIG_CPU == PP5020 || CONFIG_CPU == PP5002
+#if defined(CPU_PP)
  /* Portalplayer chips use a microsecond timer. */
  #define TIMER_FREQ 1000000
 #elif defined(CPU_COLDFIRE)