From patchwork Mon Mar 16 12:23:53 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 450535 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 F2FFA140079 for ; Mon, 16 Mar 2015 23:24:33 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 380FE4B615; Mon, 16 Mar 2015 13:24:31 +0100 (CET) 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 g3LLh--ospfa; Mon, 16 Mar 2015 13:24:31 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id B20254A03C; Mon, 16 Mar 2015 13:24:30 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 836094B615 for ; Mon, 16 Mar 2015 13:24:28 +0100 (CET) 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 25H3C998WdPA for ; Mon, 16 Mar 2015 13:24:28 +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-la0-f50.google.com (mail-la0-f50.google.com [209.85.215.50]) by theia.denx.de (Postfix) with ESMTPS id 34F384B664 for ; Mon, 16 Mar 2015 13:24:24 +0100 (CET) Received: by lagg8 with SMTP id g8so38159958lag.1 for ; Mon, 16 Mar 2015 05:24:23 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=FliGaDh5h9lnYWnT70kzDgBo6xoa6jtebprF4eA3STA=; b=SYajKU4FB6Mf4YPaKDnweM+sZzJCFwNcypCnUu90LTFuj9b6wclhVfF0CwKpzYYfvw klTXu3qlW7YJIneJbmernmmzdXYJQLtg2OeElXruE/1tH805O22NEtXgBu6VUsyqXTr5 mKsWDKUNw1cxuf3MJss4y7amb/l2SCtJKvdauJ9Aj7e+mNOamJlVjCYsTuXd8eBhG5Xh wo2iF+ZzXMSbH/AZlOKKNFOKLQlGGBJ5NIrGZsO6HSGMtJSlFYGUMoaBk42d+AJTpnB7 Q3aRrQ9+rmbW3U6pTXHxDngVkg1I7BF5SARNi+IyrH/xOJ7yjGZKny6FFy0wzQHqsUF5 QkGA== X-Gm-Message-State: ALoCoQnGu668QUIzDoSbO9Lz0a6NvmBXMB8jSNYJdSBbuwwfr94Wg7RmLtW0ls4SoFHP+wzuVzcZ X-Received: by 10.152.8.15 with SMTP id n15mr27878958laa.41.1426508663847; Mon, 16 Mar 2015 05:24:23 -0700 (PDT) Received: from localhost.localdomain ([85.235.11.236]) by mx.google.com with ESMTPSA id je5sm2160799lac.33.2015.03.16.05.24.19 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 16 Mar 2015 05:24:21 -0700 (PDT) From: Linus Walleij To: u-boot@lists.denx.de, Albert Aribaud , Tom Rini Date: Mon, 16 Mar 2015 13:23:53 +0100 Message-Id: <1426508633-10606-3-git-send-email-linus.walleij@linaro.org> X-Mailer: git-send-email 1.9.3 In-Reply-To: <1426508633-10606-1-git-send-email-linus.walleij@linaro.org> References: <1426508633-10606-1-git-send-email-linus.walleij@linaro.org> Cc: Steve Rae , u-boot-review@google.com Subject: [U-Boot] [PATCH 3/3] integrator: consolidate flash info X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.15 Precedence: list List-Id: U-Boot discussion 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" 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. Signed-off-by: Linus Walleij Reviewed-by: Tom Rini --- 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.