From patchwork Wed Jan 8 01:32:22 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nobuhiro Iwamatsu X-Patchwork-Id: 307936 X-Patchwork-Delegate: iwamatsu@nigauri.org 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 002A52C00C1 for ; Wed, 8 Jan 2014 12:32:58 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 439824AB76; Wed, 8 Jan 2014 02:32:55 +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 CoUTcbiGXfXx; Wed, 8 Jan 2014 02:32:54 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 7C4F04AB55; Wed, 8 Jan 2014 02:32:50 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id A483E4AB5C for ; Wed, 8 Jan 2014 02:32:47 +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 yJA2Cqv5rsIQ for ; Wed, 8 Jan 2014 02:32:41 +0100 (CET) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 BL_NJABL=SKIP(-1.5) (only DNSBL check requested) Received: from mail-pd0-f173.google.com (mail-pd0-f173.google.com [209.85.192.173]) by theia.denx.de (Postfix) with ESMTPS id 7C4944AB50 for ; Wed, 8 Jan 2014 02:32:39 +0100 (CET) Received: by mail-pd0-f173.google.com with SMTP id p10so1106993pdj.32 for ; Tue, 07 Jan 2014 17:32:38 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=DeIpEYLP2a2KYQ4hlS37/ryL9v6VKKrBsDbOaMGD5Io=; b=fpDnhLvvQjmc6W4rj+ixbzvHPmE2MS3sz50myY/ToP58eWcyQf7iPd1jx4OtMWZmtL hHjT5+/J8GDWe+xOmQULWP8CG33cLPX/NFON77n2NE4tBDkTTAy8X+OOvJsNoxP1JG/M JcQsT9aOfIq9PoXS3IqthsSdfiJh+ShNjuid2i8miHVYJpmGDV5pCDw8ZX1/oh4+mPWq FONvmgr5dzRCnK3h+khykiCnmmlNW9+foQZgYs0/fA0GGkCxPbG4p4SvUe2JOEgAShd/ FPL2dpmD5Q7XHB7W2ZM3/qhBLNjPacnfatXE0FWIenVkjoXFojosyzncs5hMtfBEE+Dy Yztg== X-Gm-Message-State: ALoCoQn6Pw5kyPcqaIDkhqTqcXmqIZUELdOLr8NscbNR6p5uPf/jM702pPWBJUIeGvoXN4qeX2xc X-Received: by 10.68.34.37 with SMTP id w5mr18373968pbi.159.1389144758386; Tue, 07 Jan 2014 17:32:38 -0800 (PST) Received: from xps-iwamatsu.renesas.com (49.14.32.202.bf.2iij.net. [202.32.14.49]) by mx.google.com with ESMTPSA id gv10sm139091505pbd.0.2014.01.07.17.32.35 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 07 Jan 2014 17:32:37 -0800 (PST) From: Nobuhiro Iwamatsu To: u-boot@lists.denx.de Date: Wed, 8 Jan 2014 10:32:22 +0900 Message-Id: <1389144744-6578-2-git-send-email-nobuhiro.iwamatsu.yj@renesas.com> X-Mailer: git-send-email 1.8.5 In-Reply-To: <1389144744-6578-1-git-send-email-nobuhiro.iwamatsu.yj@renesas.com> References: <1389144744-6578-1-git-send-email-nobuhiro.iwamatsu.yj@renesas.com> Cc: Nobuhiro Iwamatsu Subject: [U-Boot] [PATCH v2 2/4] arm: lager: Add support QSPI device and enable boot from SPI flash 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 This supports SH-QSPI device on lager board, and enable booting from SPI flash. Signed-off-by: Nobuhiro Iwamatsu Signed-off-by: Nobuhiro Iwamatsu --- v2: Remove address definition of SH QSPI Move CONFIG_SYS_TEXT_BASE from SPI section. include/configs/lager.h | 33 +++++++++++++++++++++++++++++---- 1 file changed, 29 insertions(+), 4 deletions(-) diff --git a/include/configs/lager.h b/include/configs/lager.h index 8932825..b6c1954 100644 --- a/include/configs/lager.h +++ b/include/configs/lager.h @@ -34,7 +34,15 @@ #define CONFIG_CMD_DHCP #define CONFIG_CMD_NFS #define CONFIG_CMD_BOOTZ -#define CONFIG_CMD_FLASH + +#if defined(CONFIG_SYS_USE_BOOT_NORFLASH) +#define CONFIG_CMD_FLASH +#define CONFIG_SYS_TEXT_BASE 0x00000000 +#else +#define CONFIG_CMD_SF +#define CONFIG_CMD_SPI +#define CONFIG_SYS_TEXT_BASE 0xE8080000 +#endif #define CONFIG_CMDLINE_TAG #define CONFIG_SETUP_MEMORY_TAGS @@ -104,8 +112,8 @@ #define CONFIG_SYS_GBL_DATA_SIZE (256) #define CONFIG_SYS_BOOTMAPSZ (8 * 1024 * 1024) +#if defined(CONFIG_SYS_USE_BOOT_NORFLASH) /* USE NOR FLASH */ -#define CONFIG_SYS_TEXT_BASE 0x00000000 #define CONFIG_SYS_FLASH_CFI #define CONFIG_SYS_FLASH_CFI_WIDTH FLASH_CFI_16BIT #define CONFIG_FLASH_CFI_DRIVER @@ -124,10 +132,27 @@ /* ENV setting */ #define CONFIG_ENV_IS_IN_FLASH -#define CONFIG_ENV_OVERWRITE 1 -#define CONFIG_ENV_SECT_SIZE (256 * 1024) #define CONFIG_ENV_ADDR (CONFIG_SYS_FLASH_BASE + \ CONFIG_SYS_MONITOR_LEN) + +#else /* CONFIG_SYS_USE_BOOT_NORFLASH */ + +/* USE SPI */ +#define CONFIG_SPI +#define CONFIG_SPI_FLASH_BAR +#define CONFIG_SH_QSPI +#define CONFIG_SPI_FLASH +#define CONFIG_SPI_FLASH_SPANSION +#define CONFIG_SYS_NO_FLASH + +/* ENV setting */ +#define CONFIG_ENV_IS_IN_SPI_FLASH +#define CONFIG_ENV_ADDR 0xC0000 +#endif + +/* Common ENV setting */ +#define CONFIG_ENV_OVERWRITE +#define CONFIG_ENV_SECT_SIZE (256 * 1024) #define CONFIG_ENV_OFFSET (CONFIG_ENV_ADDR) #define CONFIG_ENV_SIZE (CONFIG_ENV_SECT_SIZE) #define CONFIG_ENV_SIZE_REDUND (CONFIG_SYS_MONITOR_LEN)