* LWMON extensions:
- Splashscreen support
- modem support
- sysmon support
- temperature dependend enabling of LCD
* Allow booting from old "PPCBoot" disk partitions
* Add support for TQM8255 Board / MPC8255 CPU
diff --git a/cpu/mpc8260/cpu.c b/cpu/mpc8260/cpu.c
index 73881ee..b8ba48c 100644
--- a/cpu/mpc8260/cpu.c
+++ b/cpu/mpc8260/cpu.c
@@ -1,5 +1,5 @@
/*
- * (C) Copyright 2000
+ * (C) Copyright 2000-2003
* Wolfgang Denk, DENX Software Engineering, wd@denx.de.
*
* See file CREDITS for list of people who contributed to this
@@ -22,12 +22,12 @@
*/
/*
- * CPU specific code for the MPC8260
+ * CPU specific code for the MPC8255 / MPC8260 CPUs
*
* written or collected and sometimes rewritten by
* Magnus Damm <damm@bitsmart.com>
*
- * minor modifications by
+ * modified by
* Wolfgang Denk <wd@denx.de>
*
* modified for 8260 by
@@ -64,7 +64,7 @@
if ((immr & IMMR_ISB_MSK) != CFG_IMMR)
return -1; /* whoops! someone moved the IMMR */
- printf ("MPC8260 (Rev %02x, Mask ", rev);
+ printf (CPU_ID_STR " (Rev %02x, Mask ", rev);
/*
* the bottom 16 bits of the immr are the Part Number and Mask Number
@@ -101,6 +101,9 @@
case 0x0060:
printf ("A.0(A) 2K25A");
break;
+ case 0x0062:
+ printf ("B.1 4K25A");
+ break;
default:
printf ("unknown [immr=0x%04x,k=0x%04x]", m, k);
break;
diff --git a/cpu/mpc8260/cpu_init.c b/cpu/mpc8260/cpu_init.c
index 9f9369a..46ac975 100644
--- a/cpu/mpc8260/cpu_init.c
+++ b/cpu/mpc8260/cpu_init.c
@@ -250,7 +250,7 @@
int i;
char *sep;
- puts ("MPC8260 Reset Status:");
+ puts (CPU_ID_STR " Reset Status:");
sep = " ";
for (i = 0; i < n; i++)
diff --git a/cpu/mpc8260/speed.c b/cpu/mpc8260/speed.c
index 2bf2c4a..1f53c4f 100644
--- a/cpu/mpc8260/speed.c
+++ b/cpu/mpc8260/speed.c
@@ -171,7 +171,7 @@
cp = &corecnf_tab[corecnf];
- printf ("MPC8260 Clock Configuration\n - Bus-to-Core Mult ");
+ printf (CPU_ID_STR " Clock Configuration\n - Bus-to-Core Mult ");
switch (cp->b2c_mult) {
case _byp: