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 git://git.denx.de/u-boot-arm
[platform/kernel/u-boot.git]
/
arch
/
powerpc
/
cpu
/
mpc85xx
/
cpu.c
diff --git
a/arch/powerpc/cpu/mpc85xx/cpu.c
b/arch/powerpc/cpu/mpc85xx/cpu.c
index
df2ab6d
..
fbee753
100644
(file)
--- a/
arch/powerpc/cpu/mpc85xx/cpu.c
+++ b/
arch/powerpc/cpu/mpc85xx/cpu.c
@@
-121,16
+121,16
@@
int checkcpu (void)
switch(ver) {
case PVR_VER_E500_V1:
case PVR_VER_E500_V2:
switch(ver) {
case PVR_VER_E500_V1:
case PVR_VER_E500_V2:
- puts("
E
500");
+ puts("
e
500");
break;
case PVR_VER_E500MC:
break;
case PVR_VER_E500MC:
- puts("
E500MC
");
+ puts("
e500mc
");
break;
case PVR_VER_E5500:
break;
case PVR_VER_E5500:
- puts("
E
5500");
+ puts("
e
5500");
break;
case PVR_VER_E6500:
break;
case PVR_VER_E6500:
- puts("
E
6500");
+ puts("
e
6500");
break;
default:
puts("Unknown");
break;
default:
puts("Unknown");
@@
-282,14
+282,6
@@
unsigned long get_tbclk (void)
#if defined(CONFIG_WATCHDOG)
void
#if defined(CONFIG_WATCHDOG)
void
-watchdog_reset(void)
-{
- int re_enable = disable_interrupts();
- reset_85xx_watchdog();
- if (re_enable) enable_interrupts();
-}
-
-void
reset_85xx_watchdog(void)
{
/*
reset_85xx_watchdog(void)
{
/*
@@
-297,6
+289,16
@@
reset_85xx_watchdog(void)
*/
mtspr(SPRN_TSR, TSR_WIS);
}
*/
mtspr(SPRN_TSR, TSR_WIS);
}
+
+void
+watchdog_reset(void)
+{
+ int re_enable = disable_interrupts();
+
+ reset_85xx_watchdog();
+ if (re_enable)
+ enable_interrupts();
+}
#endif /* CONFIG_WATCHDOG */
/*
#endif /* CONFIG_WATCHDOG */
/*
@@
-339,7
+341,7
@@
phys_size_t initdram(int board_type)
#if defined(CONFIG_SPD_EEPROM) || defined(CONFIG_DDR_SPD)
return fsl_ddr_sdram_size();
#else
#if defined(CONFIG_SPD_EEPROM) || defined(CONFIG_DDR_SPD)
return fsl_ddr_sdram_size();
#else
- return CONFIG_SYS_SDRAM_SIZE * 1024 * 1024;
+ return
(phys_size_t)
CONFIG_SYS_SDRAM_SIZE * 1024 * 1024;
#endif
}
#else /* CONFIG_SYS_RAMBOOT */
#endif
}
#else /* CONFIG_SYS_RAMBOOT */