Skip to contentSkip to conversation

Make board_init_f under nand_boot.c a weak function.

PATCH Superseded Sughosh Ganu 2 participants 2 messages Oct 25, 2010 – Oct 26, 2010

v2 of 6 Superseded Latest is v6 →

lore
Share & tools
lore
#0 lore raw

PATCH v2 2/3 Make board_init_f under nand_boot.c a weak function.

Enable board_init_f to be overridden with a board specific funtion.

---
V2:
Splitting this change as a separate patch.

 nand_spl/nand_boot.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)
nand_spl/nand_boot.c +2 -1
index ccd0af2..3cda41c 100644
@@ -222,11 +222,12 @@ static int nand_load(struct mtd_info *mtd, unsigned int offs,
 }
 
 #if defined(CONFIG_ARM) && !defined(CONFIG_SYS_ARM_WITHOUT_RELOC)
-void board_init_f (ulong bootflag)
+void __board_init_f (ulong bootflag)
 {
 	relocate_code (CONFIG_SYS_TEXT_BASE - TOTAL_MALLOC_LEN, NULL,
 		       CONFIG_SYS_TEXT_BASE);
 }
+void board_init_f (ulong bootflag)__attribute__((weak, alias("__board_init_f")));
 #endif
 
 /*
Signature · 1 line
1.7.0.4
#1 lore raw

PATCH v2 2/3 Make board_init_f under nand_boot.c a weak function.

Quoted 4 lines · Sughosh Ganu

?Enable board_init_f to be overridden with a board specific ?funtion.

Applies to c163f4478ca72f51b28b55f74addc8fe029d7b83 of
git://git.denx.de/u-boot.git.

This patch has checkpatch.pl warnings:
WARNING: space prohibited between function name and open parenthesis '(' #94: FILE: nand_spl/nand_boot.c:225:
+void __board_init_f (ulong bootflag)

WARNING: line over 80 characters
#99: FILE: nand_spl/nand_boot.c:230:
+void board_init_f (ulong bootflag)__attribute__((weak, alias("__board_init_f")));

WARNING: space prohibited between function name and open parenthesis '(' #99: FILE: nand_spl/nand_boot.c:230:
+void board_init_f (ulong bootflag)__attribute__((weak, alias("__board_init_f")));

The resulting u-boot is usable; tested on da850evm with NAND, env.oob and tftp.

Best Regards,
Ben Gardiner

---
Nanometrics Inc.
http://www.nanometrics.ca