From patchwork Fri Oct 5 12:09:54 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yann Vernier X-Patchwork-Id: 189469 X-Patchwork-Delegate: albert.aribaud@free.fr 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 C1F872C0086 for ; Fri, 5 Oct 2012 22:12:49 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 0E0AD280D1; Fri, 5 Oct 2012 14:12:48 +0200 (CEST) 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 4ZXBm9k5BdVF; Fri, 5 Oct 2012 14:12:47 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id B60A2280D4; Fri, 5 Oct 2012 14:10:59 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id E09592808C for ; Fri, 5 Oct 2012 14:10:35 +0200 (CEST) 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 6RBteLQZ03wQ for ; Fri, 5 Oct 2012 14:10:35 +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-f44.google.com (mail-la0-f44.google.com [209.85.215.44]) by theia.denx.de (Postfix) with ESMTPS id 41F1B2808D for ; Fri, 5 Oct 2012 14:10:21 +0200 (CEST) Received: by mail-la0-f44.google.com with SMTP id b11so862265lam.3 for ; Fri, 05 Oct 2012 05:10:21 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references :in-reply-to:references:x-gm-message-state; bh=CwrqW1SAIEuiPbCEXF6JZxgdhRHX75Fm4lxHjIsxnOk=; b=Op40DblxeMuLgmcnL39wdULYzWD5udfSv5sxNbodENC0JgpKnMTPps4FUEw0rTQb4Z Vr0jh9brZAYAlmd5BPaSTEj/sJyJKTY4BE5F6LTixUE+aMl1IPhjDWfw5IP9MAXeAQ+U xGylx0SsdX7sZ4t2z8brGXCGSb5+Bor9HwChDmXBhVNWSl5MZVLh5nqACbyhGehpQZeP llJCzqf3UT4x+/W4FPJ+UHf+/d29jdt41iLJ8UHp75dfUYdOV9WvLMjziXeS4NBeGtY+ mm4UhEwd/483Xkc65CWb9Sn6AQR0M1/r5ukm/skPizwuZolf2VQCwYKEgiiho/dcZTz3 mOnQ== Received: by 10.152.144.201 with SMTP id so9mr6854708lab.24.1349439021552; Fri, 05 Oct 2012 05:10:21 -0700 (PDT) Received: from latmask.orsoc.lan (c213-89-175-97.bredband.comhem.se. [213.89.175.97]) by mx.google.com with ESMTPS id fp7sm1102794lab.4.2012.10.05.05.10.20 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 05 Oct 2012 05:10:21 -0700 (PDT) From: Yann Vernier To: u-boot@lists.denx.de Date: Fri, 5 Oct 2012 14:09:54 +0200 Message-Id: <1349438998-10954-8-git-send-email-yann.vernier@orsoc.se> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1349438998-10954-1-git-send-email-yann.vernier@orsoc.se> References: <1349438998-10954-1-git-send-email-yann.vernier@orsoc.se> In-Reply-To: <20121004111506.1777a119@lilith> References: <20121004111506.1777a119@lilith> X-Gm-Message-State: ALoCoQn/Meh2/osBebA2t6YWpmBOfhPc9A8nFl6RKs2qyfefbv1sBMnmWAu2gu3FWoSOC5kuLgrg Subject: [U-Boot] [PATCH 07/11] arm: ks8695/cm4008/cm41xx: Parameterize SDRAM 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 Allows configuration macros to set SDRAM parameters. --- arch/arm/cpu/arm920t/ks8695/lowlevel_init.S | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/arch/arm/cpu/arm920t/ks8695/lowlevel_init.S b/arch/arm/cpu/arm920t/ks8695/lowlevel_init.S index 74579ed..bec9738 100644 --- a/arch/arm/cpu/arm920t/ks8695/lowlevel_init.S +++ b/arch/arm/cpu/arm920t/ks8695/lowlevel_init.S @@ -157,19 +157,20 @@ highflash: /* * before relocating, we have to setup RAM timing */ +#if CONFIG_SYS_SDCS0_PARAMS ldr r1, =(KS8695_IO_BASE+KS8695_SDRAM_CTRL0) -#if (PHYS_SDRAM_1_SIZE == 0x02000000) - ldr r2, =0x7fc0000e /* 32MB */ -#else - ldr r2, =0x3fc0000e /* 16MB */ -#endif + ldr r2, =CONFIG_KS8695_SDCON0_VALUE str r2, [r1] /* configure sdram bank0 setup */ +#endif +#if CONFIG_SYS_SDCS1_PARAMS ldr r1, =(KS8695_IO_BASE+KS8695_SDRAM_CTRL1) - mov r2, #0 + mov r2, #CONFIG_KS8695_SDCON1_VALUE str r2, [r1] /* configure sdram bank1 setup */ +#endif +#if CONFIG_SYS_SDCS0_PARAMS || CONFIG_SYS_SDCS1_PARAMS ldr r1, =(KS8695_IO_BASE+KS8695_SDRAM_GENERAL) - ldr r2, =0x0000000a + ldr r2, =CONFIG_KS8695_SDGCON_VALUE str r2, [r1] /* set RAS/CAS timing */ ldr r1, =(KS8695_IO_BASE+KS8695_SDRAM_BUFFER) @@ -184,15 +185,16 @@ highflash: ldr r2, =0x00000020 str r2, [r1] /* set for fast refresh */ DELAY_FOR 0x100, r0 - ldr r2, =0x00000190 + ldr r2, =CONFIG_SYS_SDRAM_REFRESH_RATE str r2, [r1] /* set normal refresh timing */ ldr r1, =(KS8695_IO_BASE+KS8695_SDRAM_BUFFER) - ldr r2, =0x00020033 + ldr r2, =(0x00020000 | CONFIG_SYS_SDRAM_MODE) str r2, [r1] /* send mode command */ DELAY_FOR 0x100, r0 ldr r2, =0x01f00000 str r2, [r1] /* enable sdram fifos */ +#endif /* * set pll to top speed