1234567891011121314151617181920212223242526272829303132333435363738394041424344454647484950515253545556575859606162636465666768697071727374757677787980 |
- 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
- @@ -63,25 +63,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) {}
-
- /*
- ************************************************************************
- @@ -198,27 +188,21 @@ static int arm_pci_init(void)
- */
- typedef int (init_fnc_t) (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)
|