summaryrefslogtreecommitdiff
path: root/cpu/arm926ejs
diff options
context:
space:
mode:
authorAchim Ehrlich <aehrlich@taskit.de>2010-02-24 10:29:16 +0100
committerTom Rix <Tom.Rix@windriver.com>2010-03-07 12:36:35 -0600
commit7c966a8bdfdab80cafbfed035d7ae6ea6f58f756 (patch)
tree545dbb64661d1cdedbf718d813d330aa45bcdcf9 /cpu/arm926ejs
parent5c97a1de196fdcbe9d098948ecf4fccfbea23b78 (diff)
downloadu-boot-imx-7c966a8bdfdab80cafbfed035d7ae6ea6f58f756.zip
u-boot-imx-7c966a8bdfdab80cafbfed035d7ae6ea6f58f756.tar.gz
u-boot-imx-7c966a8bdfdab80cafbfed035d7ae6ea6f58f756.tar.bz2
ARM change name of defines for AT91 arm926ejs
Configuration defines should be preceeded with CONFIG_SYS_. Renamed some at91 specific defines to conform to this naming convention: AT91_CPU_NAME to CONFIG_SYS_AT91_CPU_NAME AT91_MAIN_CLOCK to CONFIG_SYS_AT91_MAIN_CLOCK Signed-off-by: Achim Ehrlich <aehrlich@taskit.de>
Diffstat (limited to 'cpu/arm926ejs')
-rw-r--r--cpu/arm926ejs/at91/clock.c2
-rw-r--r--cpu/arm926ejs/at91/cpu.c8
2 files changed, 5 insertions, 5 deletions
diff --git a/cpu/arm926ejs/at91/clock.c b/cpu/arm926ejs/at91/clock.c
index 7e03907..444d42d 100644
--- a/cpu/arm926ejs/at91/clock.c
+++ b/cpu/arm926ejs/at91/clock.c
@@ -147,7 +147,7 @@ int at91_clock_init(unsigned long main_clock)
{
unsigned freq, mckr;
at91_pmc_t *pmc = (at91_pmc_t *) AT91_PMC_BASE;
-#ifndef AT91_MAIN_CLOCK
+#ifndef CONFIG_SYS_AT91_MAIN_CLOCK
unsigned tmp;
/*
* When the bootloader initialized the main oscillator correctly,
diff --git a/cpu/arm926ejs/at91/cpu.c b/cpu/arm926ejs/at91/cpu.c
index 993b299..1094f8c 100644
--- a/cpu/arm926ejs/at91/cpu.c
+++ b/cpu/arm926ejs/at91/cpu.c
@@ -31,13 +31,13 @@
#include <asm/arch/clk.h>
#include <asm/arch/io.h>
-#ifndef AT91_MAIN_CLOCK
-#define AT91_MAIN_CLOCK 0
+#ifndef CONFIG_SYS_AT91_MAIN_CLOCK
+#define CONFIG_SYS_AT91_MAIN_CLOCK 0
#endif
int arch_cpu_init(void)
{
- return at91_clock_init(AT91_MAIN_CLOCK);
+ return at91_clock_init(CONFIG_SYS_AT91_MAIN_CLOCK);
}
#if defined(CONFIG_DISPLAY_CPUINFO)
@@ -45,7 +45,7 @@ int print_cpuinfo(void)
{
char buf[32];
- printf("CPU: %s\n", AT91_CPU_NAME);
+ printf("CPU: %s\n", CONFIG_SYS_AT91_CPU_NAME);
printf("Crystal frequency: %8s MHz\n",
strmhz(buf, get_main_clk_rate()));
printf("CPU clock : %8s MHz\n",