summaryrefslogtreecommitdiff
path: root/recipes/u-boot/files
diff options
context:
space:
mode:
authorGuo Hongruan <camelguo@gmail.com>2010-02-10 13:33:06 -0800
committerKhem Raj <raj.khem@gmail.com>2010-02-10 13:35:54 -0800
commit40914431d5c2426945fe5f206d86c99222ace54b (patch)
tree3c73ff4a223066757d884d0880b47cf68d42a8d3 /recipes/u-boot/files
parent2a39c2264ebf81a6f7d7573ecaef7005862da881 (diff)
u-boot: remove 'inline' from functions with weak attribute.
* gcc 4.4 onwards complains about inline qualifier on weak functions. Signed-off-by: Guo Hongruan <camelguo@gmail.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'recipes/u-boot/files')
-rw-r--r--recipes/u-boot/files/u-boot-remove-inline-of-weak-functions.patch47
1 files changed, 47 insertions, 0 deletions
diff --git a/recipes/u-boot/files/u-boot-remove-inline-of-weak-functions.patch b/recipes/u-boot/files/u-boot-remove-inline-of-weak-functions.patch
new file mode 100644
index 0000000000..ea0c2d74ff
--- /dev/null
+++ b/recipes/u-boot/files/u-boot-remove-inline-of-weak-functions.patch
@@ -0,0 +1,47 @@
+Remove 'inline' keyword of functions with weak attribution
+
+* gcc-4.4 complains about 'inline' functions with 'weak' attribution
+Index: git/lib_arm/board.c
+===================================================================
+--- git.orig/lib_arm/board.c 2010-01-26 04:56:38.000000000 +0800
++++ git/lib_arm/board.c 2010-02-02 19:31:42.000000000 +0800
+@@ -123,19 +123,19 @@
+ * 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 *
+Index: git/common/main.c
+===================================================================
+--- git.orig/common/main.c 2010-02-02 19:32:17.000000000 +0800
++++ git/common/main.c 2010-02-02 19:32:21.000000000 +0800
+@@ -48,7 +48,7 @@
+ * 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 */