Skip to content
Snippets Groups Projects
Commit 5e2c08c3 authored by Emil Medve's avatar Emil Medve Committed by Wolfgang Denk
Browse files

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: default avatarEmil Medve <Emilian.Medve@Freescale.com>
parent fe6da483
No related branches found
No related tags found
No related merge requests found
...@@ -48,7 +48,7 @@ DECLARE_GLOBAL_DATA_PTR; ...@@ -48,7 +48,7 @@ DECLARE_GLOBAL_DATA_PTR;
* Board-specific Platform code can reimplement show_boot_progress () if needed * 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) {}
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) #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 */ extern int do_reset (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]); /* for do_reset() prototype */
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment