Patchwork [U-Boot,U-Boot,PATCHv2,3/4] SPL: ONENAND: Support SPL to boot u-boot from OneNAND.

login
register
mail settings
Submitter Tom Rini
Date March 11, 2013, 6:35 p.m.
Message ID <20130311183542.GH27930@bill-the-cat>
Download mbox | patch
Permalink /patch/226641/
State Accepted
Delegated to: Tom Rini
Headers show

Comments

Tom Rini - March 11, 2013, 6:35 p.m.
On Thu, Feb 07, 2013 at 11:14:48PM -0000, Enric Balletbo i Serra wrote:

> From: Enric Balletbo i Serra <eballetbo@iseebcn.com>
> 
> This patch will allow use SPL to boot an u-boot from the OneNAND.
> 
> Tested with IGEPv2 board with a OneNAND from Numonyx
> 
> Signed-off-by: Enric Balletbo i Serra <eballetbo@iseebcn.com>
> 
> ---
> common/spl/Makefile      |    1 +
>  common/spl/spl.c         |    5 +++++
>  common/spl/spl_onenand.c |   47 ++++++++++++++++++++++++++++++++++++++++++++++
>  3 files changed, 53 insertions(+)
>  create mode 100644 common/spl/spl_onenand.c
> 
> diff --git a/common/spl/Makefile b/common/spl/Makefile
> index 5698a23..da2afc1 100644
> --- a/common/spl/Makefile
> +++ b/common/spl/Makefile
> @@ -18,6 +18,7 @@ COBJS-$(CONFIG_SPL_FRAMEWORK) += spl.o
>  COBJS-$(CONFIG_SPL_NOR_SUPPORT) += spl_nor.o
>  COBJS-$(CONFIG_SPL_YMODEM_SUPPORT) += spl_ymodem.o
>  COBJS-$(CONFIG_SPL_NAND_SUPPORT) += spl_nand.o
> +COBJS-$(CONFIG_SPL_ONENAND_SUPPORT) += spl_onenand.o
>  COBJS-$(CONFIG_SPL_NET_SUPPORT) += spl_net.o
>  endif
>  
> diff --git a/common/spl/spl.c b/common/spl/spl.c
> index ff9ba7b..293c7e1 100644
> --- a/common/spl/spl.c
> +++ b/common/spl/spl.c
> @@ -197,6 +197,11 @@ void board_init_r(gd_t *dummy1, ulong dummy2)
>  		spl_nand_load_image();
>  		break;
>  #endif
> +#ifdef CONFIG_SPL_ONENAND_SUPPORT
> +	case BOOT_DEVICE_ONENAND:
> +		spl_onenand_load_image();
> +		break;
> +#endif
>  #ifdef CONFIG_SPL_NOR_SUPPORT
>  	case BOOT_DEVICE_NOR:
>  		spl_nor_load_image();
> diff --git a/common/spl/spl_onenand.c b/common/spl/spl_onenand.c
> new file mode 100644
> index 0000000..a839557
> --- /dev/null
> +++ b/common/spl/spl_onenand.c
> @@ -0,0 +1,47 @@
> +/*
> + * Copyright (C) 2013
> + * ISEE 2007 SL - Enric Balletbo i Serra <eballetbo@iseebcn.com>
> + *
> + * Based on common/spl/spl_nand.c
> + * Copyright (C) 2011
> + * Corscience GmbH & Co. KG - Simon Schwarz <schwarz@corscience.de>
> + *
> + * 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>
> +#include <config.h>
> +#include <spl.h>
> +#include <asm/io.h>
> +#include <onenand_uboot.h>
> +
> +void spl_onenand_load_image(void)
> +{
> +	struct image_header *header;
> +
> +	debug("spl: onenand\n");
> +
> +	/*use CONFIG_SYS_TEXT_BASE as temporary storage area */
> +	header = (struct image_header *)(CONFIG_SYS_TEXT_BASE);
> +	/* Load u-boot */
> +	onenand_spl_load_image(CONFIG_SYS_ONENAND_U_BOOT_OFFS,
> +		CONFIG_SYS_ONENAND_PAGE_SIZE, (void *)header);
> +	spl_parse_image_header(header);
> +	onenand_spl_load_image(CONFIG_SYS_ONENAND_U_BOOT_OFFS,
> +		spl_image.size, (void *)spl_image.load_addr);
> +}

With the following change:

To fix a warning, applied to u-boot-ti/master, thanks!

Patch

diff --git a/include/spl.h b/include/spl.h
index b02f36f..b40be80 100644
--- a/include/spl.h
+++ b/include/spl.h
@@ -59,6 +59,9 @@  void spl_display_print(void);
 /* NAND SPL functions */
 void spl_nand_load_image(void);
 
+/* OneNAND SPL functions */
+void spl_onenand_load_image(void);
+
 /* NOR SPL functions */
 void spl_nor_load_image(void);