projects
/
platform
/
kernel
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of rsync://rsync.denx.de/git/u-boot
[platform/kernel/u-boot.git]
/
cpu
/
mpc8260
/
cpu.c
diff --git
a/cpu/mpc8260/cpu.c
b/cpu/mpc8260/cpu.c
index
f4f5279
..
4f23012
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
@@
-36,7
+36,7
@@
* added 8260 masks by
* Marius Groeger <mag@sysgo.de>
*
* added 8260 masks by
* Marius Groeger <mag@sysgo.de>
*
- * added HiP7 (82
70/8275
/8280) processors support by
+ * added HiP7 (82
4x/827x
/8280) processors support by
* Yuli Barcohen <yuli@arabellasw.com>
*/
* Yuli Barcohen <yuli@arabellasw.com>
*/
@@
-47,10
+47,10
@@
#include <asm/processor.h>
#include <asm/cpm_8260.h>
#include <asm/processor.h>
#include <asm/cpm_8260.h>
+DECLARE_GLOBAL_DATA_PTR;
+
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 ();
@@
-67,6
+67,8
@@
int checkcpu (void)
case PVR_8260_HIP4:
k = 4;
break;
case PVR_8260_HIP4:
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;
@@
-93,40
+95,55
@@
int checkcpu (void)
switch (m) {
case 0x0000:
switch (m) {
case 0x0000:
- p
rintf
("0.2 2J24M");
+ p
uts
("0.2 2J24M");
break;
case 0x0010:
break;
case 0x0010:
- p
rintf
("A.0 K22A");
+ p
uts
("A.0 K22A");
break;
case 0x0011:
break;
case 0x0011:
- p
rintf
("A.1 1K22A-XC");
+ p
uts
("A.1 1K22A-XC");
break;
case 0x0001:
break;
case 0x0001:
- p
rintf
("B.1 1K23A");
+ p
uts
("B.1 1K23A");
break;
case 0x0021:
break;
case 0x0021:
- p
rintf
("B.2 2K23A-XC");
+ p
uts
("B.2 2K23A-XC");
break;
case 0x0023:
break;
case 0x0023:
- p
rintf
("B.3 3K23A");
+ p
uts
("B.3 3K23A");
break;
case 0x0024:
break;
case 0x0024:
- p
rintf
("C.2 6K23A");
+ p
uts
("C.2 6K23A");
break;
case 0x0060:
break;
case 0x0060:
- p
rintf
("A.0(A) 2K25A");
+ p
uts
("A.0(A) 2K25A");
break;
case 0x0062:
break;
case 0x0062:
- p
rintf
("B.1 4K25A");
+ p
uts
("B.1 4K25A");
break;
case 0x0064:
break;
case 0x0064:
- p
rintf
("C.0 5K25A");
+ p
uts
("C.0 5K25A");
break;
case 0x0A00:
break;
case 0x0A00:
- p
rintf
("0.0 0K49M");
+ p
uts
("0.0 0K49M");
break;
case 0x0A01:
break;
case 0x0A01:
- printf ("0.1 1K49M");
+ puts ("0.1 1K49M");
+ break;
+ case 0x0A10:
+ puts ("1.0 1K49M");
+ break;
+ case 0x0C00:
+ puts ("0.0 0K50M");
+ break;
+ case 0x0C10:
+ puts ("1.0 1K50M");
+ break;
+ case 0x0D00:
+ 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);
@@
-203,6
+220,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[])
{
@@
-236,6
+254,7
@@
do_reset (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
return 1;
}
return 1;
}
+#endif /* CONFIG_HAVE_OWN_RESET */
/* ------------------------------------------------------------------------- */
/* ------------------------------------------------------------------------- */
@@
-245,8
+264,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;