From patchwork Wed Nov 18 10:39:07 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ryan Harkin X-Patchwork-Id: 56933 Delivered-To: patch@linaro.org Received: by 10.112.155.196 with SMTP id vy4csp2482265lbb; Wed, 18 Nov 2015 02:39:46 -0800 (PST) X-Received: by 10.194.200.134 with SMTP id js6mr1229661wjc.114.1447843186449; Wed, 18 Nov 2015 02:39:46 -0800 (PST) Return-Path: Received: from theia.denx.de (theia.denx.de. [85.214.87.163]) by mx.google.com with ESMTP id ko1si3050984wjc.225.2015.11.18.02.39.46; Wed, 18 Nov 2015 02:39:46 -0800 (PST) Received-SPF: pass (google.com: domain of u-boot-bounces@lists.denx.de designates 85.214.87.163 as permitted sender) client-ip=85.214.87.163; Authentication-Results: mx.google.com; spf=pass (google.com: domain of u-boot-bounces@lists.denx.de designates 85.214.87.163 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de; dkim=neutral (body hash did not verify) header.i=@linaro-org.20150623.gappssmtp.com Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id DCA194B755; Wed, 18 Nov 2015 11:39:42 +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 vwl8sJhcie_d; Wed, 18 Nov 2015 11:39:42 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 277BF4B766; Wed, 18 Nov 2015 11:39:37 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 74E9F4B70B for ; Wed, 18 Nov 2015 11:39:32 +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 Z2HX-UySyByZ for ; Wed, 18 Nov 2015 11:39:32 +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-wm0-f42.google.com (mail-wm0-f42.google.com [74.125.82.42]) by theia.denx.de (Postfix) with ESMTPS id 3C5DA4B72F for ; Wed, 18 Nov 2015 11:39:31 +0100 (CET) Received: by wmec201 with SMTP id c201so271336962wme.0 for ; Wed, 18 Nov 2015 02:39:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro-org.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=DF9EFa/Ly2GPoRdn/HtbIE9l1cBo1FgHvVOHmpRjn5A=; b=nRjqsWFLQwce56IwMn072eLutX/7M/C+wVLOV8cZXlljmdPCLs2z7isPnDkwQTi/qd dPB5jFxNd5YpDUk18w8Fum8FclccwYXU9jvsOWC66ciwQp3RHTWW+1E/jfHGsTrx5sg+ RWVFSE81lVTabh922wDbXNA46r1sohZIt2/rZB6jq7kRI00JpVbRg+feTfb5rZzsUo43 q/T+2i3X7z8+nfbG5Phi9JPrNDOJ/fY/Ax4ij6blzxFY63KhTbGmDIpW1Y5B3uumLfP8 1n6Tq085HC0/1N4Z8Ie2pMCkS6boPUTtNmCL2OBpCKMUF5DJSOTnwcGiZBQn22LswGU7 yuZg== 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=DF9EFa/Ly2GPoRdn/HtbIE9l1cBo1FgHvVOHmpRjn5A=; b=hrM91Ty3k+pjBXT9ZEolLfhmaWWRjnu6tB5XoZ71lXDRJQ1CbmDhYzFgCVQx9dqj4T kbUHItnuB0ubyh3M9ybTl+O13bb9uqJO0/qmzKQsEbAT15LDB1qFtG5xvTh5/lNxOMrT vIB+lJ9LYjIjw6GXU2VZjtVcx6CIVpzTdz/JMJWXFWmO38/TfZLj9S+jV6GSwh6VmqCc duE1cS2r3ItFsS5SCOuSK3uL9qR/koGNbIv3js/2l75GJv1OclmjmfkMGiHYwT6VrJwa wdniXPEkM7/Ujy4f0Vf4zF9E8M5MV+6cFIMBMi1N/MpPq1F4KeL4PIrExug8dpZLI87k KExg== X-Gm-Message-State: ALoCoQmxowy2thypd2GeP5AROy9izMSR3m4D1yFWlnZ7otgDo+HuS4DCKGw96C9DrYfaWHmU2wBF X-Received: by 10.194.8.227 with SMTP id u3mr1115874wja.38.1447843171086; Wed, 18 Nov 2015 02:39:31 -0800 (PST) Received: from localhost.localdomain (82-69-54-187.dsl.in-addr.zen.co.uk. [82.69.54.187]) by smtp.gmail.com with ESMTPSA id c4sm2148269wjs.36.2015.11.18.02.39.29 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 18 Nov 2015 02:39:30 -0800 (PST) From: Ryan Harkin To: Tom Rini , u-boot@lists.denx.de Date: Wed, 18 Nov 2015 10:39:07 +0000 Message-Id: <1447843149-28412-3-git-send-email-ryan.harkin@linaro.org> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1447843149-28412-1-git-send-email-ryan.harkin@linaro.org> References: <1447843149-28412-1-git-send-email-ryan.harkin@linaro.org> Cc: Steve Rae , Liviu Dudau , Stefan Roese Subject: [U-Boot] [PATCH v2 2/4] vexpress64: use 2nd DRAM bank only on juno 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 patch makes the 2nd DRAM bank available on Juno only and not on other vexpress64 targets, eg. the FVP models. The commit below added a 2nd bank of NOR flash for Juno, but also for all vexpress64 targets: commit 2d0cee1ca2b9d977fa3214896bb2e30cfec77059 Author: Liviu Dudau Date: Mon Oct 19 11:08:31 2015 +0100 vexpress64: Juno: Declare all 8GB of RAM and make them visible to the kernel. Juno comes with 8GB RAM, but U-Boot only passes 2GB to the kernel. Declare a secondary memory bank and set the sizes correctly. Signed-off-by: Liviu Dudau Reviewed-by: Linus Walleij Reviewed-by: Ryan Harkin Tested-by: Ryan Harkin Unfortunately, I only fully tested on Juno R0, R1 and the FVP Foundation model. Whilst FVP Base AEMV8 models run U-Boot OK, they fail to boot the kernel. Signed-off-by: Ryan Harkin Acked-by: Liviu Dudau Reviewed-by: Linus Walleij --- board/armltd/vexpress64/vexpress64.c | 2 ++ include/configs/vexpress_aemv8a.h | 11 ++++++++--- 2 files changed, 10 insertions(+), 3 deletions(-) -- 2.1.4 _______________________________________________ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot diff --git a/board/armltd/vexpress64/vexpress64.c b/board/armltd/vexpress64/vexpress64.c index 3add099..6efc8c1 100644 --- a/board/armltd/vexpress64/vexpress64.c +++ b/board/armltd/vexpress64/vexpress64.c @@ -51,8 +51,10 @@ void dram_init_banksize(void) { gd->bd->bi_dram[0].start = PHYS_SDRAM_1; gd->bd->bi_dram[0].size = PHYS_SDRAM_1_SIZE; +#ifdef PHYS_SDRAM_2 gd->bd->bi_dram[1].start = PHYS_SDRAM_2; gd->bd->bi_dram[1].size = PHYS_SDRAM_2_SIZE; +#endif } /* diff --git a/include/configs/vexpress_aemv8a.h b/include/configs/vexpress_aemv8a.h index a99d712..3c9faf4 100644 --- a/include/configs/vexpress_aemv8a.h +++ b/include/configs/vexpress_aemv8a.h @@ -165,15 +165,20 @@ #define CONFIG_SYS_LOAD_ADDR (V2M_BASE + 0x10000000) /* Physical Memory Map */ -#define CONFIG_NR_DRAM_BANKS 2 #define PHYS_SDRAM_1 (V2M_BASE) /* SDRAM Bank #1 */ -#define PHYS_SDRAM_2 (0x880000000) /* Top 16MB reserved for secure world use */ #define DRAM_SEC_SIZE 0x01000000 #define PHYS_SDRAM_1_SIZE 0x80000000 - DRAM_SEC_SIZE -#define PHYS_SDRAM_2_SIZE 0x180000000 #define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM_1 +#ifdef CONFIG_TARGET_VEXPRESS64_JUNO +#define CONFIG_NR_DRAM_BANKS 2 +#define PHYS_SDRAM_2 (0x880000000) +#define PHYS_SDRAM_2_SIZE 0x180000000 +#else +#define CONFIG_NR_DRAM_BANKS 1 +#endif + /* Enable memtest */ #define CONFIG_CMD_MEMTEST #define CONFIG_SYS_MEMTEST_START PHYS_SDRAM_1