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
global: Move remaining CONFIG_SYS_* to CFG_SYS_*
[platform/kernel/u-boot.git]
/
arch
/
arm
/
mach-at91
/
armv7
/
cpu.c
diff --git
a/arch/arm/mach-at91/armv7/cpu.c
b/arch/arm/mach-at91/armv7/cpu.c
index
7843aed
..
616621a
100644
(file)
--- a/
arch/arm/mach-at91/armv7/cpu.c
+++ b/
arch/arm/mach-at91/armv7/cpu.c
@@
-1,3
+1,4
@@
+// SPDX-License-Identifier: GPL-2.0+
/*
* (C) Copyright 2010
* Reinhard Meyer, reinhard.meyer@emk-elektronik.de
/*
* (C) Copyright 2010
* Reinhard Meyer, reinhard.meyer@emk-elektronik.de
@@
-5,29
+6,34
@@
* Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
* (C) Copyright 2013
* Bo Shen <voice.shen@atmel.com>
* Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
* (C) Copyright 2013
* Bo Shen <voice.shen@atmel.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#include <common.h>
*/
#include <common.h>
+#include <cpu_func.h>
+#include <init.h>
+#include <vsprintf.h>
#include <asm/io.h>
#include <asm/arch/hardware.h>
#include <asm/io.h>
#include <asm/arch/hardware.h>
-#include <asm/arch/at91_pmc.h>
#include <asm/arch/at91_pit.h>
#include <asm/arch/at91_gpbr.h>
#include <asm/arch/clk.h>
#include <asm/arch/at91_pit.h>
#include <asm/arch/at91_gpbr.h>
#include <asm/arch/clk.h>
-#ifndef C
ONFI
G_SYS_AT91_MAIN_CLOCK
-#define C
ONFI
G_SYS_AT91_MAIN_CLOCK 0
+#ifndef C
F
G_SYS_AT91_MAIN_CLOCK
+#define C
F
G_SYS_AT91_MAIN_CLOCK 0
#endif
int arch_cpu_init(void)
{
#endif
int arch_cpu_init(void)
{
- return at91_clock_init(CONFIG_SYS_AT91_MAIN_CLOCK);
+#if defined(CONFIG_CLK_CCF)
+ return 0;
+#else
+ return at91_clock_init(CFG_SYS_AT91_MAIN_CLOCK);
+#endif
}
void arch_preboot_os(void)
{
}
void arch_preboot_os(void)
{
+#if (IS_ENABLED(CONFIG_ATMEL_PIT_TIMER))
ulong cpiv;
at91_pit_t *pit = (at91_pit_t *)ATMEL_BASE_PIT;
ulong cpiv;
at91_pit_t *pit = (at91_pit_t *)ATMEL_BASE_PIT;
@@
-39,6
+45,7
@@
void arch_preboot_os(void)
* without waiting for wrapping back to 0
*/
writel(cpiv + 0x1000, &pit->mr);
* without waiting for wrapping back to 0
*/
writel(cpiv + 0x1000, &pit->mr);
+#endif
}
#if defined(CONFIG_DISPLAY_CPUINFO)
}
#if defined(CONFIG_DISPLAY_CPUINFO)