diff options
Diffstat (limited to 'firmware/export')
| -rw-r--r-- | firmware/export/config-ipodmini2g.h | 4 | ||||
| -rw-r--r-- | firmware/export/config-ipodnano.h | 6 | ||||
| -rw-r--r-- | firmware/export/config-ipodvideo.h | 6 | ||||
| -rw-r--r-- | firmware/export/config.h | 8 | ||||
| -rw-r--r-- | firmware/export/cpu.h | 2 |
5 files changed, 13 insertions, 13 deletions
diff --git a/firmware/export/config-ipodmini2g.h b/firmware/export/config-ipodmini2g.h index 55831c4cb3..032d32ad4c 100644 --- a/firmware/export/config-ipodmini2g.h +++ b/firmware/export/config-ipodmini2g.h | |||
| @@ -76,8 +76,8 @@ | |||
| 76 | 76 | ||
| 77 | #ifndef SIMULATOR | 77 | #ifndef SIMULATOR |
| 78 | 78 | ||
| 79 | /* Define this if you have a PortalPlayer PP5020 */ | 79 | /* Define this if you have a PortalPlayer PP5022 */ |
| 80 | #define CONFIG_CPU PP5020 | 80 | #define CONFIG_CPU PP5022 |
| 81 | 81 | ||
| 82 | /* Define this if you want to use the PP5020 i2c interface */ | 82 | /* Define this if you want to use the PP5020 i2c interface */ |
| 83 | #define CONFIG_I2C I2C_PP5020 | 83 | #define CONFIG_I2C I2C_PP5020 |
diff --git a/firmware/export/config-ipodnano.h b/firmware/export/config-ipodnano.h index 1d024d8565..37935786b7 100644 --- a/firmware/export/config-ipodnano.h +++ b/firmware/export/config-ipodnano.h | |||
| @@ -74,10 +74,8 @@ | |||
| 74 | 74 | ||
| 75 | #ifndef SIMULATOR | 75 | #ifndef SIMULATOR |
| 76 | 76 | ||
| 77 | /* The Nano actually has a PP5021 - but it's register compatible with | 77 | /* Define this if you have a PortalPlayer PP5022 */ |
| 78 | the 5020 so Rockbox doesn't care. */ | 78 | #define CONFIG_CPU PP5022 |
| 79 | /* Define this if you have a PortalPlayer PP5020 */ | ||
| 80 | #define CONFIG_CPU PP5020 | ||
| 81 | 79 | ||
| 82 | /* Define this if you want to use the PP5020 i2c interface */ | 80 | /* Define this if you want to use the PP5020 i2c interface */ |
| 83 | #define CONFIG_I2C I2C_PP5020 | 81 | #define CONFIG_I2C I2C_PP5020 |
diff --git a/firmware/export/config-ipodvideo.h b/firmware/export/config-ipodvideo.h index 46411a7784..e954859eb0 100644 --- a/firmware/export/config-ipodvideo.h +++ b/firmware/export/config-ipodvideo.h | |||
| @@ -74,10 +74,8 @@ | |||
| 74 | 74 | ||
| 75 | #ifndef SIMULATOR | 75 | #ifndef SIMULATOR |
| 76 | 76 | ||
| 77 | /* The Nano actually has a PP5021 - but it's register compatible with | 77 | /* Define this if you have a PortalPlayer PP5022 */ |
| 78 | the 5020 so Rockbox doesn't care. */ | 78 | #define CONFIG_CPU PP5022 |
| 79 | /* Define this if you have a PortalPlayer PP5020 */ | ||
| 80 | #define CONFIG_CPU PP5020 | ||
| 81 | 79 | ||
| 82 | /* Define this if you want to use the PP5020 i2c interface */ | 80 | /* Define this if you want to use the PP5020 i2c interface */ |
| 83 | #define CONFIG_I2C I2C_PP5020 | 81 | #define CONFIG_I2C I2C_PP5020 |
diff --git a/firmware/export/config.h b/firmware/export/config.h index ffcbf688ea..86e27d0031 100644 --- a/firmware/export/config.h +++ b/firmware/export/config.h | |||
| @@ -43,9 +43,10 @@ | |||
| 43 | #define MCF5250 5250 | 43 | #define MCF5250 5250 |
| 44 | #define PP5002 5002 | 44 | #define PP5002 5002 |
| 45 | #define PP5020 5020 | 45 | #define PP5020 5020 |
| 46 | #define PP5022 5022 | ||
| 47 | #define PP5024 5024 | ||
| 46 | #define PNX0101 101 | 48 | #define PNX0101 101 |
| 47 | #define S3C2440 2440 | 49 | #define S3C2440 2440 |
| 48 | #define PP5024 5024 | ||
| 49 | #define TMS320DSC25 25 | 50 | #define TMS320DSC25 25 |
| 50 | 51 | ||
| 51 | /* CONFIG_KEYPAD */ | 52 | /* CONFIG_KEYPAD */ |
| @@ -279,8 +280,11 @@ | |||
| 279 | #endif | 280 | #endif |
| 280 | 281 | ||
| 281 | /* define for all cpus from PP family */ | 282 | /* define for all cpus from PP family */ |
| 282 | #if (CONFIG_CPU == PP5002) || (CONFIG_CPU == PP5020) || (CONFIG_CPU == PP5024) | 283 | #if (CONFIG_CPU == PP5002) |
| 284 | #define CPU_PP | ||
| 285 | #elif (CONFIG_CPU == PP5020) || (CONFIG_CPU == PP5022) || (CONFIG_CPU == PP5024) | ||
| 283 | #define CPU_PP | 286 | #define CPU_PP |
| 287 | #define CPU_PP502x | ||
| 284 | #endif | 288 | #endif |
| 285 | 289 | ||
| 286 | /* define for all cpus from ARM family */ | 290 | /* define for all cpus from ARM family */ |
diff --git a/firmware/export/cpu.h b/firmware/export/cpu.h index 6adf52ba5e..eb1c57b646 100644 --- a/firmware/export/cpu.h +++ b/firmware/export/cpu.h | |||
| @@ -27,7 +27,7 @@ | |||
| 27 | #if CONFIG_CPU == MCF5250 | 27 | #if CONFIG_CPU == MCF5250 |
| 28 | #include "mcf5250.h" | 28 | #include "mcf5250.h" |
| 29 | #endif | 29 | #endif |
| 30 | #if CONFIG_CPU == PP5020 | 30 | #if (CONFIG_CPU == PP5020) || (CONFIG_CPU == PP5022) |
| 31 | #include "pp5020.h" | 31 | #include "pp5020.h" |
| 32 | #endif | 32 | #endif |
| 33 | #if CONFIG_CPU == PP5002 | 33 | #if CONFIG_CPU == PP5002 |