diff options
| author | Emil Medve <Emilian.Medve@Freescale.com> | 2009-05-12 13:48:32 -0500 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2009-05-15 22:04:04 +0200 |
| commit | 5e2c08c3ac90808e9be64856916bfd6df984823c (patch) | |
| tree | 68a91848715d0e53de9513da89a150858e81c8ab | |
| parent | fe6da4837308aa33d537ac3e7f36c2d66e3d9a36 (diff) | |
| download | u-boot-imx-5e2c08c3ac90808e9be64856916bfd6df984823c.zip u-boot-imx-5e2c08c3ac90808e9be64856916bfd6df984823c.tar.gz u-boot-imx-5e2c08c3ac90808e9be64856916bfd6df984823c.tar.bz2 | |
Remove inline qualifier from show_boot_progress()
The 'inline' is conflicting with the semantic of 'weak' attribute and with the
way the show_boot_progress() function is used.
Also gcc 4.4 is complaining about it:
main.c:51: error: inline function 'show_boot_progress' cannot be declared weak
Signed-off-by: Emil Medve <Emilian.Medve@Freescale.com>
| -rw-r--r-- | common/main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/common/main.c b/common/main.c index 905d40f..026edd1 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 */ |