projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added support for the TQM8272 board from TQ
[oweals/u-boot.git]
/
cpu
/
mpc8260
/
cpu.c
diff --git
a/cpu/mpc8260/cpu.c
b/cpu/mpc8260/cpu.c
index 8adf950f980e77e8a466a7e05b1c853dbb608fc2..94651dc4a69846731d2e8bae49645e5b2eb63c95 100644
(file)
--- a/
cpu/mpc8260/cpu.c
+++ b/
cpu/mpc8260/cpu.c
@@
-1,5
+1,5
@@
/*
/*
- * (C) Copyright 2000-200
3
+ * (C) Copyright 2000-200
6
* Wolfgang Denk, DENX Software Engineering, wd@denx.de.
*
* See file CREDITS for list of people who contributed to this
* Wolfgang Denk, DENX Software Engineering, wd@denx.de.
*
* See file CREDITS for list of people who contributed to this
@@
-47,10
+47,14
@@
#include <asm/processor.h>
#include <asm/cpm_8260.h>
#include <asm/processor.h>
#include <asm/cpm_8260.h>
+DECLARE_GLOBAL_DATA_PTR;
+
+#if defined(CONFIG_GET_CPU_STR_F)
+extern int get_cpu_str_f (char *buf);
+#endif
+
int checkcpu (void)
{
int checkcpu (void)
{
- DECLARE_GLOBAL_DATA_PTR;
-
volatile immap_t *immap = (immap_t *) CFG_IMMR;
ulong clock = gd->cpu_clk;
uint pvr = get_pvr ();
volatile immap_t *immap = (immap_t *) CFG_IMMR;
ulong clock = gd->cpu_clk;
uint pvr = get_pvr ();
@@
-68,6
+72,7
@@
int checkcpu (void)
k = 4;
break;
case PVR_8260_HIP7R1:
k = 4;
break;
case PVR_8260_HIP7R1:
+ case PVR_8260_HIP7RA:
case PVR_8260_HIP7:
k = 7;
break;
case PVR_8260_HIP7:
k = 7;
break;
@@
-80,7
+85,12
@@
int checkcpu (void)
if ((immr & IMMR_ISB_MSK) != CFG_IMMR)
return -1; /* whoops! someone moved the IMMR */
if ((immr & IMMR_ISB_MSK) != CFG_IMMR)
return -1; /* whoops! someone moved the IMMR */
+#if defined(CONFIG_GET_CPU_STR_F)
+ get_cpu_str_f (buf);
+ printf ("%s (HiP%d Rev %02x, Mask ", buf, k, rev);
+#else
printf (CPU_ID_STR " (HiP%d Rev %02x, Mask ", k, rev);
printf (CPU_ID_STR " (HiP%d Rev %02x, Mask ", k, rev);
+#endif
/*
* the bottom 16 bits of the immr are the Part Number and Mask Number
/*
* the bottom 16 bits of the immr are the Part Number and Mask Number
@@
-129,9
+139,20
@@
int checkcpu (void)
case 0x0A01:
puts ("0.1 1K49M");
break;
case 0x0A01:
puts ("0.1 1K49M");
break;
+ case 0x0A10:
+ puts ("1.0 1K49M");
+ break;
case 0x0C00:
case 0x0C00:
+ puts ("0.0 0K50M");
+ break;
+ case 0x0C10:
+ puts ("1.0 1K50M");
+ break;
case 0x0D00:
case 0x0D00:
- printf ("0.0 0K50M");
+ puts ("0.0 0K50M");
+ break;
+ case 0x0D10:
+ puts ("1.0 1K50M");
break;
default:
printf ("unknown [immr=0x%04x,k=0x%04x]", m, k);
break;
default:
printf ("unknown [immr=0x%04x,k=0x%04x]", m, k);
@@
-208,6
+229,7
@@
void upmconfig (uint upm, uint * table, uint size)
/* ------------------------------------------------------------------------- */
/* ------------------------------------------------------------------------- */
+#if !defined(CONFIG_HAVE_OWN_RESET)
int
do_reset (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
{
int
do_reset (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
{
@@
-241,6
+263,7
@@
do_reset (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
return 1;
}
return 1;
}
+#endif /* CONFIG_HAVE_OWN_RESET */
/* ------------------------------------------------------------------------- */
/* ------------------------------------------------------------------------- */
@@
-250,8
+273,6
@@
do_reset (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
*/
unsigned long get_tbclk (void)
{
*/
unsigned long get_tbclk (void)
{
- DECLARE_GLOBAL_DATA_PTR;
-
ulong tbclk;
tbclk = (gd->bus_clk + 3L) / 4L;
ulong tbclk;
tbclk = (gd->bus_clk + 3L) / 4L;