OpenWrt – Blame information for rev 4
?pathlinks?
| Rev | Author | Line No. | Line |
|---|---|---|---|
| 4 | office | 1 | From: Jeroen Hofstee <jeroen@myspectrum.nl> |
| 2 | Date: Wed, 8 Oct 2014 20:57:21 +0000 (+0200) |
||
| 3 | Subject: arm: board: use __weak |
||
| 4 | X-Git-Tag: v2015.01-rc1~176 |
||
| 5 | X-Git-Url: http://git.denx.de/?p=u-boot.git;a=commitdiff_plain;h=8590c800ee60e46f15d6085e3c1fed0d6881fc62 |
||
| 6 | |||
| 7 | arm: board: use __weak |
||
| 8 | |||
| 9 | Signed-off-by: Jeroen Hofstee <jeroen@myspectrum.nl> |
||
| 10 | Acked-by: Albert ARIBAUD <albert.u.boot@aribaud.net> |
||
| 11 | --- |
||
| 12 | |||
| 13 | --- a/arch/arm/lib/board.c |
||
| 14 | +++ b/arch/arm/lib/board.c |
||
| 15 | @@ -63,25 +63,15 @@ extern void dataflash_print_info(void); |
||
| 16 | ************************************************************************ |
||
| 17 | * May be supplied by boards if desired |
||
| 18 | */ |
||
| 19 | -inline void __coloured_LED_init(void) {} |
||
| 20 | -void coloured_LED_init(void) |
||
| 21 | - __attribute__((weak, alias("__coloured_LED_init"))); |
||
| 22 | -inline void __red_led_on(void) {} |
||
| 23 | -void red_led_on(void) __attribute__((weak, alias("__red_led_on"))); |
||
| 24 | -inline void __red_led_off(void) {} |
||
| 25 | -void red_led_off(void) __attribute__((weak, alias("__red_led_off"))); |
||
| 26 | -inline void __green_led_on(void) {} |
||
| 27 | -void green_led_on(void) __attribute__((weak, alias("__green_led_on"))); |
||
| 28 | -inline void __green_led_off(void) {} |
||
| 29 | -void green_led_off(void) __attribute__((weak, alias("__green_led_off"))); |
||
| 30 | -inline void __yellow_led_on(void) {} |
||
| 31 | -void yellow_led_on(void) __attribute__((weak, alias("__yellow_led_on"))); |
||
| 32 | -inline void __yellow_led_off(void) {} |
||
| 33 | -void yellow_led_off(void) __attribute__((weak, alias("__yellow_led_off"))); |
||
| 34 | -inline void __blue_led_on(void) {} |
||
| 35 | -void blue_led_on(void) __attribute__((weak, alias("__blue_led_on"))); |
||
| 36 | -inline void __blue_led_off(void) {} |
||
| 37 | -void blue_led_off(void) __attribute__((weak, alias("__blue_led_off"))); |
||
| 38 | +__weak void coloured_LED_init(void) {} |
||
| 39 | +__weak void red_led_on(void) {} |
||
| 40 | +__weak void red_led_off(void) {} |
||
| 41 | +__weak void green_led_on(void) {} |
||
| 42 | +__weak void green_led_off(void) {} |
||
| 43 | +__weak void yellow_led_on(void) {} |
||
| 44 | +__weak void yellow_led_off(void) {} |
||
| 45 | +__weak void blue_led_on(void) {} |
||
| 46 | +__weak void blue_led_off(void) {} |
||
| 47 | |||
| 48 | /* |
||
| 49 | ************************************************************************ |
||
| 50 | @@ -198,27 +188,21 @@ static int arm_pci_init(void) |
||
| 51 | */ |
||
| 52 | typedef int (init_fnc_t) (void); |
||
| 53 | |||
| 54 | -void __dram_init_banksize(void) |
||
| 55 | +__weak void dram_init_banksize(void) |
||
| 56 | { |
||
| 57 | gd->bd->bi_dram[0].start = CONFIG_SYS_SDRAM_BASE; |
||
| 58 | gd->bd->bi_dram[0].size = gd->ram_size; |
||
| 59 | } |
||
| 60 | -void dram_init_banksize(void) |
||
| 61 | - __attribute__((weak, alias("__dram_init_banksize"))); |
||
| 62 | |||
| 63 | -int __arch_cpu_init(void) |
||
| 64 | +__weak int arch_cpu_init(void) |
||
| 65 | { |
||
| 66 | return 0; |
||
| 67 | } |
||
| 68 | -int arch_cpu_init(void) |
||
| 69 | - __attribute__((weak, alias("__arch_cpu_init"))); |
||
| 70 | |||
| 71 | -int __power_init_board(void) |
||
| 72 | +__weak int power_init_board(void) |
||
| 73 | { |
||
| 74 | return 0; |
||
| 75 | } |
||
| 76 | -int power_init_board(void) |
||
| 77 | - __attribute__((weak, alias("__power_init_board"))); |
||
| 78 | |||
| 79 | /* Record the board_init_f() bootstage (after arch_cpu_init()) */ |
||
| 80 | static int mark_bootstage(void) |