diff options
| author | TsiChungLiew <Tsi-Chung.Liew@freescale.com> | 2008-01-14 17:35:44 -0600 |
|---|---|---|
| committer | TsiChungLiew <Tsi-Chung.Liew@freescale.com> | 2008-01-17 14:59:40 -0600 |
| commit | 397b7b81a1f1008798ae1206913508cc89cb3a7d (patch) | |
| tree | a8ed786b129e323bfae2c3f9096d1bd6f64a93aa | |
| parent | aa5f1f9dc815a76f6dffb580798599c028fe7feb (diff) | |
| download | u-boot-397b7b81a1f1008798ae1206913508cc89cb3a7d.tar.gz u-boot-397b7b81a1f1008798ae1206913508cc89cb3a7d.tar.xz u-boot-397b7b81a1f1008798ae1206913508cc89cb3a7d.zip | |
ColdFire: Fix CFI Flash low level Read/Write macro
Signed-off-by: TsiChungLiew <Tsi-Chung.Liew@freescale.com>
Signed-off by: John Rigby <jrigby@freescale.com>
| -rw-r--r-- | include/asm-m68k/io.h | 22 |
1 files changed, 8 insertions, 14 deletions
diff --git a/include/asm-m68k/io.h b/include/asm-m68k/io.h index 91d759219d..33c454a437 100644 --- a/include/asm-m68k/io.h +++ b/include/asm-m68k/io.h @@ -28,19 +28,13 @@ #include <asm/byteorder.h> -/* ++roman: The assignments to temp. vars avoid that gcc sometimes generates - * two accesses to memory, which may be undesirable for some devices. - */ -#define __raw_readb(addr) \ - ({ u8 __v = (*(volatile u8 *) (addr)); __v; }) -#define __raw_readw(addr) \ - ({ u16 __v = (*(volatile u16 *) (addr)); __v; }) -#define __raw_readl(addr) \ - ({ u32 __v = (*(volatile u32 *) (addr)); __v; }) +#define __raw_readb(addr) (*(volatile u8 *)(addr)) +#define __raw_readw(addr) (*(volatile u16 *)(addr)) +#define __raw_readl(addr) (*(volatile u32 *)(addr)) -#define __raw_writeb(addr,b) (void)((*(volatile u8 *) (addr)) = (b)) -#define __raw_writew(addr,w) (void)((*(volatile u16 *) (addr)) = (w)) -#define __raw_writel(addr,l) (void)((*(volatile u32 *) (addr)) = (l)) +#define __raw_writeb(b,addr) ((*(volatile u8 *) (addr)) = (b)) +#define __raw_writew(w,addr) ((*(volatile u16 *) (addr)) = (w)) +#define __raw_writel(l,addr) ((*(volatile u32 *) (addr)) = (l)) #define readb(addr) in_8((volatile u8 *)(addr)) #define writeb(b,addr) out_8((volatile u8 *)(addr), (b)) @@ -245,8 +239,8 @@ typedef unsigned long phys_addr_t; #define MAP_WRBACK (0) #define MAP_WRTHROUGH (0) -static inline void * -map_physmem(phys_addr_t paddr, unsigned long len, unsigned long flags) +static inline void *map_physmem(phys_addr_t paddr, unsigned long len, + unsigned long flags) { return (void *)paddr; } |