From patchwork Tue Feb 25 14:33:32 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michal Simek X-Patchwork-Id: 1244331 X-Patchwork-Delegate: jagannadh.teki@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=xilinx.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=monstr-eu.20150623.gappssmtp.com header.i=@monstr-eu.20150623.gappssmtp.com header.a=rsa-sha256 header.s=20150623 header.b=pMtfwXa+; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 48RhJm14hFz9sP7 for ; Wed, 26 Feb 2020 01:34:16 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 45F4F80561; Tue, 25 Feb 2020 15:34:00 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=xilinx.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=monstr-eu.20150623.gappssmtp.com header.i=@monstr-eu.20150623.gappssmtp.com header.b="pMtfwXa+"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 7B213802DB; Tue, 25 Feb 2020 15:33:46 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,SPF_HELO_NONE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-wr1-x441.google.com (mail-wr1-x441.google.com [IPv6:2a00:1450:4864:20::441]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 040B0802DB for ; Tue, 25 Feb 2020 15:33:40 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=xilinx.com Authentication-Results: phobos.denx.de; spf=none smtp.mailfrom=monstr@monstr.eu Received: by mail-wr1-x441.google.com with SMTP id l5so10751234wrx.4 for ; Tue, 25 Feb 2020 06:33:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=monstr-eu.20150623.gappssmtp.com; s=20150623; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=TSMY7fr5wYCbD7rSRVlCYydMR+xqmuJIIH319EpxlKI=; b=pMtfwXa+MLL8pqfreJ5qH+WfYfUe3lBMIQejnaSOJicDUSTjiFWLioOyvqDOTCWln8 +KEjHqjZX1CsZ/cn7sSsfCBgb7UymnynFYFUTo8h9hD9wxbacysHVrUHfH4B7tknkja0 HiOYMLVcOKRBJiUqb6NEl2X7fLBX/GlF/vXeEGuRKn7KBhFpKW1BtTIs2ZrL0yQxn6Hj hMnEW4pyM8CVxIFFJpndeJmdlq9q6++SEIgPe45QW0DtUcvFLPwrEU59Fn+81x2jSctJ M3LGGH//IVl+TNWYr/FNDhuF1fJfiJtchIw3qxqo6H5RMMtdIUnbwI8vD1D6FVIYVeCL YKrA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=TSMY7fr5wYCbD7rSRVlCYydMR+xqmuJIIH319EpxlKI=; b=f0y0K8ZhTUlGfeXknCaqlnCEofgV/5b1eSeet1SDGp7QBY+ECqNvGORtHoAdAbo2qj 643XzAKk/K/QQGFRW7DgQY9RwVS02j2sAjAI0+HPyq5+OfO6keA+XPG/odr4rO5QtFAb tgL/eWQ9ZNjysis0SiNfApL/ElPK8Q8V6CkNcBonEWV/WM8PCtDqoYBo/qZydl1BakRl fLEP12+NqBuZTfp40Qj1JHUTGYyO72VzDNLXnvfm94sJbwX1qQC2Hyp823UKjKzfDlLw Q06OPkgO8J9/HiMqb/3dUR8/6cwIoOg4KvoynZKYff2ylj5blr9NgXhi4PdKbj1Th9YJ 22ww== X-Gm-Message-State: APjAAAUzZ/KLqrPfeSbSufXlnoi3Db061WkQpACNWEz7ejv0e/Hlj+25 Vi8Xrl9tk7hkUebeOe4xYCf0On+3NbSKwA== X-Google-Smtp-Source: APXvYqxKffI7N0uWHt2tnLaBc7lgrs5+i6yz/OR8HvnfETT4IPsaJFAfiS/HL6mrhrLoeejK1nzMow== X-Received: by 2002:a5d:5745:: with SMTP id q5mr17179455wrw.374.1582641219345; Tue, 25 Feb 2020 06:33:39 -0800 (PST) Received: from localhost (nat-35.starnet.cz. [178.255.168.35]) by smtp.gmail.com with ESMTPSA id g7sm24758297wrq.21.2020.02.25.06.33.38 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 25 Feb 2020 06:33:38 -0800 (PST) From: Michal Simek To: u-boot@lists.denx.de, git@xilinx.com Cc: Michal Simek Subject: [PATCH 4/4] ARM: zynq: Enable DM for CFI NOR flash Date: Tue, 25 Feb 2020 15:33:32 +0100 Message-Id: X-Mailer: git-send-email 2.25.1 In-Reply-To: <3ad901af606e2355526aa363272db03a946156fc.1582641209.git.michal.simek@xilinx.com> References: <3ad901af606e2355526aa363272db03a946156fc.1582641209.git.michal.simek@xilinx.com> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.30rc1 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.102.2 at phobos.denx.de X-Virus-Status: Clean With multi defconfig NOR flash information about NOR should be taken from DT that's why there is no reason to specify address and sizes via fixed config. Signed-off-by: Michal Simek --- configs/xilinx_zynq_virt_defconfig | 1 + include/configs/zynq-common.h | 2 -- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/configs/xilinx_zynq_virt_defconfig b/configs/xilinx_zynq_virt_defconfig index 2e9f3a0f7508..08b43de103a1 100644 --- a/configs/xilinx_zynq_virt_defconfig +++ b/configs/xilinx_zynq_virt_defconfig @@ -61,6 +61,7 @@ CONFIG_MMC_SDHCI_ZYNQ=y CONFIG_MTD=y CONFIG_MTD_NOR_FLASH=y CONFIG_FLASH_CFI_DRIVER=y +CONFIG_CFI_FLASH=y CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y CONFIG_SYS_FLASH_CFI=y CONFIG_MTD_RAW_NAND=y diff --git a/include/configs/zynq-common.h b/include/configs/zynq-common.h index 33fac35f6e32..1eaf65b0a2a1 100644 --- a/include/configs/zynq-common.h +++ b/include/configs/zynq-common.h @@ -43,8 +43,6 @@ /* NOR */ #ifdef CONFIG_MTD_NOR_FLASH -# define CONFIG_SYS_FLASH_BASE 0xE2000000 -# define CONFIG_SYS_FLASH_SIZE (16 * 1024 * 1024) # define CONFIG_SYS_MAX_FLASH_BANKS 1 # define CONFIG_SYS_MAX_FLASH_SECT 512 # define CONFIG_SYS_FLASH_ERASE_TOUT 1000