diff options
| author | John Crispin <john@openwrt.org> | 2015-11-24 18:27:57 +0000 |
|---|---|---|
| committer | John Crispin <john@openwrt.org> | 2015-11-24 18:27:57 +0000 |
| commit | 9a12fe8ea94684e0445e63ce282423a41afd8a2c (patch) | |
| tree | 01f584e36a6133d4030a02886f8cdb7ffa67e915 /package/boot/uboot-imx6/patches/004-use-weak-in-main.patch | |
| parent | c7bcdac82ecd32cf1c552b486a92a58c312a7b1f (diff) | |
| download | upstream-9a12fe8ea94684e0445e63ce282423a41afd8a2c.tar.gz upstream-9a12fe8ea94684e0445e63ce282423a41afd8a2c.tar.bz2 upstream-9a12fe8ea94684e0445e63ce282423a41afd8a2c.zip | |
uboot-imx6: fix build with gcc-5
Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
SVN-Revision: 47611
Diffstat (limited to 'package/boot/uboot-imx6/patches/004-use-weak-in-main.patch')
| -rw-r--r-- | package/boot/uboot-imx6/patches/004-use-weak-in-main.patch | 27 |
1 files changed, 27 insertions, 0 deletions
diff --git a/package/boot/uboot-imx6/patches/004-use-weak-in-main.patch b/package/boot/uboot-imx6/patches/004-use-weak-in-main.patch new file mode 100644 index 0000000000..07c197fc17 --- /dev/null +++ b/package/boot/uboot-imx6/patches/004-use-weak-in-main.patch @@ -0,0 +1,27 @@ +From: Jeroen Hofstee <jeroen@myspectrum.nl> +Date: Thu, 26 Jun 2014 18:18:31 +0000 (+0200) +Subject: common: main.c: make show_boot_progress __weak +X-Git-Tag: v2014.10-rc1~130 +X-Git-Url: http://git.denx.de/?p=u-boot.git;a=commitdiff_plain;h=3422299dc28fa8257677d03cc1253e3c9bf17e9f + +common: main.c: make show_boot_progress __weak + +This not only looks a bit better it also prevents a +warning with W=1 (no previous prototype). + +Signed-off-by: Jeroen Hofstee <jeroen@myspectrum.nl> +Acked-by: Simon Glass <sjg@chromium.org> +--- + +--- a/common/main.c ++++ b/common/main.c +@@ -27,8 +27,7 @@ DECLARE_GLOBAL_DATA_PTR; + /* + * Board-specific Platform code can reimplement show_boot_progress () if needed + */ +-void inline __show_boot_progress (int val) {} +-void show_boot_progress (int val) __attribute__((weak, alias("__show_boot_progress"))); ++__weak void show_boot_progress(int val) {} + + #define MAX_DELAY_STOP_STR 32 + |