From patchwork Tue Aug 30 19:06:26 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Davis X-Patchwork-Id: 75020 Delivered-To: patch@linaro.org Received: by 10.140.29.52 with SMTP id a49csp2310020qga; Tue, 30 Aug 2016 12:08:14 -0700 (PDT) X-Received: by 10.25.216.26 with SMTP id p26mr1831290lfg.122.1472584094889; Tue, 30 Aug 2016 12:08:14 -0700 (PDT) Return-Path: Received: from theia.denx.de (theia.denx.de. [85.214.87.163]) by mx.google.com with ESMTP id 83si18835151lja.62.2016.08.30.12.08.14; Tue, 30 Aug 2016 12:08:14 -0700 (PDT) Received-SPF: pass (google.com: best guess record for 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: best guess record for domain of u-boot-bounces@lists.denx.de designates 85.214.87.163 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id A7738A75A7; Tue, 30 Aug 2016 21:07:46 +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 BvoPPO32Estk; Tue, 30 Aug 2016 21:07:46 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 1252BA7532; Tue, 30 Aug 2016 21:07:11 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 197384B77D for ; Tue, 30 Aug 2016 21:06:52 +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 VF8I7P3-BLLc for ; Tue, 30 Aug 2016 21:06:52 +0200 (CEST) Received: from devils.ext.ti.com (devils.ext.ti.com [198.47.26.153]) by theia.denx.de (Postfix) with ESMTPS id 857DF4B698 for ; Tue, 30 Aug 2016 21:06:51 +0200 (CEST) Received: from dlelxv90.itg.ti.com ([172.17.2.17]) by devils.ext.ti.com (8.13.7/8.13.7) with ESMTP id u7UJ6YH0001549; Tue, 30 Aug 2016 14:06:34 -0500 Received: from DFLE73.ent.ti.com (dfle73.ent.ti.com [128.247.5.110]) by dlelxv90.itg.ti.com (8.14.3/8.13.8) with ESMTP id u7UJ6WF8019092; Tue, 30 Aug 2016 14:06:33 -0500 Received: from dlep33.itg.ti.com (157.170.170.75) by DFLE73.ent.ti.com (128.247.5.110) with Microsoft SMTP Server id 14.3.294.0; Tue, 30 Aug 2016 14:06:32 -0500 Received: from legion.dal.design.ti.com (legion.dal.design.ti.com [128.247.22.53]) by dlep33.itg.ti.com (8.14.3/8.13.8) with ESMTP id u7UJ6Wks031587; Tue, 30 Aug 2016 14:06:32 -0500 Received: from localhost (uda0226330.am.dhcp.ti.com [128.247.83.16]) by legion.dal.design.ti.com (8.11.7p1+Sun/8.11.7) with ESMTP id u7UJ6V329521; Tue, 30 Aug 2016 14:06:31 -0500 (CDT) From: "Andrew F. Davis" To: Lokesh Vutla , Heiko Schocher , Gilles Gameiro , Daniel Allred , Madan Srinivas , Simon Glass , Enric Balletbo i Serra , Hannes Schmelzer , Tom Rini , Tero Kristo Date: Tue, 30 Aug 2016 14:06:26 -0500 Message-ID: <20160830190629.13956-8-afd@ti.com> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20160830190629.13956-1-afd@ti.com> References: <20160830190629.13956-1-afd@ti.com> MIME-Version: 1.0 Cc: u-boot@lists.denx.de Subject: [U-Boot] [PATCH v4 07/10] am335x: configs: Use ISW_ENTRY_ADDR to set SPL_TEXT_BASE 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: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" The SPL load address changes based on boot time in HS devices, ISW_ENTRY_ADDR is used to set this address for AM43xx based SoCs for similar reasons. Add this same logic for AM33xx devices. Also make the default value for ISW_ENTRY_ADDR correct for GP devices based on SoC, HS devices already pick the correct value in their defconfig. Signed-off-by: Andrew F. Davis --- arch/arm/cpu/armv7/am33xx/Kconfig | 3 ++- include/configs/ti_am335x_common.h | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) -- 2.9.3 _______________________________________________ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot diff --git a/arch/arm/cpu/armv7/am33xx/Kconfig b/arch/arm/cpu/armv7/am33xx/Kconfig index e57e6fb..79c05dd 100644 --- a/arch/arm/cpu/armv7/am33xx/Kconfig +++ b/arch/arm/cpu/armv7/am33xx/Kconfig @@ -108,7 +108,8 @@ config ISW_ENTRY_ADDR point address depending on the device type (secure/non-secure), boot media (xip/non-xip) and image headers. - default 0x402F4000 + default 0x402F4000 if AM43XX + default 0x402F0400 if AM33XX config PUB_ROM_DATA_SIZE hex "Size in bytes of the L3 SRAM reserved by ROM to store data" diff --git a/include/configs/ti_am335x_common.h b/include/configs/ti_am335x_common.h index 349d410..dba40fc 100644 --- a/include/configs/ti_am335x_common.h +++ b/include/configs/ti_am335x_common.h @@ -56,7 +56,7 @@ * supports X-MODEM loading via UART, and we leverage this and then use * Y-MODEM to load u-boot.img, when booted over UART. */ -#define CONFIG_SPL_TEXT_BASE 0x402F0400 +#define CONFIG_SPL_TEXT_BASE CONFIG_ISW_ENTRY_ADDR #define CONFIG_SPL_MAX_SIZE (0x4030B800 - CONFIG_SPL_TEXT_BASE) #define CONFIG_SYS_SPL_ARGS_ADDR (CONFIG_SYS_SDRAM_BASE + \ (128 << 20))