From patchwork Thu Aug 23 08:12:40 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Roese X-Patchwork-Id: 179547 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 C34582C0096 for ; Thu, 23 Aug 2012 18:13:27 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id EDE122808F; Thu, 23 Aug 2012 10:13:13 +0200 (CEST) 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 Evnl4mwd5OtR; Thu, 23 Aug 2012 10:13:13 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 3997228094; Thu, 23 Aug 2012 10:12:58 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 84B6728085 for ; Thu, 23 Aug 2012 10:12:54 +0200 (CEST) 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 oZ0tpWTn1PhD for ; Thu, 23 Aug 2012 10:12:52 +0200 (CEST) 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 mo-p05-ob.rzone.de (mo-p05-ob.rzone.de [81.169.146.180]) by theia.denx.de (Postfix) with ESMTPS id C8EAC28083 for ; Thu, 23 Aug 2012 10:12:51 +0200 (CEST) X-RZG-AUTH: :IW0NeWC7b/q2i6W/qstXb1SBUuFnrGohdvpEkce+Ub40Q/uAFj+9EbzQXD+D2YGO X-RZG-CLASS-ID: mo05 Received: from ubuntu-2012.fritz.box (pD9FFB867.dip.t-dialin.net [217.255.184.103]) by smtp.strato.de (joses mo91) (RZmta 30.9 DYNA|AUTH) with ESMTPA id e02de3o7N5Gti0 ; Thu, 23 Aug 2012 10:12:46 +0200 (CEST) From: Stefan Roese To: u-boot@lists.denx.de Date: Thu, 23 Aug 2012 10:12:40 +0200 Message-Id: <1345709565-28862-2-git-send-email-sr@denx.de> X-Mailer: git-send-email 1.7.12 In-Reply-To: <1345709565-28862-1-git-send-email-sr@denx.de> References: <1345709565-28862-1-git-send-email-sr@denx.de> Cc: trini@ti.com Subject: [U-Boot] [PATCH 1/6] SPL: Add NOR flash booting support 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: , MIME-Version: 1.0 Sender: u-boot-bounces@lists.denx.de Errors-To: u-boot-bounces@lists.denx.de SPL NOR flash booting support is quite simple. Only copying of the images is needed. On MPC5xxx we need to make sure to only use the standard memcpy() implementation and not the MPC5xxx specific one. As the MPC5xxx version has some complexity which is not needed for this SPL booting. Signed-off-by: Stefan Roese --- common/spl/Makefile | 1 + common/spl/spl.c | 5 ++++ common/spl/spl_nor.c | 68 ++++++++++++++++++++++++++++++++++++++++++++++++++++ include/spl.h | 3 +++ 4 files changed, 77 insertions(+) create mode 100644 common/spl/spl_nor.c diff --git a/common/spl/Makefile b/common/spl/Makefile index b61b438..53a82c4 100644 --- a/common/spl/Makefile +++ b/common/spl/Makefile @@ -15,6 +15,7 @@ LIB = $(obj)libspl.o ifdef CONFIG_SPL_BUILD COBJS-$(CONFIG_SPL_FRAMEWORK) += spl.o +COBJS-$(CONFIG_SPL_NOR_SUPPORT) += spl_nor.o COBJS-$(CONFIG_SPL_YMODEM_SUPPORT) += spl_ymodem.o endif diff --git a/common/spl/spl.c b/common/spl/spl.c index dcf8556..4c0135e 100644 --- a/common/spl/spl.c +++ b/common/spl/spl.c @@ -170,6 +170,11 @@ void board_init_r(gd_t *id, ulong dummy) spl_nand_load_image(); break; #endif +#ifdef CONFIG_SPL_NOR_SUPPORT + case BOOT_DEVICE_NOR: + spl_nor_load_image(); + break; +#endif #ifdef CONFIG_SPL_YMODEM_SUPPORT case BOOT_DEVICE_UART: spl_ymodem_load_image(); diff --git a/common/spl/spl_nor.c b/common/spl/spl_nor.c new file mode 100644 index 0000000..bf0552f --- /dev/null +++ b/common/spl/spl_nor.c @@ -0,0 +1,68 @@ +/* + * Copyright (C) 2012 Stefan Roese + * + * 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. + */ + +#include +#include + +/* + * Don't use the special MPC5xxx memcpy implementation, only use + * the standard one. + */ +#if defined(CONFIG_MPC512X) || defined(CONFIG_MPC5200) +extern void *__memcpy(void *, const void *, size_t); +#define memcpy __memcpy +#endif + +void spl_nor_load_image(void) +{ + if (spl_start_uboot()) { + /* + * Load real U-Boot from its location in NOR flash to its + * defined location in SDRAM + */ + memcpy((void *)CONFIG_SYS_TEXT_BASE, + (void *)CONFIG_SYS_UBOOT_BASE, + CONFIG_SYS_MONITOR_LEN); + + /* + * This parsing is needed for the SPL framework to correctly + * detect and boot the U-Boot image + */ + spl_parse_image_header( + (const struct image_header *)CONFIG_SYS_TEXT_BASE); + } else { + /* + * Load Linux from its location in NOR flash to its defined + * location in SDRAM + */ + spl_parse_image_header( + (const struct image_header *)CONFIG_SYS_OS_BASE); + + memcpy((void *)spl_image.load_addr, + (void *)(CONFIG_SYS_OS_BASE + + sizeof(struct image_header)), + spl_image.size); + + /* + * Copy DT blob (fdt) to SDRAM. Passing pointer to flash + * doesn't work (16 KiB should be enough for DT) + */ + memcpy((void *)CONFIG_SYS_SPL_ARGS_ADDR, + (void *)(CONFIG_SYS_FDT_BASE), + (16 << 10)); + } +} diff --git a/include/spl.h b/include/spl.h index 3b3051f..efa160e 100644 --- a/include/spl.h +++ b/include/spl.h @@ -55,6 +55,9 @@ void spl_display_print(void); /* NAND SPL functions */ void spl_nand_load_image(void); +/* NOR SPL functions */ +void spl_nor_load_image(void); + /* MMC SPL functions */ void spl_mmc_load_image(void);