diff options
| author | Achim Ehrlich <aehrlich@taskit.de> | 2010-02-24 10:29:16 +0100 |
|---|---|---|
| committer | Tom Rix <Tom.Rix@windriver.com> | 2010-03-07 12:36:35 -0600 |
| commit | 7c966a8bdfdab80cafbfed035d7ae6ea6f58f756 (patch) | |
| tree | 545dbb64661d1cdedbf718d813d330aa45bcdcf9 /cpu | |
| parent | 5c97a1de196fdcbe9d098948ecf4fccfbea23b78 (diff) | |
| download | blackbird-obmc-uboot-7c966a8bdfdab80cafbfed035d7ae6ea6f58f756.tar.gz blackbird-obmc-uboot-7c966a8bdfdab80cafbfed035d7ae6ea6f58f756.zip | |
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')
| -rw-r--r-- | cpu/arm926ejs/at91/clock.c | 2 | ||||
| -rw-r--r-- | cpu/arm926ejs/at91/cpu.c | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/cpu/arm926ejs/at91/clock.c b/cpu/arm926ejs/at91/clock.c index 7e039076f4..444d42d9ec 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 993b29924a..1094f8c7f3 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", |
