diff options
| author | Haavard Skinnemoen <haavard.skinnemoen@atmel.com> | 2008-12-17 16:53:07 +0100 | 
|---|---|---|
| committer | Haavard Skinnemoen <haavard.skinnemoen@atmel.com> | 2008-12-17 16:53:07 +0100 | 
| commit | cb5473205206c7f14cbb1e747f28ec75b48826e2 (patch) | |
| tree | 8f4808d60917100b18a10b05230f7638a0a9bbcc /cpu/at32ap/cache.c | |
| parent | baf449fc5ff96f071bb0e3789fd3265f6d4fd9a0 (diff) | |
| parent | 92c78a3bbcb2ce508b4bf1c4a1e0940406a024bb (diff) | |
| download | olio-uboot-2014.01-cb5473205206c7f14cbb1e747f28ec75b48826e2.tar.xz olio-uboot-2014.01-cb5473205206c7f14cbb1e747f28ec75b48826e2.zip | |
Merge branch 'fixes' into cleanups
Conflicts:
	board/atmel/atngw100/atngw100.c
	board/atmel/atstk1000/atstk1000.c
	cpu/at32ap/at32ap700x/gpio.c
	include/asm-avr32/arch-at32ap700x/clk.h
	include/configs/atngw100.h
	include/configs/atstk1002.h
	include/configs/atstk1003.h
	include/configs/atstk1004.h
	include/configs/atstk1006.h
	include/configs/favr-32-ezkit.h
	include/configs/hammerhead.h
	include/configs/mimc200.h
Diffstat (limited to 'cpu/at32ap/cache.c')
| -rw-r--r-- | cpu/at32ap/cache.c | 8 | 
1 files changed, 4 insertions, 4 deletions
| diff --git a/cpu/at32ap/cache.c b/cpu/at32ap/cache.c index 41fb5aa04..16a0565df 100644 --- a/cpu/at32ap/cache.c +++ b/cpu/at32ap/cache.c @@ -28,7 +28,7 @@ void dcache_clean_range(volatile void *start, size_t size)  {  	unsigned long v, begin, end, linesz; -	linesz = CFG_DCACHE_LINESZ; +	linesz = CONFIG_SYS_DCACHE_LINESZ;  	/* You asked for it, you got it */  	begin = (unsigned long)start & ~(linesz - 1); @@ -44,7 +44,7 @@ void dcache_invalidate_range(volatile void *start, size_t size)  {  	unsigned long v, begin, end, linesz; -	linesz = CFG_DCACHE_LINESZ; +	linesz = CONFIG_SYS_DCACHE_LINESZ;  	/* You asked for it, you got it */  	begin = (unsigned long)start & ~(linesz - 1); @@ -58,7 +58,7 @@ void dcache_flush_range(volatile void *start, size_t size)  {  	unsigned long v, begin, end, linesz; -	linesz = CFG_DCACHE_LINESZ; +	linesz = CONFIG_SYS_DCACHE_LINESZ;  	/* You asked for it, you got it */  	begin = (unsigned long)start & ~(linesz - 1); @@ -74,7 +74,7 @@ void icache_invalidate_range(volatile void *start, size_t size)  {  	unsigned long v, begin, end, linesz; -	linesz = CFG_ICACHE_LINESZ; +	linesz = CONFIG_SYS_ICACHE_LINESZ;  	/* You asked for it, you got it */  	begin = (unsigned long)start & ~(linesz - 1); |