From patchwork Mon Oct 26 11:00:22 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ryan Harkin X-Patchwork-Id: 55530 Delivered-To: patch@linaro.org Received: by 10.112.59.35 with SMTP id w3csp1130753lbq; Mon, 26 Oct 2015 04:00:55 -0700 (PDT) X-Received: by 10.194.77.146 with SMTP id s18mr23718118wjw.122.1445857255579; Mon, 26 Oct 2015 04:00:55 -0700 (PDT) Return-Path: Received: from theia.denx.de (theia.denx.de. [85.214.87.163]) by mx.google.com with ESMTP id pi10si22385081wic.94.2015.10.26.04.00.55; Mon, 26 Oct 2015 04:00:55 -0700 (PDT) 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 511CB4B664; Mon, 26 Oct 2015 12:00:53 +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 TvgYOs8vSdgf; Mon, 26 Oct 2015 12:00:53 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 69E5E4B66A; Mon, 26 Oct 2015 12:00:48 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id D8AEE4B62C for ; Mon, 26 Oct 2015 12:00:35 +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 HsiA8-gtePc4 for ; Mon, 26 Oct 2015 12:00:35 +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-wi0-f174.google.com (mail-wi0-f174.google.com [209.85.212.174]) by theia.denx.de (Postfix) with ESMTPS id 18B264B615 for ; Mon, 26 Oct 2015 12:00:31 +0100 (CET) Received: by wikq8 with SMTP id q8so158760770wik.1 for ; Mon, 26 Oct 2015 04:00:30 -0700 (PDT) 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; bh=CIQG/U7q1aT++wSSSIc3cgj+qGksGH+0p8zaltGI2AQ=; b=pWpt2UAr3Ddw6gdshMHYrfy2KpCsS+wuqP2yP/PWh91wBx0s4CTP5PaHI7Bt1EFlY7 p8siVzY39wU6TO5iaHCyA/CKCUZBbyHg+GPJwBOfhmsk9B24UxbjCfNSn79UWavZCipY EwMV4gbErUX4mvUnmyU2AZtYym+Jh795qY5fPjBY2SaPu9F59O7uhALjoUiU+aflj56i QKsGchczqaQ2GED7xbvMHzbmtLDEmG1UCP6s6bqlIJ+BxvOkAELTJmabWe98Ku+FXutC lxDdx87IvDXszyOYHsG/WksqMn3/yrUFI6dp9YucNn3iG9ugbLI3nwmO1uMDNBrb07Q/ rTTg== 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; bh=CIQG/U7q1aT++wSSSIc3cgj+qGksGH+0p8zaltGI2AQ=; b=Lxy3neznea9hfG3sF3vJnrD/We3LHBt0iTWf6yCbWYAvinkK8VNHP/WWJTnuZSuVrG T3tKcsW6d9srQKarqBL/Vy6voNvzpJr4IwZL6An/D1aEDCNCfAc01Vf28G2xGvCfpgWt Kn51LfTAQemNsFkUqB1y6LLDMCzY/DJ0+lYoexfmD/pHIc2boUqMlHt/8SeSkVY+l1Rq 47f/0nZzY2O5dmxNyhVB5DDyHG7VhquemVwcd+TVtU+kpPqq6odbJ5sqTqAkTuWcTNI7 mZCn9Yw35te/zAAPJVBynmZ0Ri/4nkvfnyxnhr5myZJBaFUDv30CgifkO01m4Clhhi6E vcNQ== X-Gm-Message-State: ALoCoQlagVPdJ0l8IoZ8yLlg4DK4ebwDuyzeNzzGZ/xtw0TW7X7Oyzev572DiOSiwP2UEJ67EIPa X-Received: by 10.180.90.203 with SMTP id by11mr18222838wib.49.1445857229620; Mon, 26 Oct 2015 04:00:29 -0700 (PDT) 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 d10sm6058698wje.14.2015.10.26.04.00.27 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 26 Oct 2015 04:00:28 -0700 (PDT) From: Ryan Harkin To: u-boot@lists.denx.de, Albert Aribaud , Tom Rini , Linus Walleij , Liviu Dudau Date: Mon, 26 Oct 2015 11:00:22 +0000 Message-Id: <1445857222-13294-1-git-send-email-ryan.harkin@linaro.org> X-Mailer: git-send-email 2.1.4 Cc: Steve Rae Subject: [U-Boot] [PATCH v2] 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 --- 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 Reviewed-by: Linus Walleij diff --git a/board/armltd/vexpress64/vexpress64.c b/board/armltd/vexpress64/vexpress64.c index f4e8084..22d7e6c 100644 --- a/board/armltd/vexpress64/vexpress64.c +++ b/board/armltd/vexpress64/vexpress64.c @@ -44,8 +44,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 0f2f1a3..ef2aa50 100644 --- a/include/configs/vexpress_aemv8a.h +++ b/include/configs/vexpress_aemv8a.h @@ -168,15 +168,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