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 /include/asm-sparc/io.h | |
| 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 'include/asm-sparc/io.h')
| -rw-r--r-- | include/asm-sparc/io.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/include/asm-sparc/io.h b/include/asm-sparc/io.h index ede0b1a8d..0c5d86cb3 100644 --- a/include/asm-sparc/io.h +++ b/include/asm-sparc/io.h @@ -32,7 +32,7 @@ * over and over again resulting in a hang (until an IRQ if lucky) * */ -#ifndef CFG_HAS_NO_CACHE +#ifndef CONFIG_SYS_HAS_NO_CACHE #define READ_BYTE(var) SPARC_NOCACHE_READ_BYTE((unsigned int)(var)) #define READ_HWORD(var) SPARC_NOCACHE_READ_HWORD((unsigned int)(var)) #define READ_WORD(var) SPARC_NOCACHE_READ((unsigned int)(var)) @@ -90,4 +90,9 @@ static inline void unmap_physmem(void *vaddr, unsigned long flags) } +static inline phys_addr_t virt_to_phys(void * vaddr) +{ + return (phys_addr_t)(vaddr); +} + #endif |