summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorScott Sweeny <scott.sweeny@timesys.com>2010-08-30 14:16:36 -0400
committerScott Sweeny <scott.sweeny@timesys.com>2010-08-30 14:16:36 -0400
commite1dce181db649aadcf5c83e9459ebf53dd038073 (patch)
tree48438b545d1b4b70354af4c2e0a5411b20194564
parente60beb13cf0135dc71c541021487b5ccc4d269cb (diff)
no inline and weak attributes
-rw-r--r--common/cmd_ide.c6
-rw-r--r--common/main.c2
-rw-r--r--lib_arm/board.c14
3 files changed, 11 insertions, 11 deletions
diff --git a/common/cmd_ide.c b/common/cmd_ide.c
index 8c6ed35b32..7f04577f5f 100644
--- a/common/cmd_ide.c
+++ b/common/cmd_ide.c
@@ -532,7 +532,7 @@ __ide_outb(int dev, int port, unsigned char val)
dev, port, val, (ATA_CURR_BASE(dev)+CONFIG_SYS_ATA_PORT_ADDR(port)));
outb(val, (ATA_CURR_BASE(dev)+CONFIG_SYS_ATA_PORT_ADDR(port)));
}
-void inline ide_outb (int dev, int port, unsigned char val)
+void ide_outb (int dev, int port, unsigned char val)
__attribute__((weak, alias("__ide_outb")));
unsigned char inline
@@ -544,7 +544,7 @@ __ide_inb(int dev, int port)
dev, port, (ATA_CURR_BASE(dev)+CONFIG_SYS_ATA_PORT_ADDR(port)), val);
return val;
}
-unsigned char inline ide_inb(int dev, int port)
+unsigned char ide_inb(int dev, int port)
__attribute__((weak, alias("__ide_inb")));
#ifdef CONFIG_TUNE_PIO
@@ -553,7 +553,7 @@ __ide_set_piomode(int pio_mode)
{
return 0;
}
-int inline ide_set_piomode(int pio_mode)
+int ide_set_piomode(int pio_mode)
__attribute__((weak, alias("__ide_set_piomode")));
#endif
diff --git a/common/main.c b/common/main.c
index 905d40f0e0..026edd1db2 100644
--- a/common/main.c
+++ b/common/main.c
@@ -48,7 +48,7 @@ DECLARE_GLOBAL_DATA_PTR;
* Board-specific Platform code can reimplement show_boot_progress () if needed
*/
void inline __show_boot_progress (int val) {}
-void inline show_boot_progress (int val) __attribute__((weak, alias("__show_boot_progress")));
+void show_boot_progress (int val) __attribute__((weak, alias("__show_boot_progress")));
#if defined(CONFIG_BOOT_RETRY_TIME) && defined(CONFIG_RESET_TO_RETRY)
extern int do_reset (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]); /* for do_reset() prototype */
diff --git a/lib_arm/board.c b/lib_arm/board.c
index 09eaaf25c4..6b41279da2 100644
--- a/lib_arm/board.c
+++ b/lib_arm/board.c
@@ -123,19 +123,19 @@ void *sbrk (ptrdiff_t increment)
* May be supplied by boards if desired
*/
void inline __coloured_LED_init (void) {}
-void inline coloured_LED_init (void) __attribute__((weak, alias("__coloured_LED_init")));
+void coloured_LED_init (void) __attribute__((weak, alias("__coloured_LED_init")));
void inline __red_LED_on (void) {}
-void inline red_LED_on (void) __attribute__((weak, alias("__red_LED_on")));
+void red_LED_on (void) __attribute__((weak, alias("__red_LED_on")));
void inline __red_LED_off(void) {}
-void inline red_LED_off(void) __attribute__((weak, alias("__red_LED_off")));
+void red_LED_off(void) __attribute__((weak, alias("__red_LED_off")));
void inline __green_LED_on(void) {}
-void inline green_LED_on(void) __attribute__((weak, alias("__green_LED_on")));
+void green_LED_on(void) __attribute__((weak, alias("__green_LED_on")));
void inline __green_LED_off(void) {}
-void inline green_LED_off(void)__attribute__((weak, alias("__green_LED_off")));
+void green_LED_off(void)__attribute__((weak, alias("__green_LED_off")));
void inline __yellow_LED_on(void) {}
-void inline yellow_LED_on(void)__attribute__((weak, alias("__yellow_LED_on")));
+void yellow_LED_on(void)__attribute__((weak, alias("__yellow_LED_on")));
void inline __yellow_LED_off(void) {}
-void inline yellow_LED_off(void)__attribute__((weak, alias("__yellow_LED_off")));
+void yellow_LED_off(void)__attribute__((weak, alias("__yellow_LED_off")));
/************************************************************************
* Init Utilities *