From patchwork Sat Aug 22 10:27:17 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonathan Liu X-Patchwork-Id: 509793 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 66E611402AA for ; Sun, 23 Aug 2015 15:20:19 +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=Z6THcpuF; dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 8E5374B64D; Sun, 23 Aug 2015 07:20:14 +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 hk37f9oU2cpY; Sun, 23 Aug 2015 07:20:14 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id AC85C4B62B; Sun, 23 Aug 2015 07:20:13 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 1F37D4B6BB for ; Sat, 22 Aug 2015 12:28:23 +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 HELxhDfhq4iT for ; Sat, 22 Aug 2015 12:28:22 +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-pd0-f172.google.com (mail-pd0-f172.google.com [209.85.192.172]) by theia.denx.de (Postfix) with ESMTPS id 3076B4B6B5 for ; Sat, 22 Aug 2015 12:28:18 +0200 (CEST) Received: by pdob1 with SMTP id b1so35292848pdo.2 for ; Sat, 22 Aug 2015 03:28:16 -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; bh=aZaisroCEcJ2rjgjMUYuwZUDjZDRKwFDtfFbhkpiWRE=; b=Z6THcpuFm7aZIsciRXU/DUEffs4hwxp1hS2yS9TAFRVzWxE26RA7S0ZiP0ek/Yq1Tv vaR2MuBQPbjRswHe8jVLTTU6PFTQ9bjRuiUrxPe/YHb82RZfQnkRG7rvp5rVD0pipLm5 WMIPTYtrDRU0CD/BqdcBUs1bsyVeCgYM3rGWZeIeiCJSaoiyDx9zmmcjlIy/0dychR93 hr7+MUctjY68UNhFNhVDdIusIGM05XmtEpFPBRB1+h6sKp5LmcdXU/IkMIFDHUwU0CTy 0Rigj38WyHTDl8pfUrIGLHkvofYtAgUIBDsu1FrmzW+mUvH59pYptEPbFfKNRLV3uVNi 1+7g== X-Received: by 10.70.132.228 with SMTP id ox4mr27016791pdb.0.1440239296735; Sat, 22 Aug 2015 03:28:16 -0700 (PDT) Received: from 60-242-179-244.static.tpgi.com.au (60-242-179-244.static.tpgi.com.au. [60.242.179.244]) by smtp.gmail.com with ESMTPSA id v5sm10644196pdo.87.2015.08.22.03.28.15 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 22 Aug 2015 03:28:16 -0700 (PDT) From: Jonathan Liu To: u-boot@lists.denx.de Date: Sat, 22 Aug 2015 20:27:17 +1000 Message-Id: <1440239237-14823-1-git-send-email-net147@gmail.com> X-Mailer: git-send-email 2.5.0 X-Mailman-Approved-At: Sun, 23 Aug 2015 07:20:12 +0200 Subject: [U-Boot] [PATCH] rpi: set fdt_addr_r to 0x00000100 to match default device_tree_address 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" Raspberry Pi by default loads the FDT to 0x00000100 so set fdt_addr_r to match and move scriptaddr to 0x02000000 to avoid clobbering the FDT. Signed-off-by: Jonathan Liu --- include/configs/rpi-common.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/configs/rpi-common.h b/include/configs/rpi-common.h index 8830a10..06836cd 100644 --- a/include/configs/rpi-common.h +++ b/include/configs/rpi-common.h @@ -163,10 +163,10 @@ * for the FDT/DTB to be up to 1M, which is hopefully plenty. */ #define ENV_MEM_LAYOUT_SETTINGS \ - "scriptaddr=0x00000000\0" \ + "fdt_addr_r=0x00000100\0" \ "pxefile_addr_r=0x00100000\0" \ "kernel_addr_r=0x01000000\0" \ - "fdt_addr_r=0x02000000\0" \ + "scriptaddr=0x02000000\0" \ "ramdisk_addr_r=0x02100000\0" \ #define BOOT_TARGET_DEVICES(func) \