diff options
| author | Stefan Roese <sr@denx.de> | 2007-01-31 16:56:10 +0100 |
|---|---|---|
| committer | Stefan Roese <sr@denx.de> | 2007-01-31 16:56:10 +0100 |
| commit | 2902fadade3be7659467e8d074048c6b7068f5c0 (patch) | |
| tree | 0c31f926089c07254f7f210a6766a43fd0132020 | |
| parent | d5ea287b02a6945c3977410e364a879dd1a555c8 (diff) | |
| download | blackbird-obmc-uboot-2902fadade3be7659467e8d074048c6b7068f5c0.tar.gz blackbird-obmc-uboot-2902fadade3be7659467e8d074048c6b7068f5c0.zip | |
[PATCH] Update 440EPx/440GRx cpu detection
Signed-off-by: Stefan Roese <sr@denx.de>
| -rw-r--r-- | cpu/ppc4xx/cpu.c | 12 | ||||
| -rw-r--r-- | include/asm-ppc/processor.h | 4 |
2 files changed, 10 insertions, 6 deletions
diff --git a/cpu/ppc4xx/cpu.c b/cpu/ppc4xx/cpu.c index 57a7e8d6e2..7c96ad8ab9 100644 --- a/cpu/ppc4xx/cpu.c +++ b/cpu/ppc4xx/cpu.c @@ -312,25 +312,29 @@ int checkcpu (void) #endif /* CONFIG_440GR */ #endif /* CONFIG_440 */ - case PVR_440EPX1_RA: +#ifdef CONFIG_440EPX + case PVR_440EPX1_RA: /* 440EPx rev A and 440GRx rev A have same PVR */ puts("EPx Rev. A"); strcpy(addstr, "Security/Kasumi support"); break; - case PVR_440EPX2_RA: + case PVR_440EPX2_RA: /* 440EPx rev A and 440GRx rev A have same PVR */ puts("EPx Rev. A"); strcpy(addstr, "No Security/Kasumi support"); break; +#endif /* CONFIG_440EPX */ - case PVR_440GRX1_RA: +#ifdef CONFIG_440GRX + case PVR_440GRX1_RA: /* 440EPx rev A and 440GRx rev A have same PVR */ puts("GRx Rev. A"); strcpy(addstr, "Security/Kasumi support"); break; - case PVR_440GRX2_RA: + case PVR_440GRX2_RA: /* 440EPx rev A and 440GRx rev A have same PVR */ puts("GRx Rev. A"); strcpy(addstr, "No Security/Kasumi support"); break; +#endif /* CONFIG_440GRX */ case PVR_440SP_6_RAB: puts("SP Rev. A/B"); diff --git a/include/asm-ppc/processor.h b/include/asm-ppc/processor.h index f102600038..ad9fd49ad4 100644 --- a/include/asm-ppc/processor.h +++ b/include/asm-ppc/processor.h @@ -740,8 +740,8 @@ #define PVR_440GR_RB 0x422218D4 /* 440EP rev C and 440GR rev B have same PVR */ #define PVR_440EPX1_RA 0x216218D0 /* 440EPX rev A with Security / Kasumi */ #define PVR_440EPX2_RA 0x216218D4 /* 440EPX rev A without Security / Kasumi */ -#define PVR_440GRX1_RA 0x216218D8 /* 440GRX rev A with Security / Kasumi */ -#define PVR_440GRX2_RA 0x216218DC /* 440GRX rev A without Security / Kasumi */ +#define PVR_440GRX1_RA 0x216218D0 /* 440GRX rev A with Security / Kasumi */ +#define PVR_440GRX2_RA 0x216218D4 /* 440GRX rev A without Security / Kasumi */ #define PVR_440GX_RA 0x51B21850 #define PVR_440GX_RB 0x51B21851 #define PVR_440GX_RC 0x51B21892 |
