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
Convert CONFIG_SYS_FSL_QMAN_V3 et al to Kconfig
[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
cd32290
..
1b6cdc4
100644
(file)
--- a/
arch/powerpc/cpu/mpc85xx/cpu.c
+++ b/
arch/powerpc/cpu/mpc85xx/cpu.c
@@
-12,6
+12,7
@@
#include <common.h>
#include <cpu_func.h>
#include <clock_legacy.h>
#include <common.h>
#include <cpu_func.h>
#include <clock_legacy.h>
+#include <display_options.h>
#include <init.h>
#include <irq_func.h>
#include <log.h>
#include <init.h>
#include <irq_func.h>
#include <log.h>
@@
-143,8
+144,10
@@
int checkcpu (void)
printf("Core: ");
switch(ver) {
case PVR_VER_E500_V1:
printf("Core: ");
switch(ver) {
case PVR_VER_E500_V1:
+ puts("e500v1");
+ break;
case PVR_VER_E500_V2:
case PVR_VER_E500_V2:
- puts("e500");
+ puts("e500
v2
");
break;
case PVR_VER_E500MC:
puts("e500mc");
break;
case PVR_VER_E500MC:
puts("e500mc");
@@
-241,10
+244,6
@@
int checkcpu (void)
printf("IFC:%-4s MHz\n", strmhz(buf1, sysinfo.freq_localbus));
#endif
printf("IFC:%-4s MHz\n", strmhz(buf1, sysinfo.freq_localbus));
#endif
-#ifdef CONFIG_CPM2
- printf("CPM: %s MHz\n", strmhz(buf1, sysinfo.freq_systembus));
-#endif
-
#ifdef CONFIG_QE
printf(" QE:%-4s MHz\n", strmhz(buf1, sysinfo.freq_qe));
#endif
#ifdef CONFIG_QE
printf(" QE:%-4s MHz\n", strmhz(buf1, sysinfo.freq_qe));
#endif
@@
-335,9
+334,6
@@
int do_reset(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])
/*
* Get timebase clock frequency
*/
/*
* Get timebase clock frequency
*/
-#ifndef CONFIG_SYS_FSL_TBCLK_DIV
-#define CONFIG_SYS_FSL_TBCLK_DIV 8
-#endif
__weak unsigned long get_tbclk(void)
{
unsigned long tbclk_div = CONFIG_SYS_FSL_TBCLK_DIV;
__weak unsigned long get_tbclk(void)
{
unsigned long tbclk_div = CONFIG_SYS_FSL_TBCLK_DIV;
@@
-346,6
+342,7
@@
__weak unsigned long get_tbclk(void)
}
}
+#ifndef CONFIG_WDT
#if defined(CONFIG_WATCHDOG)
#define WATCHDOG_MASK (TCR_WP(63) | TCR_WRC(3) | TCR_WIE)
void
#if defined(CONFIG_WATCHDOG)
#define WATCHDOG_MASK (TCR_WP(63) | TCR_WRC(3) | TCR_WIE)
void
@@
-374,6
+371,7
@@
watchdog_reset(void)
enable_interrupts();
}
#endif /* CONFIG_WATCHDOG */
enable_interrupts();
}
#endif /* CONFIG_WATCHDOG */
+#endif
/*
* Initializes on-chip MMC controllers.
/*
* Initializes on-chip MMC controllers.