projects
/
oweals
/
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
[oweals/u-boot.git]
/
cpu
/
mpc8260
/
cpu.c
diff --git
a/cpu/mpc8260/cpu.c
b/cpu/mpc8260/cpu.c
index 8d634b075ef41876df0b04ff1d3cf854708269af..4f23012b729420ba74ce64dc4cb65d24cb73385e 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,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 ();
@@
-137,13
+137,13
@@
int checkcpu (void)
puts ("0.0 0K50M");
break;
case 0x0C10:
puts ("0.0 0K50M");
break;
case 0x0C10:
- puts ("1.0
0
K50M");
+ puts ("1.0
1
K50M");
break;
case 0x0D00:
puts ("0.0 0K50M");
break;
case 0x0D10:
break;
case 0x0D00:
puts ("0.0 0K50M");
break;
case 0x0D10:
- puts ("1.0
0
K50M");
+ puts ("1.0
1
K50M");
break;
default:
printf ("unknown [immr=0x%04x,k=0x%04x]", m, k);
break;
default:
printf ("unknown [immr=0x%04x,k=0x%04x]", m, k);
@@
-220,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[])
{
@@
-253,6
+254,7
@@
do_reset (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
return 1;
}
return 1;
}
+#endif /* CONFIG_HAVE_OWN_RESET */
/* ------------------------------------------------------------------------- */
/* ------------------------------------------------------------------------- */
@@
-262,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;