summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGrzegorz Wianecki <grzegorz.wianecki@gmail.com>2007-04-29 14:01:54 +0200
committerWolfgang Denk <wd@denx.de>2007-05-05 21:35:03 +0200
commita9d87e2707dcb249f6bb7f7ff7e00acd8cda9fd2 (patch)
tree2cc80aba9972e540d61d27081c056d39af05e2f2
parent4ec5bd55ed1ffa91a774af298769621f4fbb18c1 (diff)
downloadu-boot-imx-a9d87e2707dcb249f6bb7f7ff7e00acd8cda9fd2.zip
u-boot-imx-a9d87e2707dcb249f6bb7f7ff7e00acd8cda9fd2.tar.gz
u-boot-imx-a9d87e2707dcb249f6bb7f7ff7e00acd8cda9fd2.tar.bz2
[PATCH] Use PVR to distinguish MPC5200B from MPC5200 in boot message
MPC5200B systems are incorrectly reported as MPC5200 in U-Boot start-up message. Use PVR to distinguish between the two variants, and print proper CPU information. Signed-off-by: Grzegorz Wianecki <grzegorz.wianecki@gmail.com> Signed-off-by: Bartlomiej Sieka <tur@semihalf.com> Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
-rw-r--r--cpu/mpc5xxx/cpu.c12
-rw-r--r--include/asm-ppc/processor.h8
2 files changed, 14 insertions, 6 deletions
diff --git a/cpu/mpc5xxx/cpu.c b/cpu/mpc5xxx/cpu.c
index 813aa79..73b166d 100644
--- a/cpu/mpc5xxx/cpu.c
+++ b/cpu/mpc5xxx/cpu.c
@@ -53,12 +53,16 @@ int checkcpu (void)
#else
svr = get_svr();
pvr = get_pvr();
- switch (SVR_VER (svr)) {
- case SVR_MPC5200:
- printf ("MPC5200");
+
+ switch (pvr) {
+ case PVR_5200:
+ printf("MPC5200");
+ break;
+ case PVR_5200B:
+ printf("MPC5200B");
break;
default:
- printf ("MPC52?? (SVR %08x)", svr);
+ printf("Unknown MPC5xxx");
break;
}
diff --git a/include/asm-ppc/processor.h b/include/asm-ppc/processor.h
index e9361c5..5efc3ee 100644
--- a/include/asm-ppc/processor.h
+++ b/include/asm-ppc/processor.h
@@ -706,8 +706,6 @@
#define SVR_MJREV(svr) (((svr) >> 4) & 0x0F) /* Major SOC design revision indicator */
#define SVR_MNREV(svr) (((svr) >> 0) & 0x0F) /* Minor SOC design revision indicator */
-/* System-On-Chip Version Numbers (version field only) */
-#define SVR_MPC5200 0x8011
/* Processor Version Register */
@@ -818,6 +816,12 @@
#define PVR_8260_HIP7R1 0x80822013
#define PVR_8260_HIP7RA 0x80822014
+/*
+ * MPC 52xx
+ */
+#define PVR_5200 0x80822011
+#define PVR_5200B 0x80822014
+
/*
* System Version Register