From patchwork Fri Aug 31 18:03:10 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Rini X-Patchwork-Id: 181025 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 E6D3E2C0261 for ; Sat, 1 Sep 2012 04:10:27 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id D6CE1280D0; Fri, 31 Aug 2012 20:08:41 +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 O991YlEY+DZc; Fri, 31 Aug 2012 20:08:41 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 7BDF3280FC; Fri, 31 Aug 2012 20:06:54 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id B5222280B6 for ; Fri, 31 Aug 2012 20:05:53 +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 TgOBhdWcl9R8 for ; Fri, 31 Aug 2012 20:05:53 +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 mail-pb0-f44.google.com (mail-pb0-f44.google.com [209.85.160.44]) by theia.denx.de (Postfix) with ESMTPS id D937F28093 for ; Fri, 31 Aug 2012 20:04:23 +0200 (CEST) Received: by mail-pb0-f44.google.com with SMTP id rr4so5184775pbb.3 for ; Fri, 31 Aug 2012 11:04:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; bh=tTFxaUxypXCWuoIqU6TaL7cldDbx/Ay3sdIUPZVdFcI=; b=Mq313ISeDzuL+xEqBJs/9fbsUoHTRdsNi3IHvL9zHj4kSlqSoMZE/nepVhPHxI5OsC mbhFBRYuR2fknJ9OE6Ym9ifT9fQNAx21gD+QcWR2+3LnfPWSvNMWqJ/XgCVtTHI+mtYu 4uWy6JtWnM/XXFfJKFEeX7r/gBf0beqTO5Otlb/Z8M+wf9m2SYUndmH6/prH6hiZr5Zh DjlKFbxotRsbXCBn570htPUX7knBXHugH8OEIIEekT/ZWoz8P4aJ6dvAThtKJM7FoUeJ FMc7wAGeBHr4yTOsmqtg9CDHPM01FokCp6EAIWKHs8nmhjvhVF638IzwRlcD5wMGGUdl 25Sg== Received: by 10.68.234.73 with SMTP id uc9mr18437064pbc.158.1346436262796; Fri, 31 Aug 2012 11:04:22 -0700 (PDT) Received: from localhost.localdomain (ip68-230-54-74.ph.ph.cox.net. [68.230.54.74]) by mx.google.com with ESMTPS id sr4sm3887134pbc.24.2012.08.31.11.04.20 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 31 Aug 2012 11:04:21 -0700 (PDT) From: Tom Rini To: u-boot@lists.denx.de Date: Fri, 31 Aug 2012 11:03:10 -0700 Message-Id: <1346436196-27742-24-git-send-email-trini@ti.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1346436196-27742-1-git-send-email-trini@ti.com> References: <1346436196-27742-1-git-send-email-trini@ti.com> Cc: Sudhakar Rajashekhara , Stefan Roese , Christian Riesch Subject: [U-Boot] [PATCH v6 23/29] 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 From: Stefan Roese 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 Signed-off-by: Tom Rini --- Changes in v5: - Add Stefan's patch for NOR loading in SPL - Drop mpc5xxx-specific memcpy changes, these should be handled by the Makefile logic (noticed by Daniel Schwierzeck, changed by me) common/spl/Makefile | 1 + common/spl/spl.c | 5 ++++ common/spl/spl_nor.c | 62 ++++++++++++++++++++++++++++++++++++++++++++++++++ include/spl.h | 3 +++ 4 files changed, 71 insertions(+) create mode 100644 common/spl/spl_nor.c diff --git a/common/spl/Makefile b/common/spl/Makefile index b9c9fd8..7cf01ad 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 COBJS-$(CONFIG_SPL_NAND_SUPPORT) += spl_nand.o endif diff --git a/common/spl/spl.c b/common/spl/spl.c index 3b4fcba..3156401 100644 --- a/common/spl/spl.c +++ b/common/spl/spl.c @@ -142,6 +142,11 @@ void board_init_r(gd_t *dummy1, ulong dummy2) 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..976e865 --- /dev/null +++ b/common/spl/spl_nor.c @@ -0,0 +1,62 @@ +/* + * 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 + +void spl_nor_load_image(void) +{ + /* + * Loading of the payload to SDRAM is done with skipping of + * the mkimage header in this SPL NOR driver + */ + spl_image.flags |= SPL_COPY_PAYLOAD_ONLY; + + if (spl_start_uboot()) { + /* + * Load real U-Boot from its location in NOR flash to its + * defined location in SDRAM + */ + spl_parse_image_header( + (const struct image_header *)CONFIG_SYS_UBOOT_BASE); + + memcpy((void *)spl_image.load_addr, + (void *)(CONFIG_SYS_UBOOT_BASE + + sizeof(struct image_header)), + spl_image.size); + } 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 2923cd2..e405386 100644 --- a/include/spl.h +++ b/include/spl.h @@ -56,6 +56,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);