diff options
author | Hauke Mehrtens <hauke@hauke-m.de> | 2015-11-20 23:38:39 +0000 |
---|---|---|
committer | Hauke Mehrtens <hauke@hauke-m.de> | 2015-11-20 23:38:39 +0000 |
commit | 53d94f89e86ef262c9f76fa2aba93ffae9995717 (patch) | |
tree | b836556e8d9c11435c231e80febe78fa86b9f902 /package/boot/uboot-omap/patches/420-use-weak-in-board.patch | |
parent | 605621fc3f2ebebca800dbcd360cd02f994f43ad (diff) | |
download | upstream-53d94f89e86ef262c9f76fa2aba93ffae9995717.tar.gz upstream-53d94f89e86ef262c9f76fa2aba93ffae9995717.tar.bz2 upstream-53d94f89e86ef262c9f76fa2aba93ffae9995717.zip |
uboot-omap: fix build with gcc-5
This fixes some problems with gcc-5.
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
SVN-Revision: 47539
Diffstat (limited to 'package/boot/uboot-omap/patches/420-use-weak-in-board.patch')
-rw-r--r-- | package/boot/uboot-omap/patches/420-use-weak-in-board.patch | 80 |
1 files changed, 80 insertions, 0 deletions
diff --git a/package/boot/uboot-omap/patches/420-use-weak-in-board.patch b/package/boot/uboot-omap/patches/420-use-weak-in-board.patch new file mode 100644 index 0000000000..b46e616f76 --- /dev/null +++ b/package/boot/uboot-omap/patches/420-use-weak-in-board.patch @@ -0,0 +1,80 @@ +From: Jeroen Hofstee <jeroen@myspectrum.nl> +Date: Wed, 8 Oct 2014 20:57:21 +0000 (+0200) +Subject: arm: board: use __weak +X-Git-Tag: v2015.01-rc1~176 +X-Git-Url: http://git.denx.de/?p=u-boot.git;a=commitdiff_plain;h=8590c800ee60e46f15d6085e3c1fed0d6881fc62 + +arm: board: use __weak + +Signed-off-by: Jeroen Hofstee <jeroen@myspectrum.nl> +Acked-by: Albert ARIBAUD <albert.u.boot@aribaud.net> +--- + +--- a/arch/arm/lib/board.c ++++ b/arch/arm/lib/board.c +@@ -62,25 +62,15 @@ extern void dataflash_print_info(void); + ************************************************************************ + * May be supplied by boards if desired + */ +-inline void __coloured_LED_init(void) {} +-void coloured_LED_init(void) +- __attribute__((weak, alias("__coloured_LED_init"))); +-inline void __red_led_on(void) {} +-void red_led_on(void) __attribute__((weak, alias("__red_led_on"))); +-inline void __red_led_off(void) {} +-void red_led_off(void) __attribute__((weak, alias("__red_led_off"))); +-inline void __green_led_on(void) {} +-void green_led_on(void) __attribute__((weak, alias("__green_led_on"))); +-inline void __green_led_off(void) {} +-void green_led_off(void) __attribute__((weak, alias("__green_led_off"))); +-inline void __yellow_led_on(void) {} +-void yellow_led_on(void) __attribute__((weak, alias("__yellow_led_on"))); +-inline void __yellow_led_off(void) {} +-void yellow_led_off(void) __attribute__((weak, alias("__yellow_led_off"))); +-inline void __blue_led_on(void) {} +-void blue_led_on(void) __attribute__((weak, alias("__blue_led_on"))); +-inline void __blue_led_off(void) {} +-void blue_led_off(void) __attribute__((weak, alias("__blue_led_off"))); ++__weak void coloured_LED_init(void) {} ++__weak void red_led_on(void) {} ++__weak void red_led_off(void) {} ++__weak void green_led_on(void) {} ++__weak void green_led_off(void) {} ++__weak void yellow_led_on(void) {} ++__weak void yellow_led_off(void) {} ++__weak void blue_led_on(void) {} ++__weak void blue_led_off(void) {} + + /* + ************************************************************************ +@@ -199,27 +189,21 @@ typedef int (init_fnc_t) (void); + + int print_cpuinfo(void); + +-void __dram_init_banksize(void) ++__weak void dram_init_banksize(void) + { + gd->bd->bi_dram[0].start = CONFIG_SYS_SDRAM_BASE; + gd->bd->bi_dram[0].size = gd->ram_size; + } +-void dram_init_banksize(void) +- __attribute__((weak, alias("__dram_init_banksize"))); + +-int __arch_cpu_init(void) ++__weak int arch_cpu_init(void) + { + return 0; + } +-int arch_cpu_init(void) +- __attribute__((weak, alias("__arch_cpu_init"))); + +-int __power_init_board(void) ++__weak int power_init_board(void) + { + return 0; + } +-int power_init_board(void) +- __attribute__((weak, alias("__power_init_board"))); + + /* Record the board_init_f() bootstage (after arch_cpu_init()) */ + static int mark_bootstage(void) |