diff options
author | Vladimir Vid <vladimir.vid@sartura.hr> | 2018-04-26 17:52:14 +0200 |
---|---|---|
committer | Hauke Mehrtens <hauke@hauke-m.de> | 2018-07-07 18:33:57 +0200 |
commit | 856cc6d9998ea717ee25d80bef52635dceeae71a (patch) | |
tree | da678b9719acbe5ada3efe8dc4b21b3c1507c56e /package/boot/uboot-imx6/patches/004-use-weak-in-main.patch | |
parent | 87493dac11f3c7bbbc1fed9aef1cf9ff62053ab0 (diff) | |
download | upstream-856cc6d9998ea717ee25d80bef52635dceeae71a.tar.gz upstream-856cc6d9998ea717ee25d80bef52635dceeae71a.tar.bz2 upstream-856cc6d9998ea717ee25d80bef52635dceeae71a.zip |
uboot-imx: bump to 2018.03 which fixes the build issues with fdt64_t redefinitions
* change mx6qsabresd to mx6qsabres to match defconfig name
* merge wanboard profiles since there is only one defconfig for the target device
* move wanboard options from wandboard.h to defconfig
* remove legacy patches
Signed-off-by: Vladimir Vid <vladimir.vid@sartura.hr>
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, 0 insertions, 27 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 deleted file mode 100644 index 07c197fc17..0000000000 --- a/package/boot/uboot-imx6/patches/004-use-weak-in-main.patch +++ /dev/null @@ -1,27 +0,0 @@ -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 - |