From patchwork Sun Apr 3 07:18:12 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Beniamino Galvani X-Patchwork-Id: 605527 X-Patchwork-Delegate: trini@ti.com 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 3qd6272f9qz9t3Z for ; Sun, 3 Apr 2016 17:19:43 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=c+lvuRlF; dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 6CD21A7654; Sun, 3 Apr 2016 09:19:24 +0200 (CEST) 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 qGKuX7GLZ251; Sun, 3 Apr 2016 09:19:24 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 7AED1A7655; Sun, 3 Apr 2016 09:19:04 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 4B687A7521 for ; Sun, 3 Apr 2016 09:18:53 +0200 (CEST) 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 2P1w1g822UGr for ; Sun, 3 Apr 2016 09:18:53 +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-lf0-f66.google.com (mail-lf0-f66.google.com [209.85.215.66]) by theia.denx.de (Postfix) with ESMTPS id 1C080A7614 for ; Sun, 3 Apr 2016 09:18:46 +0200 (CEST) Received: by mail-lf0-f66.google.com with SMTP id p81so12018067lfb.3 for ; Sun, 03 Apr 2016 00:18:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=hQe8oSnytrsNyXEa8mDLRYorBbLle0Bgt/aIy12Hv/s=; b=c+lvuRlFWOe5T+8BCFzH/FfLICSFTU2FhFMmbH27b3lveLupILvYt+7Xa/Lqd5pM3x 5i1JqIfEaRANWwWV4fqgsHHVEAoXpqQBJIeg1BZylZYhLiTt4WY9Hqhc2QSoeDt3Wkn1 gK7rHKNDI1DgUSyjAzECakCvMCA9yVo8K8QGlpZVlmr6tHJyIyuar4NBpSoIxR3ehhTv D6fFchD1VRh2upnMXjPWlZal9VIpY1bU78YOktYQUR1x1jZi2ZR9CiICBHYffhF7UouC 4WKDV16ZWmHNK8Jt/bi3XZU2IVerpGAdQiCymHnFBCxp8SppTsF9Zym9mARR1374RgG+ QJcQ== 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=hQe8oSnytrsNyXEa8mDLRYorBbLle0Bgt/aIy12Hv/s=; b=A1kM/6SBqueVDxQ6gLX2E2HMTZGFEHsRqon7e56HLD1/yu/dFI3Nkglu6wCLLYK677 vhB26qG6ID19fSQLMp0jfZ6TpzzA9EyzamHnTPOtuUitqsNUwniqwmgE/fKdVSDlTcdq 8ia2//L3VTQB4nTvtBwS4Q/dxJbtxcVAJPGplw1btTu2OOJC5HrVrmZqHBGdYJkKhHDg qK0XT/rxyfzVjov0kwp/KlecrK2DwbXg3Eg+8npt6Kpqa9qS/1QvefJPY3UkfsSeXHba ijwDwC8Q60YmsdEXL8e69DEkZtrV9wHaZXkoKHWYjOzihUHbQPAHVAM3oi8lMeWhC6X6 Y14g== X-Gm-Message-State: AD7BkJKQo+ULq0y78cybVwB630b0S+zxSLVy3DU3R3QYyhqqSQGNkSd6RldSIwLzU8Z9Wg== X-Received: by 10.194.188.20 with SMTP id fw20mr13027084wjc.80.1459667926218; Sun, 03 Apr 2016 00:18:46 -0700 (PDT) Received: from shire.fritz.box (host202-96-dynamic.51-79-r.retail.telecomitalia.it. [79.51.96.202]) by smtp.gmail.com with ESMTPSA id 138sm7282447wmf.13.2016.04.03.00.18.45 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 03 Apr 2016 00:18:45 -0700 (PDT) From: Beniamino Galvani To: u-boot@lists.denx.de Date: Sun, 3 Apr 2016 09:18:12 +0200 Message-Id: <1459667897-2824-5-git-send-email-b.galvani@gmail.com> X-Mailer: git-send-email 2.7.3 In-Reply-To: <1459667897-2824-1-git-send-email-b.galvani@gmail.com> References: <1459667897-2824-1-git-send-email-b.galvani@gmail.com> Cc: Tom Rini , linux-meson@googlegroups.com, Joe Hershberger , Carlo Caione Subject: [U-Boot] [PATCH v2 4/9] arm: meson: use device tree 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" Convert the board and config files to the use of device tree. Signed-off-by: Beniamino Galvani Reviewed-by: Tom Rini --- arch/arm/mach-meson/board.c | 25 +++++++++++++++++++++++++ configs/odroid-c2_defconfig | 2 ++ 2 files changed, 27 insertions(+) diff --git a/arch/arm/mach-meson/board.c b/arch/arm/mach-meson/board.c index 346a2c2..945a5f4 100644 --- a/arch/arm/mach-meson/board.c +++ b/arch/arm/mach-meson/board.c @@ -5,6 +5,8 @@ */ #include +#include +#include #include #include @@ -17,9 +19,32 @@ int board_init(void) int dram_init(void) { + const fdt32_t *val; + int offset; + int len; + + offset = fdt_path_offset(gd->fdt_blob, "/memory"); + if (offset < 0) + return -EINVAL; + + val = fdt_getprop(gd->fdt_blob, offset, "reg", &len); + if (len < sizeof(*val) * 4) + return -EINVAL; + + /* Don't use fdt64_t to avoid unaligned access */ + gd->ram_size = (uint64_t)fdt32_to_cpu(val[2]) << 32; + gd->ram_size |= fdt32_to_cpu(val[3]); + return 0; } +void dram_init_banksize(void) +{ + /* Reserve first 16 MiB of RAM */ + 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); +} + void reset_cpu(ulong addr) { } diff --git a/configs/odroid-c2_defconfig b/configs/odroid-c2_defconfig index 8e6df12..765076a 100644 --- a/configs/odroid-c2_defconfig +++ b/configs/odroid-c2_defconfig @@ -2,6 +2,7 @@ CONFIG_ARM=y CONFIG_ARCH_MESON=y CONFIG_MESON_GXBB=y CONFIG_TARGET_ODROID_C2=y +CONFIG_DEFAULT_DEVICE_TREE="meson-gxbb-odroidc2" # CONFIG_CMD_BDI is not set # CONFIG_CMD_IMI is not set # CONFIG_CMD_IMLS is not set @@ -9,3 +10,4 @@ CONFIG_TARGET_ODROID_C2=y # CONFIG_CMD_FPGA is not set # CONFIG_CMD_SOURCE is not set # CONFIG_CMD_SETEXPR is not set +CONFIG_OF_CONTROL=y