From 0805cf23b87119ca1b7b5928a047d8b03f364d72 Mon Sep 17 00:00:00 2001 From: Michel Pollet Date: Mon, 26 Apr 2010 16:47:44 +0100 Subject: [PATCH] MINI2440:Fixes for gcc 4.x Removed weak declarations Signed-off-by: Michel Pollet --- common/main.c | 4 ++++ lib_arm/board.c | 2 ++ 2 files changed, 6 insertions(+) diff --git a/common/main.c b/common/main.c index 17c3d270..15d52aa3 100644 --- a/common/main.c +++ b/common/main.c @@ -47,8 +47,12 @@ DECLARE_GLOBAL_DATA_PTR; /* * Board-specific Platform code can reimplement show_boot_progress () if needed */ +#ifndef CONFIG_MINI2440 void inline __show_boot_progress (int val) {} void inline show_boot_progress (int val) __attribute__((weak, alias("__show_boot_progress"))); +#else +void inline show_boot_progress (int val) {} +#endif #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 c0be131c..0cc998ac 100644 --- a/lib_arm/board.c +++ b/lib_arm/board.c @@ -125,6 +125,7 @@ void *sbrk (ptrdiff_t increment) ************************************************************************ * May be supplied by boards if desired */ +#ifndef CONFIG_MINI2440 void inline __coloured_LED_init (void) {} void inline coloured_LED_init (void) __attribute__((weak, alias("__coloured_LED_init"))); void inline __red_LED_on (void) {} @@ -139,6 +140,7 @@ void inline __yellow_LED_on(void) {} void inline 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"))); +#endif /************************************************************************ * Init Utilities * -- 2.11.4.GIT