From patchwork Wed Jan 10 05:20:18 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peng Fan X-Patchwork-Id: 857944 X-Patchwork-Delegate: sbabic@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=nxp.com header.i=@nxp.com header.b="AmhhO4Kb"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 3zGcnd6KHTz9s7n for ; Wed, 10 Jan 2018 16:21:57 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 86ED0C220FA; Wed, 10 Jan 2018 05:21:42 +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=-1.0 required=5.0 tests=BAD_ENC_HEADER, RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,T_DKIM_INVALID 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 34C62C2209B; Wed, 10 Jan 2018 05:21:22 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 5E347C22093; Wed, 10 Jan 2018 05:21:10 +0000 (UTC) Received: from EUR03-AM5-obe.outbound.protection.outlook.com (mail-eopbgr30050.outbound.protection.outlook.com [40.107.3.50]) by lists.denx.de (Postfix) with ESMTPS id CE5ADC2209D for ; Wed, 10 Jan 2018 05:21:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=imufWWKB5VeEEML5HSB4CnmjeclXGZtR5I9mejbo8A0=; b=AmhhO4KbD9BtI7Z+AmStok6TpJQBG0up/r+yFxt8SbFGLTKTZ1CW5JtjFBS7CfRbV6UpZXNYg+81IMheoTQggKe1aOr4j0Xsrqd4ro8roAE+bT+UL5+mG2pZivKNbQ6nStSEOMY6wg6ZMe2STL30czY+lSRxtzZe/v906wBZU1Y= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=peng.fan@nxp.com; Received: from linux-u7w5.ap.freescale.net.net (92.121.68.129) by DB6PR04MB3221.eurprd04.prod.outlook.com (2603:10a6:6:6::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.386.5; Wed, 10 Jan 2018 05:20:47 +0000 From: Peng Fan To: sbabic@denx.de, fabio.estevam@nxp.com Date: Wed, 10 Jan 2018 13:20:18 +0800 Message-Id: <20180110052048.4425-2-peng.fan@nxp.com> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20180110052048.4425-1-peng.fan@nxp.com> References: <20180110052048.4425-1-peng.fan@nxp.com> MIME-Version: 1.0 X-Originating-IP: [92.121.68.129] X-ClientProxiedBy: HK2PR02CA0219.apcprd02.prod.outlook.com (2603:1096:201:20::31) To DB6PR04MB3221.eurprd04.prod.outlook.com (2603:10a6:6:6::17) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 6405ecb7-36d0-4154-0e30-08d557e9e98d X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(48565401081)(4534020)(4602075)(4627115)(201703031133081)(201702281549075)(5600026)(4604075)(2017052603307)(7153060)(7193020); SRVR:DB6PR04MB3221; X-Microsoft-Exchange-Diagnostics: 1; DB6PR04MB3221; 3:N485MLex/5JjErPgYw/MgSowr+ji+ThsQqiEaL2YzHfnreivMeTuTJ3HIpjutzRwHBlPzCgKWsYJuIPmmg7eCpcr0MvFq0pZBJsQxf63UJWPNIUiNOLTKmYKfYdCeAg7fJ3ME51ooDXNeo1apsy9qe9C1K8DN80cba2/TOn3fxkZ5T54ePK9GEiuiinK4T0Q1xmObntf8NiqbKLDAlErnIMmo2H/g9/8T4EoF0zMZwc5Q9M0+6CyTDS0YBL3d2A1; 25:vOwXUv7qLUaqameuuuUQykcT9OjF31xbd/d7lkS2D3YBx5vyaNEnlHXbGZiuEBcCqITwCmibwy3Gbjuj1kBXCf4c8atCsma5zavEKt/lYofmFf67b3/MnKCA1aWEPTDm8gka9MXbLk/OrAnRCMuVl4ml0ugkaGwKi3ZxOSHI/+n9jUtcFIC3DWMrYz4N3JwsQve7SE8Kdk0fYDGIKxEtPVrPQZNTWIwt41soU9/wBg1vtId/Ig/wFmFoBxcO9Cu+tIZ7vf7Cn+Tsv0mCbfQC7Z0kccXzz0Y2gc+EH3v/KHxFvYf7GEV0+gFgWQUeJp6d6YZKJ3PvFoMt8Stssp8N3w==; 31:ipAeLTNQ0tt0qkEgsF8IF+6xfH+0GDQOhxQUTOVagR6shsknCfrRdW1DDHRr5Xs4GWkoxXeAra4v+ExFpqANgGNZsX75iUZedjRwOx/HDbM1w7B1SUJzc/sjmY6FUe8GF1KrQIj8bitLgfBJu9w1Q7YsunVnMUZ1g4GeyTamSxBuxSq96azTqODtwQJo1Syg+oAD09X0JpxiLgwmplopdn7hXPC5aq9AF8Gj4hQrtZE= X-MS-TrafficTypeDiagnostic: DB6PR04MB3221: X-Microsoft-Exchange-Diagnostics: 1; DB6PR04MB3221; 20:JzpymVo84RA8nZPYvTz/6dQQOHzX5zJGrTEp/6XuFzExstY9l7DIWI2Hc3XS0AOueHCOOCfh65Pzi6xISPMN6fAR2soKssYpMefhA53PGwQue3Cc5r89+GqOY8cYei/1Im7LyiVvOhiJOJML2GDA5sQ5Gcq/JhdI++3rQ9qBjwo9lbB3aZD+1QaNei6PsbbP3iXaUUcVUXMruwg/MzOo/ltq88GtIIrHNCwJUCSmsAxL91l2CrG8DwwefkMFYhpBgKIAzmGwmXE6s+vDYPl77lGRKAYCmqNsMVZOmwD8CRf4MVEzl1xslRss3ITdTFthzpvkArc3nPvaQStOASO+UJpHrtkC9U+o8sL/znrup17+3aNs2J5JQoBWCYXISlNK2AcV9jGzJHSgpWX/YYkRvN0LwP9PxtX7aLzDK3nBbpwlnYMcuPWwR/gnKwMZ4vLPZ2SEHBF/ZBmj68gaET5QwKIiU6wQ6ffdWOxYlQUTi6gAx7OO2Cy07P81Z2JU157r; 4:Ro3QyrDwWltVWt0fWwzZvFXXMJ1tv/+3bFLnvlDYAts+JKZLnB0LqAra8500I48tkVvtgAk+8U5uJMzzTI7XWAd8GaqAGu2s86nYTxujmZrSCkidAZEDEfzJEI/56/ZCaGG2T5emTBOL6uIaQLJZCbDP0USCudun1+Cl/vMQYepQjxiC+KzKYQv07WwkgO0VW/Z24WZ30Ye3jvD9qnOhFF5Vx/Oh43otqkK8AZ1lhcEQsHNb0JQBiVIjvYUmzEkNSjI8GIzqBaKdMN+aKK21Co83TLH5ZWq/3qSS+p1dvFqquZkXXSIlJ7QX87Q3RKqD4qADdEdHz2A3A1vVEhdVoDeVMKSO6FC7J1UIm67hB2Y= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(185117386973197)(17755550239193); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040470)(2401047)(5005006)(8121501046)(3002001)(10201501046)(93006095)(93001095)(3231023)(944501075)(6055026)(6041268)(20161123562045)(20161123558120)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123564045)(6072148)(201708071742011); SRVR:DB6PR04MB3221; BCL:0; PCL:0; RULEID:(100000803101)(100110400095); SRVR:DB6PR04MB3221; X-Forefront-PRVS: 0548586081 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(396003)(376002)(346002)(39860400002)(366004)(39380400002)(199004)(189003)(6486002)(386003)(16586007)(68736007)(6506007)(6636002)(86362001)(6666003)(2950100002)(1076002)(81166006)(16526018)(6512007)(6116002)(8936002)(3846002)(97736004)(5660300001)(50226002)(47776003)(4326008)(53936002)(50466002)(48376002)(66066001)(81156014)(36756003)(25786009)(39060400002)(106356001)(478600001)(2906002)(51416003)(76176011)(305945005)(8676002)(59450400001)(7736002)(52116002)(105586002)(316002); DIR:OUT; SFP:1101; SCL:1; SRVR:DB6PR04MB3221; H:linux-u7w5.ap.freescale.net.net; FPR:; SPF:None; PTR:InfoNoRecords; A:1; MX:1; LANG:en; Received-SPF: None (protection.outlook.com: nxp.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; DB6PR04MB3221; 23:TlVEpgy4ntXiYAkRWwmPogb8iEn6R78Q8EgH7vhsU?= l+p5kxmtccCnL90398H9+ACcCt80HT5DxbtvRni7/LbiCbB1w2d4VpAZE2/xNfRAm1IP/JgH5ugdun40nIdu67cFZw110c3qnCPy28a2Iib6laDnFS5umsbeb971tVXR9xbCRw+YbmDK3n0Os2Harzo2XjX1JEAKekxrAjUjkis6W7Vjj2PT/Op1QyjMr4YYt/g8uqiPM1WzTnsDVNoHUFNQEHAPNvnAplynEnmMFSuNUA2r76btJnFTNXSZNVhPTRIcJPCsYDIGgVjQ+JTp0GfoZyJnnGAc4rCE/Dlxg+5T2ppLFRzwei/lsFYrKoHBKjBVPyhH0oKUsWupCnDBsxsOHuNHLDTA8LkDtbvCS6cliwbTTIGqldMvtbSbpfyxo5HmZFscMhJ7l370dfFHX082eoichVHjlj1QXo6Zg/Q77MdjRDw/iJC5DmhxyYSO9Oku6wC2KbzCutAfCaF/iwAC8MP29eJ9iO1Dkkcb6159ec/4LZ34NHVy48cnoJKVBfrQUu5VvmRtn34VTex30qfinUZ+BcwtXMBTU9vmOvvqKpqYO5Cr73MF2KzW5XZS4lELXhLSIuQXDSq9zMU1khF0mA8B0tbL0Xv895R3kMWOeVTeTjt7dCDSEInRoR76qapXXldLSinE1z0/bta/4tw2ywpIxS4m1e6yr403gjfPDCDYW7OvgLTdNA2h1WqT7UFQcWTFdfxfn0c2y0lVckLhpDtsPHQZgY04W7KeXIUweWR7MQfrobNRnGznW4xNOXDMl8sv5+rdkwH0mqPG/Re19P+yIA85p/BDK/MuKlPsIKBzM6ZovKW6NoI2NmXLbOAGDUruKmp/XkuIN7cbXLwcGUDMlHWWFIAiTnHMVG6ZZsynhk5IF+CGQ0MfVNviEgjAZx5js1wcw/oHdh9eu4TedH7HgG0OsrFh2RaQkfqG2LgviQrDRotIEQi7KrceOW53bQDkPYhbS2YYsyCDDdUC5YKPJoMM+jrO+jITU6XjbaxYIGI6ZoUVyJpaWWYU96hyH5WR/8WMBLPmVHxuBFho5DWkndmac0sJ5YoLlUpxgROj2dO98Ek/XkWdRgHFourNMJRYNVU5J6BfGwZNvkJ X-Microsoft-Exchange-Diagnostics: 1; DB6PR04MB3221; 6:2JJGr17+sYcUZhyjqQlldl9RwJ0fuVOZJPxGmd6Df6KlxYiZ55aNxu7Rb31l2yM6Ip//XWXe3p96uFn+l5btW32OjFlGbkqHRXRYVlXGs6ySFD/uaFmOH2kStPjXcGoKor4iyumhrrSFZBeDLv0uPzl+QPK21SLThPtlvvl061fjBLByGb1yIDWXNMW8CmMaWFTzGOINZo9ViXRc/1rjuWlaDPwvkML9LQ4qA3FYtY29OPHPcaBpuFTF3Pe8ia16n9mk8r7vSoYjzdMqgsQ868hAsVSqWToTevCSyoP11rL3zFBCrg/4uxum5EmZQygd8D8Fejpw9xMFl+CiMoXGgdPMLZVhc2LsT0D35gL+bpo=; 5:htBEsqG6vs9GRL4zFJqhAHSNeF9bb+ebdimqe49R0t26XoaQhFhLdREZucWviJmuYV9N5wRdoqQyRxZu62+L0Mb7W7FkWChP4x07vbPTO5pXDPCfGa7WYqEWTXFJqZjGT7V9+CgbwI907aMeU1gOh2TL4d+dCwq4ca43ParJhiI=; 24:7LRKx3gvAoLa9AVbQO1m4YrCsmB2cw7n8Fhxzm9HeZUc1OlXtLkcqc94apCsU+HTnKj33hCwS3NRF3H5KJYzdkAZD07FIQUDcP+TJiy1oEM=; 7:sMpVuQetHc9wBN2u5Xws3AhUS+hKFGkvU6NEwjhSvWN235fhP8PTqjMXTy2pM1CHVhTGM+JqPKJF0z3R7uxH+MWNzTwGJkrtUVFolq1+XpvmMOSFe2JLp5ORFuh0E+RSOlBw5gJ1U5kgFCgt3kwEqGo1wVS2bd9Wdj3KPv4kIKneQdqZkDT779IjyGtEkEq8ODUcslExTyfO5jp7QLaBWSy8nRXkVjmOJSkLjboXLyir+U1fV+HelX4hIcdJiZoS SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Jan 2018 05:20:47.3249 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 6405ecb7-36d0-4154-0e30-08d557e9e98d X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB6PR04MB3221 Cc: u-boot@lists.denx.de, Tom Rini Subject: [U-Boot] [PATCH V5 01/31] arm: imx: Rework i.MX specific commands to be excluded from SPL 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: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" From: Tom Rini The "clocks" and "bootaux" commands are only usable in full U-Boot, not SPL, so do not link them inside of SPL. Rework a little of the bootaux related code to make use of __weak and declare parts of it static as it's local to the file. Cc: Stefano Babic Cc: Fabio Estevam Signed-off-by: Tom Rini --- arch/arm/mach-imx/Makefile | 2 ++ arch/arm/mach-imx/imx_bootaux.c | 13 ++++--------- arch/arm/mach-imx/mx5/clock.c | 4 +++- arch/arm/mach-imx/mx7/clock.c | 2 ++ arch/arm/mach-imx/mx7ulp/clock.c | 2 ++ 5 files changed, 13 insertions(+), 10 deletions(-) diff --git a/arch/arm/mach-imx/Makefile b/arch/arm/mach-imx/Makefile index d7966cfd4a..cf39d08bdd 100644 --- a/arch/arm/mach-imx/Makefile +++ b/arch/arm/mach-imx/Makefile @@ -28,7 +28,9 @@ obj-y += cache.o init.o obj-$(CONFIG_SATA) += sata.o obj-$(CONFIG_IMX_VIDEO_SKIP) += video.o obj-$(CONFIG_IMX_RDC) += rdc-sema.o +ifneq ($(CONFIG_SPL_BUILD),y) obj-$(CONFIG_IMX_BOOTAUX) += imx_bootaux.o +endif obj-$(CONFIG_SECURE_BOOT) += hab.o obj-$(CONFIG_SYSCOUNTER_TIMER) += syscounter.o endif diff --git a/arch/arm/mach-imx/imx_bootaux.c b/arch/arm/mach-imx/imx_bootaux.c index 69026df763..b62dfbf6bf 100644 --- a/arch/arm/mach-imx/imx_bootaux.c +++ b/arch/arm/mach-imx/imx_bootaux.c @@ -6,27 +6,22 @@ #include #include +#include /* Allow for arch specific config before we boot */ -static int __arch_auxiliary_core_up(u32 core_id, u32 boot_private_data) +int __weak arch_auxiliary_core_up(u32 core_id, u32 boot_private_data) { /* please define platform specific arch_auxiliary_core_up() */ return CMD_RET_FAILURE; } -int arch_auxiliary_core_up(u32 core_id, u32 boot_private_data) - __attribute__((weak, alias("__arch_auxiliary_core_up"))); - /* Allow for arch specific config before we boot */ -static int __arch_auxiliary_core_check_up(u32 core_id) +int __weak arch_auxiliary_core_check_up(u32 core_id) { /* please define platform specific arch_auxiliary_core_check_up() */ return 0; } -int arch_auxiliary_core_check_up(u32 core_id) - __attribute__((weak, alias("__arch_auxiliary_core_check_up"))); - /* * To i.MX6SX and i.MX7D, the image supported by bootaux needs * the reset vector at the head for the image, with SP and PC @@ -40,7 +35,7 @@ int arch_auxiliary_core_check_up(u32 core_id) * The TCMUL is mapped to (M4_BOOTROM_BASE_ADDR) at A core side for * accessing the M4 TCMUL. */ -int do_bootaux(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) +static int do_bootaux(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) { ulong addr; int ret, up; diff --git a/arch/arm/mach-imx/mx5/clock.c b/arch/arm/mach-imx/mx5/clock.c index 610098c175..284f6d4cde 100644 --- a/arch/arm/mach-imx/mx5/clock.c +++ b/arch/arm/mach-imx/mx5/clock.c @@ -911,10 +911,11 @@ void mxc_set_sata_internal_clock(void) } #endif +#ifndef CONFIG_SPL_BUILD /* * Dump some core clockes. */ -int do_mx5_showclocks(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) +static int do_mx5_showclocks(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) { u32 freq; @@ -947,3 +948,4 @@ U_BOOT_CMD( "display clocks", "" ); +#endif diff --git a/arch/arm/mach-imx/mx7/clock.c b/arch/arm/mach-imx/mx7/clock.c index 8150faa1a3..c11042d6f5 100644 --- a/arch/arm/mach-imx/mx7/clock.c +++ b/arch/arm/mach-imx/mx7/clock.c @@ -1096,6 +1096,7 @@ void epdc_clock_disable(void) } #endif +#ifndef CONFIG_SPL_BUILD /* * Dump some core clockes. */ @@ -1131,3 +1132,4 @@ U_BOOT_CMD( "display clocks", "" ); +#endif diff --git a/arch/arm/mach-imx/mx7ulp/clock.c b/arch/arm/mach-imx/mx7ulp/clock.c index 77b282addd..553d62149d 100644 --- a/arch/arm/mach-imx/mx7ulp/clock.c +++ b/arch/arm/mach-imx/mx7ulp/clock.c @@ -323,6 +323,7 @@ void hab_caam_clock_enable(unsigned char enable) } #endif +#ifndef CONFIG_SPL_BUILD /* * Dump some core clockes. */ @@ -363,3 +364,4 @@ U_BOOT_CMD( "display clocks", "" ); +#endif