Remove board_nand_init from nand_boot.c
PATCH v4 2/3 Remove board_nand_init from nand_boot.c
Remove the board_init_f function from nand_spl/nand_boot.c. This function is to be defined by all boards using the nand_spl functionality in their individual board directory.
Currently this function was being used by the smdk6400 board. Added the board specific function definition.
---
Changes since V3:
* Removed the board_init_f function from the nand_boot.c instead of adding a weak declaration.
* Added a corresponding function definition for the smdk6400 board.
The changes for smdk6400 have not been tested as it is currently broken due to the relocation and ELF-RELOC changes.
board/samsung/smdk6400/smdk6400_nand_spl.c | 37 ++++++++++++++++++++++++++++ nand_spl/board/samsung/smdk6400/Makefile | 6 ++++- nand_spl/nand_boot.c | 8 ------ 3 files changed, 42 insertions(+), 9 deletions(-) create mode 100644 board/samsung/smdk6400/smdk6400_nand_spl.c
board/samsung/smdk6400/smdk6400_nand_spl.c new file +37 -0
@@ -0,0 +1,37 @@ +/* +* (C) Copyright 2002 +* Sysgo Real-Time Solutions, GmbH <www.elinos.com> +* Marius Groeger <[email protected]> +* +* (C) Copyright 2002 +* David Mueller, ELSOFT AG, <[email protected]> +* +* (C) Copyright 2008 +* Guennadi Liakhovetki, DENX Software Engineering, <[email protected]> +* +* See file CREDITS for list of people who contributed to this +* project. +* +* This program is free software; you can redistribute it and/or +* modify it under the terms of the GNU General Public License as +* published by the Free Software Foundation; either version 2 of +* the License, or (at your option) any later version. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program; if not, write to the Free Software +* Foundation, Inc., 59 Temple Place, Suite 330, Boston, +* MA 02111-1307 USA +*/ + +#include <common.h> + +void board_init_f (unsigned long bootflag) +{ +relocate_code (CONFIG_SYS_TEXT_BASE -TOTAL_MALLOC_LEN ,NULL , +CONFIG_SYS_TEXT_BASE ); +}
nand_spl/board/samsung/smdk6400/Makefile +5 -1
@@ -35,7 +35,7 @@ AFLAGS += -DCONFIG_NAND_SPL CFLAGS += -DCONFIG_NAND_SPL SOBJS = start.o cpu_init.o lowlevel_init.o -COBJS = nand_boot.o nand_ecc.o s3c64xx.o +COBJS = nand_boot.o nand_ecc.o s3c64xx.o smdk6400_nand_spl.o SRCS := $(addprefix $(obj),$(SOBJS:.o=.S) $(COBJS:.o=.c)) OBJS := $(addprefix $(obj),$(SOBJS) $(COBJS))
@@ -93,6 +93,10 @@ $(obj)s3c64xx.c: @rm -f $@ @ln -s $(TOPDIR)/drivers/mtd/nand/s3c64xx.c $@ +$(obj)smdk6400_nand_spl.c: + @rm -f $@ + @ln -s $(TOPDIR)/board/samsung/smdk6400/smdk6400_nand_spl.c $@ + ######################################################################### $(obj)%.o: $(obj)%.S
nand_spl/nand_boot.c +0 -8
@@ -221,14 +221,6 @@ static int nand_load(struct mtd_info *mtd, unsigned int offs,return 0 ; } -#if defined(CONFIG_ARM ) && !defined(CONFIG_SYS_ARM_WITHOUT_RELOC ) -void board_init_f (ulong bootflag) -{ -relocate_code (CONFIG_SYS_TEXT_BASE -TOTAL_MALLOC_LEN ,NULL , -CONFIG_SYS_TEXT_BASE ); -} -#endif -/* * The main entry for NAND booting. It's necessary that SDRAM is already * configured and available since this code loads the main U-Boot image
Signature · 1 line
1.7.0.4
PATCH v4 2/3 Remove board_nand_init from nand_boot.c
Quoted 15 lines · On Fri, 29 Oct 2010 01:00:07 +0530 Sughosh Ganu <[email protected]> wrote:
Remove the
board_init_ffunction fromnand_spl/nand_boot.c. This function is to be defined by all boards using thenand_splfunctionality in their individual board directory.Currently this function was being used by the smdk6400 board. Added the board specific function definition.
Signed-off-by Sughosh Ganu <[email protected]>---
Changes since V3:
* Removed theboard_init_ffunction from thenand_boot.cinstead of adding a weak declaration.
* Added a corresponding function definition for the smdk6400 board.
Quoted 8 lines
The changes for smdk6400 have not been tested as it is currently broken due to the relocation and ELF-RELOC changes.
board/samsung/smdk6400/smdk6400_nand_spl.c | 37 ++++++++++++++++++++++++++++ nand_spl/board/samsung/smdk6400/Makefile | 6 ++++- nand_spl/nand_boot.c | 8 ------ 3 files changed, 42 insertions(+), 9 deletions(-) create mode 100644 board/samsung/smdk6400/smdk6400_nand_spl.c
-Scott
PATCH v4 2/3 Remove board_nand_init from nand_boot.c
In reply to Sughosh GanuQuoted 8 lines · Sughosh Ganu
?Remove the
board_init_ffunction fromnand_spl/nand_boot.c. This ?function is to be defined by all boards using thenand_spl?functionality in their individual board directory.?Currently this function was being used by the smdk6400 board. Added ?the board specific function definition.
Signed-off-by Sughosh Ganu <[email protected]>
Applies cleanly to 908614f20f7f0f5df736eed21b88e81ebbf14e86 ofgit://git.denx.de/u-boot.git; no checkpatch warnings or errors.
Tested build da850evm with NAND, env.oob enabled.
Best Regards,
Ben Gardiner
---
Nanometrics Inc.
http://www.nanometrics.ca