diff --git a/firmware/crt0.S b/firmware/crt0.S
index 6c618c6959..6477011064 100644
--- a/firmware/crt0.S
+++ b/firmware/crt0.S
@@ -285,7 +285,7 @@ boot_table:
     /* Set up stack for FIQ mode */ 
     msr    cpsr_c, #0xd1
     ldr    sp, =fiq_stack
-#if CONFIG_CPU == PP5020 || CONFIG_CPU == PP5002
+#ifdef CPU_PP
     /* We'll load the banked FIQ mode registers with useful values here.
        These values will be used in the FIQ handler in pcm_playback.c */
 #if CONFIG_CPU == PP5002
diff --git a/firmware/export/system.h b/firmware/export/system.h
index 1f74b27f29..dae5d95794 100644
--- a/firmware/export/system.h
+++ b/firmware/export/system.h
@@ -29,7 +29,7 @@ extern void system_init(void);
 
 extern long cpu_frequency;
 
-#if (CONFIG_CPU == PP5002) || (CONFIG_CPU == PP5020)
+#ifdef CPU_PP
 #define inl(a) (*(volatile unsigned long *) (a))
 #define outl(a,b) (*(volatile unsigned long *) (b) = (a))
 #define inb(a) (*(volatile unsigned char *) (a))