projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'u-boot-atmel-fixes-2020.07-a' of https://gitlab.denx.de/u-boot/custodians...
[oweals/u-boot.git]
/
arch
/
arm
/
cpu
/
arm926ejs
/
cpu.c
diff --git
a/arch/arm/cpu/arm926ejs/cpu.c
b/arch/arm/cpu/arm926ejs/cpu.c
index a90ce3047bd27f2f100512ce6239073ac6c92fa9..93d7a02ed4c212aaa8dc9a549b789943efaaef6b 100644
(file)
--- a/
arch/arm/cpu/arm926ejs/cpu.c
+++ b/
arch/arm/cpu/arm926ejs/cpu.c
@@
-1,3
+1,4
@@
+// SPDX-License-Identifier: GPL-2.0+
/*
* (C) Copyright 2002
* Sysgo Real-Time Solutions, GmbH <www.elinos.com>
/*
* (C) Copyright 2002
* Sysgo Real-Time Solutions, GmbH <www.elinos.com>
@@
-5,8
+6,6
@@
*
* (C) Copyright 2002
* Gary Jennejohn, DENX Software Engineering, <garyj@denx.de>
*
* (C) Copyright 2002
* Gary Jennejohn, DENX Software Engineering, <garyj@denx.de>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
/*
*/
/*
@@
-15,6
+14,9
@@
#include <common.h>
#include <command.h>
#include <common.h>
#include <command.h>
+#include <cpu_func.h>
+#include <irq_func.h>
+#include <asm/cache.h>
#include <asm/system.h>
static void cache_flush(void);
#include <asm/system.h>
static void cache_flush(void);
@@
-28,7
+30,7
@@
int cleanup_before_linux (void)
* we turn off caches etc ...
*/
* we turn off caches etc ...
*/
- disable_interrupts
();
+ disable_interrupts();
/* turn off I/D-cache */
/* turn off I/D-cache */
@@
-45,7
+47,7
@@
int cleanup_before_linux (void)
/* flush I/D-cache */
static void cache_flush (void)
{
/* flush I/D-cache */
static void cache_flush (void)
{
-#if !(
defined(CONFIG_SYS_ICACHE_OFF) && defined(CONFIG_
SYS_DCACHE_OFF))
+#if !(
CONFIG_IS_ENABLED(SYS_ICACHE_OFF) && CONFIG_IS_ENABLED(
SYS_DCACHE_OFF))
unsigned long i = 0;
asm ("mcr p15, 0, %0, c7, c7, 0": :"r" (i));
unsigned long i = 0;
asm ("mcr p15, 0, %0, c7, c7, 0": :"r" (i));