[U-Boot] [PATCH v2 2/9] AVR32: Make cacheflush cpu-dependent

Gunnar Rangoy
2009-01-23T11:56:27Z

From: Olav Morken <olavmrk@gmail.com>

The AT32UC3A series of processors doesn't contain any cache, and issuing
cache control instructions on those will cause an exception. This commit
makes cacheflush.h arch-dependent in preparation for the AT32UC3A-support.

Signed-off-by: Gunnar Rangoy <gunnar@rangoy.com>
Signed-off-by: Paul Driveklepp <pauldriveklepp@gmail.com>
Signed-off-by: Olav Morken <olavmrk@gmail.com>
---
board/atmel/atstk1000/flash.c | 2 +-
board/earthlcd/favr-32-ezkit/flash.c | 2 +-
cpu/at32ap/cache.c | 2 +-
.../asm-avr32/{ => arch-at32ap700x}/cacheflush.h | 0
include/asm-avr32/dma-mapping.h | 2 +-
lib_avr32/board.c | 2 +-
6 files changed, 5 insertions(+), 5 deletions(-)
rename include/asm-avr32/{ => arch-at32ap700x}/cacheflush.h (100%)

diff --git a/board/atmel/atstk1000/flash.c b/board/atmel/atstk1000/flash.c
index e2bfd4a..1b45940 100644
--- a/board/atmel/atstk1000/flash.c
+++ b/board/atmel/atstk1000/flash.c
@@ -22,7 +22,7 @@
#include <common.h>

#ifdef CONFIG_ATSTK1000_EXT_FLASH
-#include <asm/cacheflush.h>
+#include <asm/arch/cacheflush.h>
#include <asm/io.h>
#include <asm/sections.h>

diff --git a/board/earthlcd/favr-32-ezkit/flash.c b/board/earthlcd/favr-32-ezkit/flash.c
index 2aa9415..fdf83ad 100644
--- a/board/earthlcd/favr-32-ezkit/flash.c
+++ b/board/earthlcd/favr-32-ezkit/flash.c
@@ -20,7 +20,7 @@
#include <common.h>

#ifdef CONFIG_FAVR32_EZKIT_EXT_FLASH
-#include <asm/cacheflush.h>
+#include <asm/arch/cacheflush.h>
#include <asm/io.h>
#include <asm/sections.h>

diff --git a/cpu/at32ap/cache.c b/cpu/at32ap/cache.c
index 41fb5aa..3f1eea5 100644
--- a/cpu/at32ap/cache.c
+++ b/cpu/at32ap/cache.c
@@ -22,7 +22,7 @@

#include <common.h>

-#include <asm/cacheflush.h>
+#include <asm/arch/cacheflush.h>

void dcache_clean_range(volatile void *start, size_t size)
{
diff --git a/include/asm-avr32/cacheflush.h b/include/asm-avr32/arch-at32ap700x/cacheflush.h
similarity index 100%
rename from include/asm-avr32/cacheflush.h
rename to include/asm-avr32/arch-at32ap700x/cacheflush.h
diff --git a/include/asm-avr32/dma-mapping.h b/include/asm-avr32/dma-mapping.h
index 3b46fa3..0be7804 100644
--- a/include/asm-avr32/dma-mapping.h
+++ b/include/asm-avr32/dma-mapping.h
@@ -23,7 +23,7 @@
#define __ASM_AVR32_DMA_MAPPING_H

#include <asm/io.h>
-#include <asm/cacheflush.h>
+#include <asm/arch/cacheflush.h>

enum dma_data_direction {
DMA_BIDIRECTIONAL = 0,
diff --git a/lib_avr32/board.c b/lib_avr32/board.c
index d5147b8..216ff74 100644
--- a/lib_avr32/board.c
+++ b/lib_avr32/board.c
@@ -85,7 +85,7 @@ void *sbrk(ptrdiff_t increment)
}

#ifdef CFG_DMA_ALLOC_LEN
-#include <asm/cacheflush.h>
+#include <asm/arch/cacheflush.h>
#include <asm/io.h>

static unsigned long dma_alloc_start;
--
1.6.0.4