From patchwork Thu Aug 18 15:41:36 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Davis X-Patchwork-Id: 74180 Delivered-To: patch@linaro.org Received: by 10.140.29.52 with SMTP id a49csp414727qga; Thu, 18 Aug 2016 08:44:25 -0700 (PDT) X-Received: by 10.28.1.23 with SMTP id 23mr200208wmb.22.1471535065377; Thu, 18 Aug 2016 08:44:25 -0700 (PDT) Return-Path: Received: from theia.denx.de (theia.denx.de. [85.214.87.163]) by mx.google.com with ESMTP id ew17si2429520wjd.262.2016.08.18.08.44.25; Thu, 18 Aug 2016 08:44:25 -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 43F67A75BC; Thu, 18 Aug 2016 17:43:50 +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 AiYzxdAQS6xL; Thu, 18 Aug 2016 17:43:50 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 3D1F6A75C2; Thu, 18 Aug 2016 17:43:13 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 8B5064B9B0 for ; Thu, 18 Aug 2016 17:42:38 +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 2coDYhGDhtiE for ; Thu, 18 Aug 2016 17:42:38 +0200 (CEST) Received: from devils.ext.ti.com (devils.ext.ti.com [198.47.26.153]) by theia.denx.de (Postfix) with ESMTPS id 15DBD4B698 for ; Thu, 18 Aug 2016 17:42:37 +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 u7IFgOZY013304; Thu, 18 Aug 2016 10:42:24 -0500 Received: from DFLE72.ent.ti.com (dfle72.ent.ti.com [128.247.5.109]) by dlelxv90.itg.ti.com (8.14.3/8.13.8) with ESMTP id u7IFgNnT018579; Thu, 18 Aug 2016 10:42:23 -0500 Received: from dflp33.itg.ti.com (10.64.6.16) by DFLE72.ent.ti.com (128.247.5.109) with Microsoft SMTP Server id 14.3.294.0; Thu, 18 Aug 2016 10:42:22 -0500 Received: from legion.dal.design.ti.com (legion.dal.design.ti.com [128.247.22.53]) by dflp33.itg.ti.com (8.14.3/8.13.8) with ESMTP id u7IFgMKu019373; Thu, 18 Aug 2016 10:42:22 -0500 Received: from localhost (uda0226330.am.dhcp.ti.com [128.247.83.252]) by legion.dal.design.ti.com (8.11.7p1+Sun/8.11.7) with ESMTP id u7IFgL306837; Thu, 18 Aug 2016 10:42:21 -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: Thu, 18 Aug 2016 10:41:36 -0500 Message-ID: <20160818154146.16788-4-afd@ti.com> X-Mailer: git-send-email 2.9.2 In-Reply-To: <20160818154146.16788-1-afd@ti.com> References: <20160818154146.16788-1-afd@ti.com> MIME-Version: 1.0 Cc: u-boot@lists.denx.de Subject: [U-Boot] [PATCH 03/13] spl: Kconfig: Add CONFIG_SPL_TEXT_BASE as Kconfig option 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" Add a new Kconfig CONFIG_SPL_TEXT_BASE. Add its use to am335x_evm_defconfig, then only conditionally define it in ti_am335x_common.h when it is not already defined, this allows for systems that have not fully converted to the Kconfig based config system to still include this header without redefining this symbol on platforms that have. Signed-off-by: Andrew F. Davis --- Kconfig | 8 ++++++++ configs/am335x_evm_defconfig | 1 + include/configs/ti_am335x_common.h | 2 ++ 3 files changed, 11 insertions(+) -- 2.9.2 _______________________________________________ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot diff --git a/Kconfig b/Kconfig index cb5af5b..f67e7c8 100644 --- a/Kconfig +++ b/Kconfig @@ -319,6 +319,14 @@ config SYS_TEXT_BASE help TODO: Move CONFIG_SYS_TEXT_BASE for all the architecture +config SPL_TEXT_BASE + hex "Text Base" + depends on SPL + help + When SPL is enabled the image is linked with this as the + starting address in memeory for which the SPL will be loaded. + TODO: Move CONFIG_SPL_TEXT_BASE for all the architecture + config SPL_LOAD_FIT bool "Enable SPL loading U-Boot as a FIT" depends on FIT diff --git a/configs/am335x_evm_defconfig b/configs/am335x_evm_defconfig index 6885230..b1264d7 100644 --- a/configs/am335x_evm_defconfig +++ b/configs/am335x_evm_defconfig @@ -3,6 +3,7 @@ CONFIG_TARGET_AM335X_EVM=y CONFIG_SPL_STACK_R_ADDR=0x82000000 CONFIG_DEFAULT_DEVICE_TREE="am335x-evm" CONFIG_SPL=y +CONFIG_SPL_TEXT_BASE=0x402F0400 CONFIG_SPL_STACK_R=y CONFIG_SYS_EXTRA_OPTIONS="NAND" CONFIG_HUSH_PARSER=y diff --git a/include/configs/ti_am335x_common.h b/include/configs/ti_am335x_common.h index bcd56fc..25c9643 100644 --- a/include/configs/ti_am335x_common.h +++ b/include/configs/ti_am335x_common.h @@ -58,7 +58,9 @@ * supports X-MODEM loading via UART, and we leverage this and then use * Y-MODEM to load u-boot.img, when booted over UART. */ +#ifndef CONFIG_SPL_TEXT_BASE #define CONFIG_SPL_TEXT_BASE 0x402F0400 +#endif #define CONFIG_SPL_MAX_SIZE (0x4030B800 - CONFIG_SPL_TEXT_BASE) #define CONFIG_SYS_SPL_ARGS_ADDR (CONFIG_SYS_SDRAM_BASE + \ (128 << 20))