summaryrefslogtreecommitdiff
path: root/board/MAI
diff options
context:
space:
mode:
authorPeter Tyser <ptyser@xes-inc.com>2009-04-20 11:09:05 -0500
committerWolfgang Denk <wd@denx.de>2009-04-28 01:02:04 +0200
commit54e822f9590cc6c70411bd8cabd42236e07a2aa7 (patch)
tree905330a238ff670819704b223aa36255b4f358b4 /board/MAI
parentf9a109b3adc5e8647535357500e2a38f0558b5c2 (diff)
downloadu-boot-imx-54e822f9590cc6c70411bd8cabd42236e07a2aa7.zip
u-boot-imx-54e822f9590cc6c70411bd8cabd42236e07a2aa7.tar.gz
u-boot-imx-54e822f9590cc6c70411bd8cabd42236e07a2aa7.tar.bz2
Replace __asm references with __asm__
__asm__ follows gcc's documented syntax and is generally more common than __asm. This change is only asthetic and should not affect functionality. Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
Diffstat (limited to 'board/MAI')
-rw-r--r--board/MAI/AmigaOneG3SE/enet.c16
-rw-r--r--board/MAI/AmigaOneG3SE/flash_new.c10
-rw-r--r--board/MAI/AmigaOneG3SE/serial.c6
-rw-r--r--board/MAI/AmigaOneG3SE/via686.c2
4 files changed, 17 insertions, 17 deletions
diff --git a/board/MAI/AmigaOneG3SE/enet.c b/board/MAI/AmigaOneG3SE/enet.c
index ac969a9..b9df55c 100644
--- a/board/MAI/AmigaOneG3SE/enet.c
+++ b/board/MAI/AmigaOneG3SE/enet.c
@@ -297,50 +297,50 @@ static void eth_3com_halt(struct eth_device* dev);
static inline int ETH_INL(struct eth_device* dev, u_long addr)
{
- __asm volatile ("eieio");
+ __asm__ volatile ("eieio");
return le32_to_cpu(*(volatile u32 *)io_to_phys(addr + dev->iobase));
}
static inline int ETH_INW(struct eth_device* dev, u_long addr)
{
- __asm volatile ("eieio");
+ __asm__ volatile ("eieio");
return le16_to_cpu(*(volatile u16 *)io_to_phys(addr + dev->iobase));
}
static inline int ETH_INB(struct eth_device* dev, u_long addr)
{
- __asm volatile ("eieio");
+ __asm__ volatile ("eieio");
return *(volatile u8 *)io_to_phys(addr + dev->iobase);
}
static inline void ETH_OUTB(struct eth_device* dev, int command, u_long addr)
{
*(volatile u8 *)io_to_phys(addr + dev->iobase) = command;
- __asm volatile ("eieio");
+ __asm__ volatile ("eieio");
}
static inline void ETH_OUTW(struct eth_device* dev, int command, u_long addr)
{
*(volatile u16 *)io_to_phys(addr + dev->iobase) = cpu_to_le16(command);
- __asm volatile ("eieio");
+ __asm__ volatile ("eieio");
}
static inline void ETH_OUTL(struct eth_device* dev, int command, u_long addr)
{
*(volatile u32 *)io_to_phys(addr + dev->iobase) = cpu_to_le32(command);
- __asm volatile ("eieio");
+ __asm__ volatile ("eieio");
}
static inline int ETH_STATUS(struct eth_device* dev)
{
- __asm volatile ("eieio");
+ __asm__ volatile ("eieio");
return le16_to_cpu(*(volatile u16 *)io_to_phys(EL3_STATUS + dev->iobase));
}
static inline void ETH_CMD(struct eth_device* dev, int command)
{
*(volatile u16 *)io_to_phys(EL3_CMD + dev->iobase) = cpu_to_le16(command);
- __asm volatile ("eieio");
+ __asm__ volatile ("eieio");
}
/* Command register is always in the same spot in all the register windows */
diff --git a/board/MAI/AmigaOneG3SE/flash_new.c b/board/MAI/AmigaOneG3SE/flash_new.c
index 7b7ea16..9beb048 100644
--- a/board/MAI/AmigaOneG3SE/flash_new.c
+++ b/board/MAI/AmigaOneG3SE/flash_new.c
@@ -153,14 +153,14 @@ static ulong flash_get_size (ulong addr, flash_info_t *info)
/* Write auto select command: read Manufacturer ID */
x[0x0555] = 0xAA;
- __asm volatile ("sync\n eieio");
+ __asm__ volatile ("sync\n eieio");
x[0x02AA] = 0x55;
- __asm volatile ("sync\n eieio");
+ __asm__ volatile ("sync\n eieio");
x[0x0555] = 0x90;
- __asm volatile ("sync\n eieio");
+ __asm__ volatile ("sync\n eieio");
value = x[0];
- __asm volatile ("sync\n eieio");
+ __asm__ volatile ("sync\n eieio");
DEBUGF("Manuf. ID @ 0x%08lx: 0x%08x\n", (ulong)addr, value);
@@ -186,7 +186,7 @@ static ulong flash_get_size (ulong addr, flash_info_t *info)
}
value = x[1];
- __asm volatile ("sync\n eieio");
+ __asm__ volatile ("sync\n eieio");
DEBUGF("Device ID @ 0x%08lx: 0x%08x\n", addr+1, value);
diff --git a/board/MAI/AmigaOneG3SE/serial.c b/board/MAI/AmigaOneG3SE/serial.c
index 88039f3..84a913e 100644
--- a/board/MAI/AmigaOneG3SE/serial.c
+++ b/board/MAI/AmigaOneG3SE/serial.c
@@ -75,17 +75,17 @@ void serial_init (void)
/* COM_WRITE_BYTE(LINE_CONTROL, 0x83); */
/* COM_WRITE_BYTE(DIVISOR_LATCH_LSB, (uint8)(clock_divisor & 0xFF)); */
/* COM_WRITE_BYTE(DIVISOR_LATCH_MSB, (uint8)(clock_divisor >> 8)); */
- /* __asm("eieio"); */
+ /* __asm__("eieio"); */
/* Set 8-N-1 */
COM_WRITE_BYTE (LINE_CONTROL, 0x03);
- __asm ("eieio");
+ __asm__ ("eieio");
/* Disable FIFO */
COM_WRITE_BYTE (MODEM_CONTROL, 0x03);
COM_WRITE_BYTE (FIFO_CONTROL, 0x07);
- __asm ("eieio");
+ __asm__ ("eieio");
serial_init_done = 1;
}
diff --git a/board/MAI/AmigaOneG3SE/via686.c b/board/MAI/AmigaOneG3SE/via686.c
index 2427ce5..752a464 100644
--- a/board/MAI/AmigaOneG3SE/via686.c
+++ b/board/MAI/AmigaOneG3SE/via686.c
@@ -211,7 +211,7 @@ void via_cfgfunc_via686(struct pci_controller *host, pci_dev_t dev, struct pci_c
}
}
-__asm (" .globl via_calibrate_time_base \n"
+__asm__ (" .globl via_calibrate_time_base \n"
"via_calibrate_time_base: \n"
" lis 9, 0xfe00 \n"
" li 0, 0x00 \n"