From patchwork Mon Mar 11 18:35:42 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Rini X-Patchwork-Id: 226641 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from theia.denx.de (theia.denx.de [85.214.87.163]) by ozlabs.org (Postfix) with ESMTP id 9F7AA2C02C1 for ; Tue, 12 Mar 2013 05:35:52 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id F3C904A279; Mon, 11 Mar 2013 19:35:50 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at theia.denx.de Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id XGUGJehsd3hJ; Mon, 11 Mar 2013 19:35:50 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 05BEB4A22E; Mon, 11 Mar 2013 19:35:49 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id CAD5F4A22E for ; Mon, 11 Mar 2013 19:35:46 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at theia.denx.de Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id LnvVYubnEMMz for ; Mon, 11 Mar 2013 19:35:45 +0100 (CET) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 (only DNSBL check requested) Received: from mail-gh0-f174.google.com (mail-gh0-f174.google.com [209.85.160.174]) by theia.denx.de (Postfix) with ESMTPS id 5D96C4A202 for ; Mon, 11 Mar 2013 19:35:43 +0100 (CET) Received: by mail-gh0-f174.google.com with SMTP id g15so672288ghb.33 for ; Mon, 11 Mar 2013 11:35:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:sender:date:from:to:cc:subject:message-id:references :mime-version:content-type:content-disposition:in-reply-to :user-agent; bh=O+JrR8n+4gc4BlVhbci8ka+Ut8USpMxZ0SbAkn6S5P0=; b=YHfBy8qGrUIIUP9b03yadCYyw0dVIiwKyOMh27Yth21ftsxMChX4gBhjNnH5b96Qmt mn+Z6OLKvrtF5sFJcxuReswz651AZHOXhHQY0AIid69c6Hr0Q0USMqYqagxnHyLH3Cj2 MAR4gLmv+o3F/Un//9iDZEpoM1PbT3+SGB3gzMa6B02zVDJ6GkJdrW/cuUgr/2vARwwR SGjCao+k4iF4+NhUqvgDCwGftuKfr8QJ0f3ivUIjvbivsAnL3qOalmQHW77ERkKd2dPW Eraj7HvYB4SwUlTAoQg0Vqrf1Pe1gMe+7u09YdaqE9Q2VUS1+cSJeir+mf2S0xctXvG3 +WgA== X-Received: by 10.236.166.226 with SMTP id g62mr6591610yhl.74.1363026942702; Mon, 11 Mar 2013 11:35:42 -0700 (PDT) Received: from bill-the-cat (cpe-065-184-250-089.ec.res.rr.com. [65.184.250.89]) by mx.google.com with ESMTPS id d43sm25196900yhk.23.2013.03.11.11.35.40 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Mon, 11 Mar 2013 11:35:41 -0700 (PDT) Date: Mon, 11 Mar 2013 14:35:42 -0400 From: Tom Rini To: Enric Balletbo i Serra Message-ID: <20130311183542.GH27930@bill-the-cat> References: <1360314889-16955-4-git-send-email-eballetbo@gmail.com> MIME-Version: 1.0 In-Reply-To: <1360314889-16955-4-git-send-email-eballetbo@gmail.com> User-Agent: Mutt/1.5.21 (2010-09-15) Cc: u-boot@lists.denx.de Subject: Re: [U-Boot] [U-Boot, PATCHv2, 3/4] SPL: ONENAND: Support SPL to boot u-boot from OneNAND. X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.11 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: u-boot-bounces@lists.denx.de Errors-To: u-boot-bounces@lists.denx.de On Thu, Feb 07, 2013 at 11:14:48PM -0000, Enric Balletbo i Serra wrote: > From: Enric Balletbo i Serra > > 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 > > --- > 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 > + * > + * Based on common/spl/spl_nand.c > + * Copyright (C) 2011 > + * Corscience GmbH & Co. KG - Simon Schwarz > + * > + * 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 > +#include > +#include > +#include > +#include > + > +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! 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);