diff options
| -rw-r--r-- | CHANGELOG | 3 | ||||
| -rw-r--r-- | cpu/ppc4xx/cpu.c | 19 | ||||
| -rw-r--r-- | include/asm-ppc/processor.h | 3 |
3 files changed, 13 insertions, 12 deletions
@@ -2,6 +2,9 @@ Changes for U-Boot 1.1.4: ====================================================================== +* Fix 440GR to print correct cpu revision + Patch by Stefan Roese, 4 Oct 2005 + * Change board message on AMCC Yosemite & Yellowstone to common style Patch by Stefan Roese, 3 Oct 2005 diff --git a/cpu/ppc4xx/cpu.c b/cpu/ppc4xx/cpu.c index a9bb89ad0a..5ec9adb742 100644 --- a/cpu/ppc4xx/cpu.c +++ b/cpu/ppc4xx/cpu.c @@ -178,22 +178,19 @@ int checkcpu (void) case PVR_440GX_RC: puts("GX Rev. C"); break; -#if defined(CONFIG_440GR) - case PVR_440EP_RA: - puts("GR Rev. A"); - break; - case PVR_440EP_RB: - puts("GR Rev. B"); - break; -#else case PVR_440EP_RA: puts("EP Rev. A"); break; - case PVR_440EP_RB: +#ifdef CONFIG_440EP + case PVR_440EP_RB: /* 440EP rev B and 440GR rev A have same PVR */ puts("EP Rev. B"); break; -#endif - +#endif /* CONFIG_440EP */ +#ifdef CONFIG_440GR + case PVR_440GR_RA: /* 440EP rev B and 440GR rev A have same PVR */ + puts("GR Rev. A"); + break; +#endif /* CONFIG_440GR */ default: printf (" UNKNOWN (PVR=%08x)", pvr); break; diff --git a/include/asm-ppc/processor.h b/include/asm-ppc/processor.h index a85e2b0055..68917c5928 100644 --- a/include/asm-ppc/processor.h +++ b/include/asm-ppc/processor.h @@ -724,7 +724,8 @@ #define PVR_440GP_RB 0x40120440 #define PVR_440GP_RC 0x40120481 #define PVR_440EP_RA 0x42221850 -#define PVR_440EP_RB 0x422218D3 +#define PVR_440EP_RB 0x422218D3 /* 440EP rev B and 440GR rev A have same PVR */ +#define PVR_440GR_RA 0x422218D3 /* 440EP rev B and 440GR rev A have same PVR */ #define PVR_440GX_RA 0x51B21850 #define PVR_440GX_RB 0x51B21851 #define PVR_440GX_RC 0x51B21892 |