From patchwork Fri Jun 9 20:13:59 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Heinrich Schuchardt X-Patchwork-Id: 774142 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 3wktmc1Y0pz9s71 for ; Sat, 10 Jun 2017 06:14:24 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id EE0B2C21C5F; Fri, 9 Jun 2017 20:14:21 +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=FREEMAIL_FROM, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2 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 8ED5FC21C7B; Fri, 9 Jun 2017 20:14:19 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 94934C21C7B; Fri, 9 Jun 2017 20:14:17 +0000 (UTC) Received: from mout.gmx.net (mout.gmx.net [212.227.15.18]) by lists.denx.de (Postfix) with ESMTPS id 26473C21C5F for ; Fri, 9 Jun 2017 20:14:17 +0000 (UTC) Received: from localhost.localdomain ([88.152.145.149]) by mail.gmx.com (mrgmx001 [212.227.17.190]) with ESMTPSA (Nemesis) id 0LfkUs-1dcs571IhG-00pQ42; Fri, 09 Jun 2017 22:14:07 +0200 From: Heinrich Schuchardt To: Albert Aribaud , =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Fri, 9 Jun 2017 22:13:59 +0200 Message-Id: <20170609201359.2270-1-xypron.glpk@gmx.de> X-Mailer: git-send-email 2.11.0 In-Reply-To: References: MIME-Version: 1.0 X-Provags-ID: V03:K0:k9ec7KZeyR+CRL1qB77Y8evHAoMe2ycH+KXv7JELWbhQYvOkpVn DF8Urg1wzsgOziwFkhskxYlpJPT/N8mKo+Oi9EJBbMzTnk1ZLi24BzluAXGwbU3AM7Ylp07 imQ6TavK+1dQLjvcqT7iWLfWh+HRZzBSaSksn7i3owOSPX6i15JbDeJvQJq6E5ytL8v8K0C onMoKiMqVg1jDSeC5s/DA== X-UI-Out-Filterresults: notjunk:1; V01:K0:MQZhiz+syGE=:WhEEM8UFH8sYJhp8mQ3dT3 577PaGn9aO+0OgA8v2p2AK5suqrwaKaBNue8Ox1r12bCKg1126pHJpuV2kIfeFGMqaJe31DSn Ly8GbfFpp3FC+I6ZwTFDwS8e1gUktdFEVFukj2oClpjt4jeQy0AlbYgbExjoUhgsSrUxETXkI JPpE3jw4IvnZC7+B4QZXShg+NAuKRuf/ua38e3SAcyrGlV0/JIpES17lXRod7j5NX9LuBWNhR yWz8hPYmQMWZZJ0SoLMsYUbcJhMzSFltv7JviVL7MnEaGcRSYaD9th7Lqgd+JNLKhpB1IM+1d AChWtCgn2O8KgRnvxavpZEeqEVC35cclIpIf6vJE6NrqvW6qeGTE1pNpD0X/TYegWblhIJ6sL kw3ic4xikiU//GRA6SEin5Ap+gohrYf7Ppm8GOsQ7lTZNH44fb+mkR8ZCMmSyGJPo2TfL8P87 SrjsWVUlJFdDVxsAgvLJAcuif9He2BwWybFv+32X6TLOuErinwMv6ToLxSlbWMBOKZPckK1iB IQL9hQnFNsmb4X81ifni9o5jktK/BVIC5hI/lWE11KSTW5QwtPU0Eckorx8XYjWBvBpjN4MRF Oi0+2L2BrK6NT/8SVB1OiPIqumD6F80LuIyFi5TX3gPS1mfEnehgo0KmsYEJ38smRSuhvsKu1 2jHuSbrMwMsjikqFYVSvpx65SlYGJVDxGkN+luiyLQrZpQ8Y8LX1/Ap5LWFjeEbhcTa13w6AH 4NGPQXLyM2thsXz4+iWu47EV/fqG0t7EAzHXyildw8A9+4nFU3Rzsg+OVnCQPfjbjmdUsEvO6 z6NXrIy Cc: u-boot@lists.denx.de, Vagrant Cascadian , Heinrich Schuchardt , Stefan Roese Subject: [U-Boot] [PATCH v2 1/1] meson-gx: reserved memory regions 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" The Odroid C2 has two GiB of memory with two reserved regions. reg = <0x0 0x0 0x0 0x1000000>; reg = <0x0 0x10000000 0x0 0x200000>; Patch bfcef28ae4cf (arm: add initial support for Amlogic Meson and ODROID-C2) provided function dram_init_banksize to reserve the first 16 MiB of RAM for firmware in function dram_init_banksize in arch/arm/mach-meson/board.c and defined CONFIG_NR_DRAM_BANKS = 1. With this patch dram_init_banksize is changed to additionally reserve the 2MiB region for the ARM Trusted Firmware (BL31). CONFIG_NR_DRAM_BANKS is set to 2. Cc: Andreas Färber Signed-off-by: Heinrich Schuchardt --- v2: Do not change the dtb but the board file as suggested by Andreas Färber. --- arch/arm/mach-meson/board.c | 8 +++++--- include/configs/meson-gxbb-common.h | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/arch/arm/mach-meson/board.c b/arch/arm/mach-meson/board.c index 273dbeb020..e89c6aace9 100644 --- a/arch/arm/mach-meson/board.c +++ b/arch/arm/mach-meson/board.c @@ -37,9 +37,11 @@ int dram_init(void) int dram_init_banksize(void) { /* Reserve first 16 MiB of RAM for firmware */ - gd->bd->bi_dram[0].start = CONFIG_SYS_SDRAM_BASE + (16 * 1024 * 1024); - gd->bd->bi_dram[0].size = gd->ram_size - (16 * 1024 * 1024); - + gd->bd->bi_dram[0].start = 0x1000000; + gd->bd->bi_dram[0].size = 0xf000000; + /* Reserve 2 MiB for ARM Trusted Firmware (BL31) */ + gd->bd->bi_dram[1].start = 0x10000000; + gd->bd->bi_dram[1].size = gd->ram_size - 0x10200000; return 0; } diff --git a/include/configs/meson-gxbb-common.h b/include/configs/meson-gxbb-common.h index 89e3807a14..ed55f441a4 100644 --- a/include/configs/meson-gxbb-common.h +++ b/include/configs/meson-gxbb-common.h @@ -10,7 +10,7 @@ #define CONFIG_CPU_ARMV8 #define CONFIG_REMAKE_ELF -#define CONFIG_NR_DRAM_BANKS 1 +#define CONFIG_NR_DRAM_BANKS 2 #define CONFIG_ENV_IS_NOWHERE 1 #define CONFIG_ENV_SIZE 0x2000 #define CONFIG_SYS_MAXARGS 32