From patchwork Mon Nov 5 14:44:51 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mario Six X-Patchwork-Id: 993134 X-Patchwork-Delegate: mario.six@gdsys.cc Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=gdsys.cc Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 42pbnc4TRHz9sDr for ; Tue, 6 Nov 2018 02:14:44 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 5CF73C2270D; Mon, 5 Nov 2018 15:12:06 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=KHOP_BIG_TO_CC, SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id D2822C22689; Mon, 5 Nov 2018 14:58:07 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id E3018C2268A; Mon, 5 Nov 2018 14:58:00 +0000 (UTC) Received: from smtprelay08.ispgateway.de (smtprelay08.ispgateway.de [134.119.228.109]) by lists.denx.de (Postfix) with ESMTPS id 4738DC2268A for ; Mon, 5 Nov 2018 14:57:53 +0000 (UTC) Received: from [80.151.34.241] (helo=bob3.testumgebung.local) by smtprelay08.ispgateway.de with esmtpa (Exim 4.90_1) (envelope-from ) id 1gJgK3-0006fN-OB; Mon, 05 Nov 2018 15:57:47 +0100 From: Mario Six To: U-Boot Mailing List , Wolfgang Denk , Reinhard Arlt , Sinan Akman , Holger Brunck , York Sun , Heiko Schocher , Paul Gortmaker , Peter Tyser , Bin Meng Date: Mon, 5 Nov 2018 15:44:51 +0100 Message-Id: <20181105144512.16727-37-mario.six@gdsys.cc> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20181105144512.16727-1-mario.six@gdsys.cc> References: <20181105144512.16727-1-mario.six@gdsys.cc> MIME-Version: 1.0 X-Df-Sender: bWFyaW8uc2l4QGdkc3lzLmNj Subject: [U-Boot] [PATCH v2 37/58] tqm834x: Expand CONFIG_SYS_OR_TIMING_FLASH macro X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 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" We want to normalize all BR/OR config lines as much as possible. The TQM834x board uses CONFIG_SYS_OR_TIMING_FLASH in a OR definition, which we want to remove. But CONFIG_SYS_OR_TIMING_FLASH is also used outside of the config file. Replace these usages with the definition of the variable, so we can remove the variable in the next patch. Signed-off-by: Mario Six --- v1 -> v2: No changes --- board/tqc/tqm834x/tqm834x.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/board/tqc/tqm834x/tqm834x.c b/board/tqc/tqm834x/tqm834x.c index 7c92f4f54c1..c75251e132c 100644 --- a/board/tqc/tqm834x/tqm834x.c +++ b/board/tqc/tqm834x/tqm834x.c @@ -235,8 +235,8 @@ static int detect_num_flash_banks(void) debug("Number of flash banks detected: %d\n", cfi_flash_num_flash_banks); /* set OR0 and BR0 */ - set_lbc_or(0, CONFIG_SYS_OR_TIMING_FLASH | - (-(total_size) & OR_GPCM_AM)); + set_lbc_or(0, OR_GPCM_CSNT | OR_GPCM_ACS_DIV4 | OR_GPCM_SCY_5 | + OR_GPCM_TRLX | (-(total_size) & OR_GPCM_AM)); set_lbc_br(0, (CONFIG_SYS_FLASH_BASE & BR_BA) | (BR_MS_GPCM | BR_PS_32 | BR_V));