diff options
| author | Tom Rini <trini@ti.com> | 2014-09-09 20:01:59 -0400 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2014-09-09 20:01:59 -0400 |
| commit | 8c9c74e4c69b43cd50a1f04b34cfc141ed21654c (patch) | |
| tree | 180763abe35a9465d2dc4d46202ac604e7b7baac /arch/arm/include/asm/io.h | |
| parent | 0b703dbcee7103f07804d0a4328d1593355c4324 (diff) | |
| parent | b4ecc8c6f8c85d25f72933af23531728069a5b0f (diff) | |
Merge branch 'master' of git://git.denx.de/u-boot-fsl-qoriq
Diffstat (limited to 'arch/arm/include/asm/io.h')
| -rw-r--r-- | arch/arm/include/asm/io.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/arch/arm/include/asm/io.h b/arch/arm/include/asm/io.h index 88ecddbc41..bfbe0a0988 100644 --- a/arch/arm/include/asm/io.h +++ b/arch/arm/include/asm/io.h @@ -376,7 +376,12 @@ out: return retval; } -#elif !defined(readb) +#else +#define memset_io(a, b, c) memset((void *)(a), (b), (c)) +#define memcpy_fromio(a, b, c) memcpy((a), (void *)(b), (c)) +#define memcpy_toio(a, b, c) memcpy((void *)(a), (b), (c)) + +#if !defined(readb) #define readb(addr) (__readwrite_bug("readb"),0) #define readw(addr) (__readwrite_bug("readw"),0) @@ -389,6 +394,7 @@ out: #define check_signature(io,sig,len) (0) +#endif #endif /* __mem_pci */ /* |