From patchwork Mon Mar 20 11:40:31 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Heiko_St=C3=BCbner?= X-Patchwork-Id: 740958 X-Patchwork-Delegate: sjg@chromium.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 3vmvDg5cgyz9s2x for ; Mon, 20 Mar 2017 22:41:55 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 8E9C1C21CC7; Mon, 20 Mar 2017 11:41:41 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=none autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 99CD1C21C58; Mon, 20 Mar 2017 11:41:39 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 1DEB7C21C58; Mon, 20 Mar 2017 11:41:38 +0000 (UTC) Received: from gloria.sntech.de (gloria.sntech.de [95.129.55.99]) by lists.denx.de (Postfix) with ESMTPS id A16B4C21C2C for ; Mon, 20 Mar 2017 11:41:37 +0000 (UTC) Received: from p5b127f1d.dip0.t-ipconnect.de ([91.18.127.29] helo=phil.lan) by gloria.sntech.de with esmtpsa (TLS1.1:DHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.80) (envelope-from ) id 1cpvgs-0003XX-VD; Mon, 20 Mar 2017 12:41:35 +0100 From: Heiko Stuebner To: sjg@chromium.org Date: Mon, 20 Mar 2017 12:40:31 +0100 Message-Id: <20170320114036.21475-4-heiko@sntech.de> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170320114036.21475-1-heiko@sntech.de> References: <20170320114036.21475-1-heiko@sntech.de> Cc: u-boot@lists.denx.de Subject: [U-Boot] [PATCH 3/8] rockchip: rk3188: Cleanup some SPL/TPL rename leftovers X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 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" In the beginning, we did SPL -> TPL -> U-Boot, but after clarification of the real ordering swapped SPL and TPL. It seems some renames were forgotten and may confuse future readers, so also swap these to reflect the actual ordering. Signed-off-by: Heiko Stuebner Acked-by: Simon Glass --- arch/arm/mach-rockchip/rk3188-board-tpl.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/arm/mach-rockchip/rk3188-board-tpl.c b/arch/arm/mach-rockchip/rk3188-board-tpl.c index 442bfe7aa7..b458ef6ea8 100644 --- a/arch/arm/mach-rockchip/rk3188-board-tpl.c +++ b/arch/arm/mach-rockchip/rk3188-board-tpl.c @@ -17,7 +17,7 @@ DECLARE_GLOBAL_DATA_PTR; static int rk3188_num_entries __attribute__ ((section(".data"))); #define PMU_BASE 0x20004000 -#define TPL_ENTRY 0x10080C00 +#define SPL_ENTRY 0x10080C00 static void jump_to_spl(void) { @@ -25,9 +25,9 @@ static void jump_to_spl(void) struct rk3188_pmu * const pmu = (void *)PMU_BASE; image_entry_noargs_t tpl_entry = - (image_entry_noargs_t)(unsigned long)TPL_ENTRY; + (image_entry_noargs_t)(unsigned long)SPL_ENTRY; - /* Store the SAVE_SP_ADDR in a location shared with TPL. */ + /* Store the SAVE_SP_ADDR in a location shared with SPL. */ writel(SAVE_SP_ADDR, &pmu->sys_reg[2]); tpl_entry(); }