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
/
74xx_7xx
/
cpu.c
diff --git
a/cpu/74xx_7xx/cpu.c
b/cpu/74xx_7xx/cpu.c
index
30a2091
..
706c880
100644
(file)
--- a/
cpu/74xx_7xx/cpu.c
+++ b/
cpu/74xx_7xx/cpu.c
@@
-49,6
+49,8
@@
#include "../board/MAI/AmigaOneG3SE/memio.h"
#endif
#include "../board/MAI/AmigaOneG3SE/memio.h"
#endif
+DECLARE_GLOBAL_DATA_PTR;
+
cpu_t
get_cpu_type(void)
{
cpu_t
get_cpu_type(void)
{
@@
-79,6
+81,10
@@
get_cpu_type(void)
type = CPU_750FX;
break;
type = CPU_750FX;
break;
+ case 0x7002:
+ type = CPU_750GX;
+ break;
+
case 0x800C:
type = CPU_7410;
break;
case 0x800C:
type = CPU_7410;
break;
@@
-87,6
+93,14
@@
get_cpu_type(void)
type = CPU_7450;
break;
type = CPU_7450;
break;
+ case 0x8001:
+ type = CPU_7455;
+ break;
+
+ case 0x8002:
+ type = CPU_7457;
+ break;
+
default:
break;
}
default:
break;
}
@@
-99,8
+113,6
@@
get_cpu_type(void)
#if !defined(CONFIG_BAB7xx)
int checkcpu (void)
{
#if !defined(CONFIG_BAB7xx)
int checkcpu (void)
{
- DECLARE_GLOBAL_DATA_PTR;
-
uint type = get_cpu_type();
uint pvr = get_pvr();
ulong clock = gd->cpu_clk;
uint type = get_cpu_type();
uint pvr = get_pvr();
ulong clock = gd->cpu_clk;
@@
-124,6
+136,10
@@
int checkcpu (void)
str = "750FX";
break;
str = "750FX";
break;
+ case CPU_750GX:
+ str = "750GX";
+ break;
+
case CPU_755:
str = "755";
break;
case CPU_755:
str = "755";
break;
@@
-140,6
+156,14
@@
int checkcpu (void)
str = "MPC7450";
break;
str = "MPC7450";
break;
+ case CPU_7455:
+ str = "MPC7455";
+ break;
+
+ case CPU_7457:
+ str = "MPC7457";
+ break;
+
default:
printf("Unknown CPU -- PVR: 0x%08x\n", pvr);
return -1;
default:
printf("Unknown CPU -- PVR: 0x%08x\n", pvr);
return -1;
@@
-234,8
+258,6
@@
do_reset (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
#ifdef CONFIG_AMIGAONEG3SE
unsigned long get_tbclk(void)
{
#ifdef CONFIG_AMIGAONEG3SE
unsigned long get_tbclk(void)
{
- DECLARE_GLOBAL_DATA_PTR;
-
return (gd->bus_clk / 4);
}
#else /* ! CONFIG_AMIGAONEG3SE */
return (gd->bus_clk / 4);
}
#else /* ! CONFIG_AMIGAONEG3SE */