From patchwork Sat Apr 4 23:48:33 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 46778 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wg0-f70.google.com (mail-wg0-f70.google.com [74.125.82.70]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 42446216D1 for ; Sat, 4 Apr 2015 23:49:09 +0000 (UTC) Received: by wgtj4 with SMTP id j4sf280225wgt.0 for ; Sat, 04 Apr 2015 16:49:08 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:date:message-id:in-reply-to :references:cc:subject:precedence:list-id:list-unsubscribe :list-archive:list-post:list-help:list-subscribe:mime-version :content-type:content-transfer-encoding:errors-to:sender :x-original-sender:x-original-authentication-results:mailing-list; bh=3P0BZVOSbzBloNrhzOCYyvMM7eaIeT46zVWs92jk40g=; b=B752QW5nAQmqDWc3kd1TxwfQqqTM0VZZbo0waLELJ+v/w1P1YgJOGlzBvW9zUZnC+T QgBMWipvwXPja8GqFFGI4mIoAySnjpS7t0mYpZeqOObXT3tJSI2bxsbGMRMuleLNPrKj k03b+OtpPSzpdHlKxvWDT5ELgYxdSKDhN416lGHTOQopArTVwsr+/UJA22SeOyW4eT8I m+gOCi85Zn+eGFf+YjkiS4rQMWs4gBMczxp6t27K3NdftjO1km4SLMS7tctGbl5PhXJG c0oaTRBQ+4nbvlc+PKaUKiO6SbxtctYCWC/MWQ64bEfQAo/cPiNnD5+QoUzOGoChNPPh NQvQ== X-Gm-Message-State: ALoCoQny+zfdEv1/OjxgfliAroYHXcOAqiCZQIktah8EAQSiFnd9USzSmRz+gZUSDWgbHrds9w0H X-Received: by 10.180.73.137 with SMTP id l9mr2140956wiv.5.1428191348567; Sat, 04 Apr 2015 16:49:08 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.8.114 with SMTP id q18ls56548laa.8.gmail; Sat, 04 Apr 2015 16:49:08 -0700 (PDT) X-Received: by 10.112.77.234 with SMTP id v10mr7653065lbw.119.1428191348403; Sat, 04 Apr 2015 16:49:08 -0700 (PDT) Received: from mail-la0-f42.google.com (mail-la0-f42.google.com. [209.85.215.42]) by mx.google.com with ESMTPS id s5si69998laa.137.2015.04.04.16.49.08 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 04 Apr 2015 16:49:08 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.42 as permitted sender) client-ip=209.85.215.42; Received: by lagg8 with SMTP id g8so1063698lag.1 for ; Sat, 04 Apr 2015 16:49:08 -0700 (PDT) X-Received: by 10.152.26.34 with SMTP id i2mr7634634lag.117.1428191348306; Sat, 04 Apr 2015 16:49:08 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.57.201 with SMTP id k9csp2637197lbq; Sat, 4 Apr 2015 16:49:07 -0700 (PDT) X-Received: by 10.181.27.201 with SMTP id ji9mr45578672wid.20.1428191347644; Sat, 04 Apr 2015 16:49:07 -0700 (PDT) Received: from theia.denx.de (theia.denx.de. [85.214.87.163]) by mx.google.com with ESMTP id hx8si193371wjb.100.2015.04.04.16.49.07; Sat, 04 Apr 2015 16:49:07 -0700 (PDT) Received-SPF: none (google.com: u-boot-bounces@lists.denx.de does not designate permitted sender hosts) client-ip=85.214.87.163; Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 8BADE62092; Sun, 5 Apr 2015 01:48:58 +0200 (CEST) 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 VfoqlS1VvpDw; Sun, 5 Apr 2015 01:48:58 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 8DFB66209C; Sun, 5 Apr 2015 01:48:56 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 8BEDB392C for ; Sun, 5 Apr 2015 01:48:53 +0200 (CEST) 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 16Gw4F5TxKaf for ; Sun, 5 Apr 2015 01:48: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-la0-f48.google.com (mail-la0-f48.google.com [209.85.215.48]) by theia.denx.de (Postfix) with ESMTPS id 3C6E6392F for ; Sun, 5 Apr 2015 01:48:47 +0200 (CEST) Received: by lagg8 with SMTP id g8so1061541lag.1 for ; Sat, 04 Apr 2015 16:48:47 -0700 (PDT) X-Received: by 10.113.10.134 with SMTP id ea6mr3269637lbd.29.1428191327203; Sat, 04 Apr 2015 16:48:47 -0700 (PDT) Received: from localhost.lan ([80.202.93.41]) by mx.google.com with ESMTPSA id lv10sm20262lac.24.2015.04.04.16.48.45 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 04 Apr 2015 16:48:46 -0700 (PDT) From: Linus Walleij To: u-boot@lists.denx.de, Albert Aribaud , Tom Rini Date: Sun, 5 Apr 2015 01:48:33 +0200 Message-Id: <1428191313-3945-3-git-send-email-linus.walleij@linaro.org> X-Mailer: git-send-email 1.9.3 In-Reply-To: <1428191313-3945-1-git-send-email-linus.walleij@linaro.org> References: <1428191313-3945-1-git-send-email-linus.walleij@linaro.org> Cc: Steve Rae , u-boot-review@google.com Subject: [U-Boot] [PATCH 3/3 v2] integrator: consolidate flash info X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: , List-Help: , List-Subscribe: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: linus.walleij@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.42 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 This consolidates the flash settings for the Integrator and activates the new ARM flash image support for them so images can be loaded by name from flash. Reviewed-by: Tom Rini Signed-off-by: Linus Walleij --- ChangeLog v1->v2: - Rebase on the upstream baseline - Add Tom's ACK --- include/configs/integrator-common.h | 22 ++++++++++++++++++++++ include/configs/integratorap.h | 16 +++------------- include/configs/integratorcp.h | 22 ++-------------------- 3 files changed, 27 insertions(+), 33 deletions(-) diff --git a/include/configs/integrator-common.h b/include/configs/integrator-common.h index eac517aeeb1c..4362925ae1e1 100644 --- a/include/configs/integrator-common.h +++ b/include/configs/integrator-common.h @@ -86,3 +86,25 @@ CONFIG_SYS_INIT_RAM_SIZE - \ GENERATED_GBL_DATA_SIZE) #define CONFIG_SYS_INIT_SP_ADDR CONFIG_SYS_GBL_DATA_OFFSET + +/* + * FLASH and environment organization + * Top varies according to amount fitted + * Reserve top 4 blocks of flash + * - ARM Boot Monitor + * - Unused + * - SIB block + * - U-Boot environment + */ +#define CONFIG_CMD_FLASH +#define CONFIG_CMD_ARMFLASH +#define CONFIG_SYS_FLASH_CFI 1 +#define CONFIG_FLASH_CFI_DRIVER 1 +#define CONFIG_SYS_FLASH_BASE 0x24000000 +#define CONFIG_SYS_MAX_FLASH_BANKS 1 + +/* Timeout values in ticks */ +#define CONFIG_SYS_FLASH_ERASE_TOUT (2 * CONFIG_SYS_HZ) /* Erase Timeout */ +#define CONFIG_SYS_FLASH_WRITE_TOUT (2 * CONFIG_SYS_HZ) /* Write Timeout */ +#define CONFIG_SYS_FLASH_PROTECTION /* The devices have real protection */ +#define CONFIG_SYS_FLASH_EMPTY_INFO /* flinfo indicates empty blocks */ diff --git a/include/configs/integratorap.h b/include/configs/integratorap.h index edea769a921d..e168c8c9ba57 100644 --- a/include/configs/integratorap.h +++ b/include/configs/integratorap.h @@ -55,22 +55,12 @@ */ #define CONFIG_SYS_PROMPT "Integrator-AP # " /* Monitor Command Prompt */ -#define CONFIG_SYS_FLASH_BASE 0x24000000 - -/*----------------------------------------------------------------------- - * FLASH and environment organization - */ -#define CONFIG_SYS_FLASH_CFI 1 -#define CONFIG_FLASH_CFI_DRIVER 1 -#define CONFIG_ENV_IS_NOWHERE -#define CONFIG_SYS_MAX_FLASH_BANKS 1 /* max number of memory banks */ -/* timeout values are in ticks */ -#define CONFIG_SYS_FLASH_ERASE_TOUT (2*CONFIG_SYS_HZ) /* Timeout for Flash Erase */ -#define CONFIG_SYS_FLASH_WRITE_TOUT (2*CONFIG_SYS_HZ) /* Timeout for Flash Write */ +/* Flash settings */ +#define CONFIG_SYS_FLASH_SIZE 0x02000000 /* 32 MiB */ #define CONFIG_SYS_MAX_FLASH_SECT 128 +#define CONFIG_ENV_IS_NOWHERE 1 #define CONFIG_ENV_SIZE 32768 - /*----------------------------------------------------------------------- * PCI definitions */ diff --git a/include/configs/integratorcp.h b/include/configs/integratorcp.h index 608719a7eacb..7c1ef2483ea2 100644 --- a/include/configs/integratorcp.h +++ b/include/configs/integratorcp.h @@ -55,28 +55,10 @@ */ #define CONFIG_SYS_PROMPT "Integrator-CP # " /* Monitor Command Prompt */ -/* - * FLASH and environment organization - * Top varies according to amount fitted - * Reserve top 4 blocks of flash - * - ARM Boot Monitor - * - Unused - * - SIB block - * - U-Boot environment - * - * Base is always 0x24000000 - */ -#define CONFIG_SYS_FLASH_BASE 0x24000000 -#define CONFIG_SYS_FLASH_CFI 1 -#define CONFIG_FLASH_CFI_DRIVER 1 -#define CONFIG_SYS_MAX_FLASH_SECT 64 -#define CONFIG_SYS_MAX_FLASH_BANKS 1 /* max number of memory banks */ #define PHYS_FLASH_SIZE 0x01000000 /* 16MB */ -#define CONFIG_SYS_FLASH_ERASE_TOUT (2*CONFIG_SYS_HZ) /* Timeout for Flash Erase */ -#define CONFIG_SYS_FLASH_WRITE_TOUT (2*CONFIG_SYS_HZ) /* Timeout for Flash Write */ - -#define CONFIG_SYS_MONITOR_LEN 0x00100000 +#define CONFIG_SYS_MAX_FLASH_SECT 64 #define CONFIG_ENV_IS_IN_FLASH 1 +#define CONFIG_SYS_MONITOR_LEN 0x00100000 /* * Move up the U-Boot & monitor area if more flash is fitted.