From patchwork Fri Oct 4 14:51:40 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Rini X-Patchwork-Id: 280633 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 937362C00C2 for ; Sat, 5 Oct 2013 00:52:28 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id E2A484A081; Fri, 4 Oct 2013 16:52:26 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at theia.denx.de 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 ouijzDqHyAEF; Fri, 4 Oct 2013 16:52:26 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 524F94A092; Fri, 4 Oct 2013 16:52:05 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 8ACEC4A087 for ; Fri, 4 Oct 2013 16:51:57 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at theia.denx.de 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 Aqgku3tBuuAX for ; Fri, 4 Oct 2013 16:51:51 +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-qa0-f43.google.com (mail-qa0-f43.google.com [209.85.216.43]) by theia.denx.de (Postfix) with ESMTPS id 63DC44A07B for ; Fri, 4 Oct 2013 16:51:45 +0200 (CEST) Received: by mail-qa0-f43.google.com with SMTP id k15so1108869qaq.9 for ; Fri, 04 Oct 2013 07:51:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:subject:date:message-id; bh=ECbBUxnxKIKoI+2yyHDu/TbUBQ7wFVMDaSAdPJ8U8Yw=; b=QcmV32kuukc08KsiyRPBA0cQa24z8U5Eq2D6wLqSzdtC0THQ/WzGUlQraCUTv8AhQZ oqXu2O29uXZJnaRpM6n9Mfay7AUWGQI2/K2kwxKrp6rr23bvONG7R//Yn4LliRd/ZGor yTdFsLSwjjH91mV3w1h0WV2b2iskQywyVO56ibgZshW/+Gaauj8n9QOdbqShmGt1UrCB 5CtgTbNCf+YOaQFGOJOQ0JcZaJdP5yiiXjVnGeOY8np3hnF2atqdgtEl83xNPdrTbBp8 OAMlDp4JyLCK8OKYwXtJX4of62deXgkY4/vbjo0XItvK7Vt8rV4uGsNT6y6t+UBYVMYj d7Sw== X-Received: by 10.224.135.193 with SMTP id o1mr3568088qat.114.1380898302905; Fri, 04 Oct 2013 07:51:42 -0700 (PDT) Received: from localhost.localdomain (cpe-174-106-216-211.ec.res.rr.com. [174.106.216.211]) by mx.google.com with ESMTPSA id ge5sm10680563qeb.5.1969.12.31.16.00.00 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 04 Oct 2013 07:51:41 -0700 (PDT) From: Tom Rini To: u-boot@lists.denx.de Date: Fri, 4 Oct 2013 10:51:40 -0400 Message-Id: <1380898300-15059-1-git-send-email-trini@ti.com> X-Mailer: git-send-email 1.7.9.5 Subject: [U-Boot] [PATCH] TI:armv7: Change CONFIG_SYS_SPL_ARGS_ADDR to a higher address X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.11 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: u-boot-bounces@lists.denx.de Errors-To: u-boot-bounces@lists.denx.de With changes to increase the size of the device tree (required to move more data out of the kernel and into DT), loading the args at the old address leads to us overwriting things later on. To correct this, load the args file to where we load the device tree anyhow. This is also safe for non-DT booting as in either case we use r2 to pass in the location of things. Signed-off-by: Tom Rini --- include/configs/ti_armv7_common.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/configs/ti_armv7_common.h b/include/configs/ti_armv7_common.h index d15850b..07730c9 100644 --- a/include/configs/ti_armv7_common.h +++ b/include/configs/ti_armv7_common.h @@ -203,7 +203,7 @@ #ifdef CONFIG_SPL_OS_BOOT #define CONFIG_SPL_ENV_SUPPORT /* For 'boot_os' and similar */ -#define CONFIG_SYS_SPL_ARGS_ADDR (CONFIG_SYS_SDRAM_BASE + 0x100) +#define CONFIG_SYS_SPL_ARGS_ADDR 0x80F80000 /* FAT */ #define CONFIG_SPL_FAT_LOAD_KERNEL_NAME "uImage"