summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>2009-05-31 14:53:18 +0200
committerWolfgang Denk <wd@denx.de>2009-06-12 20:45:46 +0200
commitb2403589b4d9996394bafc73eca3623f43ac2c31 (patch)
tree59b97ba4801ba3e2a66929edf39d19dfa285048a
parentb32e189079fa16e1b647ac6b949fd4e0a9435343 (diff)
downloadu-boot-imx-b2403589b4d9996394bafc73eca3623f43ac2c31.zip
u-boot-imx-b2403589b4d9996394bafc73eca3623f43ac2c31.tar.gz
u-boot-imx-b2403589b4d9996394bafc73eca3623f43ac2c31.tar.bz2
at91: move cpu info print to cpu
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
-rw-r--r--board/ronetix/pm9263/pm9263.c7
-rw-r--r--cpu/arm926ejs/at91/cpu.c27
-rw-r--r--include/configs/pm9263.h1
3 files changed, 23 insertions, 12 deletions
diff --git a/board/ronetix/pm9263/pm9263.c b/board/ronetix/pm9263/pm9263.c
index d24ef9a..d2598a0 100644
--- a/board/ronetix/pm9263/pm9263.c
+++ b/board/ronetix/pm9263/pm9263.c
@@ -382,15 +382,8 @@ int board_eth_init(bd_t *bis)
int checkboard (void)
{
char *ss;
- char buf[32];
printf ("Board : Ronetix PM9263\n");
- printf ("Crystal frequency: %8s MHz\n",
- strmhz(buf, get_main_clk_rate()));
- printf ("CPU clock : %8s MHz\n",
- strmhz(buf, get_cpu_clk_rate()));
- printf ("Master clock : %8s MHz\n",
- strmhz(buf, get_mck_clk_rate()));
switch (gd->fb_base) {
case PHYS_PSRAM:
diff --git a/cpu/arm926ejs/at91/cpu.c b/cpu/arm926ejs/at91/cpu.c
index 2ae97fe..f2f7b62 100644
--- a/cpu/arm926ejs/at91/cpu.c
+++ b/cpu/arm926ejs/at91/cpu.c
@@ -21,17 +21,34 @@
* MA 02111-1307 USA
*/
-#include <config.h>
+#include <common.h>
#include <asm/arch/hardware.h>
#include <asm/arch/at91_pmc.h>
#include <asm/arch/clk.h>
#include <asm/arch/io.h>
+#ifndef AT91_MAIN_CLOCK
+#define AT91_MAIN_CLOCK 0
+#endif
+
int arch_cpu_init(void)
{
-#ifdef AT91_MAIN_CLOCK
return at91_clock_init(AT91_MAIN_CLOCK);
-#else
- return at91_clock_init(0);
-#endif
}
+
+#if defined(CONFIG_DISPLAY_CPUINFO)
+int print_cpuinfo(void)
+{
+ char buf[32];
+
+ printf("CPU: %s\n", AT91_CPU_NAME);
+ printf("Crystal frequency: %8s MHz\n",
+ strmhz(buf, get_main_clk_rate()));
+ printf("CPU clock : %8s MHz\n",
+ strmhz(buf, get_cpu_clk_rate()));
+ printf("Master clock : %8s MHz\n",
+ strmhz(buf, get_mck_clk_rate()));
+
+ return 0;
+}
+#endif
diff --git a/include/configs/pm9263.h b/include/configs/pm9263.h
index d60c417..f0dbe81 100644
--- a/include/configs/pm9263.h
+++ b/include/configs/pm9263.h
@@ -29,6 +29,7 @@
#define __CONFIG_H
/* ARM asynchronous clock */
+#define CONFIG_DISPLAY_CPUINFO
#define CONFIG_DISPLAY_BOARDINFO
#define MASTER_PLL_DIV 15