From patchwork Wed Oct 3 10:44:07 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rajesh Bhagat X-Patchwork-Id: 978166 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; dmarc=fail (p=none dis=none) header.from=nxp.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=nxp.com header.i=@nxp.com header.b="rn4xJS4N"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 42QCP64ZvRz9s8J for ; Wed, 3 Oct 2018 20:46:18 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 4F3D9C220CC; Wed, 3 Oct 2018 10:45:57 +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.2 required=5.0 tests=BAD_ENC_HEADER, SPF_HELO_PASS, T_DKIM_INVALID, UPPERCASE_75_100 autolearn=no autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 99C5FC22095; Wed, 3 Oct 2018 10:45:32 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 2A0B7C21D72; Wed, 3 Oct 2018 10:45:28 +0000 (UTC) Received: from EUR02-AM5-obe.outbound.protection.outlook.com (mail-eopbgr00082.outbound.protection.outlook.com [40.107.0.82]) by lists.denx.de (Postfix) with ESMTPS id 0165BC22063 for ; Wed, 3 Oct 2018 10:45:23 +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:X-MS-Exchange-SenderADCheck; bh=JubCB4HHgQi0qdOs/Z14UvtyQSGRw6pqaCHEgiz38+w=; b=rn4xJS4N76nixQLjV3JrfgX4W9v4kFHivwkuHkNkFaBXiJiLUEluERAdxuxtXsY/dZc8b/U1bOodlajEENt6r8bWSvVoC78XmlMQAT/RxQAltMHmNdX/q8dKLnQCYJ60zYXNWPNjwdjnz+mDX2J8pO/jIHoQ+cO41AJxKUBBJnY= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=rajesh.bhagat@nxp.com; Received: from phoenix7.ap.freescale.net (14.143.30.134) by AM0PR04MB4849.eurprd04.prod.outlook.com (2603:10a6:208:c4::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1185.24; Wed, 3 Oct 2018 10:45:20 +0000 From: Rajesh Bhagat To: u-boot@lists.denx.de Date: Wed, 3 Oct 2018 16:14:07 +0530 Message-Id: <20181003104459.5444-2-rajesh.bhagat@nxp.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181003104459.5444-1-rajesh.bhagat@nxp.com> References: <20181003104459.5444-1-rajesh.bhagat@nxp.com> MIME-Version: 1.0 X-Originating-IP: [14.143.30.134] X-ClientProxiedBy: TY2PR02CA0011.apcprd02.prod.outlook.com (2603:1096:404:56::23) To AM0PR04MB4849.eurprd04.prod.outlook.com (2603:10a6:208:c4::26) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 90957c93-f41e-41d5-7c60-08d6291d51f1 X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989299)(4534185)(7168020)(4627221)(201703031133081)(201702281549075)(8990200)(5600074)(711020)(4618075)(2017052603328)(7153060)(7193020); SRVR:AM0PR04MB4849; X-Microsoft-Exchange-Diagnostics: 1; AM0PR04MB4849; 3:1KNC8u22J6s4nn6SeNoTO5gsN/BWJVd5H8TNu3W3l2GTUJAi0z2j2quP1T5Il1yTPlBVhPpT+m6kRiy4fAxwAKD5ql1T3eUaKo9krJV9iKnK0SVjyujoyMvIcgicjP8VTtn3N1SR6sozRhwuL9Q1Kv15N4wA2bsExybHDd7JRFBsXh0xhHrJaYhmaJ34necVmu8qF3F5DjowRr3H2uvyTfFX7R5oqqxpkN1trlCSa/E+dXumg9mI85zUHA8ioOOX; 25:obvL7wgdyuCX+NeaWihVAEZKGvhJvjybEtf5k+EoDXhuI1tqtyEorbOWZIF0l0x3j3U1z8iBsjiLDlQ+H9RemS+JaQTxwK4LpnxOZz6T0ZbzMnIU3RfhYipNjFIWSZvm9g5clUdybpI+pVlVPUktSfiKEg7S4RPypM17ANOQ0HTmL/6z9nEHGiRCaSbR5DX1CRyPKYImUlBnN/kg+kjHAwwMxzX4VlkrCI76PHQ5KLjevnppz2ttzMc3fTPWK3nVd4pc3YTfLl4SolzHZU91SSgOIJQP3L75XK9gx96ao7hPGn2De9SDlfryo+wQBPRbTiTxiePQ7X7m6NaQOVIY/A==; 31:/9x2irNb5lFnOyj72Vvx5L70X0cgyKC0BoAS0zwWVh/p6rUxusAZqXPLieqjdab3sm76Y5Ac3P6iJqDlPO7iStt1MuROwbCzBjoFLIqNYCHJfBN5Oj85cyCPDvDoVuBOEuSfRhEYcCc3eKAnsLj+KR2WgjvKkrElBtLdE5aSfeEaIdwM+CBskS8BLA7ppdXPpK/By5uCpWmBvOssnKscZdh2NA5/NF/r7fidGuhcvEU= X-MS-TrafficTypeDiagnostic: AM0PR04MB4849: X-Microsoft-Exchange-Diagnostics: 1; AM0PR04MB4849; 20:jaPc7SQINRCNhwbRttjW5VZivz9Xm4lODPnnVj/5rs1A7xxR8Itc9gjGXF4OV5Yd4sJ4VYAdTKCZF9gwAtYOy31Djs0/hElz5r2aVemh5tVa7qXU0JPb012bn7cfDsUXHMypzcEJNYBTUL5F9Vc7NsW6NMHyCIW98xtcKx06e572bpH0eal1Pt06wYH1HKyUgSnmPzWEXZ0qf+5vvXudFQDhH3QeLX+BBp5MPrdSHoPEE5wgGovzOSxQfooTHjPR6pqHyWpQSHJtlb2IrbLv/Ms6d+ND5BJ8PutdG1qeEV6nHsJC5X19zY5/RxkeRwkEXnuCgl4Ongsd99UR7RhjNu2tipvIej+QNrxj3xMANKHgFMuW8JEXioiG9p99HIm4pR/1+5Esw4aNA8kuTAKblATnJg8WecxXMsUEk95yrji/zWNPuzC4/yi1jHe+X6dYCwY8to9XDMOTuy7f1tMrmVGy/2Yhf2k88TM7N2WjPu4juynwxGEK5u1zcfIbAzCj; 4:zMOrlPzIswfAegHSl4eDdWmVmT4eh2pWT1juJ9lsVaIiwWUr1pcVwoY2KHAxMo/J7GvzX6cr+opzSROg4CogPKqPkE8Bk3n/3Z+ziN9cboIjh7Gq8xxhEZ4f1Yy3QhYVAGw12bzEc/wT4cCWPE/MiYm6C9KdQLgMhwi5Sd/eCDJwnVLo41VdWbJyy4ci9aZQiFeLGTaBU8p1kYnB6otKNKIbaHUV3VTlZh1pI/NSLJKjpVFhfxAWS2ZCePk04yEUKmS5nAlCh2T+4+OPe6/1im7Kgx0l7xK51q6R8iex/rm8xr4LxSfbhzJp+fzuJJr/MTk9fgp/F9lDJzRRfIxQ3JdkLN7xcBrfbOxrS9sZhSk= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(185117386973197)(275809806118684); X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(5005006)(8121501046)(3002001)(3231355)(944501410)(52105095)(10201501046)(93006095)(93001095)(6055026)(149066)(150057)(6041310)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123562045)(20161123564045)(20161123558120)(201708071742011)(7699051); SRVR:AM0PR04MB4849; BCL:0; PCL:0; RULEID:; SRVR:AM0PR04MB4849; X-Forefront-PRVS: 0814A2C7A3 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(346002)(376002)(366004)(136003)(39860400002)(396003)(189003)(199004)(66066001)(50226002)(97736004)(7736002)(50466002)(55236004)(6666003)(14444005)(6506007)(386003)(16526019)(53936002)(26005)(68736007)(6486002)(186003)(47776003)(8936002)(8676002)(81156014)(476003)(81166006)(5009440100003)(4744004)(4326008)(16586007)(36756003)(5660300001)(86362001)(575784001)(2906002)(1076002)(2361001)(2351001)(478600001)(446003)(3846002)(6116002)(316002)(2616005)(44832011)(305945005)(76176011)(956004)(486006)(48376002)(105586002)(106356001)(51416003)(52116002)(25786009)(11346002)(6512007)(6916009)(110426005); DIR:OUT; SFP:1101; SCL:1; SRVR:AM0PR04MB4849; H:phoenix7.ap.freescale.net; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; Received-SPF: None (protection.outlook.com: nxp.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; AM0PR04MB4849; 23:M07mNrd6qP80VucnmYPg+uWYfCeUnRZYcFmReWpLC?= 4pjJmHABZF+0f+E3i0vTcAqZag+BhA3zMb3nClFY8JvC7sbCmW0jGigJRl2EuspRfY/OqqdB+iPGWAaAp92lct26qol3CHxNGhMKVWp2lYWRvwFBGxk8pR35eWtYKKwgLQqxHcPH9QMDBaD+BuleWl9GSDxnW/T/lo7lSVD5NkyIok+Fsq6NjqDaGxWDWduieJUk6H8U0I/9MjRN2VVbkaFntO+TCBERlLA/odFfZ9wEiY7TSp1JhsCIgoQyPK3evZz8KybnjWCvsHLYwy3ygw3/2Pqc1CoD0a8oAU3PXK54qLMfA88ac91OnhHUGPUFcInnY6bVzlmnuss4dkl1aoPNGbqt+NUlQMAO0cvi8EuckXEhVvt114SH1lIUsA/3bouwVSdQkuGMutVW9PkgWFxRGfWHB5o0TSNMaEoh7HxU8YKsxCkdvit7bgRa+zy6YqsFend6Bejd66pNl1aOsirsiwtPvjUifdHKrgiUqaylN1ZpuwsbK90wiPfTzlToFDFtg0OTiOst0n92NIDCPIMlbrQ11oub9JD4yp1jvtDVCdpJMl3YtyIQfOc11LlX95JAsdrx7VVYFfx23ChLBrUAvSWG5am0yJEsq7DXhRIvOQIymr42mYGu8cg7l+EvMDDCblDWJ6mB3ptL/Vnteoq/NaGD/OJoLQ5WXY/XnK3KkbWYj9oOpyVjFTr4jPDjmTJRwZNE6AAvkFHtJnFWvelOOo0eQZMOAvYhn6DGbEnf9xBJIy2KX7CiZonDvhCBbKLmWUssezF3Il27VxYpnVKo+y+8eXSrYCRN0ZLuLxCrCbd+3g8f2cRj0Uq08f0w+2Fg2yPm9NFsMgrWXLfnIW776Hfmaei06+PA/meI384Dc0CXyIa0VoK6aL7MhjN1D0tw4TSxYW6g9iph3JPSu520wJ7YuqMtPHwkQgV3GgIya1KyQDD0VMMQhlu2Zo4/QAI3AZYZIkvCN8R/WqGlAH5XIzmpD8cK8Gj5YU4nTPQoEyzhi3f2cbXMZhQiIPp+dmESZOdAAxAWDfEGZxQtHGy1w1m90PbugyzH4cJHsqhg9I4EBPcnJZCuc/3IMpPNBfijqpGi2eVlDbKlx/s4M8DXFgJZHsbW8qUiHKIpXcxEAIXP6focxZ1Jx42GRhUJEKxN5x3R3o7lrjeT6w3hlYbWaajKXcVTtRDFdag6Obn+3mW6d3Y4ZrCTE4A2OQpqymy+kAqlkW3rWtc5tv5hGgQexO+0o6DWT6wuti3Op0nkCJVi/u8AblwEgeRDPTP4qnOh2o1CogPHcNiQlttp59Z2/DiaRkQvi6NnIvIKYRYQ/KykRFlB8eIOPEcXPDTJcI= X-Microsoft-Antispam-Message-Info: byjxPqDmK56eWHskQ+fs2oPgqhOl9+RFls+51dXsnEPLESA1vzkCxLPCe2ojxAO5dS7wt75DxkRNJXzLNVvKY3cl/JyHuVjkmulv9PQ7eh52yH/C9hPUbw4byyAkxiWsMqr+gVNzYqEmvVUl7IqHFV8Igy6Owr2p71xQYFcZS5XADXG2n92iaQ60aMXHSAjrCMXtptYSdOuxx8HhPqXyotjGtjV1ntCyyBFaSstVTKanfXhfGs8LtAPUMcUX+Oq1j8f/QaYOeW6qHE6xS+YpscMlTjkop5uxMCRtuaR5MNxkKEBqAaUuzdmVEMQiGWlyysuFAZeVPSx5s1+FGI2ZDmi9HtlxNpi33VTuDwah+pM= X-Microsoft-Exchange-Diagnostics: 1; AM0PR04MB4849; 6:h4wD9jA2I0fE0h5bGfzsQYWblTBVV4GWpiNuzlSas6q4oNqYjmDMHLEgklo95F42YWn6jYU7//uFx9C8vj+580o/DaLStW7s0q3bUkLVVjWp42kCzAmAn769YpiOXp8sIB6U6OxsgrEw2TAMtxxM0XP1au4MBZzUvxwTI1OdU5o5fR5UpEMGpJSafxJIqQI5qYGX5QnY9YMOGpkYpXuvkugVhA897lesEucPY52iR/G0oWRggtTDFQDDVCtjvsV6Ef3KxPyHup1CqRkJwVvFe/dPLzj1yvx/jWp2I5I83VZIod0QaSFa0M287IOkNTEaroWVPnYi+xYQGjvLD7gnXhBDjCms4X1oGDvULaxAVsublZGPkw3yEQDeogL9ddOmw51vMwtW3kKCuF2vsYDi9Cq4PoyARyuOumb+qxrw4QgcsmssnMM8l23jjyoN3Rx110K1llLkRYW2msF5bCTTPg==; 5:c6jc0oC4/2phcsjI8Me3ZImJBjjKtLYi/KRu90wqvzgOohdxbMZfMtGgFWItPN+MLTOAomrPrBnD6GQorJ6jpoVa1tP+cABXQRTHAw56/r+OJCP0jvYXcBfGNUsOUKljzObb5ieQ6PFuWIhJFwdNoaCDOjKfrLxlPNLBwgyUl6g=; 7:gJdPSSXxzSJ/S8VcpvHSOW54Fh8TjB7pkuf2/ursj7gdUw0Tqep2NogTk7N1H7jWpdYqzKyMvswyRQFJpvCANj1D7yIY/bzQC0p97TvVrZOZkLRebKlYCOTAW6NJhLgnA5Wg1aRElsvnTYB7GOVa6Efmw71pslnNvruT/Irj0gHjzxYn4l5/c6btxxMsLsntR2TrPq6D1SdlzTe6vr2k1YIc6F3fAov+CCB4I0nTvzhecXrkYgynkoc54b1XXsMl SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Oct 2018 10:45:20.1728 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 90957c93-f41e-41d5-7c60-08d6291d51f1 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR04MB4849 Subject: [U-Boot] [PATCH 01/53] move data structure out of cpu.h 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: York Sun Move static definitions to cpu.c file, as it doesn't allow the cpu.h file to be included in multiple c files. Signed-off-by: York Sun --- arch/arm/cpu/armv8/fsl-layerscape/cpu.c | 297 +++++++++++++++++ .../arm/include/asm/arch-fsl-layerscape/cpu.h | 300 ------------------ 2 files changed, 297 insertions(+), 300 deletions(-) diff --git a/arch/arm/cpu/armv8/fsl-layerscape/cpu.c b/arch/arm/cpu/armv8/fsl-layerscape/cpu.c index 052e0708d4..bae50f68d8 100644 --- a/arch/arm/cpu/armv8/fsl-layerscape/cpu.c +++ b/arch/arm/cpu/armv8/fsl-layerscape/cpu.c @@ -33,6 +33,303 @@ DECLARE_GLOBAL_DATA_PTR; +static struct cpu_type cpu_type_list[] = { + CPU_TYPE_ENTRY(LS2080A, LS2080A, 8), + CPU_TYPE_ENTRY(LS2085A, LS2085A, 8), + CPU_TYPE_ENTRY(LS2045A, LS2045A, 4), + CPU_TYPE_ENTRY(LS2088A, LS2088A, 8), + CPU_TYPE_ENTRY(LS2084A, LS2084A, 8), + CPU_TYPE_ENTRY(LS2048A, LS2048A, 4), + CPU_TYPE_ENTRY(LS2044A, LS2044A, 4), + CPU_TYPE_ENTRY(LS2081A, LS2081A, 8), + CPU_TYPE_ENTRY(LS2041A, LS2041A, 4), + CPU_TYPE_ENTRY(LS1043A, LS1043A, 4), + CPU_TYPE_ENTRY(LS1023A, LS1023A, 2), + CPU_TYPE_ENTRY(LS1046A, LS1046A, 4), + CPU_TYPE_ENTRY(LS1026A, LS1026A, 2), + CPU_TYPE_ENTRY(LS2040A, LS2040A, 4), + CPU_TYPE_ENTRY(LS1012A, LS1012A, 1), + CPU_TYPE_ENTRY(LS1088A, LS1088A, 8), + CPU_TYPE_ENTRY(LS1084A, LS1084A, 8), + CPU_TYPE_ENTRY(LS1048A, LS1048A, 4), + CPU_TYPE_ENTRY(LS1044A, LS1044A, 4), +}; + +#define EARLY_PGTABLE_SIZE 0x5000 +static struct mm_region early_map[] = { +#ifdef CONFIG_FSL_LSCH3 + { CONFIG_SYS_FSL_CCSR_BASE, CONFIG_SYS_FSL_CCSR_BASE, + CONFIG_SYS_FSL_CCSR_SIZE, + PTE_BLOCK_MEMTYPE(MT_DEVICE_NGNRNE) | + PTE_BLOCK_NON_SHARE | PTE_BLOCK_PXN | PTE_BLOCK_UXN + }, + { CONFIG_SYS_FSL_OCRAM_BASE, CONFIG_SYS_FSL_OCRAM_BASE, + SYS_FSL_OCRAM_SPACE_SIZE, + PTE_BLOCK_MEMTYPE(MT_NORMAL) | PTE_BLOCK_NON_SHARE + }, + { CONFIG_SYS_FSL_QSPI_BASE1, CONFIG_SYS_FSL_QSPI_BASE1, + CONFIG_SYS_FSL_QSPI_SIZE1, + PTE_BLOCK_MEMTYPE(MT_NORMAL) | PTE_BLOCK_NON_SHARE}, +#ifdef CONFIG_FSL_IFC + /* For IFC Region #1, only the first 4MB is cache-enabled */ + { CONFIG_SYS_FSL_IFC_BASE1, CONFIG_SYS_FSL_IFC_BASE1, + CONFIG_SYS_FSL_IFC_SIZE1_1, + PTE_BLOCK_MEMTYPE(MT_NORMAL) | PTE_BLOCK_NON_SHARE + }, + { CONFIG_SYS_FSL_IFC_BASE1 + CONFIG_SYS_FSL_IFC_SIZE1_1, + CONFIG_SYS_FSL_IFC_BASE1 + CONFIG_SYS_FSL_IFC_SIZE1_1, + CONFIG_SYS_FSL_IFC_SIZE1 - CONFIG_SYS_FSL_IFC_SIZE1_1, + PTE_BLOCK_MEMTYPE(MT_DEVICE_NGNRNE) | PTE_BLOCK_NON_SHARE + }, + { CONFIG_SYS_FLASH_BASE, CONFIG_SYS_FSL_IFC_BASE1, + CONFIG_SYS_FSL_IFC_SIZE1, + PTE_BLOCK_MEMTYPE(MT_DEVICE_NGNRNE) | PTE_BLOCK_NON_SHARE + }, +#endif + { CONFIG_SYS_FSL_DRAM_BASE1, CONFIG_SYS_FSL_DRAM_BASE1, + CONFIG_SYS_FSL_DRAM_SIZE1, +#if defined(CONFIG_SPL) && !defined(CONFIG_SPL_BUILD) + PTE_BLOCK_MEMTYPE(MT_NORMAL) | +#else /* Start with nGnRnE and PXN and UXN to prevent speculative access */ + PTE_BLOCK_MEMTYPE(MT_DEVICE_NGNRNE) | PTE_BLOCK_PXN | PTE_BLOCK_UXN | +#endif + PTE_BLOCK_OUTER_SHARE | PTE_BLOCK_NS + }, +#ifdef CONFIG_FSL_IFC + /* Map IFC region #2 up to CONFIG_SYS_FLASH_BASE for NAND boot */ + { CONFIG_SYS_FSL_IFC_BASE2, CONFIG_SYS_FSL_IFC_BASE2, + CONFIG_SYS_FLASH_BASE - CONFIG_SYS_FSL_IFC_BASE2, + PTE_BLOCK_MEMTYPE(MT_DEVICE_NGNRNE) | PTE_BLOCK_NON_SHARE + }, +#endif + { CONFIG_SYS_FSL_DCSR_BASE, CONFIG_SYS_FSL_DCSR_BASE, + CONFIG_SYS_FSL_DCSR_SIZE, + PTE_BLOCK_MEMTYPE(MT_DEVICE_NGNRNE) | + PTE_BLOCK_NON_SHARE | PTE_BLOCK_PXN | PTE_BLOCK_UXN + }, + { CONFIG_SYS_FSL_DRAM_BASE2, CONFIG_SYS_FSL_DRAM_BASE2, + CONFIG_SYS_FSL_DRAM_SIZE2, + PTE_BLOCK_MEMTYPE(MT_DEVICE_NGNRNE) | PTE_BLOCK_PXN | PTE_BLOCK_UXN | + PTE_BLOCK_OUTER_SHARE | PTE_BLOCK_NS + }, +#elif defined(CONFIG_FSL_LSCH2) + { CONFIG_SYS_FSL_CCSR_BASE, CONFIG_SYS_FSL_CCSR_BASE, + CONFIG_SYS_FSL_CCSR_SIZE, + PTE_BLOCK_MEMTYPE(MT_DEVICE_NGNRNE) | + PTE_BLOCK_NON_SHARE | PTE_BLOCK_PXN | PTE_BLOCK_UXN + }, + { CONFIG_SYS_FSL_OCRAM_BASE, CONFIG_SYS_FSL_OCRAM_BASE, + SYS_FSL_OCRAM_SPACE_SIZE, + PTE_BLOCK_MEMTYPE(MT_NORMAL) | PTE_BLOCK_NON_SHARE + }, + { CONFIG_SYS_FSL_DCSR_BASE, CONFIG_SYS_FSL_DCSR_BASE, + CONFIG_SYS_FSL_DCSR_SIZE, + PTE_BLOCK_MEMTYPE(MT_DEVICE_NGNRNE) | + PTE_BLOCK_NON_SHARE | PTE_BLOCK_PXN | PTE_BLOCK_UXN + }, + { CONFIG_SYS_FSL_QSPI_BASE, CONFIG_SYS_FSL_QSPI_BASE, + CONFIG_SYS_FSL_QSPI_SIZE, + PTE_BLOCK_MEMTYPE(MT_DEVICE_NGNRNE) | PTE_BLOCK_NON_SHARE + }, +#ifdef CONFIG_FSL_IFC + { CONFIG_SYS_FSL_IFC_BASE, CONFIG_SYS_FSL_IFC_BASE, + CONFIG_SYS_FSL_IFC_SIZE, + PTE_BLOCK_MEMTYPE(MT_DEVICE_NGNRNE) | PTE_BLOCK_NON_SHARE + }, +#endif + { CONFIG_SYS_FSL_DRAM_BASE1, CONFIG_SYS_FSL_DRAM_BASE1, + CONFIG_SYS_FSL_DRAM_SIZE1, +#if defined(CONFIG_SPL) && !defined(CONFIG_SPL_BUILD) + PTE_BLOCK_MEMTYPE(MT_NORMAL) | +#else /* Start with nGnRnE and PXN and UXN to prevent speculative access */ + PTE_BLOCK_MEMTYPE(MT_DEVICE_NGNRNE) | PTE_BLOCK_PXN | PTE_BLOCK_UXN | +#endif + PTE_BLOCK_OUTER_SHARE | PTE_BLOCK_NS + }, + { CONFIG_SYS_FSL_DRAM_BASE2, CONFIG_SYS_FSL_DRAM_BASE2, + CONFIG_SYS_FSL_DRAM_SIZE2, + PTE_BLOCK_MEMTYPE(MT_DEVICE_NGNRNE) | PTE_BLOCK_PXN | PTE_BLOCK_UXN | + PTE_BLOCK_OUTER_SHARE | PTE_BLOCK_NS + }, +#endif + {}, /* list terminator */ +}; + +static struct mm_region final_map[] = { +#ifdef CONFIG_FSL_LSCH3 + { CONFIG_SYS_FSL_CCSR_BASE, CONFIG_SYS_FSL_CCSR_BASE, + CONFIG_SYS_FSL_CCSR_SIZE, + PTE_BLOCK_MEMTYPE(MT_DEVICE_NGNRNE) | + PTE_BLOCK_NON_SHARE | PTE_BLOCK_PXN | PTE_BLOCK_UXN + }, + { CONFIG_SYS_FSL_OCRAM_BASE, CONFIG_SYS_FSL_OCRAM_BASE, + SYS_FSL_OCRAM_SPACE_SIZE, + PTE_BLOCK_MEMTYPE(MT_NORMAL) | PTE_BLOCK_NON_SHARE + }, + { CONFIG_SYS_FSL_DRAM_BASE1, CONFIG_SYS_FSL_DRAM_BASE1, + CONFIG_SYS_FSL_DRAM_SIZE1, + PTE_BLOCK_MEMTYPE(MT_NORMAL) | + PTE_BLOCK_OUTER_SHARE | PTE_BLOCK_NS + }, + { CONFIG_SYS_FSL_QSPI_BASE1, CONFIG_SYS_FSL_QSPI_BASE1, + CONFIG_SYS_FSL_QSPI_SIZE1, + PTE_BLOCK_MEMTYPE(MT_DEVICE_NGNRNE) | + PTE_BLOCK_NON_SHARE | PTE_BLOCK_PXN | PTE_BLOCK_UXN + }, + { CONFIG_SYS_FSL_QSPI_BASE2, CONFIG_SYS_FSL_QSPI_BASE2, + CONFIG_SYS_FSL_QSPI_SIZE2, + PTE_BLOCK_MEMTYPE(MT_DEVICE_NGNRNE) | + PTE_BLOCK_NON_SHARE | PTE_BLOCK_PXN | PTE_BLOCK_UXN + }, +#ifdef CONFIG_FSL_IFC + { CONFIG_SYS_FSL_IFC_BASE2, CONFIG_SYS_FSL_IFC_BASE2, + CONFIG_SYS_FSL_IFC_SIZE2, + PTE_BLOCK_MEMTYPE(MT_DEVICE_NGNRNE) | + PTE_BLOCK_NON_SHARE | PTE_BLOCK_PXN | PTE_BLOCK_UXN + }, +#endif + { CONFIG_SYS_FSL_DCSR_BASE, CONFIG_SYS_FSL_DCSR_BASE, + CONFIG_SYS_FSL_DCSR_SIZE, + PTE_BLOCK_MEMTYPE(MT_DEVICE_NGNRNE) | + PTE_BLOCK_NON_SHARE | PTE_BLOCK_PXN | PTE_BLOCK_UXN + }, + { CONFIG_SYS_FSL_MC_BASE, CONFIG_SYS_FSL_MC_BASE, + CONFIG_SYS_FSL_MC_SIZE, + PTE_BLOCK_MEMTYPE(MT_DEVICE_NGNRNE) | + PTE_BLOCK_NON_SHARE | PTE_BLOCK_PXN | PTE_BLOCK_UXN + }, + { CONFIG_SYS_FSL_NI_BASE, CONFIG_SYS_FSL_NI_BASE, + CONFIG_SYS_FSL_NI_SIZE, + PTE_BLOCK_MEMTYPE(MT_DEVICE_NGNRNE) | + PTE_BLOCK_NON_SHARE | PTE_BLOCK_PXN | PTE_BLOCK_UXN + }, + /* For QBMAN portal, only the first 64MB is cache-enabled */ + { CONFIG_SYS_FSL_QBMAN_BASE, CONFIG_SYS_FSL_QBMAN_BASE, + CONFIG_SYS_FSL_QBMAN_SIZE_1, + PTE_BLOCK_MEMTYPE(MT_NORMAL) | + PTE_BLOCK_NON_SHARE | PTE_BLOCK_PXN | PTE_BLOCK_UXN | PTE_BLOCK_NS + }, + { CONFIG_SYS_FSL_QBMAN_BASE + CONFIG_SYS_FSL_QBMAN_SIZE_1, + CONFIG_SYS_FSL_QBMAN_BASE + CONFIG_SYS_FSL_QBMAN_SIZE_1, + CONFIG_SYS_FSL_QBMAN_SIZE - CONFIG_SYS_FSL_QBMAN_SIZE_1, + PTE_BLOCK_MEMTYPE(MT_DEVICE_NGNRNE) | + PTE_BLOCK_NON_SHARE | PTE_BLOCK_PXN | PTE_BLOCK_UXN + }, + { CONFIG_SYS_PCIE1_PHYS_ADDR, CONFIG_SYS_PCIE1_PHYS_ADDR, + CONFIG_SYS_PCIE1_PHYS_SIZE, + PTE_BLOCK_MEMTYPE(MT_DEVICE_NGNRNE) | + PTE_BLOCK_NON_SHARE | PTE_BLOCK_PXN | PTE_BLOCK_UXN + }, + { CONFIG_SYS_PCIE2_PHYS_ADDR, CONFIG_SYS_PCIE2_PHYS_ADDR, + CONFIG_SYS_PCIE2_PHYS_SIZE, + PTE_BLOCK_MEMTYPE(MT_DEVICE_NGNRNE) | + PTE_BLOCK_NON_SHARE | PTE_BLOCK_PXN | PTE_BLOCK_UXN + }, + { CONFIG_SYS_PCIE3_PHYS_ADDR, CONFIG_SYS_PCIE3_PHYS_ADDR, + CONFIG_SYS_PCIE3_PHYS_SIZE, + PTE_BLOCK_MEMTYPE(MT_DEVICE_NGNRNE) | + PTE_BLOCK_NON_SHARE | PTE_BLOCK_PXN | PTE_BLOCK_UXN + }, +#ifdef CONFIG_ARCH_LS2080A + { CONFIG_SYS_PCIE4_PHYS_ADDR, CONFIG_SYS_PCIE4_PHYS_ADDR, + CONFIG_SYS_PCIE4_PHYS_SIZE, + PTE_BLOCK_MEMTYPE(MT_DEVICE_NGNRNE) | + PTE_BLOCK_NON_SHARE | PTE_BLOCK_PXN | PTE_BLOCK_UXN + }, +#endif + { CONFIG_SYS_FSL_WRIOP1_BASE, CONFIG_SYS_FSL_WRIOP1_BASE, + CONFIG_SYS_FSL_WRIOP1_SIZE, + PTE_BLOCK_MEMTYPE(MT_DEVICE_NGNRNE) | + PTE_BLOCK_NON_SHARE | PTE_BLOCK_PXN | PTE_BLOCK_UXN + }, + { CONFIG_SYS_FSL_AIOP1_BASE, CONFIG_SYS_FSL_AIOP1_BASE, + CONFIG_SYS_FSL_AIOP1_SIZE, + PTE_BLOCK_MEMTYPE(MT_DEVICE_NGNRNE) | + PTE_BLOCK_NON_SHARE | PTE_BLOCK_PXN | PTE_BLOCK_UXN + }, + { CONFIG_SYS_FSL_PEBUF_BASE, CONFIG_SYS_FSL_PEBUF_BASE, + CONFIG_SYS_FSL_PEBUF_SIZE, + PTE_BLOCK_MEMTYPE(MT_DEVICE_NGNRNE) | + PTE_BLOCK_NON_SHARE | PTE_BLOCK_PXN | PTE_BLOCK_UXN + }, + { CONFIG_SYS_FSL_DRAM_BASE2, CONFIG_SYS_FSL_DRAM_BASE2, + CONFIG_SYS_FSL_DRAM_SIZE2, + PTE_BLOCK_MEMTYPE(MT_NORMAL) | + PTE_BLOCK_OUTER_SHARE | PTE_BLOCK_NS + }, +#elif defined(CONFIG_FSL_LSCH2) + { CONFIG_SYS_FSL_BOOTROM_BASE, CONFIG_SYS_FSL_BOOTROM_BASE, + CONFIG_SYS_FSL_BOOTROM_SIZE, + PTE_BLOCK_MEMTYPE(MT_DEVICE_NGNRNE) | + PTE_BLOCK_NON_SHARE | PTE_BLOCK_PXN | PTE_BLOCK_UXN + }, + { CONFIG_SYS_FSL_CCSR_BASE, CONFIG_SYS_FSL_CCSR_BASE, + CONFIG_SYS_FSL_CCSR_SIZE, + PTE_BLOCK_MEMTYPE(MT_DEVICE_NGNRNE) | + PTE_BLOCK_NON_SHARE | PTE_BLOCK_PXN | PTE_BLOCK_UXN + }, + { CONFIG_SYS_FSL_OCRAM_BASE, CONFIG_SYS_FSL_OCRAM_BASE, + SYS_FSL_OCRAM_SPACE_SIZE, + PTE_BLOCK_MEMTYPE(MT_NORMAL) | PTE_BLOCK_NON_SHARE + }, + { CONFIG_SYS_FSL_DCSR_BASE, CONFIG_SYS_FSL_DCSR_BASE, + CONFIG_SYS_FSL_DCSR_SIZE, + PTE_BLOCK_MEMTYPE(MT_DEVICE_NGNRNE) | + PTE_BLOCK_NON_SHARE | PTE_BLOCK_PXN | PTE_BLOCK_UXN + }, + { CONFIG_SYS_FSL_QSPI_BASE, CONFIG_SYS_FSL_QSPI_BASE, + CONFIG_SYS_FSL_QSPI_SIZE, + PTE_BLOCK_MEMTYPE(MT_DEVICE_NGNRNE) | + PTE_BLOCK_NON_SHARE | PTE_BLOCK_PXN | PTE_BLOCK_UXN + }, +#ifdef CONFIG_FSL_IFC + { CONFIG_SYS_FSL_IFC_BASE, CONFIG_SYS_FSL_IFC_BASE, + CONFIG_SYS_FSL_IFC_SIZE, + PTE_BLOCK_MEMTYPE(MT_DEVICE_NGNRNE) | PTE_BLOCK_NON_SHARE + }, +#endif + { CONFIG_SYS_FSL_DRAM_BASE1, CONFIG_SYS_FSL_DRAM_BASE1, + CONFIG_SYS_FSL_DRAM_SIZE1, + PTE_BLOCK_MEMTYPE(MT_NORMAL) | + PTE_BLOCK_OUTER_SHARE | PTE_BLOCK_NS + }, + { CONFIG_SYS_FSL_QBMAN_BASE, CONFIG_SYS_FSL_QBMAN_BASE, + CONFIG_SYS_FSL_QBMAN_SIZE, + PTE_BLOCK_MEMTYPE(MT_DEVICE_NGNRNE) | + PTE_BLOCK_NON_SHARE | PTE_BLOCK_PXN | PTE_BLOCK_UXN + }, + { CONFIG_SYS_FSL_DRAM_BASE2, CONFIG_SYS_FSL_DRAM_BASE2, + CONFIG_SYS_FSL_DRAM_SIZE2, + PTE_BLOCK_MEMTYPE(MT_NORMAL) | + PTE_BLOCK_OUTER_SHARE | PTE_BLOCK_NS + }, + { CONFIG_SYS_PCIE1_PHYS_ADDR, CONFIG_SYS_PCIE1_PHYS_ADDR, + CONFIG_SYS_PCIE1_PHYS_SIZE, + PTE_BLOCK_MEMTYPE(MT_DEVICE_NGNRNE) | + PTE_BLOCK_NON_SHARE | PTE_BLOCK_PXN | PTE_BLOCK_UXN + }, + { CONFIG_SYS_PCIE2_PHYS_ADDR, CONFIG_SYS_PCIE2_PHYS_ADDR, + CONFIG_SYS_PCIE2_PHYS_SIZE, + PTE_BLOCK_MEMTYPE(MT_DEVICE_NGNRNE) | + PTE_BLOCK_NON_SHARE | PTE_BLOCK_PXN | PTE_BLOCK_UXN + }, + { CONFIG_SYS_PCIE3_PHYS_ADDR, CONFIG_SYS_PCIE3_PHYS_ADDR, + CONFIG_SYS_PCIE3_PHYS_SIZE, + PTE_BLOCK_MEMTYPE(MT_DEVICE_NGNRNE) | + PTE_BLOCK_NON_SHARE | PTE_BLOCK_PXN | PTE_BLOCK_UXN + }, + { CONFIG_SYS_FSL_DRAM_BASE3, CONFIG_SYS_FSL_DRAM_BASE3, + CONFIG_SYS_FSL_DRAM_SIZE3, + PTE_BLOCK_MEMTYPE(MT_NORMAL) | + PTE_BLOCK_OUTER_SHARE | PTE_BLOCK_NS + }, +#endif +#ifdef CONFIG_SYS_MEM_RESERVE_SECURE + {}, /* space holder for secure mem */ +#endif + {}, +}; + struct mm_region *mem_map = early_map; void cpu_name(char *name) diff --git a/arch/arm/include/asm/arch-fsl-layerscape/cpu.h b/arch/arm/include/asm/arch-fsl-layerscape/cpu.h index 48d0ab163a..3926aa3039 100644 --- a/arch/arm/include/asm/arch-fsl-layerscape/cpu.h +++ b/arch/arm/include/asm/arch-fsl-layerscape/cpu.h @@ -7,30 +7,6 @@ #ifndef _FSL_LAYERSCAPE_CPU_H #define _FSL_LAYERSCAPE_CPU_H -static struct cpu_type cpu_type_list[] = { - CPU_TYPE_ENTRY(LS2080A, LS2080A, 8), - CPU_TYPE_ENTRY(LS2085A, LS2085A, 8), - CPU_TYPE_ENTRY(LS2045A, LS2045A, 4), - CPU_TYPE_ENTRY(LS2088A, LS2088A, 8), - CPU_TYPE_ENTRY(LS2084A, LS2084A, 8), - CPU_TYPE_ENTRY(LS2048A, LS2048A, 4), - CPU_TYPE_ENTRY(LS2044A, LS2044A, 4), - CPU_TYPE_ENTRY(LS2081A, LS2081A, 8), - CPU_TYPE_ENTRY(LS2041A, LS2041A, 4), - CPU_TYPE_ENTRY(LS1043A, LS1043A, 4), - CPU_TYPE_ENTRY(LS1023A, LS1023A, 2), - CPU_TYPE_ENTRY(LS1046A, LS1046A, 4), - CPU_TYPE_ENTRY(LS1026A, LS1026A, 2), - CPU_TYPE_ENTRY(LS2040A, LS2040A, 4), - CPU_TYPE_ENTRY(LS1012A, LS1012A, 1), - CPU_TYPE_ENTRY(LS1088A, LS1088A, 8), - CPU_TYPE_ENTRY(LS1084A, LS1084A, 8), - CPU_TYPE_ENTRY(LS1048A, LS1048A, 4), - CPU_TYPE_ENTRY(LS1044A, LS1044A, 4), -}; - -#ifndef CONFIG_SYS_DCACHE_OFF - #ifdef CONFIG_FSL_LSCH3 #define CONFIG_SYS_FSL_CCSR_BASE 0x00000000 #define CONFIG_SYS_FSL_CCSR_SIZE 0x10000000 @@ -90,282 +66,6 @@ static struct cpu_type cpu_type_list[] = { #define CONFIG_SYS_FSL_DRAM_SIZE3 0x7800000000 /* 480GB */ #endif -#define EARLY_PGTABLE_SIZE 0x5000 -static struct mm_region early_map[] = { -#ifdef CONFIG_FSL_LSCH3 - { CONFIG_SYS_FSL_CCSR_BASE, CONFIG_SYS_FSL_CCSR_BASE, - CONFIG_SYS_FSL_CCSR_SIZE, - PTE_BLOCK_MEMTYPE(MT_DEVICE_NGNRNE) | - PTE_BLOCK_NON_SHARE | PTE_BLOCK_PXN | PTE_BLOCK_UXN - }, - { CONFIG_SYS_FSL_OCRAM_BASE, CONFIG_SYS_FSL_OCRAM_BASE, - SYS_FSL_OCRAM_SPACE_SIZE, - PTE_BLOCK_MEMTYPE(MT_NORMAL) | PTE_BLOCK_NON_SHARE - }, - { CONFIG_SYS_FSL_QSPI_BASE1, CONFIG_SYS_FSL_QSPI_BASE1, - CONFIG_SYS_FSL_QSPI_SIZE1, - PTE_BLOCK_MEMTYPE(MT_NORMAL) | PTE_BLOCK_NON_SHARE}, -#ifdef CONFIG_FSL_IFC - /* For IFC Region #1, only the first 4MB is cache-enabled */ - { CONFIG_SYS_FSL_IFC_BASE1, CONFIG_SYS_FSL_IFC_BASE1, - CONFIG_SYS_FSL_IFC_SIZE1_1, - PTE_BLOCK_MEMTYPE(MT_NORMAL) | PTE_BLOCK_NON_SHARE - }, - { CONFIG_SYS_FSL_IFC_BASE1 + CONFIG_SYS_FSL_IFC_SIZE1_1, - CONFIG_SYS_FSL_IFC_BASE1 + CONFIG_SYS_FSL_IFC_SIZE1_1, - CONFIG_SYS_FSL_IFC_SIZE1 - CONFIG_SYS_FSL_IFC_SIZE1_1, - PTE_BLOCK_MEMTYPE(MT_DEVICE_NGNRNE) | PTE_BLOCK_NON_SHARE - }, - { CONFIG_SYS_FLASH_BASE, CONFIG_SYS_FSL_IFC_BASE1, - CONFIG_SYS_FSL_IFC_SIZE1, - PTE_BLOCK_MEMTYPE(MT_DEVICE_NGNRNE) | PTE_BLOCK_NON_SHARE - }, -#endif - { CONFIG_SYS_FSL_DRAM_BASE1, CONFIG_SYS_FSL_DRAM_BASE1, - CONFIG_SYS_FSL_DRAM_SIZE1, -#if defined(CONFIG_SPL) && !defined(CONFIG_SPL_BUILD) - PTE_BLOCK_MEMTYPE(MT_NORMAL) | -#else /* Start with nGnRnE and PXN and UXN to prevent speculative access */ - PTE_BLOCK_MEMTYPE(MT_DEVICE_NGNRNE) | PTE_BLOCK_PXN | PTE_BLOCK_UXN | -#endif - PTE_BLOCK_OUTER_SHARE | PTE_BLOCK_NS - }, -#ifdef CONFIG_FSL_IFC - /* Map IFC region #2 up to CONFIG_SYS_FLASH_BASE for NAND boot */ - { CONFIG_SYS_FSL_IFC_BASE2, CONFIG_SYS_FSL_IFC_BASE2, - CONFIG_SYS_FLASH_BASE - CONFIG_SYS_FSL_IFC_BASE2, - PTE_BLOCK_MEMTYPE(MT_DEVICE_NGNRNE) | PTE_BLOCK_NON_SHARE - }, -#endif - { CONFIG_SYS_FSL_DCSR_BASE, CONFIG_SYS_FSL_DCSR_BASE, - CONFIG_SYS_FSL_DCSR_SIZE, - PTE_BLOCK_MEMTYPE(MT_DEVICE_NGNRNE) | - PTE_BLOCK_NON_SHARE | PTE_BLOCK_PXN | PTE_BLOCK_UXN - }, - { CONFIG_SYS_FSL_DRAM_BASE2, CONFIG_SYS_FSL_DRAM_BASE2, - CONFIG_SYS_FSL_DRAM_SIZE2, - PTE_BLOCK_MEMTYPE(MT_DEVICE_NGNRNE) | PTE_BLOCK_PXN | PTE_BLOCK_UXN | - PTE_BLOCK_OUTER_SHARE | PTE_BLOCK_NS - }, -#elif defined(CONFIG_FSL_LSCH2) - { CONFIG_SYS_FSL_CCSR_BASE, CONFIG_SYS_FSL_CCSR_BASE, - CONFIG_SYS_FSL_CCSR_SIZE, - PTE_BLOCK_MEMTYPE(MT_DEVICE_NGNRNE) | - PTE_BLOCK_NON_SHARE | PTE_BLOCK_PXN | PTE_BLOCK_UXN - }, - { CONFIG_SYS_FSL_OCRAM_BASE, CONFIG_SYS_FSL_OCRAM_BASE, - SYS_FSL_OCRAM_SPACE_SIZE, - PTE_BLOCK_MEMTYPE(MT_NORMAL) | PTE_BLOCK_NON_SHARE - }, - { CONFIG_SYS_FSL_DCSR_BASE, CONFIG_SYS_FSL_DCSR_BASE, - CONFIG_SYS_FSL_DCSR_SIZE, - PTE_BLOCK_MEMTYPE(MT_DEVICE_NGNRNE) | - PTE_BLOCK_NON_SHARE | PTE_BLOCK_PXN | PTE_BLOCK_UXN - }, - { CONFIG_SYS_FSL_QSPI_BASE, CONFIG_SYS_FSL_QSPI_BASE, - CONFIG_SYS_FSL_QSPI_SIZE, - PTE_BLOCK_MEMTYPE(MT_DEVICE_NGNRNE) | PTE_BLOCK_NON_SHARE - }, -#ifdef CONFIG_FSL_IFC - { CONFIG_SYS_FSL_IFC_BASE, CONFIG_SYS_FSL_IFC_BASE, - CONFIG_SYS_FSL_IFC_SIZE, - PTE_BLOCK_MEMTYPE(MT_DEVICE_NGNRNE) | PTE_BLOCK_NON_SHARE - }, -#endif - { CONFIG_SYS_FSL_DRAM_BASE1, CONFIG_SYS_FSL_DRAM_BASE1, - CONFIG_SYS_FSL_DRAM_SIZE1, -#if defined(CONFIG_SPL) && !defined(CONFIG_SPL_BUILD) - PTE_BLOCK_MEMTYPE(MT_NORMAL) | -#else /* Start with nGnRnE and PXN and UXN to prevent speculative access */ - PTE_BLOCK_MEMTYPE(MT_DEVICE_NGNRNE) | PTE_BLOCK_PXN | PTE_BLOCK_UXN | -#endif - PTE_BLOCK_OUTER_SHARE | PTE_BLOCK_NS - }, - { CONFIG_SYS_FSL_DRAM_BASE2, CONFIG_SYS_FSL_DRAM_BASE2, - CONFIG_SYS_FSL_DRAM_SIZE2, - PTE_BLOCK_MEMTYPE(MT_DEVICE_NGNRNE) | PTE_BLOCK_PXN | PTE_BLOCK_UXN | - PTE_BLOCK_OUTER_SHARE | PTE_BLOCK_NS - }, -#endif - {}, /* list terminator */ -}; - -static struct mm_region final_map[] = { -#ifdef CONFIG_FSL_LSCH3 - { CONFIG_SYS_FSL_CCSR_BASE, CONFIG_SYS_FSL_CCSR_BASE, - CONFIG_SYS_FSL_CCSR_SIZE, - PTE_BLOCK_MEMTYPE(MT_DEVICE_NGNRNE) | - PTE_BLOCK_NON_SHARE | PTE_BLOCK_PXN | PTE_BLOCK_UXN - }, - { CONFIG_SYS_FSL_OCRAM_BASE, CONFIG_SYS_FSL_OCRAM_BASE, - SYS_FSL_OCRAM_SPACE_SIZE, - PTE_BLOCK_MEMTYPE(MT_NORMAL) | PTE_BLOCK_NON_SHARE - }, - { CONFIG_SYS_FSL_DRAM_BASE1, CONFIG_SYS_FSL_DRAM_BASE1, - CONFIG_SYS_FSL_DRAM_SIZE1, - PTE_BLOCK_MEMTYPE(MT_NORMAL) | - PTE_BLOCK_OUTER_SHARE | PTE_BLOCK_NS - }, - { CONFIG_SYS_FSL_QSPI_BASE1, CONFIG_SYS_FSL_QSPI_BASE1, - CONFIG_SYS_FSL_QSPI_SIZE1, - PTE_BLOCK_MEMTYPE(MT_DEVICE_NGNRNE) | - PTE_BLOCK_NON_SHARE | PTE_BLOCK_PXN | PTE_BLOCK_UXN - }, - { CONFIG_SYS_FSL_QSPI_BASE2, CONFIG_SYS_FSL_QSPI_BASE2, - CONFIG_SYS_FSL_QSPI_SIZE2, - PTE_BLOCK_MEMTYPE(MT_DEVICE_NGNRNE) | - PTE_BLOCK_NON_SHARE | PTE_BLOCK_PXN | PTE_BLOCK_UXN - }, -#ifdef CONFIG_FSL_IFC - { CONFIG_SYS_FSL_IFC_BASE2, CONFIG_SYS_FSL_IFC_BASE2, - CONFIG_SYS_FSL_IFC_SIZE2, - PTE_BLOCK_MEMTYPE(MT_DEVICE_NGNRNE) | - PTE_BLOCK_NON_SHARE | PTE_BLOCK_PXN | PTE_BLOCK_UXN - }, -#endif - { CONFIG_SYS_FSL_DCSR_BASE, CONFIG_SYS_FSL_DCSR_BASE, - CONFIG_SYS_FSL_DCSR_SIZE, - PTE_BLOCK_MEMTYPE(MT_DEVICE_NGNRNE) | - PTE_BLOCK_NON_SHARE | PTE_BLOCK_PXN | PTE_BLOCK_UXN - }, - { CONFIG_SYS_FSL_MC_BASE, CONFIG_SYS_FSL_MC_BASE, - CONFIG_SYS_FSL_MC_SIZE, - PTE_BLOCK_MEMTYPE(MT_DEVICE_NGNRNE) | - PTE_BLOCK_NON_SHARE | PTE_BLOCK_PXN | PTE_BLOCK_UXN - }, - { CONFIG_SYS_FSL_NI_BASE, CONFIG_SYS_FSL_NI_BASE, - CONFIG_SYS_FSL_NI_SIZE, - PTE_BLOCK_MEMTYPE(MT_DEVICE_NGNRNE) | - PTE_BLOCK_NON_SHARE | PTE_BLOCK_PXN | PTE_BLOCK_UXN - }, - /* For QBMAN portal, only the first 64MB is cache-enabled */ - { CONFIG_SYS_FSL_QBMAN_BASE, CONFIG_SYS_FSL_QBMAN_BASE, - CONFIG_SYS_FSL_QBMAN_SIZE_1, - PTE_BLOCK_MEMTYPE(MT_NORMAL) | - PTE_BLOCK_NON_SHARE | PTE_BLOCK_PXN | PTE_BLOCK_UXN | PTE_BLOCK_NS - }, - { CONFIG_SYS_FSL_QBMAN_BASE + CONFIG_SYS_FSL_QBMAN_SIZE_1, - CONFIG_SYS_FSL_QBMAN_BASE + CONFIG_SYS_FSL_QBMAN_SIZE_1, - CONFIG_SYS_FSL_QBMAN_SIZE - CONFIG_SYS_FSL_QBMAN_SIZE_1, - PTE_BLOCK_MEMTYPE(MT_DEVICE_NGNRNE) | - PTE_BLOCK_NON_SHARE | PTE_BLOCK_PXN | PTE_BLOCK_UXN - }, - { CONFIG_SYS_PCIE1_PHYS_ADDR, CONFIG_SYS_PCIE1_PHYS_ADDR, - CONFIG_SYS_PCIE1_PHYS_SIZE, - PTE_BLOCK_MEMTYPE(MT_DEVICE_NGNRNE) | - PTE_BLOCK_NON_SHARE | PTE_BLOCK_PXN | PTE_BLOCK_UXN - }, - { CONFIG_SYS_PCIE2_PHYS_ADDR, CONFIG_SYS_PCIE2_PHYS_ADDR, - CONFIG_SYS_PCIE2_PHYS_SIZE, - PTE_BLOCK_MEMTYPE(MT_DEVICE_NGNRNE) | - PTE_BLOCK_NON_SHARE | PTE_BLOCK_PXN | PTE_BLOCK_UXN - }, - { CONFIG_SYS_PCIE3_PHYS_ADDR, CONFIG_SYS_PCIE3_PHYS_ADDR, - CONFIG_SYS_PCIE3_PHYS_SIZE, - PTE_BLOCK_MEMTYPE(MT_DEVICE_NGNRNE) | - PTE_BLOCK_NON_SHARE | PTE_BLOCK_PXN | PTE_BLOCK_UXN - }, -#ifdef CONFIG_ARCH_LS2080A - { CONFIG_SYS_PCIE4_PHYS_ADDR, CONFIG_SYS_PCIE4_PHYS_ADDR, - CONFIG_SYS_PCIE4_PHYS_SIZE, - PTE_BLOCK_MEMTYPE(MT_DEVICE_NGNRNE) | - PTE_BLOCK_NON_SHARE | PTE_BLOCK_PXN | PTE_BLOCK_UXN - }, -#endif - { CONFIG_SYS_FSL_WRIOP1_BASE, CONFIG_SYS_FSL_WRIOP1_BASE, - CONFIG_SYS_FSL_WRIOP1_SIZE, - PTE_BLOCK_MEMTYPE(MT_DEVICE_NGNRNE) | - PTE_BLOCK_NON_SHARE | PTE_BLOCK_PXN | PTE_BLOCK_UXN - }, - { CONFIG_SYS_FSL_AIOP1_BASE, CONFIG_SYS_FSL_AIOP1_BASE, - CONFIG_SYS_FSL_AIOP1_SIZE, - PTE_BLOCK_MEMTYPE(MT_DEVICE_NGNRNE) | - PTE_BLOCK_NON_SHARE | PTE_BLOCK_PXN | PTE_BLOCK_UXN - }, - { CONFIG_SYS_FSL_PEBUF_BASE, CONFIG_SYS_FSL_PEBUF_BASE, - CONFIG_SYS_FSL_PEBUF_SIZE, - PTE_BLOCK_MEMTYPE(MT_DEVICE_NGNRNE) | - PTE_BLOCK_NON_SHARE | PTE_BLOCK_PXN | PTE_BLOCK_UXN - }, - { CONFIG_SYS_FSL_DRAM_BASE2, CONFIG_SYS_FSL_DRAM_BASE2, - CONFIG_SYS_FSL_DRAM_SIZE2, - PTE_BLOCK_MEMTYPE(MT_NORMAL) | - PTE_BLOCK_OUTER_SHARE | PTE_BLOCK_NS - }, -#elif defined(CONFIG_FSL_LSCH2) - { CONFIG_SYS_FSL_BOOTROM_BASE, CONFIG_SYS_FSL_BOOTROM_BASE, - CONFIG_SYS_FSL_BOOTROM_SIZE, - PTE_BLOCK_MEMTYPE(MT_DEVICE_NGNRNE) | - PTE_BLOCK_NON_SHARE | PTE_BLOCK_PXN | PTE_BLOCK_UXN - }, - { CONFIG_SYS_FSL_CCSR_BASE, CONFIG_SYS_FSL_CCSR_BASE, - CONFIG_SYS_FSL_CCSR_SIZE, - PTE_BLOCK_MEMTYPE(MT_DEVICE_NGNRNE) | - PTE_BLOCK_NON_SHARE | PTE_BLOCK_PXN | PTE_BLOCK_UXN - }, - { CONFIG_SYS_FSL_OCRAM_BASE, CONFIG_SYS_FSL_OCRAM_BASE, - SYS_FSL_OCRAM_SPACE_SIZE, - PTE_BLOCK_MEMTYPE(MT_NORMAL) | PTE_BLOCK_NON_SHARE - }, - { CONFIG_SYS_FSL_DCSR_BASE, CONFIG_SYS_FSL_DCSR_BASE, - CONFIG_SYS_FSL_DCSR_SIZE, - PTE_BLOCK_MEMTYPE(MT_DEVICE_NGNRNE) | - PTE_BLOCK_NON_SHARE | PTE_BLOCK_PXN | PTE_BLOCK_UXN - }, - { CONFIG_SYS_FSL_QSPI_BASE, CONFIG_SYS_FSL_QSPI_BASE, - CONFIG_SYS_FSL_QSPI_SIZE, - PTE_BLOCK_MEMTYPE(MT_DEVICE_NGNRNE) | - PTE_BLOCK_NON_SHARE | PTE_BLOCK_PXN | PTE_BLOCK_UXN - }, -#ifdef CONFIG_FSL_IFC - { CONFIG_SYS_FSL_IFC_BASE, CONFIG_SYS_FSL_IFC_BASE, - CONFIG_SYS_FSL_IFC_SIZE, - PTE_BLOCK_MEMTYPE(MT_DEVICE_NGNRNE) | PTE_BLOCK_NON_SHARE - }, -#endif - { CONFIG_SYS_FSL_DRAM_BASE1, CONFIG_SYS_FSL_DRAM_BASE1, - CONFIG_SYS_FSL_DRAM_SIZE1, - PTE_BLOCK_MEMTYPE(MT_NORMAL) | - PTE_BLOCK_OUTER_SHARE | PTE_BLOCK_NS - }, - { CONFIG_SYS_FSL_QBMAN_BASE, CONFIG_SYS_FSL_QBMAN_BASE, - CONFIG_SYS_FSL_QBMAN_SIZE, - PTE_BLOCK_MEMTYPE(MT_DEVICE_NGNRNE) | - PTE_BLOCK_NON_SHARE | PTE_BLOCK_PXN | PTE_BLOCK_UXN - }, - { CONFIG_SYS_FSL_DRAM_BASE2, CONFIG_SYS_FSL_DRAM_BASE2, - CONFIG_SYS_FSL_DRAM_SIZE2, - PTE_BLOCK_MEMTYPE(MT_NORMAL) | - PTE_BLOCK_OUTER_SHARE | PTE_BLOCK_NS - }, - { CONFIG_SYS_PCIE1_PHYS_ADDR, CONFIG_SYS_PCIE1_PHYS_ADDR, - CONFIG_SYS_PCIE1_PHYS_SIZE, - PTE_BLOCK_MEMTYPE(MT_DEVICE_NGNRNE) | - PTE_BLOCK_NON_SHARE | PTE_BLOCK_PXN | PTE_BLOCK_UXN - }, - { CONFIG_SYS_PCIE2_PHYS_ADDR, CONFIG_SYS_PCIE2_PHYS_ADDR, - CONFIG_SYS_PCIE2_PHYS_SIZE, - PTE_BLOCK_MEMTYPE(MT_DEVICE_NGNRNE) | - PTE_BLOCK_NON_SHARE | PTE_BLOCK_PXN | PTE_BLOCK_UXN - }, - { CONFIG_SYS_PCIE3_PHYS_ADDR, CONFIG_SYS_PCIE3_PHYS_ADDR, - CONFIG_SYS_PCIE3_PHYS_SIZE, - PTE_BLOCK_MEMTYPE(MT_DEVICE_NGNRNE) | - PTE_BLOCK_NON_SHARE | PTE_BLOCK_PXN | PTE_BLOCK_UXN - }, - { CONFIG_SYS_FSL_DRAM_BASE3, CONFIG_SYS_FSL_DRAM_BASE3, - CONFIG_SYS_FSL_DRAM_SIZE3, - PTE_BLOCK_MEMTYPE(MT_NORMAL) | - PTE_BLOCK_OUTER_SHARE | PTE_BLOCK_NS - }, -#endif -#ifdef CONFIG_SYS_MEM_RESERVE_SECURE - {}, /* space holder for secure mem */ -#endif - {}, -}; -#endif /* !CONFIG_SYS_DCACHE_OFF */ - int fsl_qoriq_core_to_cluster(unsigned int core); u32 cpu_mask(void); From patchwork Wed Oct 3 10:44:08 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rajesh Bhagat X-Patchwork-Id: 978171 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; dmarc=fail (p=none dis=none) header.from=nxp.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=nxp.com header.i=@nxp.com header.b="W7wAeBIR"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 42QCWd2Nb9z9s8J for ; Wed, 3 Oct 2018 20:51:57 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id E3847C220B9; Wed, 3 Oct 2018 10:46:59 +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=BAD_ENC_HEADER, 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 AB79CC22071; Wed, 3 Oct 2018 10:45:41 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 8B237C2203D; Wed, 3 Oct 2018 10:45:31 +0000 (UTC) Received: from EUR02-AM5-obe.outbound.protection.outlook.com (mail-eopbgr00060.outbound.protection.outlook.com [40.107.0.60]) by lists.denx.de (Postfix) with ESMTPS id 7C733C22094 for ; Wed, 3 Oct 2018 10:45:26 +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:X-MS-Exchange-SenderADCheck; bh=F/3rpEVEs5mJaWW2jP4IKBwAu20UIt9FqxQgdZN+MJU=; b=W7wAeBIRQb9gzsJz7KarvZrl3qpEII7dK6emdHwvdhHd3zIA3ZB2W3vNcD+ZPR7yx6K7zPnLwxEBx4Fl92UR50nETYqHUiU4IUOJHKqTDmcGtEHQC6VAkZ2pI0LDpsLPZyBppQHabvHCTLwMErammaIUZ9nRyOMCWZfpRA6viCI= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=rajesh.bhagat@nxp.com; Received: from phoenix7.ap.freescale.net (14.143.30.134) by AM0PR04MB4849.eurprd04.prod.outlook.com (2603:10a6:208:c4::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1185.24; Wed, 3 Oct 2018 10:45:23 +0000 From: Rajesh Bhagat To: u-boot@lists.denx.de Date: Wed, 3 Oct 2018 16:14:08 +0530 Message-Id: <20181003104459.5444-3-rajesh.bhagat@nxp.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181003104459.5444-1-rajesh.bhagat@nxp.com> References: <20181003104459.5444-1-rajesh.bhagat@nxp.com> MIME-Version: 1.0 X-Originating-IP: [14.143.30.134] X-ClientProxiedBy: TY2PR02CA0011.apcprd02.prod.outlook.com (2603:1096:404:56::23) To AM0PR04MB4849.eurprd04.prod.outlook.com (2603:10a6:208:c4::26) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: cdd75cb2-fa59-4c0c-25a0-08d6291d53df X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989299)(4534185)(7168020)(4627221)(201703031133081)(201702281549075)(8990200)(5600074)(711020)(4618075)(2017052603328)(7153060)(7193020); SRVR:AM0PR04MB4849; X-Microsoft-Exchange-Diagnostics: 1; AM0PR04MB4849; 3:v4aG4iXLpBGlEEkGmUgTkZT+uC6tFNirq2PjLyt69M58pU1VPCysTr2aHlAvBekxHsFfVCZ4EO8mIgg4mlJLTQqoHG+ciGKUTF4eTWIN8yGyFJQ4dUHrwXNM2i+4ViuBfRT1Xel3NjSvkMn/xht5F8YHPLiJIoOGEWqBZ7/Sybmhf4vNngNfVCkKL8mXeQH0Y8Og092HyiI6AUpQtnpOOIfFBvEL+sPKf5i2eVhblt3oM8iH/gGZ5QQUC9rbr3dP; 25:3h+fqbXjjqC3qoZvqBR7H78WNU2AANOY+1V5XVIZaLd5Pym2AKfaLEEjmuBmY08WtLhxW13bDRGwGhoVostycMhW9qv1EjLtZf/lA5jgKdREQ9j+U9PZKkS5JJOyIo/0po3l52hDjaSN436N1zKuI3qdffi8z6kRBkzUr40/jTiEmzcTVsUZzP7H8JWUDFNP2mKhan3cueSPDpRw4JFVVe/8VwuUoRx+dobPl3SEWoGo2DL9bEtM0GZUI77hun0kdHVFol/zKN3ofL/gFxRBQ7rMs4fQpZhvEr8dR9TYBWrHan3ZntrpSAb7Tl+xZHio6sxf5nyPsOBXHBoSTXjvEg==; 31:HUJASZXWInqfCMWuKdk60K84VX1Q2T6PLfk32L6Qj+4Qg6eHY8yRInvuy0mh+13SNH4rvPfdg9sBht/8jFHAsiLlEY7KiOf6lQKkkN0Gwp6yPZ57X7aUbdgK6D1DV6IWT3CFcCwtxkc+ljJ8/GOaMmX/watG2nFSP0Nv1Cbj+tdJMMIXXOpSwbcG1du48igmByW6VRGAYVgsTRYTVh7nGKnSd4Qtvc8u+uarYhjDAms= X-MS-TrafficTypeDiagnostic: AM0PR04MB4849: X-Microsoft-Exchange-Diagnostics: 1; AM0PR04MB4849; 20:HwFDlpJX1caR12uVTqMVO28l2C/mk+uCKmNY9jhQaP+WcRZNY9hiNi4rwRGvwJZhf9WynRRARs/XtuIDHgouLiL0kkEIbajP0SNLUp+Ord3SV5gXiJ0A6VpnKd2SpMskNZPuMYzfeMt2euz03XCDt+emfc12B+2ZKkeP8UqLRbE+m85yClALxiUYSkqVIuqZvJRrfsoqVbpad/LWO3Xs4E8npCT5Zj3p0WqE0AuOjAwBP8zPYBWPaC+x9ekj8XwGNLYO9twj4Ns7gw8DU84OFyeXX10Fp2/N+zcg8EHloJBEe5UQxqcGAnW83B0AmOEQMu14VGhSLOXIbWze50prQeJvMPMub9YPHiFIY1pWlRURCxIuHfQmIXzdpOAYkfTS6l+6geWNCQh0LB7evIXqL/SZXL9NxA2xTdxj5ykfbhBFdFRogvH2Um7tk/5tAnLMtQrcIefxXKHaLOmrA42AA+FpzZcQjlkxFM1P7CCCTRKNyXj8zafz2DTquVtGIji4; 4:HKqrgC9YVv7mjUi8oL2XRafaZ3XYqLp4pmHUJXbffmckY8zFrTlZD2+OtvzPgw+n13TJs0VL9bIfzKIWgKYTS/EpBua69YiD+b4I/05l+epK1/Rl17jXhtCFVwu2WBkR83O13hIEJxhnP/hEtTFTFgCGyFqcJGrFpZ9x8cj5hJpXRAQxMVeP3Za/pkSQ+JL+WorF+/jvGLe1w9ebiCO/3fHgJqE4LApU/KLBegq8FXMDbVtwvtAeVf7SFci+OljrtYNluzxQWq9CuVLOKUGpFbAo1qlp7LtwpYvTXPIqIahWPIODtQcYM0tP0Wu6Ln7T X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(185117386973197); X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(5005006)(8121501046)(3002001)(3231355)(944501410)(52105095)(10201501046)(93006095)(93001095)(6055026)(149066)(150057)(6041310)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123562045)(20161123564045)(20161123558120)(201708071742011)(7699051); SRVR:AM0PR04MB4849; BCL:0; PCL:0; RULEID:; SRVR:AM0PR04MB4849; X-Forefront-PRVS: 0814A2C7A3 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(346002)(376002)(366004)(136003)(39860400002)(396003)(189003)(199004)(66066001)(50226002)(97736004)(7736002)(50466002)(55236004)(6666003)(6506007)(386003)(16526019)(53936002)(26005)(68736007)(6486002)(186003)(47776003)(8936002)(8676002)(81156014)(476003)(81166006)(5009440100003)(4326008)(16586007)(36756003)(5660300001)(86362001)(2906002)(1076002)(2361001)(2351001)(478600001)(446003)(3846002)(6116002)(316002)(2616005)(44832011)(305945005)(76176011)(956004)(486006)(48376002)(105586002)(106356001)(51416003)(52116002)(25786009)(11346002)(6512007)(6916009)(110426005); DIR:OUT; SFP:1101; SCL:1; SRVR:AM0PR04MB4849; H:phoenix7.ap.freescale.net; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; Received-SPF: None (protection.outlook.com: nxp.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; AM0PR04MB4849; 23:bB4hUy5KXPAfRM8/Oh70YSh5WjQRK3UI57IjFvH+v?= iNVcL9/kzdmCPDdUx6mWRzS2EBAjJMoX4iyRMaycXqTOFQErKC+rggrGWWktyWl8w9DtA1bqUpZC9TyiGmGwpjctX+HjSg27xO19+RjSmk8rwMRy1pW0wfM6kCnW14UZgD15cmu14Oi+dc8mhu0AGdlKBXALkrBUdnPIQp9TXh60vFkHetPYezNn4/vH72hrzYfHs1SRcpmVZZsDpfNISrdFsgbavtPTOkhnJqdElJJrOq/vg6y5k4h3V1iBy/uZPdO1KU4e58NletW1hglzvl3/3b2I441chEC6epwdG7VwxaM4rMazXTmtPSW/vhOO3nT+p8WOpPGGKEiyqi9rkrs2Q6gEVrftN/su8FcjHet/WPCr4nPrGkY8GbOo4oU6+SPgwG4fPL+fvktk1Fjw6GaXHzZoNJHLNpxE7eevL7YruJ2rRLo1xrD+VK/xOsR1xvvBWBVpL7WOn+lbaPWqoLaVh+JIr8q7Eub+5m1GYtsuP6v0BSEd9hqfUrLf0Fcbq72JjXJCDtssYvVPFz3QyPd7Fic7Fp+isDCo/9EyekgmRl65frGm9hplw+FLzOyNUyH2IfEUzy8Hhvt9IWObgOMk7yuxA9oPrKis7Gq9luCt+FCQWGo+Kva389b56CHhVMhfb4FzrZBD86YWodMXyLpFw8q4tQhZMuM3pygxFP27ixcq923NgCxZxQcvLxtT+7T8itbtrarmR4GVS0evwfUozeFfh46fCaTkcsPKurSQN7QGyRsXV+LK3usnNYSbHhmIJsCWE1qvuQKqWdLbiPJ0POyWdkxjOzwYzrIuCd4UR/s2aF1bETgyP+FODQ80MRMZdoCWURU3vk1sHfrd/A/1jSJB8eBb0KMtQDslcnF8HQySPt6kZWJfzon1W3vmcWPKT6QE43jctIcnIOaBEZCLMnDCrd85Os3GCl201t46WcUCj3cvgiAhEi/m3AveXPabORZdz6NCumfOoeN9ipWVHq171dUZ9gI2NuzcEYqY5DPE6GjG4it1lY86QBsmX5+i7IoaKLCW6Mfb8voJpjiDq1uEHM03SoowTW9EYtQxRNNOghhi1R8uU1PV8+a4HYjkSIhsSQJpncQDny6sMrzxpCppFr+Mf63syP8+t4hyszc4ta6Ck0IEBHzIUGT2k2cpZuX4hqYxyU7e6OgQ0TZebP0DpVIntJgaxOOIQwpMwYlIb90ld3U74QUcN0N1blj2jUBQi68kxf6HDZJjCSzpzwi54ySRokh7XKZnLTxEUtWzRhOxktXVXaBesiQF6M= X-Microsoft-Antispam-Message-Info: KnWWODypYW+GbGVZWdil+8AchzhErqMAc1alRIqwbiWZc7AsmmsC5kyh2biixEedohfA1BP7FYjYDYk/lT75bBuPppxj/m7qKnUkMtZFsG92KHBvr2uxoHpaz+qQywHg+oTvbIUOYyumHL86dgEiQlySZ+xC2NYIAKlw/VHbsFCBiFQePznT8L8cYaPdVl9fR168I4WwsI3QnPbF70H5rWymEJd+O/V3UpNGegFIXOQ7zzSr1OLLHPMqTQ0KZniIoyRUqBKKgpoPdQ51Xo7g3Vh1EZUk7J5PTdh5knJS9g60lXgrBJcugL3RBnDKDurEzvGwUY7yXrVuFkvCrj7dNmE16OsbwTDRrH/INhcmCaE= X-Microsoft-Exchange-Diagnostics: 1; AM0PR04MB4849; 6:pqU629ppGuk0LY3L2NVL1ODnDR7/fz2jrxu0AHDd6SrP/8+KjTWA82iXFRLp9Qf8IybMm2AirmuG4JaSYH/NKBCgwEefz4QYhD3beo374d8LN4Q7YyC7F4Jh2ZeMkc2/dtIcbNkmbAY4G46DktyjocowRooHmROKQow7ggDWrnJ/+lfeOU9ir1+X+W3opnxFwxv+n6ZAoBQomamRnjFrYQNe7tB9mwBzqzwW9KPia5B+z55YZMmguXmJQV9Haoh1XcupCOfXqGsMdzBkUq5vu0/5ky0VPYmX9cuB0rwPE1GLy4yjqiXNoqSkTWHAApsOPDCaHTMCM3BO5455FBXvx60idbEKyXfbVFOt9Bw9M9+EssDxSwTG1+m2pYRRq8cpL9mkG68c7Dex4uUPGGS8R1++U2DJkOfS/dlhqt9j/NzaK7cWnQg4Mp2BCJUnYxUmINV2fbIpA4T2bmLiFhrzhg==; 5:GTBLXvS24hKt587WAwTGkE2sjR9a+txlczejoKW2z3AAZAiSCeC2yARHQjBsyFtPaMmatuydWDlQ2rqmoEN+c6XlZXXN2xVtCjJYDPRjJx1HCDi/d/5axx2oPu4si8BpOVoN65jTqR4hwFJiHeK4PiIgv4y2r8n1W1tqc8FGmC8=; 7:I9QFUmXN9xCevJXfWSFaal1cL75g3/fulslVik3VSyKyfR4aouYTZBGYi+MiyffZpaSUkJtOjqFITEJW14zojCkxs/PuvQc8NcSBLTfo5AaUvLLlv2cc3/CbgLxKdEXrMTamZHu7ylIZUPExZGA13mQ3zCgZqzjWVLqOsucBnazAd0Zi2ttrn2L9F1d+5+OQ4mAFzcoJztXev/fYvM2xrRf5zMPI7YQFrC9SSoF4TfQtkcbtUixy5lyyrjTrZkjh SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Oct 2018 10:45:23.5081 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: cdd75cb2-fa59-4c0c-25a0-08d6291d53df X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR04MB4849 Subject: [U-Boot] [PATCH 02/53] env: allow flash and nand env driver to compile together 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" Define env_ptr as static in flash and nand env driver to allow these to compile together. Signed-off-by: Rajesh Bhagat --- env/flash.c | 4 ++-- env/nand.c | 6 +++--- include/environment.h | 1 - 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/env/flash.c b/env/flash.c index 32236c716e..33b199f05b 100644 --- a/env/flash.c +++ b/env/flash.c @@ -45,13 +45,13 @@ DECLARE_GLOBAL_DATA_PTR; #endif #ifdef ENV_IS_EMBEDDED -env_t *env_ptr = &environment; +static env_t *env_ptr = &environment; static __maybe_unused env_t *flash_addr = (env_t *)CONFIG_ENV_ADDR; #else /* ! ENV_IS_EMBEDDED */ -env_t *env_ptr = (env_t *)CONFIG_ENV_ADDR; +static env_t *env_ptr = (env_t *)CONFIG_ENV_ADDR; static __maybe_unused env_t *flash_addr = (env_t *)CONFIG_ENV_ADDR; #endif /* ENV_IS_EMBEDDED */ diff --git a/env/nand.c b/env/nand.c index 3698e68957..4d04bbb164 100644 --- a/env/nand.c +++ b/env/nand.c @@ -40,11 +40,11 @@ #endif #if defined(ENV_IS_EMBEDDED) -env_t *env_ptr = &environment; +static env_t *env_ptr = &environment; #elif defined(CONFIG_NAND_ENV_DST) -env_t *env_ptr = (env_t *)CONFIG_NAND_ENV_DST; +static env_t *env_ptr = (env_t *)CONFIG_NAND_ENV_DST; #else /* ! ENV_IS_EMBEDDED */ -env_t *env_ptr; +static env_t *env_ptr; #endif /* ENV_IS_EMBEDDED */ DECLARE_GLOBAL_DATA_PTR; diff --git a/include/environment.h b/include/environment.h index 5e90f157e8..7da1291d5b 100644 --- a/include/environment.h +++ b/include/environment.h @@ -157,7 +157,6 @@ extern env_t environment; #endif /* ENV_IS_EMBEDDED */ extern const unsigned char default_environment[]; -extern env_t *env_ptr; #if defined(CONFIG_NEEDS_MANUAL_RELOC) extern void env_reloc(void); From patchwork Wed Oct 3 10:44:09 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rajesh Bhagat X-Patchwork-Id: 978167 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; dmarc=fail (p=none dis=none) header.from=nxp.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=nxp.com header.i=@nxp.com header.b="xrcQYIKR"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 42QCQ34zc4z9s8J for ; Wed, 3 Oct 2018 20:47:07 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 5F999C2212B; Wed, 3 Oct 2018 10:46:39 +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=BAD_ENC_HEADER, 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 962EBC22056; Wed, 3 Oct 2018 10:45:37 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 36FC1C22057; Wed, 3 Oct 2018 10:45:35 +0000 (UTC) Received: from EUR02-AM5-obe.outbound.protection.outlook.com (mail-eopbgr00085.outbound.protection.outlook.com [40.107.0.85]) by lists.denx.de (Postfix) with ESMTPS id C3091C22057 for ; Wed, 3 Oct 2018 10:45:29 +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:X-MS-Exchange-SenderADCheck; bh=gpzx7JEN/0M7vnxdvDaLFiKhtgUEHouGQRnQk+028Vw=; b=xrcQYIKRj24TttNxjNxb5FOqYYa2JuZYrxOuB+Dn/wTnhYmBAEyj6y8vC+IfDYwNkH+PnZGNaoSuLHbwkgTMm2p3sjKPay1ljB4G0JnHvY558v5Jp1ag6+daii+apLQaBO0Wc/Hqn/IEfkakkV2Uu21WA0Aoz4z4iKRNUNZSu9s= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=rajesh.bhagat@nxp.com; Received: from phoenix7.ap.freescale.net (14.143.30.134) by AM0PR04MB4849.eurprd04.prod.outlook.com (2603:10a6:208:c4::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1185.24; Wed, 3 Oct 2018 10:45:26 +0000 From: Rajesh Bhagat To: u-boot@lists.denx.de Date: Wed, 3 Oct 2018 16:14:09 +0530 Message-Id: <20181003104459.5444-4-rajesh.bhagat@nxp.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181003104459.5444-1-rajesh.bhagat@nxp.com> References: <20181003104459.5444-1-rajesh.bhagat@nxp.com> MIME-Version: 1.0 X-Originating-IP: [14.143.30.134] X-ClientProxiedBy: TY2PR02CA0011.apcprd02.prod.outlook.com (2603:1096:404:56::23) To AM0PR04MB4849.eurprd04.prod.outlook.com (2603:10a6:208:c4::26) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 5742e1f7-caeb-4ac1-2eb5-08d6291d559b X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989299)(4534185)(7168020)(4627221)(201703031133081)(201702281549075)(8990200)(5600074)(711020)(4618075)(2017052603328)(7153060)(7193020); SRVR:AM0PR04MB4849; X-Microsoft-Exchange-Diagnostics: 1; AM0PR04MB4849; 3:u8AnFZVpN+4S+T1ZGdW3y8ROgKoDH33ugZSUOLg+Pq7vnmG42nE52rW1lAzccd1hs/HDIyf3NeEv2+jYxu1WMV7o3dY1mo3eO9TbtgbRfDK0atLnJoqvBbj6/nl2u7CcO7uLpZqC1eNzzDbo07QYAjw4Z8aQD9z2Kk7IsA41K587BKtK/9/HD5XmBcl+wcFzNzv17KDRbPLVxnJjUIxujVOwS46Oq6RfepV4nlmUymmII9s41U7crmqQIEeeFwTx; 25:x6P7aXOi2m0sH/YMAcUrXdtCDtLUqAAAqW8IxtBEjLyO0Xtwh9UTwFthVeLBV4LWbLeRC5OaRmveFAzT+alZiw+fZo1dM0vx0Y2LPkYG3/5bP+3JvBr4jkC9RyugyPAeKEeRCr14Y9/Dc9RGEhvK8UkhGG6Fje4DWXoU0I85nD3zXVFnDwAHCgtpV8bisLEMUpJIqkjJh2WdauU5evusA50xF7LssplF5KHEyQi9y++DhjJby1bz9pVp6NygonxJhcY/PFk8PfBSohS/qo54Wv2f7AF5mqJVTNzVlDxWGuOSuxi1Tp2O1XYTqbcvHNETs5gZz6Gq8v970Sca14eysA==; 31:OCB/fpztTb9u4Rh/B41giFEHMGW2ECFC8XI2bFCuk5DDtA8+tC/E05O94QPaWwmynBhO4kyfpwBFp8MgJZCrgSKdm89+PE6RbL68RnFYsLyHqSHeAZp3RegQneAW/Ck5YViMzX7mZhitRMx2koVRO1ReY7y4XMRX2zQ6Q9UhJm6OdAaBQCBkWMY41apVfUnFiFltVY4LJ5FfSy58C1LRJeJ3nLctm2aMXfxCbqTrCt0= X-MS-TrafficTypeDiagnostic: AM0PR04MB4849: X-Microsoft-Exchange-Diagnostics: 1; AM0PR04MB4849; 20:U/hJ48pnHKmexP+2pKJ94cG73m3Wtrk77SLnG/JtKBMIdbtuFGcuThA9siDMfcABHQSr4HTkQzPDRbLhx3UzP66GD1YR9NFthzl1Z93sFYLjbgcg5JNeLN6BB1dnnevbDBiK40+KVg3S8IjO+KeN6lTwM4C6hzw40DG8zfBDT+asOKs6vMjzkUjVVL/5qcot2d1FfipcWJ3FOpSTgSmTCxXaVfHjgNKQu1E+dVPZV+nk0g8rqPNf1vnmhjC7xe2haW91adcs7lPl2iXDrqoPfAcCN2/HgqJfQtViGmjYKAkfTlxeBlJSZES+lA3Ax1V5fOLv3MtBtTOSVMMrLwvaDSXAPmWj4CLF5sb88tADovNYdvBuoUVGDCqwqs1GvhjO0vVFw7cePMMiepfzp3kcFwcf5noMQRixRx6nl16PaVRIdbNkNkQeSBJOTg3XUF0z2JTlAuLDyvAbu2hncT7yIJvzjX3/zdGiFug3p258zYcwB+kVylhHEA1D7Tw7gPru; 4:ollq3FY82IhzbLDDI/hcrBADKMqNK6prmETEs2zt1BE6/97UEyY7qZfEtEKN6ZIVaqti83OFDZryOglHqConPLZBsvmOcywRULYm3u+9Vgt2o55z/Z+04Emu6A3zTb3UXFUWXw3WdK0IdcPDQ5FFEG1XT53QiAAEvxrHiTOpBKRSRHkqUogv8vi8U3PSDuhkNmcXiqKhnJdWnLg1y/Ai5AgvyVgVYjcSnBBV2DqWY+zf36JCG/DNG3QHsfNlEPEg5SdJQmcq2vVB4UITiiKMkXPM29SzCRIdQGUnOl8c5BclhZas6eJAiCP97QaLOcjz X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(185117386973197); X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(5005006)(8121501046)(3002001)(3231355)(944501410)(52105095)(10201501046)(93006095)(93001095)(6055026)(149066)(150057)(6041310)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123562045)(20161123564045)(20161123558120)(201708071742011)(7699051); SRVR:AM0PR04MB4849; BCL:0; PCL:0; RULEID:; SRVR:AM0PR04MB4849; X-Forefront-PRVS: 0814A2C7A3 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(346002)(376002)(366004)(136003)(39860400002)(396003)(189003)(199004)(66066001)(50226002)(97736004)(7736002)(50466002)(55236004)(6666003)(14444005)(6506007)(386003)(16526019)(53936002)(26005)(68736007)(6486002)(186003)(47776003)(8936002)(8676002)(81156014)(476003)(81166006)(5009440100003)(4326008)(16586007)(36756003)(5660300001)(86362001)(2906002)(1076002)(2361001)(2351001)(478600001)(446003)(3846002)(6116002)(316002)(2616005)(44832011)(305945005)(76176011)(956004)(486006)(48376002)(105586002)(106356001)(51416003)(52116002)(25786009)(11346002)(6512007)(6916009)(110426005); DIR:OUT; SFP:1101; SCL:1; SRVR:AM0PR04MB4849; H:phoenix7.ap.freescale.net; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; Received-SPF: None (protection.outlook.com: nxp.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; AM0PR04MB4849; 23:cV87hhVZGNJWyTwnAUvhqELMC/pWxu7DpCBpwftMS?= mmTsKvYJz3su8swynl1B1WCLvNzf+9pgkW7BWVEV8OckX3aOb/PhB+XyKs6NyG1rxAGzmTLPg+A+cLx2ucvxGQtzx7JWzVjnHmoe4JHCBNzkhLr0sbDj57NNVa04mSv+/3xy437eqjAkGSngQwGHjkFupNnKL+OqHB3LAgUqByiBSNaseVD0RNKIUalVXbJFiIg3IAxNivFADZzTOrPpT4OK1ERVyX07+fxOgi7tUHGgrisV7PmJ5EqKQU/zAeBV2wwxdxeW1kvIz8Uk+R2wAoF9xu9wWNnbtk0/CX5Os3dflFZanE+AuXP2yk+xSxlIiNUe8O3Gr2MhgfzZr8CQxnYqAv9LesgvPN1xuRsCZvwHdLXQXRwJkWVGTWpwRCFUVwFr22j+obPhoLHN/6WqETbnzTL4s+Dju0X/BOzfHa8uXP2eEacb3iBHiA1XeavxMeytJdWDZgL27Uw8CZSWwQjkitOnKN+Z6pA2aeziU1EnPOkT3k8HZKp9uBET/VQvDSTo3LWrnZMRQbGoCaw0W5+JCetVF/0S+gx9x/YuDRDFWaXY8tHLTJQC76iXeEJxVtbgP3GTPfnpgZ3UuiluTK2MJ22YCMY8ywlUu+93MybBmL8+kIZgfNix3EYVcTZ5TLB9K6vMVI5d+VpXWdeL4TMbN5HjNDtADxORFSf+njiND/b721LF/6Co3bWumCEi2qg1fogW17T4+v4eocSwjoE/O9RsMZBEA/irsV1iZEyqgu2PNx6T0JrML7AdF5nzq+ftKkBhSjz4bl8ekWo1jk/5Tf47WEfFWsXuFth2i0psEG0vfE6x1u4+o5smVCQ++2w3fng0nD//N1ua1kURU6pcsn4OY41tel1IjnsZb3bi1h1UBegl0rdMe18hpmf5FGD5cTGtyfKt7uNKmDC32zXtTdMoqYlCSB7OwKJZjPW4jgEn0LrZqLw75L3/QcEdVrUY+GS5/dEzZrervpyLDuzC8EcERiwIaXcUykD1tI9yHT09UAyd9OGplHx+N+fbffztdq3Qv8zD++ASj1Ga546tQVl+3OkOKVcpSF/7isK/WIBj99zi150S3s4CyJwQUL7E9V1MtidB3YGE1sKLaehLEjzESvZlgjSU/jLk7p68t+6r+5KdXwc3VYNcZ33cik2Toqpr6cvzKvwO9AqVOEoYXO5uctWWMjP3dK5A7XLT8qPucECa1MHc+0rbCMVhstkR0xXOBuqy6Hr/LkE+25/3f0XPVd1BpxFhfGEng2Sm/5XdsEere6+qvBVkQikFbrqwTMi5FscxDrGfh4Pi8m8 X-Microsoft-Antispam-Message-Info: Vh9BHGYzpkMeBjxjEOaboZfGx4ASoOqm7XYzDkBIlBnOMdzPQOadWYlPYGo79AEvLtM1Md24OeuMl6sNhJZIXkOZI0078qnEoWBY5IT6T+GUIkAUpETif0gxUvkGGqm3K4e7SjNRW+WtHwIGOfHo+FMkZ9GSePxavw8MEyEdtwg1F9aMg8ogaikX0qk900ueMTT9wVSm0efmx3QileGCDgV3/6l790x1HAgg+B616gbkAt0tXnPyrOqIAyNcAC1e4D75yGtMSWheGp3FNM+Qjm2IWJ567BfRzGzYpNMNwq9vewDLWoTjJ65HAxqKS+D6SWQ++lW/QDN+kLeKI45wVHFjxbEopc3LEHT8pO7q/EA= X-Microsoft-Exchange-Diagnostics: 1; AM0PR04MB4849; 6:NuRQzSr8Yya+JdbK4+Oh4mDsF6Rs3NyRRb1v9A8CONjEQuHEwa/vcMPJ2lFGrFbfw6M4jNI9zn/5It+J7MKgNOkHo2c0qr0F4l5Vhn1T4tVEAK37RuGphG0L5CbB8d0mnmsS2oZEMEjDLFzbGywZWhtJjg2/LrLP3cNeyl3u/1A4GhrKUa7DzMtK4GHz9LJhNaS6g8gqN0y7Ao9BUANlCEx0ajBjJF5BppWWUoph26rDC+gmQUHsksQKD38Gfor1mEyOVgbNYIuwaRiosyub1ZkM1y9PlsWwFGb7k1DvfvplwQF0cMqGhlq4n30YwxUtC8bG2Sg7qF1VXcCkHgcL44oyoiCoOU3JOcbsOrvaJYORLn80Xeot/nRsp+5vc6+x9nZzOfJ8rbVPP46odlavfYQHOJyb5oaLGJq+TTHgpQeN63tk71L03yJDt4nY3v0GILTEZWx63vAcLJnhfZl3/Q==; 5:SkjuJN0z8Y2v9OBJcYQjin1wr4uJlJgU54iAzpd53f5HpVa1LMhMkslyS7oGBqh1Ij+9iHzM3YfAmLmmvoYrUXweS9ou3PY/iG+5P1jiw1qaGPA2iatuG0og+yHF9OPm2qv7Gr7bAm6yktIH45QAaVFJq2rpfLSw0u6TXdyg/CM=; 7:fZ43e4RYo6ZxQnQTfunGIH59YPVsrKKMTPiytcDpIoFfvp2eWazkJSETeGp8dx8xC8BdrOQyTlPQ7K0be8LjwO+7jEmZUW7WrJ0QRzKuhHMJP3HnGf1bK/w3YiExuHu1o+vmPvpy3K4gOjZgToVrnyPOuKK4FwlpB24bH0pt/rvSHQeNqOiZFNt0fIgeTkO0n+I3hTKu8t+F8AIV4SF75rIEjFQhQOB2bPNgdIldoyCIAQlB+WKzQ1vg5KQDDvFF SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Oct 2018 10:45:26.4162 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 5742e1f7-caeb-4ac1-2eb5-08d6291d559b X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR04MB4849 Subject: [U-Boot] [PATCH 03/53] env: sf: define API to override sf environment address 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" Defines env_sf_get_env_addr API to override sf environment address, required to support multiple environment. Signed-off-by: Rajesh Bhagat --- env/sf.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/env/sf.c b/env/sf.c index 494510533a..df22fd520b 100644 --- a/env/sf.c +++ b/env/sf.c @@ -297,10 +297,17 @@ out: } #endif +#ifdef CONFIG_ENV_ADDR +__weak void *env_sf_get_env_addr(void) +{ + return (void *)CONFIG_ENV_ADDR; +} +#endif + #if defined(INITENV) && defined(CONFIG_ENV_ADDR) static int env_sf_init(void) { - env_t *env_ptr = (env_t *)(CONFIG_ENV_ADDR); + env_t *env_ptr = (env_t *)env_sf_get_env_addr(); if (crc32(0, env_ptr->data, ENV_SIZE) == env_ptr->crc) { gd->env_addr = (ulong)&(env_ptr->data); From patchwork Wed Oct 3 10:44:10 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rajesh Bhagat X-Patchwork-Id: 978173 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; dmarc=fail (p=none dis=none) header.from=nxp.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=nxp.com header.i=@nxp.com header.b="gjYg/sGM"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 42QCXR52H6z9s8J for ; Wed, 3 Oct 2018 20:52:39 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 1CC8BC22043; Wed, 3 Oct 2018 10:47:18 +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=BAD_ENC_HEADER, 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 EF692C22057; Wed, 3 Oct 2018 10:45:48 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 4A17AC2204D; Wed, 3 Oct 2018 10:45:37 +0000 (UTC) Received: from EUR02-AM5-obe.outbound.protection.outlook.com (mail-eopbgr00076.outbound.protection.outlook.com [40.107.0.76]) by lists.denx.de (Postfix) with ESMTPS id 8EB0AC22092 for ; Wed, 3 Oct 2018 10:45:32 +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:X-MS-Exchange-SenderADCheck; bh=1pU0CT1FW1VyzADc3L2ixM4M4aOQ4BQrwAdfi0PHOSI=; b=gjYg/sGMGgAhMzKh91tM43pAsFhuxyXhq/2lV534ga3d6+cNLBJncT3zD7MYQ08xm3m1Iytbzbbt+V//gxnL3TIWmHXYTxTkIld9hEOxXNl7b6OWNCGj4pqOTb5L600oKh8aiAkvXLlFrO4gr2JDM8PYI6HUvd9hCsNh3WbmFUM= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=rajesh.bhagat@nxp.com; Received: from phoenix7.ap.freescale.net (14.143.30.134) by AM0PR04MB4849.eurprd04.prod.outlook.com (2603:10a6:208:c4::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1185.24; Wed, 3 Oct 2018 10:45:29 +0000 From: Rajesh Bhagat To: u-boot@lists.denx.de Date: Wed, 3 Oct 2018 16:14:10 +0530 Message-Id: <20181003104459.5444-5-rajesh.bhagat@nxp.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181003104459.5444-1-rajesh.bhagat@nxp.com> References: <20181003104459.5444-1-rajesh.bhagat@nxp.com> MIME-Version: 1.0 X-Originating-IP: [14.143.30.134] X-ClientProxiedBy: TY2PR02CA0011.apcprd02.prod.outlook.com (2603:1096:404:56::23) To AM0PR04MB4849.eurprd04.prod.outlook.com (2603:10a6:208:c4::26) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 05201ead-45ab-4bf1-6504-08d6291d575e X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989299)(4534185)(7168020)(4627221)(201703031133081)(201702281549075)(8990200)(5600074)(711020)(4618075)(2017052603328)(7153060)(7193020); SRVR:AM0PR04MB4849; X-Microsoft-Exchange-Diagnostics: 1; AM0PR04MB4849; 3:/ip94A8RJt/qFEMewvAodgb7MUDhzA969TIgRHakECFJuVTXTxWfSHFCk+CrQpGwcngXxlYJo2O2mJmndnWaqUOCIj1XTcODWkRTeZ0ETXPJWoKUAfv3Y2WQIeqEaB5+jjaBW6o5c9or8gdA6DADLnQaAss/gl8QUytkZIOp3ErcyVc2Koh9xlxG2x52fHEF6CBl09ti9d7+ToTRdMpm5aPBNAEavM7z129sD7kiiI7Wke9D78sJH7ZO/9isLrdi; 25:d2SjhluvCipGBK3PvIAdtLTsxxbSdF6kybQKgbaa8hS+O8gxyrQA7xhFpPWZrXEcYIhXs3/xtnUaHnX1ERsuu/sWDZajeKxXrs/dLI3GA623vJ7lyR3R8EiecGZ/y3xcGF8N0gDd84l2hG7Sby289RCkRCWNBmExG2gAjeTv0I7xgypoFkIFU4Yc97nq9XsXI6Hp92iDrHonD5h7PqHbjgTltDekY6fQP1vokdugqPnLDUIcePDlExZ38nhnAOcLphR87oJ78adsr+7uohI24OH88H4/o2Nbg6pEAAKy11AU8YWqipVYI3m3rJ8SFaPxN1Xbe9auW6FCYiRh6Zh8YQ==; 31:jKBqxyjOIAzU4M6LrwHygsLh2RyR8aoPilvrddrR5NSrvnyufu5VFJD4Q/3q8S8VMSWJ9pi7rNG1eTbJs1EhS4kV8C4j47ocV90qedHygWi9PobRwFlBKe0qwTZEhCH3nI+qCb1EN0d7gfLjgpxjSrh/2/fVmlaxsthFkpho/CV1PVppA5Jl008azm72EYu6gYy6Kb+fgd3kgXrZA2NG3YGofJZiQzXqzBfSCOQVAT4= X-MS-TrafficTypeDiagnostic: AM0PR04MB4849: X-Microsoft-Exchange-Diagnostics: 1; AM0PR04MB4849; 20:LxAldioKoLsIrmsWijCt3m5egMI9YmRTe6g+uGrdfIIDUCgEyXBIzCyfSausrBbMXPWcDgNdVk6fHCQbIzF80JX4DCbItNtJZkYZzM2J2UhF7ePhC0udo/fl3LxA3wN6HCcuQABYpcjvSx/Bp/UJE4WD+LfoR5EcNqrPE2KdDFVqkpJdKUcREXxsUw1kEtuxN2jTP3kIPLheC5fpl+X98s/U/FAXXA5OqhLwyfqeCPyRH7lbK94bjrGkiU7VCiCqIBQ6wgb4ew4Uru84Hu68egg9xA8uKIy42rbjBmRM/n55IJHKk5E5ZtFZzoLQocpOVnGt3qeZKsVm1HNAnOHl3nQBpdZ0XbUt7E2m9O/AR5FyQsBL/b5RL2hYpDm8XoSxcr/YTysqst48hCmV6lY4cwvXg5OGqbbcDsvc64as7z+nEAzKDOeJ7maVGQLd0qfk85/UfLxMnw6jx9MPgcpaYIjkWDXKq6/M7xlxMVH/FlQaXtZyzoRsyn6VCTrTmRwI; 4:GaLOqf6lN5tR6IjMN//38gjOuraHRXo73+5ao8+J5nvSd3EigHML6PK2VgkN5DDQ/lzExyC5ojEWlk2HRSu8Rk8HgVmgwIbwg31XfB6ZdibFBiV13LfvGhkCCLh06w5HaxTeifN/9TS8WZygaFqIGPIOlFH8bjBFhXgWx4y+/M5rpzlucOoo0sqw9Yomh81dLdYsJuBvYM27JSUH78Xr+Yq2x8TWUmwwAfd70b0zQZXgxihaOAdLVZgL/rBxF+62tTL3cHwFsPIPWPJk7TiNORM1kBVL4KnWu/vQZryBOAXAQKUNT7rqToxhF74Aj0Pi X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(185117386973197); X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(5005006)(8121501046)(3002001)(3231355)(944501410)(52105095)(10201501046)(93006095)(93001095)(6055026)(149066)(150057)(6041310)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123562045)(20161123564045)(20161123558120)(201708071742011)(7699051); SRVR:AM0PR04MB4849; BCL:0; PCL:0; RULEID:; SRVR:AM0PR04MB4849; X-Forefront-PRVS: 0814A2C7A3 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(346002)(376002)(366004)(136003)(39860400002)(396003)(189003)(199004)(66066001)(50226002)(97736004)(7736002)(50466002)(55236004)(6666003)(6506007)(386003)(16526019)(53936002)(26005)(68736007)(6486002)(186003)(47776003)(8936002)(8676002)(81156014)(476003)(81166006)(5009440100003)(4326008)(16586007)(36756003)(5660300001)(86362001)(2906002)(1076002)(2361001)(2351001)(478600001)(446003)(3846002)(6116002)(316002)(2616005)(44832011)(305945005)(76176011)(956004)(486006)(48376002)(105586002)(106356001)(51416003)(52116002)(25786009)(11346002)(6512007)(6916009)(110426005); DIR:OUT; SFP:1101; SCL:1; SRVR:AM0PR04MB4849; H:phoenix7.ap.freescale.net; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; Received-SPF: None (protection.outlook.com: nxp.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; AM0PR04MB4849; 23:CWkLJuEVN959ND3LPFfIVRIG2dgbPY2+sX6EvxqH0?= T4SieLB3D4sxStlGx8LYbpGDj3hHRYLS7fbyG7DCge9+BqT6HPuoe5ZOETQwEgJe/QdGd4xx4/aeBt6GJwTJuhc7U/x+8aXmzVAtEZb08ZSn/YKbMDgeUsBp05JM6xOS6qNctbaKjql1kKdDs54Hc/IMsVf8yfhYysVHimlqaQ2kT/hSuK7cUMcQbe6yOxZhzUFlUivHM8rHKapRs7j3WqFOeCNAI5c+GdSSCXyFsGrta9PbteUcor1PF9TJ98YtkLHCMOlROKUf72Nay+rUAYkcPcIRyHpiVJdqtaI7pXWbDPEsx7J/ehORDhVvUI1y2rPCIPOhlBULCwREyWB5+/XEKlUAjyI3N7h1PbuLOvCZxwPTXbvtobCMmT9VJQKhMpF9XsV9SbVfsdx1u39WexxAxx6EjZWEhxnNn1gLGfyS0+ZcNei4Y7U4gdXzzlfDLN0QKdBY5IbcSS0zIwKppDLvnpMsfw89KGefvj7PyGc69BmQAsUkiSEZyqZuD0w9ro0sYMYeDz5S2W+YG4l3PDtDaVwhrQAITKdZVtV+bFJG3k55bwTyOkiRG4X+zK5QMXOlClq0Kdyt2RuEHi3x3dFJ29Rt1EDBvNMRCbW+5l2AmMqAMZzNuYRK+iYz6Wu8mqPtDe1odnkOzCBhCSW2zXhW0xBwDPnMN4gBQMEH4Ia0jgyTklXT7uJ0M3C069lxDwCitKJGzvlYCk/K0MF0zXIG5YRRFbmKI4UX92RG6ThSfK/UThbfi/HEb5Qg/uPaycQpufSSwvKkJXQpkBOJe4tLX5IsPNJj/KDnwHupn7zo/BVa8US6bCrhIYOgBMWr3q7lDuBQI0makALeoCPRLlYCh0cKQ4NVeELZhIQpf5ahdFrEZ+YvMZOs03IzBmRBJAnYsMNYEVCClKUgA8OnG9AF3lX7lQHE83mNFV0REyT8wPqZwzpszZrz21sRsPtwIZC5bE4NlPoCPbIMUv0jJ5pIyPgU8vkwmgvsZjdsFMBP6AFt1sM/WN8t3hq555ha6sjyL/ruqkZ5PBcNRcwYoNW5DswN1GfuZKrQaGPOJE96aM3ZXU1aDwpcDhArJVftta3lwnRafGnWMVkkDoJAJJDs6/k72ckYSffS0+2eQ0XPwHcEhXz4mZaEZ0jgbUDdnuGR+v7+ri9GeQ38btdCELKX6bUOsaOSjLWt6n2JAPXDrxm0hUAUxPAYfc0f9yar2ixhxRXUzvO2vmBtFeaQT59QP+xpvN7Da8KTinoAIKlM/c108DGH8yB2+DAaMeaqRk= X-Microsoft-Antispam-Message-Info: p9AyoD9nQZZJaFKohcErBAbicz1Yrs0XnnmPMAHzqIp3xxID17EEUJvkOUO3n/yRpxG+pLqu0X/BlI3l9WUYFfiMLY2MY6H4fTGpJs3TE7AzFUe9FENkjZ/8LzPydxKhGkBHRt79GfAV2uObD4oCbhDswxXcXgrNkUXd3hKTr6MBk1knAhk35APV39ONP8lyngW6YKbP8PUCnqvSsEzF7iBZMcwL+0mVcP7NVbC5m7UobErb47bztJw/v9S49vQ/KEfJUOTwgv00JPP75g/JXeLsFO8bUK4Xv5PjhyhXgeuquPQl63/rdyTzxdOekvLjsaYgckm3n6aEovgfaq5xp320dNJzVwUI327IPtR2u1g= X-Microsoft-Exchange-Diagnostics: 1; AM0PR04MB4849; 6:DQijRVaKlwCcYCZtEZB7upX1Ed8A7QlWMHVdy50jOdoExfMJMz2qPI+Ci6pjbi438O/9fy0ZlnN50q/TH1NnGHN2uT1bEN4RDcsypv37NwsIqKWbDEVfpfCzJrXH+1LOkDJZ6CN3hH/MGl7ofrsvBUc/t1IjR9pgJ2Uz2M8XR9RuErlgHnq7yFL9mPx/CIR8ErKyBaCQWEmvOleyCw/uiZ1tFwR4f/OxeKxMHyDKc9IEQHLrIpE4XQKuxuBPi4mTITudB/RlHQw3861hPWM0KHY6J8uMPp1j4+tSbxF8YQx0uejPzPpTAJhd/FlCwC8LnRVknTe5peCtKMcLsxyn0pXznomVP8I20cqRw2+lndSmXZMt3OkJCMoWSyv2nW/AWLi/M90qohThVYKy9dre7/6XhbIVa1eD+44jQ8wkC+Kmf6uzKlqWuCGDpL4XByW5+01wI4KjzHEGgJgrZxAsmA==; 5:WJ+yp+XdpixDr1gtvOyUWZO5vAqfXzcJhwuIlxaSMH/fJZ27lVRu5yqNwMdGcveowEJCQ/ZeNmgJ1JQwjkxw6B/kSG0DpV9Rsw6KfwoJ7hXstR3xVbZHdDIW3HgqRd0IVgqD9JPkRPWMBO/P97WqAvgfwg04M9RwjQQ3aXDfVCo=; 7:WYUWmtLGgPz3ojVXyPG3ktDRigf0vQpL+EX8ufwBYZ1vbIBHTEsoSEKTYxdIY7qUt0FSTNbBmHZJPTxjF4dzNk28g3rnKlC6EcYzGtclJapiY6MVpk3ErZtOt1d0ZvxBsNwzNhVteww97Ge/pjVLqeJym6eLXls0Jf5oC5k/kX3NB/RaRNVnz1uPE8okEp7a7xu7QP98FroNm0e/1AUGc5vpVhSNUYny5kGJfK8xOqaOvHTO9jYX1M6cKxv7d+qO SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Oct 2018 10:45:29.3732 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 05201ead-45ab-4bf1-6504-08d6291d575e X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR04MB4849 Subject: [U-Boot] [PATCH 04/53] env: nand: remove unnecessary env_ptr definition 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" env_ptr is not used when ENV_IS_EMBEDDED and CONFIG_NAND_ENV_DST is not defined. Hence, remove it. Signed-off-by: Rajesh Bhagat --- env/nand.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/env/nand.c b/env/nand.c index 4d04bbb164..29eda66fad 100644 --- a/env/nand.c +++ b/env/nand.c @@ -43,8 +43,6 @@ static env_t *env_ptr = &environment; #elif defined(CONFIG_NAND_ENV_DST) static env_t *env_ptr = (env_t *)CONFIG_NAND_ENV_DST; -#else /* ! ENV_IS_EMBEDDED */ -static env_t *env_ptr; #endif /* ENV_IS_EMBEDDED */ DECLARE_GLOBAL_DATA_PTR; From patchwork Wed Oct 3 10:44:11 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rajesh Bhagat X-Patchwork-Id: 978190 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; dmarc=fail (p=none dis=none) header.from=nxp.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=nxp.com header.i=@nxp.com header.b="D9eTm5aB"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 42QCk20tKyz9sBN for ; Wed, 3 Oct 2018 21:00:57 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 91621C21C6A; Wed, 3 Oct 2018 10:49:04 +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=BAD_ENC_HEADER, 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 3F7DCC2207B; Wed, 3 Oct 2018 10:46:26 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 6122DC22104; Wed, 3 Oct 2018 10:45:47 +0000 (UTC) Received: from EUR02-AM5-obe.outbound.protection.outlook.com (mail-eopbgr00076.outbound.protection.outlook.com [40.107.0.76]) by lists.denx.de (Postfix) with ESMTPS id B9732C220C4 for ; Wed, 3 Oct 2018 10:45:38 +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:X-MS-Exchange-SenderADCheck; bh=5kSImawnnI6Q+LGCv/hZ8bdn3Szj8/zqpl7iqZmwe9Y=; b=D9eTm5aB0d3b+l9lOP1Fm5k8lDo/zsT2GwJaejEBgXAWTNgZAW6ZwgJiUpXfkt3LZiRwGDt+uOpfvBO0TwLXX8GLvp23kkLGo4S2ctMSo8Os89F9fdHpBbZwP0AKmUsvw3P90m3KGLvjzKX+KfJNSWZSJPeS+eG5/X2Y8IBhowg= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=rajesh.bhagat@nxp.com; Received: from phoenix7.ap.freescale.net (14.143.30.134) by AM0PR04MB4849.eurprd04.prod.outlook.com (2603:10a6:208:c4::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1185.24; Wed, 3 Oct 2018 10:45:32 +0000 From: Rajesh Bhagat To: u-boot@lists.denx.de Date: Wed, 3 Oct 2018 16:14:11 +0530 Message-Id: <20181003104459.5444-6-rajesh.bhagat@nxp.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181003104459.5444-1-rajesh.bhagat@nxp.com> References: <20181003104459.5444-1-rajesh.bhagat@nxp.com> MIME-Version: 1.0 X-Originating-IP: [14.143.30.134] X-ClientProxiedBy: TY2PR02CA0011.apcprd02.prod.outlook.com (2603:1096:404:56::23) To AM0PR04MB4849.eurprd04.prod.outlook.com (2603:10a6:208:c4::26) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: c716430d-d1e8-435f-fd65-08d6291d592b X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989299)(4534185)(7168020)(4627221)(201703031133081)(201702281549075)(8990200)(5600074)(711020)(4618075)(2017052603328)(7153060)(7193020); SRVR:AM0PR04MB4849; X-Microsoft-Exchange-Diagnostics: 1; AM0PR04MB4849; 3:/MNG6DvMmU6KMYmczYcP/kvFMLlUjrlLmj52GDWBPRiAHqNQJfRNQksRDNkEXSPSbrAspuyqDl6dIpjjFXUYcd6mctcGrdDQ10wwc9ZrO5GwGKUj9iPOiYzqAMMzQBaT9qm6ORDen+dvz4BX2lFA6CPxbHeZAmBsuOSlqegUqFGBJMOQMLzf2b+2AMnAd927p6pWAKwLPHr+qwKlcUreGpV37Ks2H8l+QsJv3lbzuuu5D40PQslJTJgsj44UNOwg; 25:qI1/CgkEj6MAaLuQbsHeNTbABM4DXxc7y92APBKN4VPpAPW7Qfck6lEU6/Xn/JlznEE4iOpp6l+1yiam40OtE8zuvrUILg9yfNN8jVLRESSxXJpzcVXGWVXpDFK/nK99qE7LdPpkN5aZnDZDunZ98tyDc6yqBpTgJpSV7GvVyblg7uBhMMpdR32NWLtYaGgJ76Ak45rd2dmIVmfeVDRQo/X1hLf4FrpZeTxz6GyMWAcKeL9/YVlcuni3HpQNk7yi/c3/AFtUvzIyiEWSkSmj1l/KoS+/feayC8wGF/F/aGcQKiAjTMFeEd3nXq2RvAvWcB+UOXUEeTRyCvFC+QJ1XQ==; 31:Kt2McK9bw9OaY2HqFtOwPS7GpM+3/1bbZlYpfIco5/BuBttljCfEh2rg5QCI02HQAlGDM+cdMdZgeN5eXUJQGmIidBATftgmeYYXsPsrOKbv0CLUqNV/BT/CK4pHM5cAy85qTV8SYEBcA8x34IhdXiFm0H+ee3vXMtT1qy7H2FT3pqgei5ZtApZ6mou1sMnVpK4P2OCXxYkehZEyh3UtVVtw6uyJf5shhxFyt0ouQMc= X-MS-TrafficTypeDiagnostic: AM0PR04MB4849: X-Microsoft-Exchange-Diagnostics: 1; AM0PR04MB4849; 20:uMgOmy1j2THB3BJYyxYd95VHq60EK99LnnIwXBceq0APzCnfPM2xu6g8Ynt8f6Yo7+jywwvK0thzK1/o+DSxCS/SodFC4V4WE7C8oJOiJ2ipXp4fGMMh2VG/55bsA0lyKJjEU2YfbbFtlMaEYJHvc7nMieD/4ajc7K5A9k3HdS7/XM/X47v9lONPDwQ6QbOKLzVl+xEgd3PAEn+ft4UZM9q8nc9YJCTS8HlVipgYRjRsK7cixP98hsyNPnbarygqTTTEMxnVZBhZnh7GtL1ChDOkv/DPc6huXhximAcMIgBcFwmr/jRBpt2TA2xHepzUjknqa0CV0fyRfhDeoa5xvxsYv5iTn2ffY4RV6q0KFru2AjXBO+BbQ1jkEmLqrIOyvbYbSviG4K6dsK8ut4qUNcQuousnaLcf6pjR3xKP+/vawOUZN4l8GugATHILPglBRjJl96uh95YZ4PJEFCLCZKMwdtDGnmPRkMuUyj9knzZ0c/4hGQzQ8U/hsJEUXgLq; 4:GGksDwpmYkgAxj5zUB4ZYwP2JukcIPD1N2Yn2IJiR1CG7VWO+C0DTiazrz0WJwIws/HsR5NHHfB9vd1ZZY1wEtT1Yx66xERQP11F7Bx3mwhPRBBXzF7ubgi9fq5USByYqv151rqJHNg+76Ygy8VS437Fb8up95N4stP9phO42f/Z/v+Dr1+F80Av1xF4k6VQN4KX1i5/DP9BrtEI7myzU4hP4bvS+A2AqB5y1KspT3FdWLNJG2o5qGjfFx6rycDAYZB20ydOgkZrTWTMVhbg/tktR5+22+CKea/H+jwDcjmrwVXMJQY6HrkIhGNGaYGF X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(185117386973197); X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(5005006)(8121501046)(3002001)(3231355)(944501410)(52105095)(10201501046)(93006095)(93001095)(6055026)(149066)(150057)(6041310)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123562045)(20161123564045)(20161123558120)(201708071742011)(7699051); SRVR:AM0PR04MB4849; BCL:0; PCL:0; RULEID:; SRVR:AM0PR04MB4849; X-Forefront-PRVS: 0814A2C7A3 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(346002)(376002)(366004)(136003)(39860400002)(396003)(189003)(199004)(66066001)(50226002)(97736004)(7736002)(50466002)(55236004)(6666003)(6506007)(386003)(16526019)(53936002)(26005)(68736007)(6486002)(186003)(47776003)(8936002)(8676002)(81156014)(476003)(81166006)(5009440100003)(4326008)(16586007)(36756003)(5660300001)(86362001)(2906002)(1076002)(2361001)(2351001)(478600001)(446003)(3846002)(6116002)(316002)(2616005)(44832011)(305945005)(76176011)(956004)(486006)(48376002)(105586002)(106356001)(51416003)(52116002)(25786009)(11346002)(6512007)(6916009)(110426005); DIR:OUT; SFP:1101; SCL:1; SRVR:AM0PR04MB4849; H:phoenix7.ap.freescale.net; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; Received-SPF: None (protection.outlook.com: nxp.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; AM0PR04MB4849; 23:wwIbsmikfCpMYke3Pj6OFsTI4TCRUvTqGXGc4IVjl?= CDAfTx1YDJ5SoGkaXyrycfWLDHuFYKmitWBx1hhnyElxkMz1EJTGhHycC4pASF5QVlRg3Ewxc87yuvBZY0+kv1ohj/yOUvPlkazHLJKYTdtkxCe166pVL+JAMAe+6On8qlusSXtsxXj9wqUJwLhaRpN9oibqdtLLVtrgJrL5K4LNMhCQMokbT3ShSoIB3bSeVlbV2IUDuivcFrSkEG7yhMvpx8KargWsAt1w2kBO3sjiLxuF8MQRnClv4FKJgD3hXboXFrbvfK4aNwzmimhs8GGJFfxpZRWCiiUrmRMQRm1k9KPdZjbzH/4e4HspEasKkwNGIVvjbmkhhzYtmFr/hMoy/BESx9UUy+V5MQ9llMIllL1SnG4YQNp3T+BqXYnvNIYRRh4p0UQpXiFQAqukpTpWiOUgwLkAypUS1PEeK4DaAPGeMyaQXZgUw4Uppr9nUnSI6Ny6T4lf+LAgCsWr+3auiTtfhh0ggOsFLhqGwyUO4rRSvJKLCWjBxs5FcFuwrKuA5506VTSEAsyHIUpgMo4JKmOKQrN63eJ8FwepQJiqGXwhUnYfek/wATsH3LaH/R0VKVHu5D50Qs5wLfS7cjak6oILtOEM1xt8dDTDbC7NgSdcsCCoOvZzQ63TiGugvU6I4D9qmBcA+IbaQ4xBA+fz8wNPolH8C+oCDHCf4MnbpRzsQM7lrb5HHRK3Z9+A8Iy6qljqpZq1ZzefncCVK4nZ6txdI/u0n4cuTJQQLhanVDj2+m1OKZ6SA4QtfDETReiPMmFvZDsshjw3Dy5trlcZ1p9QAtJJA9L6CR9TYmHtyJ0IZpq7+36QK+sLem7TakjfY2Z5RxrRGM3ZDnYvRjJ3OepKIwlg/cC9N2Gtrwyz8sJFD5bbU4hSAq/Y0mSsUdiJF5P6XqYDY7zyTBvH400FwjpFjWvi/S8kf6z4uZSHzto981AiHBx6XB6f1l83LkVh4jLxcASrFwMVl36NU+UfNoLi4jY5czHo/gpjPjwtOWEHUeS21Xo/eI05VrPmOpknJnT3qb9yOS5kZPQTZJbKAaw5qJQVezq/668oEJ9CwFIsoXYmW14USBlcW5+9MGjTWlFhRy+gIkYXXA+M2Kj0u5oX9DjX2eucjY+qMWJK6ju2UgTKEAPtP5UC8FosDRUI1tn/WqQsHcnTIQGPrdTlNg3YFzykd/taw4j9NIZtWctgSfhCavmvNZCE0iZ2WnhZ8vb8SsZce43MQT6bse2mMJAtMgyzeBnVO+3f983kcsNmAxco83RqvIXG5E03qI= X-Microsoft-Antispam-Message-Info: 6P6ayrIsp5LNS2bWdkpPPl7OWdu5YK/3dHARbvceOzGB2jMA4K0FHtH76TAguclhsl5F9F3vgrEufKtJHMRRN1p9Pvnc11h7b0TfZcWzP760jk2WUs3j7zbKV2H5o9L04y87vRvTtxYSdi0SutI08PbZvEg/NZQBfTSMXMIyhzboBrWJhTe8TPm/3l7MhA08tZa1c0R6/BxGaIgC//C8/xiaNUdO8E0O+Fe1RGJaEzNflgteY40Vg9EnwOCjerhOXWLC3vubcs6j0LF5j90dECE5LedN5vR4KawOD0BM9XR/coHIRsaRRLGhqU4kVPxaKixPkLoCLPG2ixRuEAVfix00jHm/O1gOyFusizN/FOs= X-Microsoft-Exchange-Diagnostics: 1; AM0PR04MB4849; 6:3MY+VP9pnXyAqfCfpr5pdcvtYF4xxBvtNX7q4Xur8Z/WEBhFi5NqjzraxlKybiz8o64m/6v11U360uHA4lAL4YwZMiaZA83nhxmXFxkbc+vUvrnkaKdd34HMn4CaYOA5AxdWsHsHbOnVY8QNytmlJTNZq7QE/9Xyavy9QzDFMtB9W0ZzmxqHTSgxSqpe9kqHeto05xsj2YMpHanFgq7PEMjAcqYr3c4MP7hmI1/6+bcLU0LK1vZkFmM5hjdRPBdbygaR+2xJ07NaAaQvmGQ/U8YTz8nJw6QE8BSXzXya1rojYFbP0IEV6sX7sCXan853R3K9eoAaaJirKnthvORHzq45XwP17DkDLm2amdkBFPV1GoYeV9nI1hP2LK7HN/UpIpF9pxx5sjeXwG4VOXXDXmWNCiRC3KkYBarEy3Ysle8OnAJmyC9Q2qpiVYGw6vgT0Qx2Ld648gv+RFhCyVqtPw==; 5:3u28Doi1nOetmAZg9PskKchGmtrNV3X2yMsfN8J9YZ1KnJFD4EHelV/k6+OSbdb/Me2rjUOXiQYqT89BZx6wtZ8iixLnIQK/WgVm44UyjAfYFn2NPqp8Ki48+zMcVZqcbKUFKy4r0GPPvbQCjpbBw8Ipl3WQW/MYExxnLv9HyVw=; 7:OAd58KCWXOQyeT9FH3QIatpwgNs3aPn74ivh/RoBDt8BHmqihIdJ2yOyy9a89kzDBM90VC/GLy0Xfs5EYxoNAG1XcExtchzvaRqP3wLlcY9Svj+lDfkin2hZ1foEBi3Nb/QabMQWZFYC525yMhAJsuqNANP4EBBYzxnfvYN45pqiiHqWrthxI/Wqv+bv20iZN7EPlsuuuP3KteZfZLU+tjZk4t3gOWcEraCHHbEymbyzRzSYHgZKIkctDlhgH021 SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Oct 2018 10:45:32.3993 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: c716430d-d1e8-435f-fd65-08d6291d592b X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR04MB4849 Subject: [U-Boot] [PATCH 05/53] armv8: layerscape: add TFABOOT config option 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" Adds TFABOOT config option for u-boot to be loaded by trusted firmware. Signed-off-by: Rajesh Bhagat --- arch/arm/cpu/armv8/fsl-layerscape/Kconfig | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/arch/arm/cpu/armv8/fsl-layerscape/Kconfig b/arch/arm/cpu/armv8/fsl-layerscape/Kconfig index f2111fadc0..9092757d1f 100644 --- a/arch/arm/cpu/armv8/fsl-layerscape/Kconfig +++ b/arch/arm/cpu/armv8/fsl-layerscape/Kconfig @@ -514,3 +514,10 @@ config HAS_FSL_XHCI_USB help For some SoC(such as LS1043A and LS1046A), USB and QE-HDLC multiplex use pins, select it when the pins are assigned to USB. + +config TFABOOT + bool "Support for booting from TFA" + default n + help + Enabling this will make a U-Boot binary that is capable of being + booted via TFA. From patchwork Wed Oct 3 10:44:12 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rajesh Bhagat X-Patchwork-Id: 978168 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; dmarc=fail (p=none dis=none) header.from=nxp.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=nxp.com header.i=@nxp.com header.b="XyY9crjK"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 42QCSD0pcbz9s8J for ; Wed, 3 Oct 2018 20:48:59 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id A0BE5C220D8; Wed, 3 Oct 2018 10:47:57 +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=BAD_ENC_HEADER, 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 42E11C220FC; Wed, 3 Oct 2018 10:46:16 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 334D6C2207D; Wed, 3 Oct 2018 10:45:47 +0000 (UTC) Received: from EUR02-AM5-obe.outbound.protection.outlook.com (mail-eopbgr00076.outbound.protection.outlook.com [40.107.0.76]) by lists.denx.de (Postfix) with ESMTPS id DF420C220CC for ; Wed, 3 Oct 2018 10:45:38 +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:X-MS-Exchange-SenderADCheck; bh=5rvqaxja4Zskry1+0SkwLdV3YfOR7J+6Woq2jXNNhb8=; b=XyY9crjK910ahweWyVTsHeeHHSXHe5ho5uDshGLekvimMHChdbyuOr/Q37soydPjJ4YMSQXb8M1K9+ka2XxHVfr0l1UWLOoGat/Mwd3cG/57ioQCHBtD/5Ernxa9W/eQ+JwF3SZPPNHwQLhr7khNEZ1Jf+BuV+1nK3Je6KlqI44= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=rajesh.bhagat@nxp.com; Received: from phoenix7.ap.freescale.net (14.143.30.134) by AM0PR04MB4849.eurprd04.prod.outlook.com (2603:10a6:208:c4::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1185.24; Wed, 3 Oct 2018 10:45:35 +0000 From: Rajesh Bhagat To: u-boot@lists.denx.de Date: Wed, 3 Oct 2018 16:14:12 +0530 Message-Id: <20181003104459.5444-7-rajesh.bhagat@nxp.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181003104459.5444-1-rajesh.bhagat@nxp.com> References: <20181003104459.5444-1-rajesh.bhagat@nxp.com> MIME-Version: 1.0 X-Originating-IP: [14.143.30.134] X-ClientProxiedBy: TY2PR02CA0011.apcprd02.prod.outlook.com (2603:1096:404:56::23) To AM0PR04MB4849.eurprd04.prod.outlook.com (2603:10a6:208:c4::26) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: ab68e057-e95f-430a-ea1a-08d6291d5b33 X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989299)(4534185)(7168020)(4627221)(201703031133081)(201702281549075)(8990200)(5600074)(711020)(4618075)(2017052603328)(7153060)(7193020); SRVR:AM0PR04MB4849; X-Microsoft-Exchange-Diagnostics: 1; AM0PR04MB4849; 3:X2SXEL+DE+hSyLOXpyQWJRUlPfapN96apJ9A+vTV65zP014poD/GKAe0J6wNEz+dLuJXXHn+3wp5Mq844lAy2N+T62hDsOn/mFNbaNWCYzjE1b7pLv4QEvF2GCpE/iDrOZoaGQJS6IHFFK0nMMd9SfySUIDEw/M7DAjV0BlbwLWJsF7ZN3suJKjU3KHioeIVicKRHqaR8eQVjDULIrAO4jfnmPwjSl2qqxuetl0tYRobwGX3gaKqf5fi8ubOM3wM; 25:U3bBSV6+A6RPcw3M4JwakPteSvQekpu0twxi7IR/a3R1jpNc3TfaN8DhUZLavWPRSLBfhpMLM+PvHtJqeLoU8dZfbrNXcXJchCaaQrXJPdyFfiFTWYFM3ycwVb8h/5vBDzEwuy07Ckw6D/je7TZDLWek24UlMv9lfkL3TsDSObkDFb+frvUIpCB4H/o1WjMnafR7RO2A+/MBtL1ANcCXwaZA/FIqgorqfEBfvhPfqZxvk3NF+Y22gIHHyMZlileEFjrGioYmek0r0sgvBihVYyxMAFhs5W5QVeCno7KBNASnPvqCi9GRp5xJddbKVgJf53kTgXtpPp1U6cvMRYNvRA==; 31:t4ng2/rQ+Wfii0DdoarSY5uNevn4OXmlfIlRX3YrODoQPN56iPsMiJ3CQ0PgRIBEH34xwt+i4gwydfPUQMkTDPQK0atNbFh/suZDp42yR1VnWQRg3IPpfx/kE/cXoBYnKAPZ2QGqgXbhEJ/CRfULK/dSsdqHvL+8RxWNW7gC3d6xAh+x2TqKafqhVqMz+GdpeIfmp07YuOSJaAnIx1bDLZpQFQdR5A++HsskwcUjxj8= X-MS-TrafficTypeDiagnostic: AM0PR04MB4849: X-Microsoft-Exchange-Diagnostics: 1; AM0PR04MB4849; 20:qaocvsF6HcaV4z55+P+ZcY6V0kh7k10NudCcQTk+RENNXA20Wifash1/LfEh+PAL8Ov/1QLY2qmJNDmwFxXcUbp8Eom+u37ZfDtzORpkV2Fb+NCS1BBzg0I4sgB8RgOwHtD8U/JOhdTzqYe4QcY0d7/sK0jbuGxtJKODU0PfHABsa9qci6OLrfgIYheRTDl9tPfwvR0s0tg8BFfT+BMVWEtak8HPe8qhKKIKAw2LNy78Oakba8hz+mazEfWouBFFnNYdKXvF9e5MfN6IF9KURLQBRMiZZrQMZARgXl4K5dFnldMqd0TleRDG1mRXcHuSQdgrgW4/p+Rso0EWlsaxFMNlLwkDIDrWJjBOkIbL2Lqr8RojVfqe6PZmmJ2jAtoNawpiSokpPjiNjkOeyx7iylflqBjH9/W5/ZYKdTjKGIROJrxZi7tTrV3DQoUZu2CcXmPras9AzpXn3a1OOzkwK5/ktJmkEYJuv3TR+/LVPyDZZppmkN9cqLu0QsnJAiRl; 4:BLtvXRQ6FbdIjpUFj3jyUQ/aJvRngs/6oYXEk9GybkOOAOzAKlhRzN5gwpLnJOo0RBwOiDOokeS4pLvRWGsQAbSK19XltNljFdhovOn2iuNYc8BoCslqdIrKBwCemAFtgMN9hLMwxw6pCWTp3hGHn4lDDMDUnEeC9N7QPdvfw95OcWmLSkfUJZBNponT0I1tELc1+x9TuEe4ZSaoPNNKeub0J4o2cjL6pv1hJR+yApu6PaPp0rBsWaKSnYPLIkUocMqcpPoo1cy/bs8CY7xwBzIydCgqybqnZjImF6q+/AZZaEHsIOHtMwUCP49extD4skyjwMQLgfIjO6eaARaV0q+XHBufkT+CPX7nRA6Fw3c= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(185117386973197)(192374486261705); X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(5005006)(8121501046)(3002001)(3231355)(944501410)(52105095)(10201501046)(93006095)(93001095)(6055026)(149066)(150057)(6041310)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123562045)(20161123564045)(20161123558120)(201708071742011)(7699051); SRVR:AM0PR04MB4849; BCL:0; PCL:0; RULEID:; SRVR:AM0PR04MB4849; X-Forefront-PRVS: 0814A2C7A3 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(346002)(376002)(366004)(136003)(39860400002)(396003)(189003)(199004)(66066001)(50226002)(97736004)(7736002)(50466002)(55236004)(6666003)(14444005)(6506007)(386003)(16526019)(53936002)(26005)(68736007)(6486002)(186003)(47776003)(8936002)(8676002)(81156014)(476003)(81166006)(5009440100003)(4326008)(16586007)(36756003)(5660300001)(86362001)(575784001)(2906002)(1076002)(2361001)(2351001)(478600001)(446003)(3846002)(6116002)(316002)(2616005)(44832011)(305945005)(76176011)(956004)(486006)(48376002)(105586002)(106356001)(51416003)(52116002)(25786009)(11346002)(6512007)(6916009)(110426005); DIR:OUT; SFP:1101; SCL:1; SRVR:AM0PR04MB4849; H:phoenix7.ap.freescale.net; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; Received-SPF: None (protection.outlook.com: nxp.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; AM0PR04MB4849; 23:i8az9gcl9ncS9sq9IGKFblM8mRMuJxf2WlJTYZiv3?= rZ8SIAd9JIW6g2r4DWp9Evy2nbC/h0wzoc4vVZ89UYH7jiY6guNPHpl9cByp5V7QquRJP6vDMBWSvWgAFr4NcqhHEd3IYKnkUtzDCfg6uwfqyssf2zYLfP5pcEWT+OKK0ne9YOjR50gAmvfZTT8aHvtOozVU0tasVmk3NfxMqkVBZj8/6LZarFuuvB6VXb2TyaiXeme7JoSWWDowR2cOFJAhJ1fTA6hMjoyIn0nKfH6ObmF4tr6UuSQP9Z/SGiF2GoNhljybJPBT812CiEKjywnFK7JzdxdEngSH7J3IydWlE+8MjhDgnauFi0KjCtiJXY/f9xztQ0pVwVjR2r/BoDTBihdJwJ9rm8t64EbWSfAbkyVR5ve1b0KF5SCA/5P9crha7bxUMVGvdKiZWrVEEJFqG01fEszE/vU27TJesYn7m02RZHurj7zU7ZDOmEG8gGC5CUsXgyx4m8dFGLg2il93L3h/znz8Sp/FFwT8LZHdmIVlcMNpL3BO43XS12STXV/PTZ8ORan24E+fI5ueINVLU42v2gzs99a5fHTig48VUYrE1ImFjBIgZCd33A6iMNz6a6+nNx3+I2Q8WJprsQ1HBa/RPQMN15Sy/9MahqCMsn0OomwzJDKLQLeLFHn6DhkPp5wrOQOJNgwmJHirMINXk8wSMqcn8tOveiqrUTZ7KLPoQtwD1rtkjH21wNhU369C/x/P8fm3ZgsscV3PFZbybzUP9/Jb29goJjwIN5/t3eB8hclN6YZZh2UTGtM1q4hnRUSuBnduYcXFA7H/nmOCOyyew4Rrwepk/o7CM7l5loFwE2ExctxcxZhe1LozlGwQHZnxPvmRlkY5JOyfnskdGt6vGqiBwhV6T7mY7mETSY7Rd/l5oyjtcCmZ1fBVnidi0GAHMqVTyqEx0uZoVEdG8h0OcFsIqrOgh4n9BXodJ0pxMLY75khqFmpKgYnIbBsCeQV+wdYfiAXJ74IOrwNs9ajZ3goyElG+jmVXObsyJYJ+2JQE5vz/QfRNa/EJcdEKqOqlrfTcImvp8sbN+NQWhYXJ96XdSXDsAqT8uDgoXqhtB16mQabDp4jCpwOscW1yC6TprpVMHeyqbmnihaxqXQEj96k/3z53E0fqaxw9PKN0ATKAaDBwHj1Co8zP0vWo5yfX1kbKVvuOKDVdNZR3yyG1juAIl0/FGuqD2oYM0eQepcLn6y7lJRZ/Hwyo5gw65xN95uwB7B1vrdc/2FclKIRiYgFhG0D442Cy9LzKiq65YxT/J2CvJZr6BKvT2pIKdsh50NUHpXRp7EAnZIAU23LGUmMQ+lRk6sOF/yT3A== X-Microsoft-Antispam-Message-Info: nM1cwQ3rU8VVVJK63EpOfKmpjl98dj2fBqSHZYt7xwfgmpcbeEB95toZ+QJLeZKlwjT0F/PGSbtl1ttPCicZRZrhWOwfnS1ix77fswj6twxHhr7LbE/gtaFsHJ5C0HAhdNvWByRDZe3/ODcKpkisbOzj6EuAlgyvJRhqlqS8XJ/yBSUatExDHH05eoDC9yOdZpWSBUFyZhjOpJQgzbid4Eoo7RKitHWFgh+/QxXD0YhnUqVMS27fZFqiPYAGpWFLieIXyqLZ8R3yV5afoI+OFEnHUGMP7uaGQ4Fx+LCCkJg+zNiL5BRbn5LQ44PkKGs744KBPl4fsKOY7z8LcEky+70LzTmY/P9AqJkd0YGPHNk= X-Microsoft-Exchange-Diagnostics: 1; AM0PR04MB4849; 6:fJC+a3QjWfapbQ81P5PHbOymg1flvGyN7qbOqNtst5+E6aegpZlgmpudgW9vX9C8ouVduAodeM8Ahbx7eMsPSCrCFJ3oLTbosH3YxZsGNYHgz9sCPxsF3UOyNBrOnj+A7dlpgtUC01arKBc39VBqtOF9+8cJNfNLhKA3kwuCNYg3UtwGB3/srYSqYW0guIYS06UUuzNCzAYzrK9z+yc872UCqBbRSx45g2x/1Wt+GCNLfPNe2I+c8B6hDEdwV0ZShjL816zly++NyAXQp8GctGStqmJtGj4VSiHraXpWXKDbawFfdKIbFHIpQLeysaZQNsn6R1lWtQlXuNXbDliIbQKcLy+X61dHZdzq61x78ayUmlw4cLR6/Ia1UWHlwx896kJMQ2MHW5gdWYwH8nv9RpFDH18IcMCmM8IJpzIcxwQCBssrQ52kC1Cp8U50moWcx+0a4wTul2+2YTUg7yAyrg==; 5:8oo4vsCX1pfzdQYOlj1Z0nkByPmAhYuxORDvp4UvXKlzI7A09tGzu0Ylzn4q6hku1stHiJyjwQ3BoLEzYvyUc57FnHmcm6kdcuKuTlboIxTpxfVojecI+cuUO5sGBDEc7pWhq8QxDSmOuvgfqplK4eMul/PL5dYpW3fX0/lTEXE=; 7:Pxhr9vF7dufXAOVmbVsOHa/yrwM7o6vTatUSLl9Pe4lJjDB9XdD84gqn3iwyNy3C9ZkVh8Z18y645GvHA0LiElN5gq8utug+LENJ/hIjpLR0q5LQR0sphnhyAtdcRcL3Nye/WOB2DyeQETJM01cGGHP+JzlfcGtvlZQpXtni+qm3ZQLtealZXlDkBXXrEquWKyky1Sr39VhADpINFPIdU5U24uAQWQuIH+fC3sucHgxn/vQDSPrRSUk1uWw+wonc SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Oct 2018 10:45:35.4344 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: ab68e057-e95f-430a-ea1a-08d6291d5b33 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR04MB4849 Cc: Pankit Garg Subject: [U-Boot] [PATCH 06/53] armv8: fsl-layerscape: identify boot source from PORSR register 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" PORSR register holds the cfg_rcw_src field which can be used to identify boot source. Further, it can be used to select the environment location. Signed-off-by: Pankit Garg Signed-off-by: Rajesh Bhagat --- arch/arm/cpu/armv8/fsl-layerscape/cpu.c | 190 ++++++++++++++++++ .../asm/arch-fsl-layerscape/immap_lsch2.h | 20 ++ .../asm/arch-fsl-layerscape/immap_lsch3.h | 49 +++++ .../arm/include/asm/arch-fsl-layerscape/soc.h | 17 ++ 4 files changed, 276 insertions(+) diff --git a/arch/arm/cpu/armv8/fsl-layerscape/cpu.c b/arch/arm/cpu/armv8/fsl-layerscape/cpu.c index bae50f68d8..3b4f110027 100644 --- a/arch/arm/cpu/armv8/fsl-layerscape/cpu.c +++ b/arch/arm/cpu/armv8/fsl-layerscape/cpu.c @@ -31,6 +31,10 @@ #include #include +#ifdef CONFIG_TFABOOT +#include +#endif + DECLARE_GLOBAL_DATA_PTR; static struct cpu_type cpu_type_list[] = { @@ -576,7 +580,193 @@ void enable_caches(void) icache_enable(); dcache_enable(); } +#endif /* CONFIG_SYS_DCACHE_OFF */ + +#ifdef CONFIG_TFABOOT +enum boot_src __get_boot_src(u32 porsr1) +{ + enum boot_src src = BOOT_SOURCE_RESERVED; + uint32_t rcw_src = (porsr1 & RCW_SRC_MASK) >> RCW_SRC_BIT; +#if !defined(CONFIG_FSL_LSCH3_2) + uint32_t val; +#endif + debug("%s: rcw_src 0x%x\n", __func__, rcw_src); + +#if defined(CONFIG_FSL_LSCH3) +#if defined(CONFIG_FSL_LSCH3_2) + switch (rcw_src) { + case RCW_SRC_SDHC1_VAL: + src = BOOT_SOURCE_SD_MMC; + break; + case RCW_SRC_SDHC2_VAL: + src = BOOT_SOURCE_SD_MMC2; + break; + case RCW_SRC_I2C1_VAL: + src = BOOT_SOURCE_I2C1_EXTENDED; + break; + case RCW_SRC_FLEXSPI_NAND2K_VAL: + src = BOOT_SOURCE_XSPI_NAND; + break; + case RCW_SRC_FLEXSPI_NAND4K_VAL: + src = BOOT_SOURCE_XSPI_NAND; + break; + case RCW_SRC_RESERVED_1_VAL: + src = BOOT_SOURCE_RESERVED; + break; + case RCW_SRC_FLEXSPI_NOR_24B: + src = BOOT_SOURCE_XSPI_NOR; + break; + default: + src = BOOT_SOURCE_RESERVED; + } +#else + val = rcw_src & RCW_SRC_TYPE_MASK; + if (val == RCW_SRC_NOR_VAL) { + val = rcw_src & NOR_TYPE_MASK; + + switch (val) { + case NOR_16B_VAL: + case NOR_32B_VAL: + src = BOOT_SOURCE_IFC_NOR; + break; + default: + src = BOOT_SOURCE_RESERVED; + } + } else { + /* RCW SRC Serial Flash */ + val = rcw_src & RCW_SRC_SERIAL_MASK; + switch (val) { + case RCW_SRC_QSPI_VAL: + /* RCW SRC Serial NOR (QSPI) */ + src = BOOT_SOURCE_QSPI_NOR; + break; + case RCW_SRC_SD_CARD_VAL: + /* RCW SRC SD Card */ + src = BOOT_SOURCE_SD_MMC; + break; + case RCW_SRC_EMMC_VAL: + /* RCW SRC EMMC */ + src = BOOT_SOURCE_SD_MMC2; + break; + case RCW_SRC_I2C1_VAL: + /* RCW SRC I2C1 Extended */ + src = BOOT_SOURCE_I2C1_EXTENDED; + break; + default: + src = BOOT_SOURCE_RESERVED; + } + } +#endif +#elif defined(CONFIG_FSL_LSCH2) + /* RCW SRC NAND */ + val = rcw_src & RCW_SRC_NAND_MASK; + if (val == RCW_SRC_NAND_VAL) { + val = rcw_src & NAND_RESERVED_MASK; + if ((val != NAND_RESERVED_1) && (val != NAND_RESERVED_2)) { + src = BOOT_SOURCE_IFC_NAND; + } + } else { + /* RCW SRC NOR */ + val = rcw_src & RCW_SRC_NOR_MASK; + if (val == NOR_8B_VAL || val == NOR_16B_VAL) { + src = BOOT_SOURCE_IFC_NOR; + } else { + switch (rcw_src) { + case QSPI_VAL1: + case QSPI_VAL2: + src = BOOT_SOURCE_QSPI_NOR; + break; + case SD_VAL: + src = BOOT_SOURCE_SD_MMC; + break; + default: + src = BOOT_SOURCE_RESERVED; + } + } + } #endif + debug("%s: src 0x%x\n", __func__, src); + return src; +} + +enum boot_src get_boot_src(void) +{ + u32 porsr1; + +#if defined(CONFIG_FSL_LSCH3) + u32 __iomem *dcfg_ccsr = (u32 __iomem *)DCFG_BASE; + + porsr1 = in_le32(dcfg_ccsr + DCFG_PORSR1 / 4); +#elif defined(CONFIG_FSL_LSCH2) + struct ccsr_gur __iomem *gur = (void *)(CONFIG_SYS_FSL_GUTS_ADDR); + + porsr1 = in_be32(&gur->porsr1); +#endif + debug("%s: porsr1 0x%x\n", __func__, porsr1); + + return __get_boot_src(porsr1); +} + +#ifdef CONFIG_ENV_IS_IN_MMC +int mmc_get_env_dev(void) +{ + enum boot_src src = get_boot_src(); + int dev = CONFIG_SYS_MMC_ENV_DEV; + + switch (src) { + case BOOT_SOURCE_SD_MMC: + dev = 0; + break; + case BOOT_SOURCE_SD_MMC2: + dev = 1; + break; + default: + break; + } + + return dev; +} +#endif + +enum env_location env_get_location(enum env_operation op, int prio) +{ + enum boot_src src = get_boot_src(); + enum env_location env_loc = ENVL_NOWHERE; + + if (prio) + return ENVL_UNKNOWN; + + switch (src) { + case BOOT_SOURCE_IFC_NOR: + env_loc = ENVL_FLASH; + break; + case BOOT_SOURCE_QSPI_NOR: + /* FALLTHROUGH */ + case BOOT_SOURCE_XSPI_NOR: + env_loc = ENVL_SPI_FLASH; + break; + case BOOT_SOURCE_IFC_NAND: + /* FALLTHROUGH */ + case BOOT_SOURCE_QSPI_NAND: + /* FALLTHROUGH */ + case BOOT_SOURCE_XSPI_NAND: + env_loc = ENVL_NAND; + break; + case BOOT_SOURCE_SD_MMC: + /* FALLTHROUGH */ + case BOOT_SOURCE_SD_MMC2: + env_loc = ENVL_MMC; + break; + case BOOT_SOURCE_I2C1_EXTENDED: + /* FALLTHROUGH */ + default: + break; + } + + + return env_loc; +} +#endif /* CONFIG_TFABOOT */ u32 initiator_type(u32 cluster, int init_id) { diff --git a/arch/arm/include/asm/arch-fsl-layerscape/immap_lsch2.h b/arch/arm/include/asm/arch-fsl-layerscape/immap_lsch2.h index be0a6ae363..16528911d7 100644 --- a/arch/arm/include/asm/arch-fsl-layerscape/immap_lsch2.h +++ b/arch/arm/include/asm/arch-fsl-layerscape/immap_lsch2.h @@ -675,6 +675,26 @@ struct ccsr_gpio { #define SCR0_CLIENTPD_MASK 0x00000001 #define SCR0_USFCFG_MASK 0x00000400 +#ifdef CONFIG_TFABOOT +#define RCW_SRC_MASK (0xFF800000) +#define RCW_SRC_BIT 23 + +/* RCW SRC NAND */ +#define RCW_SRC_NAND_MASK (0x100) +#define RCW_SRC_NAND_VAL (0x100) +#define NAND_RESERVED_MASK (0xFC) +#define NAND_RESERVED_1 (0x0) +#define NAND_RESERVED_2 (0x80) + +/* RCW SRC NOR */ +#define RCW_SRC_NOR_MASK (0x1F0) +#define NOR_8B_VAL (0x10) +#define NOR_16B_VAL (0x20) +#define SD_VAL (0x40) +#define QSPI_VAL1 (0x44) +#define QSPI_VAL2 (0x45) +#endif + uint get_svr(void); #endif /* __ARCH_FSL_LSCH2_IMMAP_H__*/ diff --git a/arch/arm/include/asm/arch-fsl-layerscape/immap_lsch3.h b/arch/arm/include/asm/arch-fsl-layerscape/immap_lsch3.h index b0cec74db0..816d960b2f 100644 --- a/arch/arm/include/asm/arch-fsl-layerscape/immap_lsch3.h +++ b/arch/arm/include/asm/arch-fsl-layerscape/immap_lsch3.h @@ -82,6 +82,55 @@ #define CONFIG_SYS_FSL_JR0_ADDR \ (CONFIG_SYS_IMMR + CONFIG_SYS_FSL_JR0_OFFSET) +#ifdef CONFIG_TFABOOT +#ifdef CONFIG_FSL_LSCH3_2 +/* RCW_SRC field in Power-On Reset Control Register 1 */ +#define RCW_SRC_MASK 0x07800000 +#define RCW_SRC_BIT 23 + +/* CFG_RCW_SRC[3:0] */ +#define RCW_SRC_TYPE_MASK 0x8 +#define RCW_SRC_ADDR_OFFSET_8MB 0x800000 + +/* RCW SRC HARDCODED */ +#define RCW_SRC_HARDCODED_VAL 0x0 /* 0x00 - 0x07 */ + +#define RCW_SRC_SDHC1_VAL 0x8 /* 0x8 */ +#define RCW_SRC_SDHC2_VAL 0x9 /* 0x9 */ +#define RCW_SRC_I2C1_VAL 0xa /* 0xa */ +#define RCW_SRC_RESERVED_UART_VAL 0xb /* 0xb */ +#define RCW_SRC_FLEXSPI_NAND2K_VAL 0xc /* 0xc */ +#define RCW_SRC_FLEXSPI_NAND4K_VAL 0xd /* 0xd */ +#define RCW_SRC_RESERVED_1_VAL 0xe /* 0xe */ +#define RCW_SRC_FLEXSPI_NOR_24B 0xf /* 0xf */ +#else +#define RCW_SRC_MASK (0xFF800000) +#define RCW_SRC_BIT 23 +/* CFG_RCW_SRC[6:0] */ +#define RCW_SRC_TYPE_MASK (0x70) + +/* RCW SRC HARDCODED */ +#define RCW_SRC_HARDCODED_VAL (0x10) /* 0x10 - 0x1f */ +/* Hardcoded will also have CFG_RCW_SRC[7] as 1. 0x90 - 0x9f */ + +/* RCW SRC NOR */ +#define RCW_SRC_NOR_VAL (0x20) +#define NOR_TYPE_MASK (0x10) +#define NOR_16B_VAL (0x0) /* 0x20 - 0x2f */ +#define NOR_32B_VAL (0x10) /* 0x30 - 0x3f */ + +/* RCW SRC Serial Flash + * 1. SERIAL NOR (QSPI) + * 2. OTHERS (SD/MMC, SPI, I2C1 + */ +#define RCW_SRC_SERIAL_MASK (0x7F) +#define RCW_SRC_QSPI_VAL (0x62) /* 0x62 */ +#define RCW_SRC_SD_CARD_VAL (0x40) /* 0x40 */ +#define RCW_SRC_EMMC_VAL (0x41) /* 0x41 */ +#define RCW_SRC_I2C1_VAL (0x49) /* 0x49 */ +#endif +#endif + /* Security Monitor */ #define CONFIG_SYS_SEC_MON_ADDR (CONFIG_SYS_IMMR + 0x00e90000) diff --git a/arch/arm/include/asm/arch-fsl-layerscape/soc.h b/arch/arm/include/asm/arch-fsl-layerscape/soc.h index 61b6e4bf07..d327c7ba1f 100644 --- a/arch/arm/include/asm/arch-fsl-layerscape/soc.h +++ b/arch/arm/include/asm/arch-fsl-layerscape/soc.h @@ -53,6 +53,23 @@ struct cpu_type { #define CPU_TYPE_ENTRY(n, v, nc) \ { .name = #n, .soc_ver = SVR_##v, .num_cores = (nc)} + +#ifdef CONFIG_TFABOOT +enum boot_src { + BOOT_SOURCE_RESERVED = 0, + BOOT_SOURCE_IFC_NOR, + BOOT_SOURCE_IFC_NAND, + BOOT_SOURCE_QSPI_NOR, + BOOT_SOURCE_QSPI_NAND, + BOOT_SOURCE_XSPI_NOR, + BOOT_SOURCE_XSPI_NAND, + BOOT_SOURCE_SD_MMC, + BOOT_SOURCE_SD_MMC2, + BOOT_SOURCE_I2C1_EXTENDED, +}; + +enum boot_src get_boot_src(void); +#endif #endif #define SVR_WO_E 0xFFFFFE #define SVR_LS1012A 0x870400 From patchwork Wed Oct 3 10:44:13 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rajesh Bhagat X-Patchwork-Id: 978169 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; dmarc=fail (p=none dis=none) header.from=nxp.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=nxp.com header.i=@nxp.com header.b="cBiC5Rs7"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 42QCST465Nz9sBh for ; Wed, 3 Oct 2018 20:49:13 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 3F4C9C220FD; Wed, 3 Oct 2018 10:47:35 +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=BAD_ENC_HEADER, 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 4804BC22075; Wed, 3 Oct 2018 10:46:15 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 58D2DC220EF; Wed, 3 Oct 2018 10:45:50 +0000 (UTC) Received: from EUR02-AM5-obe.outbound.protection.outlook.com (mail-eopbgr00047.outbound.protection.outlook.com [40.107.0.47]) by lists.denx.de (Postfix) with ESMTPS id 4FD2EC22087 for ; Wed, 3 Oct 2018 10:45:42 +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:X-MS-Exchange-SenderADCheck; bh=nZcRlCiuglJIh/NfS89tRHuGO/qSO3iCQXvg4tS5Ywg=; b=cBiC5Rs7eMhZ0ZytI6PIbzIHIJyOepQ1pCv9EET4lrX76KczNTyiFEODjw16LEneUW/r5kMByccBnisuv+pYQp7rIs9+cMBDITYzc+6aUkYXFKKUF6vMzdx1s8rHa3RlQkuwiyweerDS/mUJLXcgPcdtTdySbY9U7muhtNn18d0= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=rajesh.bhagat@nxp.com; Received: from phoenix7.ap.freescale.net (14.143.30.134) by AM0PR04MB4849.eurprd04.prod.outlook.com (2603:10a6:208:c4::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1185.24; Wed, 3 Oct 2018 10:45:38 +0000 From: Rajesh Bhagat To: u-boot@lists.denx.de Date: Wed, 3 Oct 2018 16:14:13 +0530 Message-Id: <20181003104459.5444-8-rajesh.bhagat@nxp.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181003104459.5444-1-rajesh.bhagat@nxp.com> References: <20181003104459.5444-1-rajesh.bhagat@nxp.com> MIME-Version: 1.0 X-Originating-IP: [14.143.30.134] X-ClientProxiedBy: TY2PR02CA0011.apcprd02.prod.outlook.com (2603:1096:404:56::23) To AM0PR04MB4849.eurprd04.prod.outlook.com (2603:10a6:208:c4::26) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 8d55137d-631e-49ab-3200-08d6291d5d2b X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989299)(4534185)(7168020)(4627221)(201703031133081)(201702281549075)(8990200)(5600074)(711020)(4618075)(2017052603328)(7153060)(7193020); SRVR:AM0PR04MB4849; X-Microsoft-Exchange-Diagnostics: 1; AM0PR04MB4849; 3:JLhpmtOJF/xyIdFl32BisWAyd/8UyNqsMYk0HHds8ipgLjK+feIg1YMQhkStMqkinIDuVXEofsU0XbYDvqiSna/DH3wHJYepOtBZneZBa6d7IcK/GL7Mtl3uAmJdbDisDqDXx84wDfGkKFNnCAqWfm8U64dpazu2++Ad5nyS/V3zV0TfO+Wx2n4hz9lD1g6QGshVt1izBSMv2mi6KUNsYL7emQj7487T9U6Ss9CNQ8jkVXLW17/3uv/byAuIiZNE; 25:NsP9znr9Efupf5C6QIBcrhyqEsGeaxxM0tWyzqhgb7bLFQSG5eJj4t1/dYSz9k2imIq1MLfMZMVLiDh58MmykT5doXQrnaXfHayhHB21+lA/7+Nhin/PBY9TLhLVdayR7PzDriQIDr3iikBUPveDMcPaavdbBUEyqqARUpCdzi9hniejCjwGiZGzdDF3xdLy5yhk+D3F+341xyDrVpMwJIKqE0rZzsry4nHdG58YKyRyBGtSFyxjiEig/RBwVCtfIgybSHmwV58YC97aPg0WGOL5fONo1rcvHN4DeT1qZGTUcJ1zxpJhjTnHKkZ3zfNcQ0JTNV1ANMHRsn1RP2L0aA==; 31:fQPhEx2w8O9SyfuJUQehgMlt2Duk6rl6pGs/NajyjoQQpeu8SJd/y6D0kYLZX9/MpQHpwE8K7RqhOMzuJ8KYd1iQNPX6a5la+ZVnAjyGSr86u3B/vR7sln3z40tht0PstrrDWjJ2kSLNtlK+pR5lYSHdx73CGSMWMdwKxrce037toJYiEENUOcNhfobZfiuFNpZmyTwNFZ/wtSSfOe9oZ32Ffel2tDwvmY8PsW1kJf8= X-MS-TrafficTypeDiagnostic: AM0PR04MB4849: X-Microsoft-Exchange-Diagnostics: 1; AM0PR04MB4849; 20:iJLi7iz3drGizs8sBwhiYXG3j1LcYsscmaPSLeU8B8iPij74OXvRhYZqh21LJXYXFVngMVFT7ObnAcrdeKyIQvrtJvB/xcju7hF7S7m1B2FPe8A7DWcBGIce7ZMs/bRgijXiOQpKCZqTlZsiPzSHP3y7BDLBFCE0X04m4dYvKVTlLRzU3Nn3acjIsc7kVIUR2bnn/oGYkZgBnrR/quBNaSfVq3vrKMH9ZQTfSJPFKQ9HwfNoHXkgh026jto3aoRYT2AtnUTWfaDYmNZK0yYCOwkyx6dYg+zS8/pt+Ahpby23dCF5sQjP0FR0uUtOcX0UUqJ1dCdzGrJtwSBuCNc4zR8i4wvRd3ypkBU9m1EpzNi0D5rmEoW/8jqfoyR+ypz79JfhJFvvMpTcUhYK1tSjIyMAnn09LPW0lDOEYwblORNPdophMUHhgpMznfqAA32NbWU5agYnaTPQsIHFFCGUF+nGzvQHWgCps1c91YMiEa/+E5zMEDvdCE8IVedEQq+U; 4:hiX+hg5RH9nmGx1UQODwjOLhMYJVzZnsVz6z5YfoPhq45ON0HxqMKPmCuugAeRi1UfZpMnGONXvBh4sCJODMZayHCI60rIiShIZg8Feh6kLhKGCex9k0m6h9hzb8fvPa2G0Vw9hgM2NRwTCcFGMNooDkzx5ZAtFhn6OkgpQ4E/Ck87gDwKfRB+OLayAeGxA6wBEIQPzA6hAreVeFlCH6Gj0l526nNnI7alEptUwxGwVgUqSlNOUmFhcVv9yoHIWafRoXv5FSp/yQ8Vs7oA2bsyhzpcDAP0wSWH+Qis0W8EwWj40/iSgcZ2VIpRntRWG7 X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(185117386973197); X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(5005006)(8121501046)(3002001)(3231355)(944501410)(52105095)(10201501046)(93006095)(93001095)(6055026)(149066)(150057)(6041310)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123562045)(20161123564045)(20161123558120)(201708071742011)(7699051); SRVR:AM0PR04MB4849; BCL:0; PCL:0; RULEID:; SRVR:AM0PR04MB4849; X-Forefront-PRVS: 0814A2C7A3 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(346002)(376002)(366004)(136003)(39860400002)(396003)(189003)(199004)(66066001)(50226002)(97736004)(7736002)(50466002)(55236004)(6666003)(14444005)(6506007)(386003)(16526019)(53936002)(26005)(68736007)(6486002)(186003)(47776003)(8936002)(8676002)(81156014)(476003)(81166006)(5009440100003)(4326008)(16586007)(36756003)(5660300001)(86362001)(2906002)(1076002)(2361001)(2351001)(478600001)(446003)(3846002)(6116002)(316002)(2616005)(44832011)(305945005)(76176011)(956004)(486006)(48376002)(105586002)(106356001)(51416003)(52116002)(25786009)(11346002)(6512007)(6916009)(110426005); DIR:OUT; SFP:1101; SCL:1; SRVR:AM0PR04MB4849; H:phoenix7.ap.freescale.net; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; Received-SPF: None (protection.outlook.com: nxp.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; AM0PR04MB4849; 23:gNea2kTT3dZUHzwvy8T1Kl60/+MxhVt0lOJcfHfpq?= WJNadZV4I+BbKfqDE5kS2kZddm5V5Ff1vly3NyB+WZw3aqYvuoKv5bvyPqxuT4Yc1vc11RhALddd/nnkfAHtRYg9lXn8xWO+Wef2s587L07o/pRbL48c8OFB0dKCHMCYGebONF+yqhOZ1+q6t1hkui7JL/na/2J2ojkJhRAG36D3BGuHiPCwP3TYPO1bkqUonvyQVINudoSmbO5bccRU4teAtQ+JfGkKlkZY5+Ige1q8AJ+0ucdKJV6VDnNWT54B20kvFO28hpvtOTEYjcOsjAA4uWoIbj/DDenyHSYlu9kHyIAskbaJu1LnZh2Sg7NXwG3Un43xaMLNRvExR3lIh9bId8eRzt9BPriT9YKPrgcJ0skpgtvywgeoqPiaTs/NtCCCZdpL1E5sgLcPrnHRcxd5LGJAiMXY4Z3Ko8SWqVkiXzl0tk1Qg9SytgLQ5mfpKEFrvXsHqe93wP1PCdN98wW5sRcQ/051tKt8RmL22nab+mjmV+4kSWooYHiN/qPg1l/F4qwGL3K6tEnQB+/JeZfeXVnulHSk4TTO+LD4NZvICbl74+H5dDLyQi39Ny3QWZ4OTRh52pHCQq2X+3/eXWHak0c1dh5IkhcL1aYKfpPnaMSeI39yck7KDgg3uVEhsCOT3+/JpfmvAOn1pgnxWOyQoUET6NLy9eDJ4iq6q+mP+Ub0uLjko6tN3JbwUXXsG1P8EbDoOZEeLlTBwTInurQiYocHCZtZu1k6S7HWyXkmrF4Yt5zUZJW+AezkAUxvZ9dcWAL0pd/8sDJd1mrmnIdiLA0rSm00+xm+NGYpX/JmIriUOeSGY3Zs9aBWs/ljtBIGnONOmOgXnbX+mWi4uigj117C+alRCLbxMGlX8Knjy+/LLrX1tZppjKRC2aV++Ctw+LioKwPle9EnMJfJotft9VuYWUTzOEmv28GRjJddgLbDQg6EfOd2kAVe4gbre0HEe1Hny2Y66Ra/Oje5tfXwDhxwmhvBRRMQaJej5HHWD0kmM0uLwp5/I0GdVXyR+Is1GODL82NXwzlC1AA8iW3Ovb5ZjOyFlnSJFKiPlvQUBflGHdRfqgojipUCBgUT6QwH/YP2F1osuEUH8ZdPwOKJYFB0+mVTNoRmbpUba69hbgrlYh+qs/kVok5BdgKLZ7vJ9XiZtUyuXjT5CfRtLy9sC8FAPdg8I1Kq9MeITXMXDT8UKpRTgrKoiJuGMyT/SFOZmoStcaNv57BlDjWqg2JvIZqL1LaXWR5nFlqS1ITRSjkN/CO1Fa0TWDwR798htLU8MXHiq+XkJ2IrNmE93jL X-Microsoft-Antispam-Message-Info: n58d/2xF3aBq1BOxZJh843bFMLGpAWcVaJskaBZPVWz+nsLXB4gErNJiyZQXxsrVLmxvGbyhY6aO6INP3NVOBqBI0EM8bwNGTZYG+WJpoR6asvdMcjSYD7mSX8g5Vequ8OqqtjOJyODyqRg3pOfsfc+XoiHA4OwcB0ZaUvM63cIOUx7BIKIjq7vynil8QpaSFnQlYlwUqN468kMaGQp9Jcr7Epb5z5tI+7elDytGPOOkTq9k3iNryVtWn8beYMIGEhrCVfmd+moMdhublzmEYGHrxSa9rAJMPv5GcHaIK//RYaC7DelmT4Q2KXXRGzFH4oa8K4KtQl6xiCNtPCB+gHQXtRb4QIZCclosqYKQIo0= X-Microsoft-Exchange-Diagnostics: 1; AM0PR04MB4849; 6:L8t+iVvJ5SWRK/zH8Cg4+bZOszCMS596m85bvcTB1V1lepT8IVeED5ShEvSbVGO9zzoKL3xfzB9lM4W7/n9h+DpFN5pR9xLLWLh4qwl8BcyOatJlY1ieHNVew9U9/BpiIDIddZuJOjwy8jZv4SVU5RNN+vKbOum42yJoP/37IOmLntEdgM64cxNuAcjyqKFJwUJbzRZzBd9ZKcFvG1IQLdC3fVZ5co4YKXITW4ppZfqsJZ4z/T8VqmEH2XSuqqzbOsbdxMnSwbj8JkKLT/oX3yeb3nlaAfis7D51CAekVf/lY3nF8DMJksE//4sq/Cu+kYoECyZs0Za6CAgmZb3/GObf+6ZGtocpVWmGj10GzD6anucxRcNiJCJjWqhtiNU+8oxddcbQfhH8D12OJ/J3Z/nqgz5dk6b/ReH4CW3NfooEbXZYZSDT9MFcnKEtdhmnDDWK10cDsDCflSzw2M1a8g==; 5:/taQJHrgtUcx70IDRyfhdeSdRVExuEh55tAXrNsdkmdFZZ2hcV1tKRdARK2rflGpOg3CTqDAZcDWegWQjaHQQTMlyEOrT9/vu/H3TfCWjqk0C4b4nc59ifSGOPwJbGIGCzfUUircrrQaU2j3Wn9hii9/tdBmGWRJyskwukDdES4=; 7:Q9W5iq4xH0bsHIsnpmHywEawiKjTIsfZcjHiB4l87hhCsftSv0uhvYDGEfS8zHqXWMhhZ8YClBx6dwZu6oSfyGb8zEDjC/7Q+NFpwaU8dV5kOOnQN3VSpNTin2LSUTclID8ZcBgdf4O6iLZlC5brOwwO+iZsK79f9zB7nB2g+j0y80YfHMalb7vTdYJsivTccEf6pPCYS4uzZej3LXWQS7tsszvsNToXtLZUEGSZqPGcQ26R2JpRWFqJSPMvqJG+ SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Oct 2018 10:45:38.7318 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 8d55137d-631e-49ab-3200-08d6291d5d2b X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR04MB4849 Cc: Pankit Garg Subject: [U-Boot] [PATCH 07/53] armv8: ls1046ardb: Add TFABOOT defconfig 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" This defconfig is for TFABOOT, to be loaded by trusted firmware. Signed-off-by: York Sun Signed-off-by: Pankit Garg Signed-off-by: Rajesh Bhagat --- arch/arm/cpu/armv8/fsl-layerscape/cpu.c | 9 +++-- board/freescale/ls1046ardb/ddr.c | 3 +- configs/ls1046ardb_ram_defconfig | 49 +++++++++++++++++++++++++ include/configs/ls1046a_common.h | 4 ++ 4 files changed, 61 insertions(+), 4 deletions(-) create mode 100644 configs/ls1046ardb_ram_defconfig diff --git a/arch/arm/cpu/armv8/fsl-layerscape/cpu.c b/arch/arm/cpu/armv8/fsl-layerscape/cpu.c index 3b4f110027..1ab4d93638 100644 --- a/arch/arm/cpu/armv8/fsl-layerscape/cpu.c +++ b/arch/arm/cpu/armv8/fsl-layerscape/cpu.c @@ -92,7 +92,8 @@ static struct mm_region early_map[] = { #endif { CONFIG_SYS_FSL_DRAM_BASE1, CONFIG_SYS_FSL_DRAM_BASE1, CONFIG_SYS_FSL_DRAM_SIZE1, -#if defined(CONFIG_SPL) && !defined(CONFIG_SPL_BUILD) +#if defined(CONFIG_TFABOOT) || \ + (defined(CONFIG_SPL) && !defined(CONFIG_SPL_BUILD)) PTE_BLOCK_MEMTYPE(MT_NORMAL) | #else /* Start with nGnRnE and PXN and UXN to prevent speculative access */ PTE_BLOCK_MEMTYPE(MT_DEVICE_NGNRNE) | PTE_BLOCK_PXN | PTE_BLOCK_UXN | @@ -143,7 +144,8 @@ static struct mm_region early_map[] = { #endif { CONFIG_SYS_FSL_DRAM_BASE1, CONFIG_SYS_FSL_DRAM_BASE1, CONFIG_SYS_FSL_DRAM_SIZE1, -#if defined(CONFIG_SPL) && !defined(CONFIG_SPL_BUILD) +#if defined(CONFIG_TFABOOT) || \ + (defined(CONFIG_SPL) && !defined(CONFIG_SPL_BUILD)) PTE_BLOCK_MEMTYPE(MT_NORMAL) | #else /* Start with nGnRnE and PXN and UXN to prevent speculative access */ PTE_BLOCK_MEMTYPE(MT_DEVICE_NGNRNE) | PTE_BLOCK_PXN | PTE_BLOCK_UXN | @@ -1423,7 +1425,8 @@ void update_early_mmu_table(void) __weak int dram_init(void) { fsl_initdram(); -#if !defined(CONFIG_SPL) || defined(CONFIG_SPL_BUILD) +#if (!defined(CONFIG_SPL) && !defined(CONFIG_TFABOOT)) || \ + defined(CONFIG_SPL_BUILD) /* This will break-before-make MMU for DDR */ update_early_mmu_table(); #endif diff --git a/board/freescale/ls1046ardb/ddr.c b/board/freescale/ls1046ardb/ddr.c index 82b1b1d9ea..8fe0794198 100644 --- a/board/freescale/ls1046ardb/ddr.c +++ b/board/freescale/ls1046ardb/ddr.c @@ -101,7 +101,8 @@ int fsl_initdram(void) { phys_size_t dram_size; -#if defined(CONFIG_SPL) && !defined(CONFIG_SPL_BUILD) +#if defined(CONFIG_TFABOOT) || \ + (defined(CONFIG_SPL) && !defined(CONFIG_SPL_BUILD)) gd->ram_size = fsl_ddr_sdram_size(); return 0; diff --git a/configs/ls1046ardb_ram_defconfig b/configs/ls1046ardb_ram_defconfig new file mode 100644 index 0000000000..5bc80ed24e --- /dev/null +++ b/configs/ls1046ardb_ram_defconfig @@ -0,0 +1,49 @@ +CONFIG_ARM=y +CONFIG_TARGET_LS1046ARDB=y +CONFIG_SYS_TEXT_BASE=0x82000000 +CONFIG_QSPI_AHB_INIT=y +CONFIG_TFABOOT=y +CONFIG_ARMV8_SEC_FIRMWARE_SUPPORT=y +CONFIG_SEC_FIRMWARE_ARMV8_PSCI=y +CONFIG_DISTRO_DEFAULTS=y +CONFIG_NR_DRAM_BANKS=2 +CONFIG_FIT_VERBOSE=y +CONFIG_OF_BOARD_SETUP=y +CONFIG_BOOTDELAY=10 +CONFIG_USE_BOOTARGS=y +CONFIG_BOOTARGS="console=ttyS0,115200 root=/dev/ram0 earlycon=uart8250,mmio,0x21c0500 mtdparts=1550000.quadspi:1m(rcw),15m(u-boot),48m(kernel.itb);7e800000.flash:16m(nand_uboot),48m(nand_kernel),448m(nand_free)" +CONFIG_MISC_INIT_R=y +CONFIG_CMD_GPT=y +CONFIG_CMD_I2C=y +CONFIG_CMD_MMC=y +CONFIG_CMD_NAND=y +CONFIG_CMD_PCI=y +CONFIG_CMD_SF=y +CONFIG_CMD_USB=y +CONFIG_CMD_CACHE=y +CONFIG_MP=y +CONFIG_MTDPARTS_DEFAULT="mtdparts=1550000.quadspi:1m(rcw),15m(u-boot),48m(kernel.itb);7e800000.flash:16m(nand_uboot),48m(nand_kernel),448m(nand_free)" +CONFIG_OF_CONTROL=y +CONFIG_DEFAULT_DEVICE_TREE="fsl-ls1046a-rdb" +CONFIG_ENV_IS_IN_SPI_FLASH=y +CONFIG_DM=y +CONFIG_FSL_CAAM=y +CONFIG_FSL_ESDHC=y +CONFIG_SPI_FLASH=y +# CONFIG_SPI_FLASH_USE_4K_SECTORS is not set +CONFIG_PHYLIB=y +CONFIG_PHY_GIGE=y +CONFIG_E1000=y +CONFIG_PCI=y +CONFIG_DM_PCI=y +CONFIG_DM_PCI_COMPAT=y +CONFIG_PCIE_LAYERSCAPE=y +CONFIG_SYS_NS16550=y +CONFIG_SPI=y +CONFIG_DM_SPI=y +CONFIG_FSL_QSPI=y +CONFIG_USB=y +CONFIG_DM_USB=y +CONFIG_USB_XHCI_HCD=y +CONFIG_USB_XHCI_DWC3=y +CONFIG_USB_STORAGE=y diff --git a/include/configs/ls1046a_common.h b/include/configs/ls1046a_common.h index cdb73f644a..b6ec5bdf66 100644 --- a/include/configs/ls1046a_common.h +++ b/include/configs/ls1046a_common.h @@ -33,7 +33,11 @@ #include /* Link Definitions */ +#ifdef CONFIG_TFABOOT +#define CONFIG_SYS_INIT_SP_ADDR CONFIG_SYS_TEXT_BASE +#else #define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_FSL_OCRAM_BASE + 0xfff0) +#endif #define CONFIG_SKIP_LOWLEVEL_INIT From patchwork Wed Oct 3 10:44:14 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rajesh Bhagat X-Patchwork-Id: 978175 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; dmarc=fail (p=none dis=none) header.from=nxp.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=nxp.com header.i=@nxp.com header.b="dTYjhoZz"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 42QCYf3Qfsz9s8J for ; Wed, 3 Oct 2018 20:53:42 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 0BD51C2206E; Wed, 3 Oct 2018 10:49:21 +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=BAD_ENC_HEADER, 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 67EE6C2210A; Wed, 3 Oct 2018 10:46:29 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 34360C22106; Wed, 3 Oct 2018 10:45:55 +0000 (UTC) Received: from EUR02-AM5-obe.outbound.protection.outlook.com (mail-eopbgr00049.outbound.protection.outlook.com [40.107.0.49]) by lists.denx.de (Postfix) with ESMTPS id 979ECC2209A for ; Wed, 3 Oct 2018 10:45:45 +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:X-MS-Exchange-SenderADCheck; bh=oBjnlSHG444sUj4xlbKdeBCJG94qOAE4qbe7iSuoRf4=; b=dTYjhoZzl9gRGhlqTfzyIU/XrBbqNs/IUrUqxrLgFLuwjlHBOZp/fjHIAZ9LkCQp81LYierUnxWwuISyxQIK6s1Wt6icPNUjq/G438SWPOYv13K2O67nHNZhmgjjR9+SdipzADSpIF+kPnvoQZFCcqCp4cYLqCIwMNgC+kHc8AI= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=rajesh.bhagat@nxp.com; Received: from phoenix7.ap.freescale.net (14.143.30.134) by AM0PR04MB4849.eurprd04.prod.outlook.com (2603:10a6:208:c4::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1185.24; Wed, 3 Oct 2018 10:45:42 +0000 From: Rajesh Bhagat To: u-boot@lists.denx.de Date: Wed, 3 Oct 2018 16:14:14 +0530 Message-Id: <20181003104459.5444-9-rajesh.bhagat@nxp.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181003104459.5444-1-rajesh.bhagat@nxp.com> References: <20181003104459.5444-1-rajesh.bhagat@nxp.com> MIME-Version: 1.0 X-Originating-IP: [14.143.30.134] X-ClientProxiedBy: TY2PR02CA0011.apcprd02.prod.outlook.com (2603:1096:404:56::23) To AM0PR04MB4849.eurprd04.prod.outlook.com (2603:10a6:208:c4::26) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: b4963a99-bb83-4204-59bc-08d6291d5f3d X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989299)(4534185)(7168020)(4627221)(201703031133081)(201702281549075)(8990200)(5600074)(711020)(4618075)(2017052603328)(7153060)(7193020); SRVR:AM0PR04MB4849; X-Microsoft-Exchange-Diagnostics: 1; AM0PR04MB4849; 3:+1e7IFAJI1aIuFwj88E4CaYp+s77PVAKjCZcWuKglXPd8Lh6Xg8Jb8cf/5Hmo92vUTYA3Z7c86O/MQ90adn7EeyNqcpvfu2YcAJdWt6n2LAsR01i00upxN/p2kOr04IKYpBkRz2yG42XgmzBgXqYDnxiTwyovoLs/4XJOaou4OQuPybn8bJLnl0/C/bLWs+Lc+plnXLUSc+ajfb3PIthkHw2vUG+9YPGSIIhxsYR3lzdc17VMRj02XdwzPMeajw7; 25:o+XlEUBWPKMEbOVxJuf9ZYA9rDw+HgDGxb1kndldlPCIL8FeRo/ykxwgaQbK9cexAeX4DcyudRaSjQg+Kp/hpXq5teINN/5ZGlzX3yJIqd1/jSXwXLROAVDFOfsr1Ph6gFHP4rDpvPFoaW9vHv3iQKyM+NOWSuqMu9IJO+DFDwGhrHyf7j+AQGQblIf4NlfaSW/ugSNng7da56x/tf8SfrsRToUsmnotkfM2Y5hRj4aGlGpL7O941cMtUDl+Y7aqMoyIcsZk1AuMIhO1rjifwNL8oE/oFH8vT5Znfu3IKXJo0Zwwz872slGiWd+WUf00pBQLZWK2CdjkwjnXhkHOPQ==; 31:vYxuDFYz3WlZkaiVxXtx9cmKhWzfoZ2XoGn9yKXScXHRuF5/Yb67ozfFVfUSdB3i2slEzCtVsPllAHA4YoCM5t1+GPfepHCMtdfOm/lwoxomFkRWz145/9SuXnmT+PBanmEBuCWT+XRhs5RFEUOQlC543B8GkJN4c1SDB9ceVmyx8lRxm8Fdcr4H39WXPNTCv1dFEICoZfWzZ9fAe1WNkLuF9Ki+P1I1iG/QiCTrvbA= X-MS-TrafficTypeDiagnostic: AM0PR04MB4849: X-Microsoft-Exchange-Diagnostics: 1; AM0PR04MB4849; 20:Tc8IG37UaErEX4J/gT9iYOxrrOscJIHweiiQvFMi4R9mmWDznbjmKihrIwNaLtabJixIcLDZmWk53QffbkW9xJM0xuAVS3DrDZ/R5jfNvtQ2FVQwavdqi5V0iuOUBZE+LHSUeLxAmrp/etSOitEIy3t+xLz9NPYn1LNoeGJIVRtTTVslBRoZ4lqipufou7Fvga1qrlOAHNrLAO4LWToNxSuBENzeG2kkEWYWV+QVgdZUEOiZoyqdpzVBkBsfxzcfe7aSeZn0KjcXFNtLwj2kHRHuZ+1cX7GkczSWe+rOK4E5bhQnCU0zz84wAALNX3igd7ydslcdgegquB7lV6ZBV/DYOqhIbhIxocd865xhLFMXeAQZTDLWfHfLTLVEjL0RKJyCDMF76rUZkaNDXYv6BMVgnInrAZt0LP8ghEEdNrSjFeAOypWqn1w7W/62ePRoaaODmklSElmoUOYU72R16PqoJmLGor9hnrZxRGxTMJLE8+2Jv8jgpHBtQq9r7dk+; 4:PLSgbRMtKWAyMSecxm1xgxWUK2d3vp/Z7NecFrxcgJTCk/eEeg62JYgrI//RVsHE7j++cA0ssgYHddEWNrat76kNJZG0G1pTSDp1MarQm437NHXu+kRghIiOUTGeya0bSn4yNL69n93+53F1VG/VG83mFaootsoKSpGzbFLqm+jqBwpWFxVRmAra0mDMz4BHnOw6CkPqdOLARIS4LmyL5Ud3xZ3oEY2bLh3/IfvmR+FP0ra5xx5/B7QfDG51entrEhOQGux365ZMCOs6maTxG5tVbZ2sycJ6XfbWiwlwJ/zfG9YWQOAfXch+GB07lQ0u X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(185117386973197); X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(5005006)(8121501046)(3002001)(3231355)(944501410)(52105095)(10201501046)(93006095)(93001095)(6055026)(149066)(150057)(6041310)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123562045)(20161123564045)(20161123558120)(201708071742011)(7699051); SRVR:AM0PR04MB4849; BCL:0; PCL:0; RULEID:; SRVR:AM0PR04MB4849; X-Forefront-PRVS: 0814A2C7A3 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(346002)(376002)(366004)(136003)(39860400002)(396003)(189003)(199004)(66066001)(50226002)(97736004)(7736002)(50466002)(55236004)(6666003)(14444005)(6506007)(386003)(16526019)(53936002)(26005)(68736007)(6486002)(186003)(47776003)(8936002)(8676002)(81156014)(476003)(81166006)(5009440100003)(4326008)(16586007)(36756003)(5660300001)(86362001)(2906002)(1076002)(2361001)(2351001)(478600001)(446003)(3846002)(6116002)(316002)(2616005)(44832011)(305945005)(76176011)(956004)(486006)(48376002)(105586002)(106356001)(51416003)(52116002)(25786009)(11346002)(6512007)(6916009)(110426005); DIR:OUT; SFP:1101; SCL:1; SRVR:AM0PR04MB4849; H:phoenix7.ap.freescale.net; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; Received-SPF: None (protection.outlook.com: nxp.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; AM0PR04MB4849; 23:5L4Xl/LnzZmQFByqqDmUbRp7wJsuVLycqhZroObZA?= 46oqJpaf2N4EKzZgjp3P6dg88DjTPw9BnTMY48TLoWDr4HZ3nPjqTc9uoGoBYzmN3dyObC+N6hd0l1t5qB6q0S/34F1GtdGomHsiCHwEIU0qn18c8uuODWuk/K/oZr7l/QFYnbYPZa/ri6lnm+xWmJ9GYUdYlkRPHbBoTSLO8vzGCc/9pPUIPdZCATiVPDTzOgwxxb+9zjhGPacqdYqtj1tb2UhYs2N+S535DUf5SX+pIQxRtWeiuDPUaCSR70QWRGpf4u0YgAsYqck15pj4gDGdIXQmmL5LKPkwT1qJRtzNQ2rQoXyJoTdGixWzde9kwvl1xncuDVCcZClxcnzyI2pDohN7d969ZACz8pCcst5Jb7uRhL00gf4TUbgZRqoCuUzK1rrXU3QqrZEakj6uk7oMHpZbR3PtUV8keSlB6YrtpXQeF5A/9PRzLrovYX368kjSOn7JP4H8fVeJlFmkzb9igeiRGCsY0BU9gTherdLvDy2Ryq/F/p5qDJHhYQInBjCmqrDotHthXQsCf/zYAI+CEvDyEo6iqyGTXHFK7GD4PT1MVIcwpD6tpnUeNxaRCRzxeQiArrqKf+JvSxyTXZAeiAp1EhOyKZRPhYVpIkdHdJAUgmAM2WiEXRqt7/yUkA2HbpvjfzVNEWd2LCW6c4Waz69t2shDOgtdbLGMVWKr7U0nm7EWg6xXf0fK6/m8TGHL7zz/BFvJcNLDByjkqM9+HteXAVyyMiyhdnRirsrFYFavApHE4iXzlFIjm54/FYQzuf3ziIqQLSPhv8a4qlERlzmn5Nysxdg+as8AvYundgQEcZMpHKYwSKWrxEVk02oXWvaq4O2t5/nYqxPp+douEOqqR8a7TgRu4qi6JMliAKQuw96yEV/8na/yf6/EHxpM02PbGkIoZVasbH//poZfvsRF1kWQVPSlem6jcxT4AD/EY42mFIUg3/ovUFyYnzXAvbEC9b1W2Ai/tV/tsIIkrkuhrTLqSkL1fhIOZF8n5yTMBsIiA/Nci/bbIGt7oRk9hPXcBb/Pt+9Ulr6U38a6m54qwp7kKJO1iL0THVtvDUZjGALjwAc4bkKB5bIwNAR0/nrnRsxixPV2Fm0eor3dbt7Gy/H1xkQIpNdwd6rPgH1OYTG9NZQdavDit30WybJqpfUXGtGFYS7wOlWFmMjhdn2hvrvmaLFWp4hu6u9vrBJAmcSEmx6TSywIOSlnGSKH9yjoi9diI42Z4huc2jvzj87ACow9IwOfes04vQYPMNfTQY2sxBV7OCC1qElJkm41x1X8veiBTp9j+KZ0jMS X-Microsoft-Antispam-Message-Info: nYO9PzG1Q9g2FtNg7oK5joWFhNmhLuzQyCSh56sFOdxJRAGw3k7gATA6SWVazmnn3V/LNowcNKp6ec29hT7indHU+7UUivFNKu9XLIKPlXLOPNfUQkGnSeSKr2cmfRr7h55hJAfiO2TA8wn4t/b7oOFHuLMENg+f8cqWiMh6svASyn+ydJttTOzFGWlI1LxUAQWZwz/Eyr2oBxtVUM2/U4KxUTWywOeWTa1WTgJUQlIkhVpAQt0KaS6e/AWJMORVz023yK+tW4VgxjxNYmW+DEsDZQKSPF/FRSK4d9HqW880FGyTAwtm0wP5Wr70kYGHScVskBgV+EB+eywzyzML3F+48ZJ+MV/Tjaeh9GNiVAs= X-Microsoft-Exchange-Diagnostics: 1; AM0PR04MB4849; 6:Z0KeNJirth43AVUTjFEmXeZJIXyvVfzaaeLSbl7fZPNzqnjNTES6UhHNPRC+7CWO+6hhRumjlPzE1Nu3obnFI6JapG3R97RnienquoZCtD3Ejb9r2+AypnT4RpaN2V/TSfEbKStYS2OjQWr2aUHUy7Xm34XUP6s9VuQtjtw3dauowRiYBTIBTQ0iVnnWUpiaOG445H9XT3xt6AfdF0W9+QFkwcpWReEHKDDrofYtuEWCMfLmQmXiX+rnPIRRYsyLPRuaGUodQ6IiI00XSXGPTRmrk4mtro7LK8nvMp5FMlcKXVkVquimvj/bvDvt5KdDSGJPZfjOumGzH46tyaVWEU4xGVZ+JBApYDGM14+CeFoBF0ZUIP2MFSPycZSLlgtFoS0sHrKjA5mn9X96JmlQ7o2Rt+kGnIGdhu5mJpbTXWg4HDcQFveu3VEOQI6js4vSw5g50461o0IHB0xOX4I9Zg==; 5:Zv4WHhqBX8Z8NJArIfoKmJm+pYZIkltXxMQTI8J3bTHm5U6Bkn/vpWIE6UrtxY9gyZp7iOh8CJcUlfW4k6M8UlYaVftLMKpomsYT5QGg5p6Ou03YG0FDUrkBPoAnoWXhWFEEFAF17uo++sfT7npwYMCKuLXYOfBNq3PvTpQr6LY=; 7:P7zaGUg3PtYAhlHvchRv8asdIte0y7xWxzbc/E7jsN3XCyEn4NzcbNE1/ldVPnnVRpqRCGib+xLKsY5KanRwqZsftdABLj1Ly6RhCuv+NpR7Vt/kMihwebGt1kC6V6dpjMFLAGyF4dO7l+6aEOMHNkO6aFsDLfcCnPpoV6gMFUyf1p3VKA5me3j7/z28xyyS0KX0Y55rRQ1ac8Ck1ZsGb6FaUwbFTnYwfXbS762jKVVITUpJokFdTDuIkWh2pvSE SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Oct 2018 10:45:42.2062 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: b4963a99-bb83-4204-59bc-08d6291d5f3d X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR04MB4849 Cc: Pankit Garg Subject: [U-Boot] [PATCH 08/53] armv8: ls1046aqds: Add TFABOOT defconfig 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" This defconfig is for TFABOOT, to be loaded by trusted firmware. Signed-off-by: Pankit Garg Signed-off-by: Rajesh Bhagat --- board/freescale/ls1046aqds/ddr.c | 3 +- board/freescale/ls1046aqds/ls1046aqds.c | 15 ++++++- configs/ls1046aqds_ram_defconfig | 57 +++++++++++++++++++++++++ include/configs/ls1046aqds.h | 3 +- 4 files changed, 75 insertions(+), 3 deletions(-) create mode 100644 configs/ls1046aqds_ram_defconfig diff --git a/board/freescale/ls1046aqds/ddr.c b/board/freescale/ls1046aqds/ddr.c index 08f7610e69..d2afe62cfc 100644 --- a/board/freescale/ls1046aqds/ddr.c +++ b/board/freescale/ls1046aqds/ddr.c @@ -96,7 +96,8 @@ int fsl_initdram(void) { phys_size_t dram_size; -#if defined(CONFIG_SPL) && !defined(CONFIG_SPL_BUILD) +#if defined(CONFIG_TFABOOT) || \ + (defined(CONFIG_SPL) && !defined(CONFIG_SPL_BUILD)) gd->ram_size = fsl_ddr_sdram_size(); return 0; diff --git a/board/freescale/ls1046aqds/ls1046aqds.c b/board/freescale/ls1046aqds/ls1046aqds.c index 0da82381af..77b21ac52a 100644 --- a/board/freescale/ls1046aqds/ls1046aqds.c +++ b/board/freescale/ls1046aqds/ls1046aqds.c @@ -38,6 +38,9 @@ enum { int checkboard(void) { +#ifdef CONFIG_TFABOOT + enum boot_src src = get_boot_src(); +#endif char buf[64]; #ifndef CONFIG_SD_BOOT u8 sw; @@ -45,6 +48,12 @@ int checkboard(void) puts("Board: LS1046AQDS, boot from "); +#ifdef CONFIG_TFABOOT + if (src == BOOT_SOURCE_SD_MMC) + puts("SD\n"); + else { +#endif + #ifdef CONFIG_SD_BOOT puts("SD\n"); #else @@ -63,6 +72,9 @@ int checkboard(void) printf("invalid setting of SW%u\n", QIXIS_LBMAP_SWITCH); #endif +#ifdef CONFIG_TFABOOT + } +#endif printf("Sys ID: 0x%02x, Sys Ver: 0x%02x\n", QIXIS_READ(id), QIXIS_READ(arch)); @@ -153,7 +165,8 @@ int dram_init(void) */ select_i2c_ch_pca9547(I2C_MUX_CH_DEFAULT); fsl_initdram(); -#if !defined(CONFIG_SPL) || defined(CONFIG_SPL_BUILD) +#if (!defined(CONFIG_SPL) && !defined(CONFIG_TFABOOT)) || \ + defined(CONFIG_SPL_BUILD) /* This will break-before-make MMU for DDR */ update_early_mmu_table(); #endif diff --git a/configs/ls1046aqds_ram_defconfig b/configs/ls1046aqds_ram_defconfig new file mode 100644 index 0000000000..c91bb76edf --- /dev/null +++ b/configs/ls1046aqds_ram_defconfig @@ -0,0 +1,57 @@ +CONFIG_ARM=y +CONFIG_TARGET_LS1046AQDS=y +CONFIG_SYS_TEXT_BASE=0x82000000 +CONFIG_TFABOOT=y +CONFIG_ARMV8_SEC_FIRMWARE_SUPPORT=y +CONFIG_SEC_FIRMWARE_ARMV8_PSCI=y +CONFIG_DISTRO_DEFAULTS=y +CONFIG_NR_DRAM_BANKS=2 +CONFIG_FIT_VERBOSE=y +CONFIG_OF_BOARD_SETUP=y +CONFIG_BOOTDELAY=10 +CONFIG_USE_BOOTARGS=y +CONFIG_BOOTARGS="console=ttyS0,115200 root=/dev/ram0 earlycon=uart8250,mmio,0x21c0500 mtdparts=60000000.nor:2m@0x100000(nor_bank0_uboot),40m@0x1100000(nor_bank0_fit),7m(nor_bank0_user),2m@0x4100000(nor_bank4_uboot),40m@0x5100000(nor_bank4_fit),-(nor_bank4_user);7e800000.flash:4m(nand_uboot),36m(nand_kernel),472m(nand_free);spi0.0:2m(uboot),14m(free)" +# CONFIG_USE_BOOTCOMMAND is not set +CONFIG_MISC_INIT_R=y +CONFIG_CMD_BOOTZ=y +CONFIG_CMD_IMLS=y +CONFIG_CMD_GREPENV=y +CONFIG_CMD_MEMINFO=y +CONFIG_CMD_MEMTEST=y +CONFIG_CMD_GPT=y +CONFIG_CMD_I2C=y +CONFIG_CMD_MMC=y +CONFIG_CMD_NAND=y +CONFIG_CMD_PCI=y +CONFIG_CMD_SF=y +CONFIG_CMD_USB=y +CONFIG_CMD_CACHE=y +CONFIG_MP=y +CONFIG_MTDPARTS_DEFAULT="mtdparts=60000000.nor:2m@0x100000(nor_bank0_uboot),40m@0x1100000(nor_bank0_fit),7m(nor_bank0_user),2m@0x4100000(nor_bank4_uboot),40m@0x5100000(nor_bank4_fit),-(nor_bank4_user);7e800000.flash:4m(nand_uboot),36m(nand_kernel),472m(nand_free);spi0.0:2m(uboot),14m(free)" +CONFIG_OF_CONTROL=y +CONFIG_DEFAULT_DEVICE_TREE="fsl-ls1046a-qds-duart" +CONFIG_ENV_IS_IN_FLASH=y +CONFIG_ENV_IS_IN_NAND=y +CONFIG_ENV_IS_IN_SPI_FLASH=y +CONFIG_DM=y +CONFIG_FSL_CAAM=y +CONFIG_FSL_ESDHC=y +CONFIG_MTD_NOR_FLASH=y +CONFIG_SPI_FLASH=y +# CONFIG_SPI_FLASH_USE_4K_SECTORS is not set +CONFIG_PHYLIB=y +CONFIG_E1000=y +CONFIG_PCI=y +CONFIG_DM_PCI=y +CONFIG_DM_PCI_COMPAT=y +CONFIG_PCIE_LAYERSCAPE=y +CONFIG_SYS_NS16550=y +CONFIG_SPI=y +CONFIG_DM_SPI=y +CONFIG_FSL_DSPI=y +CONFIG_FSL_QSPI=y +CONFIG_USB=y +CONFIG_DM_USB=y +CONFIG_USB_XHCI_HCD=y +CONFIG_USB_XHCI_DWC3=y +CONFIG_USB_STORAGE=y diff --git a/include/configs/ls1046aqds.h b/include/configs/ls1046aqds.h index 8edaf190d0..07e21469c8 100644 --- a/include/configs/ls1046aqds.h +++ b/include/configs/ls1046aqds.h @@ -50,7 +50,8 @@ unsigned long get_board_ddr_clk(void); #endif /* QSPI */ -#if defined(CONFIG_QSPI_BOOT) || defined(CONFIG_SD_BOOT_QSPI) +#if defined(CONFIG_TFABOOT) || \ + defined(CONFIG_QSPI_BOOT) || defined(CONFIG_SD_BOOT_QSPI) #ifdef CONFIG_FSL_QSPI #define CONFIG_SPI_FLASH_SPANSION #define FSL_QSPI_FLASH_SIZE (1 << 24) From patchwork Wed Oct 3 10:44:15 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rajesh Bhagat X-Patchwork-Id: 978170 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; dmarc=fail (p=none dis=none) header.from=nxp.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=nxp.com header.i=@nxp.com header.b="myK4D7LX"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 42QCTz2kjkz9sB7 for ; Wed, 3 Oct 2018 20:50:31 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id E20A2C2206E; Wed, 3 Oct 2018 10:48:47 +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=BAD_ENC_HEADER, 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 517F3C220BB; Wed, 3 Oct 2018 10:46:25 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 407B9C22087; Wed, 3 Oct 2018 10:45:57 +0000 (UTC) Received: from EUR02-AM5-obe.outbound.protection.outlook.com (mail-eopbgr00081.outbound.protection.outlook.com [40.107.0.81]) by lists.denx.de (Postfix) with ESMTPS id 32F30C22094 for ; Wed, 3 Oct 2018 10:45:49 +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:X-MS-Exchange-SenderADCheck; bh=D6WKbzGHGqqbqHw+XRBE40O7AVw3Ts/muJFGp9iYyAs=; b=myK4D7LXjrpRm4lJL4ouvGSX5kUNb1cVuFwP7SslLNlGj1wILzFpao9dkUyVkl5oSufbax8fTwN67c6UtXn4XxV8M9tOjsh6wad8gN6tBtvm+hjbrOUEt/QPF0PFq3a+oU6R+NRXtkwyxdSTbXmzztBHTw7K54qdx4Eq/4o2GzU= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=rajesh.bhagat@nxp.com; Received: from phoenix7.ap.freescale.net (14.143.30.134) by AM0PR04MB4849.eurprd04.prod.outlook.com (2603:10a6:208:c4::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1185.24; Wed, 3 Oct 2018 10:45:45 +0000 From: Rajesh Bhagat To: u-boot@lists.denx.de Date: Wed, 3 Oct 2018 16:14:15 +0530 Message-Id: <20181003104459.5444-10-rajesh.bhagat@nxp.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181003104459.5444-1-rajesh.bhagat@nxp.com> References: <20181003104459.5444-1-rajesh.bhagat@nxp.com> MIME-Version: 1.0 X-Originating-IP: [14.143.30.134] X-ClientProxiedBy: TY2PR02CA0011.apcprd02.prod.outlook.com (2603:1096:404:56::23) To AM0PR04MB4849.eurprd04.prod.outlook.com (2603:10a6:208:c4::26) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 0672d90e-b52c-4819-d43e-08d6291d6161 X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989299)(4534185)(7168020)(4627221)(201703031133081)(201702281549075)(8990200)(5600074)(711020)(4618075)(2017052603328)(7153060)(7193020); SRVR:AM0PR04MB4849; X-Microsoft-Exchange-Diagnostics: 1; AM0PR04MB4849; 3:P/VhRInpIwI4Qpuc++bkzZ2vN0U8JFyt1QNFUdk3uT6oxiMuAQFvR0GjVdRUF0ZHFMbWyew5jChVgvNyTTZFaF9Mz1Pj16Aan3zeiVA1RehJ4YchrODy1cXEQpoiSquM8fVGvPfAAcDMXt+2nIEpQZL1FWZLXTf7dvkWU3OmI//as2LT2eE0+qv5KCvklDclCLMrraQLa97wE5qKTIMYrBWvv7aVz7rwEItn2ERrbXzpZQ+BT6p6YhIBv9pcFDtC; 25:fNm/B68U/WzxQW0EKuYcw4haxcGx+CiEnAi2EoF3COYQeigJgCJC6ZrHw7UukZbhxozM1/xKixnVN5II8DE24nl9SXCRuraC+uIaZXBvS5wILZ9HsFiMBTReUj7gJLLy7WANKWFuYuVaELj9HWUk4FS+wPjTvzlfJa0CGFwVKVGmhxU6phiyALNB8eVXMqp7UJ79sQ49j+4dc9rKdctiNKMnIQ5xZThkxMhsCHiSoqM01LNL5nRaSl0mD7iCbvxxxN+HOk79LFyMlYYlhiLGqh/Dro0uGIhRQWOe0frpdrDLeOYnCTUE0zqx2cA+KSrHo+cJaI7zklCVmJp9Qo8qxw==; 31:y/0efS6/mxtRXKD4kQSRJaLqBY4JUigbsreqtX5ycjllpgD71zJjY6gVY1sVy0gC5+tN8EeealS/B6Na7cCS83kPeZxOSv2hGxQRGqV4O28cOmwk/q6TAgEoZceYeA04WVahkH5GdXqwoq4dAID4BIbpMagqPF8/Hu0x6euhj1VRKNIqfEoQ08yZVEFoWrhLiHGwdnX0Ghav0fOEnt3l/tA2RcevvN9t1xInsHIwU4M= X-MS-TrafficTypeDiagnostic: AM0PR04MB4849: X-Microsoft-Exchange-Diagnostics: 1; AM0PR04MB4849; 20:50aj2fNDzzVGK9MYglyHOfCqsU5t0Q9UdhlooL7vWXXRnqUTOjWQR1A6taB/zmI1AOnjr+wXUeza+dy0F7ky9jMHQ5TbAvX/FO7ZY09LL/yhyn2QN4zncwMD5S2DJ9MnLIzkfoYsZCQljNx+ynaI4PUAMO2LnJsS9o5XOKCgUsGf8EKe5uGC52RtXS2Fnt0pNgjaBq/W5d7FnCAQ4egvQg7N616nZ+doyCPxGY7D+DuWN90P6fj2/uFpWEpmarrYCzQ8V8AheNaR/y1ZWsAMSOHON7LMdax4CvDZStxr29kU3cFj60R8m9TQ4VHx6pRdRmb98YOkqQPXdpcCzY0zhZupXZHFQAS8HePeoGfneq2ZLiCtuKoh96tcdQ9mbKWkobWSUeTxspySuavzn5EdhOJTEUQiJp7SDJLKHgNxxVHO5TReQoQi38wnHSHMjG1yi04AOBV/5ME4F1I+IUC/0LrVi75QBSHAIq1azttFROojzu9LjTmx1W2J4O3iMbyo; 4:FbKlOlHC3ymKiazK+o0MsPj1onm//fgWhUtmBiUtKAhvc4CC/wMVH/xFkon0/07u21k0n70o8c1JidHYS0eSrf1/EBfwPCj98oYTiBvKy+Zf/oFzV/VSi0B/H8hA3yNXWNWbTR/yopgRaoCZjN7Vg4FGt/aM4cdg6MK2WH5DBdDC6+CqNDK6Lq+0BTsIAcVk0jybKxrjd2ef52pIhGDMmm8WxKqXeZlAA36ylc/K20SKOvmubuVPi3jkFnNw2bB2rk03nlol0hc508vSE589ph9n0PJwY43oE3KbR6g4gfWHrJDhNKz4YYg7JmKjUgSM X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(185117386973197); X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(5005006)(8121501046)(3002001)(3231355)(944501410)(52105095)(10201501046)(93006095)(93001095)(6055026)(149066)(150057)(6041310)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123562045)(20161123564045)(20161123558120)(201708071742011)(7699051); SRVR:AM0PR04MB4849; BCL:0; PCL:0; RULEID:; SRVR:AM0PR04MB4849; X-Forefront-PRVS: 0814A2C7A3 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(346002)(376002)(366004)(136003)(39860400002)(396003)(189003)(199004)(66066001)(50226002)(97736004)(7736002)(50466002)(55236004)(6666003)(6506007)(386003)(16526019)(53936002)(26005)(68736007)(6486002)(186003)(47776003)(8936002)(8676002)(81156014)(476003)(81166006)(5009440100003)(4326008)(16586007)(36756003)(5660300001)(86362001)(2906002)(1076002)(2361001)(2351001)(478600001)(446003)(3846002)(6116002)(316002)(2616005)(44832011)(305945005)(76176011)(956004)(486006)(48376002)(105586002)(106356001)(51416003)(52116002)(25786009)(11346002)(6512007)(6916009)(110426005); DIR:OUT; SFP:1101; SCL:1; SRVR:AM0PR04MB4849; H:phoenix7.ap.freescale.net; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; Received-SPF: None (protection.outlook.com: nxp.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; AM0PR04MB4849; 23:36T9ESexzCooOqASkgIDEVh/RSY58rNMmMBsepzTn?= +MQybOUz3jpGqHlWu7Jp7JwA9f3UUpE41JrDcyvl6XdXfGIfwwJ0SsfSFS+wrZL5XJ6uh5WxCSATjKuuwxD1iS8FYBYVnPuzwcshA1FNqPok8e+0vmYqo6WIQssFNr5jyuCNkkdARMQX+W+a8QiZ92oJ1YIVIz/Fpy/H4FfLJzJcMWiA2M4EZXIfHKghoYNNwau09YIysgxtPH3bBYRI4jyLsNaD12AI+EnqjGJVHZhUjmTcIJJNm47C7E0op8tk5CQDGoj4QV7Wl+7Siq6inm+cmbz9obypIVkaPrfyKoboqdxKHWNUQ8vh5337zs7oA1rr8hiG9ment+ZG+jrzFEAyqjGKeT5FG04Z5lmztatFNQwz12LKVduYD6c5IKtEjdlRFJIMNISyLTWJ1q9ZvBscuKP0uxfsGrHHR2/QcW9//VGQyR7epdxt3hVyO+P5xg8H+ACqzaSogFwam+ygE1dNTOTGpkfHyNpWswlhMjW2UytO7NhJvDFxx2/g5Tvsrdcj6b4SztwiYfuFXhfdxrKWRfYboBksYGUCgxxuguHMPkg8S8iSeAbeyxzmcKswQT+aKYsr/WRK5xwNPJdqcg2UpGnnCn2t6VQ2oEHCgicEU/0Le1SQWbt8ZagIGnKy65JyHO1k7xEeKnfFaUGld1nEE42TpzvzNkTLPDHae64T7Oo20Lbf0dpoAn5n/7/xHat6TfHnbbDN9ooJ9Qud1FlmKc6M9H59P/NOjGBLmMWsTX+Ebw17nJ1jSk0D4AUO5C6t5XlE6YMpMDlCt2O3q6QiePs1caXadesFuhahwT+NbVJ4QVGGHGpip3c+g6uBCsJ/zoJy4vZixDIBoQV6Dtlp3++3GJ3oRyJJ7kl6pEYn6KtbXb2uYZFJLNnx3P3K/3sceqlDLk6Lmeox/GMXBjLkl5sc3bF/nDFAswfVhD5OSUuW1zWdTmntJSXOMRiKBgSpgOFyUcDfWstg0422+lLUi2msuoY5led333384f9W+GM9WgLldfCectgPUenz7gvcduBwF3Mk0cimNQPR0tXaY2B1zzzqRV4CUr9C1an/XuKbjY+FLOX1qFfd5g0D+cEbDI3IUgteD6Qj7h+B+Kj2drKY7WKLYUu5ffmU4mCdi7LEii6XAmBSfDfsXvDTGBmQNjUT+g6EM7w3/fFSPhAGcm9h+HmClW2Zy5hpWpKNenTGybGQTKEByjc0y63CA0Ak7WdGJorr4ldV8+i2VZ3pZXCsyVykD6TNNHjFVZb4AvwaRsRkOMi9ptKjjDScdA= X-Microsoft-Antispam-Message-Info: WPF0iOnHipRUPz10in5+TjUehKdtPesVKsYcBah7eVVPcGJAdaKiWENpQz6hK74RRTSe5XZSq7aoRoS3CjY92O39TP2h9a/IwSQez3hTtR2wnhLtX7TtxhLAUSj9t9WHIJVez8qTE/uWutdviirxOxDMt47W3qBSWrHXO4KSlYfKyj/S5jEG7wFnkBzfvBNiN+HVdI+2C0PNJ84hEAuMsCuUfrsvfZ4gaW/ODeBv1UOSTBEunCIjluBNWeNnpq8vY4BoSvOTHOTneGR7hy69UBG50+RU8YR9f24JS+6bT7I7R8ZZG9rKicz7ITkAAKPIlVNWmG7VUMu6j8ovh26P/nd5Oh9V2LWKsuS3nI85aIw= X-Microsoft-Exchange-Diagnostics: 1; AM0PR04MB4849; 6:poKiLLaGOYkTdmY1dZZ2/tyS7YywNmLLwHTGQMCswFm2nKbBDg1qQnTmS0wwljfHZYpTDlheSYR33Txkaz/yVARwdwyb50FTrQo9ZR/ftj8muBqJuTM954ywJyJkmqbaKxJwZu6Y3ROvTQEueNf+wDZWNluNawULqZ8zvXV+t193alS6rGAYkn+72YvXSpbXTVIkmpC2iQl0Hi6uU1r7D1kXcoHNUklqFpRJ4nfmKQGYkKrc9QyotGDTir7kVjJ0BV96l7XpGCxi4k5puGfTdgt/9BycEQEzjGbqGyeiAxfhUmWS43RPlQGADnMCm6jujZR9jaLeF92IZGv8AZyTnkw0iysCM+cPII0+VjTvd0aLWPnxH7/2JQ4W1tSoX1x4u4h7IjgY5a6PRBn1pG7dvVfIqkPvXtHtzrmsO3f9wCdRNDeEwj+qWWXsjv3hQNqV1EQDRD1A/bKyjR+O+EPFDA==; 5:HZzf3bEipXuMKuhalOvijxgobx+0qRDuQbsyW6nTe0LEtCoA9FhAhoWqMCsPRzcBDdto/zWH9V96At3rhDsnlBz8mj7Zy06s5RjUIrFo7FHypz2AKG+QOi/qCoX93sZphediJtaBrQuDxCy9+jY/XJTVH+u+JEcq3g0aKCyhwYc=; 7:aqPeJD22eBPyW8mO4MpTw42nPTraqZK5TRXh7vPcOIsTZ0Dt4hxPyHRAxF4qSIU3SgxZ2OWWVPWMvKUlijuKcKHs5HqffSkOJqOVYwtR6f5Jj6xIbiWXq2Ufl4xwv33rQ/gRkSC+rAFV06eIXN6nC4d8wmyn+wnnJz18+28n7GcbUn7reZdO2sFNpOWEzLHP/9ubZIHK9Kedt+0WCFKIRbR2ZHP8rZr+3qkKZe0NH3isHub5N4IIXneg1S6Gflfp SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Oct 2018 10:45:45.5155 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 0672d90e-b52c-4819-d43e-08d6291d6161 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR04MB4849 Cc: Pankit Garg Subject: [U-Boot] [PATCH 09/53] armv8: ls1046a: make environment address and size common 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" CONFIG_ENV_OFFSET, CONFIG_ENV_SIZE and CONFIG_ENV_SECT_SIZE made common to support all boot sources. Signed-off-by: Pankit Garg Signed-off-by: Rajesh Bhagat --- include/configs/ls1046aqds.h | 9 +++++++++ include/configs/ls1046ardb.h | 8 ++++++++ 2 files changed, 17 insertions(+) diff --git a/include/configs/ls1046aqds.h b/include/configs/ls1046aqds.h index 07e21469c8..765a21e00f 100644 --- a/include/configs/ls1046aqds.h +++ b/include/configs/ls1046aqds.h @@ -403,6 +403,14 @@ unsigned long get_board_ddr_clk(void); */ #define CONFIG_ENV_OVERWRITE +#ifdef CONFIG_TFABOOT +#define CONFIG_SYS_MMC_ENV_DEV 0 + +#define CONFIG_ENV_SIZE 0x2000 +#define CONFIG_ENV_OFFSET 0x500000 /* 5MB */ +#define CONFIG_ENV_ADDR (CONFIG_SYS_FLASH_BASE + 0x500000) +#define CONFIG_ENV_SECT_SIZE 0x20000 +#else #ifdef CONFIG_NAND_BOOT #define CONFIG_ENV_SIZE 0x2000 #define CONFIG_ENV_OFFSET (12 * CONFIG_SYS_NAND_BLOCK_SIZE) @@ -419,6 +427,7 @@ unsigned long get_board_ddr_clk(void); #define CONFIG_ENV_SECT_SIZE 0x20000 #define CONFIG_ENV_SIZE 0x20000 #endif +#endif #define CONFIG_CMDLINE_TAG diff --git a/include/configs/ls1046ardb.h b/include/configs/ls1046ardb.h index ffca410b1a..b8d9419b48 100644 --- a/include/configs/ls1046ardb.h +++ b/include/configs/ls1046ardb.h @@ -160,6 +160,13 @@ #define CONFIG_ENV_OVERWRITE #endif +#ifdef CONFIG_TFABOOT +#define CONFIG_SYS_MMC_ENV_DEV 0 + +#define CONFIG_ENV_SIZE 0x2000 /* 8KB */ +#define CONFIG_ENV_OFFSET 0x500000 /* 5MB */ +#define CONFIG_ENV_SECT_SIZE 0x40000 /* 256KB */ +#else #if defined(CONFIG_SD_BOOT) #define CONFIG_SYS_MMC_ENV_DEV 0 #define CONFIG_ENV_OFFSET (3 * 1024 * 1024) @@ -169,6 +176,7 @@ #define CONFIG_ENV_OFFSET 0x300000 /* 3MB */ #define CONFIG_ENV_SECT_SIZE 0x40000 /* 256KB */ #endif +#endif #define AQR105_IRQ_MASK 0x80000000 /* FMan */ From patchwork Wed Oct 3 10:44:16 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rajesh Bhagat X-Patchwork-Id: 978194 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; dmarc=fail (p=none dis=none) header.from=nxp.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=nxp.com header.i=@nxp.com header.b="CMuk5uLF"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 42QCmk5Ggwz9s8J for ; Wed, 3 Oct 2018 21:03:18 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 68524C2206E; Wed, 3 Oct 2018 10:48:23 +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=BAD_ENC_HEADER, 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 7AE61C21D72; Wed, 3 Oct 2018 10:46:19 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 12F99C22104; Wed, 3 Oct 2018 10:46:03 +0000 (UTC) Received: from EUR02-AM5-obe.outbound.protection.outlook.com (mail-eopbgr00055.outbound.protection.outlook.com [40.107.0.55]) by lists.denx.de (Postfix) with ESMTPS id 9973EC220EC for ; Wed, 3 Oct 2018 10:45:52 +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:X-MS-Exchange-SenderADCheck; bh=dSCwWqffai46azeOAcFuBX9wGsc42w2jgJnEOX/23mY=; b=CMuk5uLFtTwK422wDKDosgw19T1Ojv5lXfjArklmmSGjL2Ww4nvbCTuhkYrOPOpdmR7LaNn+ozHx+JDmciU/o3Z+FhZUme8LYj6I2kCLw9uo/mH2YAXUMiKACkcTidgaRo8zIig8K/ynNE9sclJhusL3LXRPj+7m2cRzxciBmQM= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=rajesh.bhagat@nxp.com; Received: from phoenix7.ap.freescale.net (14.143.30.134) by AM0PR04MB4849.eurprd04.prod.outlook.com (2603:10a6:208:c4::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1185.24; Wed, 3 Oct 2018 10:45:49 +0000 From: Rajesh Bhagat To: u-boot@lists.denx.de Date: Wed, 3 Oct 2018 16:14:16 +0530 Message-Id: <20181003104459.5444-11-rajesh.bhagat@nxp.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181003104459.5444-1-rajesh.bhagat@nxp.com> References: <20181003104459.5444-1-rajesh.bhagat@nxp.com> MIME-Version: 1.0 X-Originating-IP: [14.143.30.134] X-ClientProxiedBy: TY2PR02CA0011.apcprd02.prod.outlook.com (2603:1096:404:56::23) To AM0PR04MB4849.eurprd04.prod.outlook.com (2603:10a6:208:c4::26) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: c1d56f76-15de-4d4e-6a52-08d6291d6359 X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989299)(4534185)(7168020)(4627221)(201703031133081)(201702281549075)(8990200)(5600074)(711020)(4618075)(2017052603328)(7153060)(7193020); SRVR:AM0PR04MB4849; X-Microsoft-Exchange-Diagnostics: 1; AM0PR04MB4849; 3:Sp1LsQJxfadc+nRYBdpcHrC0sYa8xh1hrELVtqROMCnmL6aERUoqeC12CPHvCg93w4DHhFnE2MPsw9IOR69fda5JwXXhl8ax7lJ7gBiv68/84Lw59ldIUdJEBCFTnVC8rsgXISeze55MDn0Wxk0hIjv90CgXJrHtK1IsB4RjpAxetnUz9Pjmhu8jjsKmNhLTgCtDy+P2rUaw4Eyp8RnCgk+chVZPLfDDM0hXh6cCCF5oVpLYgnF8O+EPLLR+ZsMA; 25:6DhBGeDLD1V04/JpKcUkBsrLA39MtyDCRglz/BdA8WqYI67/BFr9n4u/G27nwV4SdP/k9EuOLjtba5+aN+3aXuU98cPgKjXixUFe7CT2GOqHacktSnWcm50u5B/UuwdGxubsHdnAFYliS1pHm15UTKageBMxH4Q8UAEwOiLNqcUqN2UNEAKb38h6eKagshFTf9Ygr/4PtpmgQccdI0hyZXL/bJnyvDXFcaarghpHOLZGgh7gOEHPuo8XUYbPeiuYizGfTCLe2YV4E2MdlXnlSlKXesxfV7krLH6PAbdxMwGidJG4YcGMsCrCYIKdGwrIBCPDKyYfWAtjX61aMe1mZw==; 31:E6NEA2tUMrlVhKeI7a2sYEetN6xqKiSf74Gm0d/2wumgQxZrWthRSodUIS9IjKxN1JaINbJNO+p/+DsYZoCV/nWp0vaVjeAKB5XsEL7hiUqruRvxnuHpv9HAFOcLE/QqanC5qjqXKYHU2B+v2SIYEhoO7sOKrkX3j7oEiKj+Mfp8yp3x+02N+KAjlXRrZZZ1okJQVRp63E6DYkqbFiW49drinRSLY60M+Ol09iCdGTk= X-MS-TrafficTypeDiagnostic: AM0PR04MB4849: X-Microsoft-Exchange-Diagnostics: 1; AM0PR04MB4849; 20:oIC3mU3ku4vYx7Ucinvq91eumSMAtZGqzuIBBGnAnYmOj2COdn/OObqu9u3Nb4FryKEnAkc2zFhVUytxjvzNc1g4BdNBjIZAo30QSbBfTLuA4ZRxcoEgIzV3SEIuR7crBRc85ptEohNcpLz3OCg1pxiX7MFhGBIhO1Cnabu4Q9iHA5ZTByS0hJ/dAKaGrTo9JLvjBbA+ltjjQhyxwR0HTd6/5l/WvSv/DvFXUUaobATobeFzLHh+Pp6/2DgojkpcPlQjPDgJvdt/q8rdzTd8zX0gmg6RsECqRxsMOdMYps8HQkPqOj3s3y0xUTIywnTlOeofImcjp7JH9NTuPWztI0V0L9P64nkPAx29NZqcGbynI89H7x+Bhcsqxcks+ajYb73Fmv/UVeTZ3crPAngt+UQKRcHTdes+ssGs9dwKRbkh1hYUpfXYpfp9qiK4fGl5pHE23hjw5fI5m7HZZOCwKSBTdBEfVqf/3UaLl0w1yEgMenqgPbjynQKh6Cyjs5Up; 4:sfmjvtEHp3VtXJOdDLVzMJcgh2p39BDfbMNeB+I21JZUSzDL/ila+F9MFJJO0kGdk1bYnX+jFj7NRHi6SHm0wQzIOaLzzvgv7l8OzLvHoSyCcAZq520lK7RbTsm9XN4e2NhDZVPTU82LGa0RTxEZtPce69ABY2Vw2uZvXmRu2nnekVErIxljSbpRQqKTQG9azrDWe2/OF4Iv78qL7npNtsK2oSe3zCCO1WBfrpoN1w407yPo+SMTuwzMqT16ay2HdYZS2ghCft0yMLPBUs9XERtQxOBglndiwVXCxJkZC76bRuTbKYmTQ8h9ui5UpUeD X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(185117386973197); X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(5005006)(8121501046)(3002001)(3231355)(944501410)(52105095)(10201501046)(93006095)(93001095)(6055026)(149066)(150057)(6041310)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123562045)(20161123564045)(20161123558120)(201708071742011)(7699051); SRVR:AM0PR04MB4849; BCL:0; PCL:0; RULEID:; SRVR:AM0PR04MB4849; X-Forefront-PRVS: 0814A2C7A3 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(346002)(376002)(366004)(136003)(39860400002)(396003)(189003)(199004)(66066001)(50226002)(97736004)(7736002)(50466002)(55236004)(6666003)(14444005)(6506007)(386003)(16526019)(53936002)(26005)(68736007)(6486002)(186003)(47776003)(8936002)(8676002)(81156014)(476003)(81166006)(5009440100003)(4326008)(16586007)(36756003)(5660300001)(86362001)(575784001)(2906002)(1076002)(2361001)(2351001)(478600001)(446003)(3846002)(6116002)(316002)(2616005)(44832011)(305945005)(76176011)(956004)(486006)(48376002)(105586002)(106356001)(51416003)(52116002)(25786009)(11346002)(6512007)(6916009)(110426005); DIR:OUT; SFP:1101; SCL:1; SRVR:AM0PR04MB4849; H:phoenix7.ap.freescale.net; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; Received-SPF: None (protection.outlook.com: nxp.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; AM0PR04MB4849; 23:+9kBnxDOlYi6ATHKOLjvKeJPnK5fLDOX4qV/8AgGp?= GwwWu4QpWBK2vbdmhETCA9qBZL1gGKv05SRRDbqL15c9n2xTrwneVMXZWQyDZ8E9QsH2Au8fbJ31nuhFBu4qWAafpwBO9d0ebKpiKHgpZ41PL2E8uv0sUg4SzLJUSZpxVeAs7YuB0o5otxvD56izXGidwY9kii1S7HQdgj2HNVLPFqZ4u62Zb49hbZpZAmkypCsH+HUR+gEUeZmxCPrcfJGMDNEizVFmNEeit0wKWKREY3+I1t82rUcnq1rJfqOL5ETbEjEchP4mhWqn6cqJvmt5L377XWOAFlGLF7I4Hj/KfMsNTgC2fla+warIzgg/fkT9xglAsF43Hdi70lx2RaEC4JSz0pu3BmLpkonSizqOsrtiy0pwaruIeiuImV0hG37GOqq5k3vAHScoNV/B1q+tTDwMgdvzA6idI+nJvdG096hsSUT0o18NgpmXg0QdmHoq5tBhkvSzpE1IouzGcTWd8DAqfAiygV+7+qYHMBn+NUblVMh2YkO9PYf5jyJwMSacjPNUmBDNnDhNoB9n7o1W54g3jJ2sqEpVUU4BkVstSUd0nta2RmFpgOypE6V3cISQAsBESqd0TueY7vAYzNXY1wDh2nPw97OtLyiI2gAXJ0+JtFWvO0d1fNHM6H7OF41I3TArpKXvSJIBFCYYSyUuLAHjVLAXcI/DT855PXKQviyFOKiaCWxJDQ7aI9q3LOSu3DINwynCwgRbo6PoKgaoZG964PvJaI+ax2uSfD6AdyQzcKuqu+HA7tMxbyJEKORyGooWloYj8ye0eKtZLNpqmUMdmE2mDWPwZnls9DMHfUwHywa5uby8SmbSlK7zaPUf7U3/DIvnwWcMb452BPbTbvDQYLSwnHXi3NhghDKYif/+/goAX3nXI5jjyHZz6fXTSl7UzjQ6JhGTfDMzihufLlswrfG/MuFG6cLUatgaY3ofUQVYryhvRejK+9MbQ4P4iio+3Z5mfi/O+iJ9ItewhyQ79jefgeLJQUlBpdZ18OWkMTEL/wzza9YPKreXej+frNg6XUxpPJVGBtMPmXia3x+jXmc1GA2hyrQgIbmguWlXKVcXjsF0DdKuiJeuoVVV9LbBK7/Y//wHupd0StWQdIf7gnA4wGpGUGylYMCJAbDilXc1pm2Du9ujT3verHEXDQgz3d4rOXFodTQxV18b8B+tMOVvdIVriyMzL9EDieAr8wtZ99xf3Q5A8RXiTNwJyx3TORKEHVQfgEvsZ/p+ZYg/c3YAzPxU4pElwqjSu6OdMpHo9bgNYOizb5dZxI8fTHPE4dm1Ci/Y8Q36tjh2iLrucmVhF6KXrgrmlx5XA== X-Microsoft-Antispam-Message-Info: +68BEbDh4970A7JhjTCQF0OfJmMHDQlZ2tDoqsaQK6ZJVIuV/Yz4XevViLrzzL/dEGSNZSu0hMYxysjnZ7cYbt1pjswYgIo13D0x8Wv0BG18iZJrW/4z/boSwf5l78gBicQgtGU/z3sb1LAFrW8T/MzxAOa9vpbN6gMJ8RHeOlIUxhht3uF7ZgWJ5g9bAmQNfas0Dl4/ElYmwvpQPDUURqS9K72jfk2Ynt0/iZA9J1x6Li2ekXa5QSE13FIa07reZm6zV86ysYafGm3n5KIv48mM4IEpEApBADfFfl/BmhZ+oIVA1SioHFZNDRDPizda60aTH0C8jiJfTjmOTKlzb0QUK91Pi+Q2B3TriuPa4uY= X-Microsoft-Exchange-Diagnostics: 1; AM0PR04MB4849; 6:y2XTxB7/g3T/qGNpCpEC8R+GAZmfBUrZmgUu2cymi1+CaGscX+D/bJuYGRiSGwPSlAxytRh2GRQFFe3umS1Pe4Z/+ymL2jRJpLUnFa27N+ZGGD7J8XYpiPXd0R6O0zM++RGQvMwPDQngLg97Mfo63ql1zqcYtv6i08A4xO7ZbWrFNUqaDeGNI/r30od3KcjcRAYGpL1H7FrvOlGAyxX+iYnsmsVtjs8ulMa0FU/OidFyQNzCPHa1otWa1WMaT0CeBbYKRzpDgeBIgrk/eWuf2dW1GsZSx424iWGx+cBdSA5Nlk9qMPw32vcix9cJvuFTB0LBSf3Jo9VJKG3zyJ5eOmQJj/x1um0vXYPGJu9s2UUdwzHEnnoefvsbtISiIzVmiIOzVbQaBrmWDXYX4iUkGH5FfUk8v3naIvJd1ZMLuCceBj6FHAU9H8rY1YnRtsDQboxnpYjEQWgbE3rHUTsYuQ==; 5:YpPw06At2MJZIiJFD7G2nO4j1lczk6Qesb3Zdp9f/TfnRpoqEgASpyJEwjn/HJS+b2eIKIJDHd3f4b/jpvVJ9sjliIlKwASvy6hVdJRncQI1v7DvT5Okg87HIGuOwYNctwAWJiV7ta1uPPyZgHgvxktY2IDPCOJbUrUV3+aPHaU=; 7:ck664nnsg93kIFD4f4Wk6G7KjeX/RxWA4zLauzPWOa2F7wStirN2fcpCS6ZTa5QVFqhJoPKycZ9FnM5qPyx93DNjzNTQ6ti1mra47oK6Y8zAlPyKTaX8EKBFK84lA9y8jiH2rB0C+OAHpMTxBJzMA2Mw2vePBNiTALpuUPozA8CJAQ12au1sWXpVSS4YML2m3M9p0nMM/z7852ENEZNQllsKZiB3lthXnLtXrKNRx1ddknpxNXiVNppnnok8Orb7 SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Oct 2018 10:45:49.0990 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: c1d56f76-15de-4d4e-6a52-08d6291d6359 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR04MB4849 Cc: Pankit Garg Subject: [U-Boot] [PATCH 10/53] armv8: ls1043ardb: Add TFABOOT defconfig 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" This defconfig is for TFABOOT, to be loaded by trusted firmware. Signed-off-by: Pankit Garg Signed-off-by: Rajesh Bhagat --- board/freescale/ls1043ardb/ddr.c | 6 ++- board/freescale/ls1043ardb/ls1043ardb.c | 12 ++++++ configs/ls1043ardb_ram_defconfig | 49 +++++++++++++++++++++++++ include/configs/ls1043a_common.h | 7 +++- 4 files changed, 71 insertions(+), 3 deletions(-) create mode 100644 configs/ls1043ardb_ram_defconfig diff --git a/board/freescale/ls1043ardb/ddr.c b/board/freescale/ls1043ardb/ddr.c index 7bc0f568ff..1fb1635dfb 100644 --- a/board/freescale/ls1043ardb/ddr.c +++ b/board/freescale/ls1043ardb/ddr.c @@ -210,14 +210,16 @@ int fsl_initdram(void) phys_size_t dram_size; #ifdef CONFIG_SYS_DDR_RAW_TIMING -#if defined(CONFIG_SPL_BUILD) || !defined(CONFIG_SPL) +#if !defined(CONFIG_TFABOOT) && \ + (defined(CONFIG_SPL_BUILD) || !defined(CONFIG_SPL)) puts("Initializing DDR....\n"); dram_size = fsl_ddr_sdram(); #else dram_size = fsl_ddr_sdram_size(); #endif #else -#if defined(CONFIG_SPL_BUILD) || !defined(CONFIG_SPL) +#if !defined(CONFIG_TFABOOT) && \ + (defined(CONFIG_SPL_BUILD) || !defined(CONFIG_SPL)) puts("Initialzing DDR using fixed setting\n"); dram_size = fixed_sdram(); #else diff --git a/board/freescale/ls1043ardb/ls1043ardb.c b/board/freescale/ls1043ardb/ls1043ardb.c index e7d8650d27..aa266557ba 100644 --- a/board/freescale/ls1043ardb/ls1043ardb.c +++ b/board/freescale/ls1043ardb/ls1043ardb.c @@ -37,6 +37,9 @@ int board_early_init_f(void) int checkboard(void) { +#ifdef CONFIG_TFABOOT + enum boot_src src = get_boot_src(); +#endif static const char *freq[2] = {"100.00MHZ", "156.25MHZ"}; #ifndef CONFIG_SD_BOOT u8 cfg_rcw_src1, cfg_rcw_src2; @@ -46,6 +49,12 @@ int checkboard(void) printf("Board: LS1043ARDB, boot from "); +#ifdef CONFIG_TFABOOT + if (src == BOOT_SOURCE_SD_MMC) + puts("SD\n"); + else { +#endif + #ifdef CONFIG_SD_BOOT puts("SD\n"); #else @@ -63,6 +72,9 @@ int checkboard(void) printf("Invalid setting of SW4\n"); #endif +#ifdef CONFIG_TFABOOT + } +#endif printf("CPLD: V%x.%x\nPCBA: V%x.0\n", CPLD_READ(cpld_ver), CPLD_READ(cpld_ver_sub), CPLD_READ(pcba_ver)); diff --git a/configs/ls1043ardb_ram_defconfig b/configs/ls1043ardb_ram_defconfig new file mode 100644 index 0000000000..a15cb524d3 --- /dev/null +++ b/configs/ls1043ardb_ram_defconfig @@ -0,0 +1,49 @@ +CONFIG_ARM=y +CONFIG_TARGET_LS1043ARDB=y +CONFIG_SYS_TEXT_BASE=0x82000000 +CONFIG_TFABOOT=y +CONFIG_ARMV8_SEC_FIRMWARE_SUPPORT=y +CONFIG_SEC_FIRMWARE_ARMV8_PSCI=y +CONFIG_DISTRO_DEFAULTS=y +CONFIG_NR_DRAM_BANKS=2 +CONFIG_FIT_VERBOSE=y +CONFIG_OF_BOARD_SETUP=y +CONFIG_BOOTDELAY=10 +CONFIG_USE_BOOTARGS=y +CONFIG_BOOTARGS="console=ttyS0,115200 root=/dev/ram0 earlycon=uart8250,mmio,0x21c0500 mtdparts=60000000.nor:2m@0x100000(nor_bank0_uboot),40m@0x1100000(nor_bank0_fit),7m(nor_bank0_user),2m@0x4100000(nor_bank4_uboot),40m@0x5100000(nor_bank4_fit),-(nor_bank4_user);7e800000.flash:1m(nand_uboot),1m(nand_uboot_env),20m(nand_fit);spi0.0:1m(uboot),5m(kernel),1m(dtb),9m(file_system)" +CONFIG_MISC_INIT_R=y +CONFIG_CMD_IMLS=y +CONFIG_CMD_GPT=y +CONFIG_CMD_I2C=y +CONFIG_CMD_MMC=y +CONFIG_CMD_NAND=y +CONFIG_CMD_SF=y +CONFIG_CMD_USB=y +CONFIG_CMD_CACHE=y +CONFIG_MP=y +CONFIG_MTDPARTS_DEFAULT="mtdparts=60000000.nor:2m@0x100000(nor_bank0_uboot),40m@0x1100000(nor_bank0_fit),7m(nor_bank0_user),2m@0x4100000(nor_bank4_uboot),40m@0x5100000(nor_bank4_fit),-(nor_bank4_user);7e800000.flash:1m(nand_uboot),1m(nand_uboot_env),20m(nand_fit);spi0.0:1m(uboot),5m(kernel),1m(dtb),9m(file_system)" +CONFIG_OF_CONTROL=y +CONFIG_DEFAULT_DEVICE_TREE="fsl-ls1043a-rdb" +CONFIG_ENV_IS_IN_FLASH=y +CONFIG_ENV_IS_IN_NAND=y +CONFIG_DM=y +CONFIG_FSL_CAAM=y +CONFIG_FSL_ESDHC=y +CONFIG_MTD_NOR_FLASH=y +CONFIG_SPI_FLASH=y +# CONFIG_SPI_FLASH_USE_4K_SECTORS is not set +CONFIG_PHYLIB=y +CONFIG_PHY_GIGE=y +CONFIG_E1000=y +CONFIG_PCI=y +CONFIG_DM_PCI=y +CONFIG_DM_PCI_COMPAT=y +CONFIG_PCIE_LAYERSCAPE=y +CONFIG_SYS_NS16550=y +CONFIG_SPI=y +CONFIG_DM_SPI=y +CONFIG_USB=y +CONFIG_DM_USB=y +CONFIG_USB_XHCI_HCD=y +CONFIG_USB_XHCI_DWC3=y +CONFIG_USB_STORAGE=y diff --git a/include/configs/ls1043a_common.h b/include/configs/ls1043a_common.h index 656d10dffb..80676487ae 100644 --- a/include/configs/ls1043a_common.h +++ b/include/configs/ls1043a_common.h @@ -33,7 +33,11 @@ #include /* Link Definitions */ +#ifdef CONFIG_TFABOOT +#define CONFIG_SYS_INIT_SP_ADDR CONFIG_SYS_TEXT_BASE +#else #define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_FSL_OCRAM_BASE + 0xfff0) +#endif #define CONFIG_SKIP_LOWLEVEL_INIT @@ -119,7 +123,8 @@ /* IFC */ #ifndef SPL_NO_IFC -#if !defined(CONFIG_QSPI_BOOT) && !defined(CONFIG_SD_BOOT_QSPI) +#if defined(CONFIG_TFABOOT) || \ + (!defined(CONFIG_QSPI_BOOT) && !defined(CONFIG_SD_BOOT_QSPI)) #define CONFIG_FSL_IFC /* * CONFIG_SYS_FLASH_BASE has the final address (core view) From patchwork Wed Oct 3 10:44:17 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rajesh Bhagat X-Patchwork-Id: 978187 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; dmarc=fail (p=none dis=none) header.from=nxp.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=nxp.com header.i=@nxp.com header.b="RmWib1Gs"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 42QCj70V8Pz9s8J for ; Wed, 3 Oct 2018 21:00:11 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id B5253C22087; Wed, 3 Oct 2018 10:50:16 +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=BAD_ENC_HEADER, 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 49AFFC220FF; Wed, 3 Oct 2018 10:46:37 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 803B1C2211F; Wed, 3 Oct 2018 10:46:07 +0000 (UTC) Received: from EUR02-AM5-obe.outbound.protection.outlook.com (mail-eopbgr00054.outbound.protection.outlook.com [40.107.0.54]) by lists.denx.de (Postfix) with ESMTPS id 0560AC220E3 for ; Wed, 3 Oct 2018 10:45:56 +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:X-MS-Exchange-SenderADCheck; bh=BSsiYL3IOKdCebg2Y3/qWQYLlqddydOz6TYBFLqwAGY=; b=RmWib1GsjjWChnph6YpWQKa71EjD+Kq1jjvwdkdzHoKD7TSQxlIG46OA/wFMArc+AytC6b8xGGBIz6zFR2f42wwYpPSbQvuL8A9sA6LI1v9t+3m/Iqzw5euqOGbGYpWsQOdsUAbH6yHP0yrWRz4jwxW7flwZGhCAWOiw3BavD7M= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=rajesh.bhagat@nxp.com; Received: from phoenix7.ap.freescale.net (14.143.30.134) by AM0PR04MB4849.eurprd04.prod.outlook.com (2603:10a6:208:c4::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1185.24; Wed, 3 Oct 2018 10:45:52 +0000 From: Rajesh Bhagat To: u-boot@lists.denx.de Date: Wed, 3 Oct 2018 16:14:17 +0530 Message-Id: <20181003104459.5444-12-rajesh.bhagat@nxp.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181003104459.5444-1-rajesh.bhagat@nxp.com> References: <20181003104459.5444-1-rajesh.bhagat@nxp.com> MIME-Version: 1.0 X-Originating-IP: [14.143.30.134] X-ClientProxiedBy: TY2PR02CA0011.apcprd02.prod.outlook.com (2603:1096:404:56::23) To AM0PR04MB4849.eurprd04.prod.outlook.com (2603:10a6:208:c4::26) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 874d711f-68bd-471d-3dbe-08d6291d6564 X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989299)(4534185)(7168020)(4627221)(201703031133081)(201702281549075)(8990200)(5600074)(711020)(4618075)(2017052603328)(7153060)(7193020); SRVR:AM0PR04MB4849; X-Microsoft-Exchange-Diagnostics: 1; AM0PR04MB4849; 3:wM0lgzNFsb3QNhyc3wvWMKIaOUGI8H/QZ/9GTNtN9ea2WZPLuc6otNuttzqNq4/j3oGMyYdRFRLXOxYdgafXx4/pi66uZWc84AlAuXgXurVBYv1eknv52X676/KiyP5r3A3ELGh1HjZp5JPxg5vI0WjA6mu4Wi/66/jXKnP6e7F+UANT2yqJjoiBJ4B9ftrYevTLmzODtWvalAyKYBB9ev4AoqfOA/Q/0I0RAPNcIIwV63dwADXnpW7fBu+tjssC; 25:el7KFKH5gV7NZo7w3eM34g6HeKNxI7kV5RMzELr8c6TKUqBX4l/g/jIygniPgenHpISX5XE4G9K+xq8uQKI5DPUtlEHOhr19BhoeF6tfFiuE2ACD/obS6uNBDXkCVM170lVPWNsxcodvpyV/KFsPYPCADcoujugMcPYck8J7mWFb0Sxl7TNJZkKsLo1JPC9X73+8SzALHIUMKUNizYqBpfv8SvUkfzxKzOuQJSwnTMdHtT4QYyfZMLYCzvsmtU4wFR5DyWJwwjAedOK/A07qqw0APRa7ebHvwFEVDdB3lhV7TsBopfqjCUCBTQL+kTuWUFb3KXNuEe6u7XDHaYTJuA==; 31:1NEObtYwWSn9X0HT0xaFxRHQuwqEHYM/UKmS63AKvMniQA6xU4Awk00s9Xr+BFtt+WizESMxb9W9U8SdMvSncoQs/5whhMqH0jqF8Uo7yEPguxzIYX3bVDYAME2RM7S1pUBF8FNgdkQM/KoVlLKFWlVFDrLj7u8Lpd3jhvpClxyCXtuTX+uXmkuoAeAvNGZg36YVLUQiAV4rmLBt0nYPs2E0bwrUyCAgSyYvN0vqe2Q= X-MS-TrafficTypeDiagnostic: AM0PR04MB4849: X-Microsoft-Exchange-Diagnostics: 1; AM0PR04MB4849; 20:DqrsnIHKC3wdznWk4cGGwEaEXgOOTE5CYB3ZUiwYqqmeJtRWigbIEtQwbl1/eNUgP+f7HtWEm5tEGco5shX68Ba9N0bMdiFKYL4kgdFN8AI66OoYNG3BaYRvcWYd7u5mXeYkebu2iX0lmon3lF3iW17TMDq//P3oxdK4eAaEl2dSkA3Nm6MV+9+mMtsOD//RZg/DTRnbgCXoZUF3BoSEGYPKpZKiPKvxNxCWbtrm+BvLw/daDaiM7aDcGI34ZVrebWaZhnVdyqB1iorbp+bfJeOSgDPgGYq/Pdj83K7XHlSCsAVyLrAJl4NBnOSum38yqCPJV1DuW2UEu1FFRO2QdX3nRGBIzNhSrUMJvmt7Cb+V6PHFt1B2jIz30Ds+Od3+wYdsP4ZPGSlzF5C7CbnQF8K/Btj298+BkTLMQWgQTqw3gkexQf2q4cY6i2F2EewOP2qd2sEqxo1iUJGG5zjiK5lELtaFtGDDhgblMh6OT6TXJsPHG37oryXc1j8YbFFw; 4:fqE7dMXSvj0nu6cX+wlTAyv5U8Cc7gYlhedElIZpLy5/nDo7Xw9kgx1VGDTHJdz7+ZUbV6A0VH7VV9pJ1+qM1Ju+1p8LirTM4qzrqKGB2NjHKOPC419BTFPIUfnrXYMG30n5Qgi+JR5WhJKkCrHgYk0WR4+xZhljSh+8je0Ve1fsPFOCd+3fvMFjy7SX9wHPn+tLec6ORyUYG9F0BsF71eLYBRupc15UztMqB1tjZU5RQrZ4Zk1fL7bvfGQx9YTrUylSsK7QSAjJ1ok+vo2csJ0w64Zc9PBVBLSrpjl4kGiMrMqUybcCB4k+rozfmK4a X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(185117386973197); X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(5005006)(8121501046)(3002001)(3231355)(944501410)(52105095)(10201501046)(93006095)(93001095)(6055026)(149066)(150057)(6041310)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123562045)(20161123564045)(20161123558120)(201708071742011)(7699051); SRVR:AM0PR04MB4849; BCL:0; PCL:0; RULEID:; SRVR:AM0PR04MB4849; X-Forefront-PRVS: 0814A2C7A3 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(346002)(376002)(366004)(136003)(39860400002)(396003)(189003)(199004)(66066001)(50226002)(97736004)(7736002)(50466002)(55236004)(6666003)(14444005)(6506007)(386003)(16526019)(53936002)(26005)(68736007)(6486002)(186003)(47776003)(8936002)(8676002)(81156014)(476003)(81166006)(5009440100003)(4326008)(16586007)(36756003)(5660300001)(86362001)(2906002)(1076002)(2361001)(2351001)(478600001)(446003)(3846002)(6116002)(316002)(2616005)(44832011)(305945005)(76176011)(956004)(486006)(48376002)(105586002)(106356001)(51416003)(52116002)(25786009)(11346002)(6512007)(6916009)(110426005); DIR:OUT; SFP:1101; SCL:1; SRVR:AM0PR04MB4849; H:phoenix7.ap.freescale.net; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; Received-SPF: None (protection.outlook.com: nxp.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; AM0PR04MB4849; 23:jTuSGSmuDl+CN4IuaTzQIcZCPia9PmOnTJdenymwO?= tLB0EIkHRR6GMreLSL4i0QBTVPPvRIVsV/GgV+yESazoQHRNqsi45e2MJldBOYKtSXhoLVMsgaoxAoOyBpH6EzRSMI2c7j5euuHQ34KkURFXJ0xEo6mBl9mTiBybmBt+iqrH/+kG80ld47vOKcDy/c8Z4CpI1XECTvzAvs1qcFcwEuYjGUkxBueJpXk0Z5yVfs3wBi+iwxjvAXe2TVjefdxgTrPPJCOt4mAhf4qwdwnOvDvSHReMhhXItKHan4iWrX21Utt0BSaJ7ZQncnPr08G0baqCu4+zbQszjkxqWAtMRlIqsX6SsISDWAnY2PZsFHiX4QKjdAZNbBybyMqdADK4xz2s3LIsm9p7LaxsDmTUZIIbcHJbfaHUiMI1l9viHbzhErSmjlKPyQOPbwNySLt9seH8jkOTi/JxHAQ0Oe8dU+DJ/hr+IFyIyl+NI+4566baDvoNBrh/LwxDUHgiGyYobS9vD2lAa1kb9uIcSxdz7Ie1NBTG57dULy9quPdXqZT40rhqauNp6XyNPT1HLXUhWpVEgEUpfI6QVnBbACN+m5FaGUDiYvGq+Y+Xx+p5UX02KCW2nPwe5ft8mrOmE9HkLniE4BbuVQ0OF+CqUNcOcOnOv9DXxwA9ioeK7P/mSUDM7OXC+Rbr4Jmtf4ucNLWZynzKgmDb6ucA7wYlRswAdYn4kV0DUSDt9DGBEL4SsY/dziflFPtQ8ndqTzCgq6/UTbI9ZB3Y2Q1+/8sCCTK6SQ9JCGcrEBzY86LrI1EQmUXmXVkPgZ1eajMGdScNOaAcOYPMSyIpCDmAShWeEO0X4gE6Bz/lMvoQ1eGyXBI80R1u6z1bBfAldFHZhZl5nVq5YYRkvbCyBEhigJ4fk1/O2vYfdKksQf9s84xI0g5JcDNorCGv/KgFxwpqAVuk5d1PUM1Ym3eNQH0FDsVlv1TkphvtQO8F4D3P/OPNYEgaXZxzk3puPosGmR/NCF4MZRJxaro7KiRe5BdmqpV5SreXOQF3YsSfrs8HSZbEggJ2IDpgIgsWJGVlFuPNWMhfegC03yeB/IB1IWAf13EjlLzZ2plo/OmRkICciz2OUtzZT1rmLJKrCKAswrkTE4zqBpQFfNyzwaQH9PetLRZruBK4v0UQdl2xkTWHEIT8rGsNSyYzhodiBYZlKTPE5PQcUe94+wtUaxzTqtpnhVGd9ymEgI1bLiOT0Aws7Ek3lmkGSny7ymKfc94bGk6kx+JUrsBsOK6oZQtVerYFdUeBzOYHR9mphsfTl2Rjs7bHpQbnRmYPataa4NBDdp8YWTKeLRQ X-Microsoft-Antispam-Message-Info: 5GpsPP0hXllKA90/sKNE8RPXFf3505XJy+mcW8eZ2uE3YbbGySSFF/vZhcL6+4UzFVL7YGDQocYXbOAnM6u2DgIwv2IGsYhGIoL3233p4ZsDGnb0ooOcrD0sPlexd1ybkRxWb0R1sAvCIIt8s8OrmjF+oKEUcIVJu3TfeA/M/4c03knYAYAO6n10GksJiZ0BWFXWYNf5b/X5FtonRJ4q4gASuxpmLj6QkBrC10+yzkNeiowyet52hozVSjipC1iq+0XgtOn/X0VYPjN3WtVZTMcZko3dJxM4F53q8kG7oxA/GGH4gZtHSgHv3ZH2r8t+aG9+90GdbbHa7B6+jyVm3/WW3xL5u4uKH6622o8WVTA= X-Microsoft-Exchange-Diagnostics: 1; AM0PR04MB4849; 6:pwgIxSlW5bP9K2SYif7EnpRrrbFWMmUMVGozGEKIazneopkypbStPVBxX31ODugwQBYrgkIUeaQvzKJ1Qm61ctvL4tPlfHvIeGYOTwinmKXNpkXasmqnQb4ah+bzYAW4G5042Ta+uLaKU9c2I2rHM3oBu6CBA4+jvNI4zdKDQIPG+9NqE99Tl4kWh6j0cYb3h/tMpcuKDfuntuEZsGhomn8L1uDUyVJz21iaUA5YtcHb0P4rpWVZ1NiPCLZl41LbTJ2m/KrEXQZgOyCg88OJUh3SDlyjuQETWdwS1HeY+2uu7bViDrnHpJ/ymxfyg0cFvouvYWJFpCXGir91OTY7i8WWFnuzrQq5WWTfJpe18gELAiBothx6zpWNbhSZnE3MEVJ3ccFDMocIvJjfy73bUe+HNUtp7vRpqrHIjObRaWfG24j5Lk0/iHAZ2pMG/JBALpUWhNtoEk1woJymGTJW8w==; 5:avkdboMyMj01XgYvthytllvzwez5lvvoZOVGccdF/kgm5EWveSGF8llNosUx28XDfwcvE0WJHVTkJuds77eqR9gIS8icSQkoDzIU7wkqTIhDnxxxQsPzQtBgjV1BM4uwRNk9Q0+Ymu6YRfT3V9YVwDSCkbIukyGQCck1h4yIAYg=; 7:M1wG87Ddrbv/JU8+ckoN1mcafukyJit8FRHPKxtber/PFZspQFSFu+6QxEGmBVFHg/wI99kil6HdlbwD18j9W7YnlPNF6KXJOqw1snV61g5fodKyjgB5qyS5m3piSWomvgxP5UB7X3Bu5bZs00lcmq/w+pRsjKhe90fu+IVridobK6iviOHHi9470eR86cl7/qk6GS8R8lBRhVvq1pLjx4+SLYHhfGqfAQurFXpTOdfXJY9348SIhudFPaBlf1qN SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Oct 2018 10:45:52.5294 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 874d711f-68bd-471d-3dbe-08d6291d6564 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR04MB4849 Cc: Pankit Garg Subject: [U-Boot] [PATCH 11/53] armv8: ls1043aqds: Add TFABOOT defconfig 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" This defconfig is for TFABOOT, to be loaded by trusted firmware. Signed-off-by: Pankit Garg Signed-off-by: Rajesh Bhagat --- board/freescale/ls1043aqds/ddr.c | 3 +- board/freescale/ls1043aqds/ls1043aqds.c | 15 ++++++- configs/ls1043aqds_ram_defconfig | 54 +++++++++++++++++++++++++ include/configs/ls1043aqds.h | 3 +- 4 files changed, 72 insertions(+), 3 deletions(-) create mode 100644 configs/ls1043aqds_ram_defconfig diff --git a/board/freescale/ls1043aqds/ddr.c b/board/freescale/ls1043aqds/ddr.c index efc441a917..a79d8e2120 100644 --- a/board/freescale/ls1043aqds/ddr.c +++ b/board/freescale/ls1043aqds/ddr.c @@ -112,7 +112,8 @@ int fsl_initdram(void) { phys_size_t dram_size; -#if defined(CONFIG_SPL) && !defined(CONFIG_SPL_BUILD) +#if defined(CONFIG_TFABOOT) || \ + (defined(CONFIG_SPL) && !defined(CONFIG_SPL_BUILD)) gd->ram_size = fsl_ddr_sdram_size(); return 0; diff --git a/board/freescale/ls1043aqds/ls1043aqds.c b/board/freescale/ls1043aqds/ls1043aqds.c index 4fba57242b..5247d9ac14 100644 --- a/board/freescale/ls1043aqds/ls1043aqds.c +++ b/board/freescale/ls1043aqds/ls1043aqds.c @@ -47,6 +47,9 @@ enum { int checkboard(void) { +#ifdef CONFIG_TFABOOT + enum boot_src src = get_boot_src(); +#endif char buf[64]; #ifndef CONFIG_SD_BOOT u8 sw; @@ -54,6 +57,12 @@ int checkboard(void) puts("Board: LS1043AQDS, boot from "); +#ifdef CONFIG_TFABOOT + if (src == BOOT_SOURCE_SD_MMC) + puts("SD\n"); + else { +#endif + #ifdef CONFIG_SD_BOOT puts("SD\n"); #else @@ -72,6 +81,9 @@ int checkboard(void) printf("invalid setting of SW%u\n", QIXIS_LBMAP_SWITCH); #endif +#ifdef CONFIG_TFABOOT + } +#endif printf("Sys ID: 0x%02x, Sys Ver: 0x%02x\n", QIXIS_READ(id), QIXIS_READ(arch)); @@ -155,7 +167,8 @@ int dram_init(void) */ select_i2c_ch_pca9547(I2C_MUX_CH_DEFAULT); fsl_initdram(); -#if !defined(CONFIG_SPL) || defined(CONFIG_SPL_BUILD) +#if (!defined(CONFIG_SPL) && !defined(CONFIG_TFABOOT)) || \ + defined(CONFIG_SPL_BUILD) /* This will break-before-make MMU for DDR */ update_early_mmu_table(); #endif diff --git a/configs/ls1043aqds_ram_defconfig b/configs/ls1043aqds_ram_defconfig new file mode 100644 index 0000000000..149a26ef33 --- /dev/null +++ b/configs/ls1043aqds_ram_defconfig @@ -0,0 +1,54 @@ +CONFIG_ARM=y +CONFIG_TARGET_LS1043AQDS=y +CONFIG_SYS_TEXT_BASE=0x82000000 +CONFIG_TFABOOT=y +CONFIG_ARMV8_SEC_FIRMWARE_SUPPORT=y +CONFIG_SEC_FIRMWARE_ARMV8_PSCI=y +CONFIG_DISTRO_DEFAULTS=y +CONFIG_NR_DRAM_BANKS=2 +CONFIG_FIT_VERBOSE=y +CONFIG_OF_BOARD_SETUP=y +CONFIG_BOOTDELAY=10 +CONFIG_USE_BOOTARGS=y +CONFIG_BOOTARGS="console=ttyS0,115200 root=/dev/ram0 earlycon=uart8250,mmio,0x21c0500 mtdparts=60000000.nor:2m@0x100000(nor_bank0_uboot),40m@0x1100000(nor_bank0_fit),7m(nor_bank0_user),2m@0x4100000(nor_bank4_uboot),40m@0x5100000(nor_bank4_fit),-(nor_bank4_user);7e800000.flash:1m(nand_uboot),1m(nand_uboot_env),20m(nand_fit);spi0.0:1m(uboot),5m(kernel),1m(dtb),9m(file_system)" +# CONFIG_USE_BOOTCOMMAND is not set +CONFIG_MISC_INIT_R=y +CONFIG_CMD_BOOTZ=y +CONFIG_CMD_IMLS=y +CONFIG_CMD_GREPENV=y +CONFIG_CMD_MEMINFO=y +CONFIG_CMD_MEMTEST=y +CONFIG_CMD_GPT=y +CONFIG_CMD_I2C=y +CONFIG_CMD_MMC=y +CONFIG_CMD_NAND=y +CONFIG_CMD_SF=y +CONFIG_CMD_USB=y +CONFIG_CMD_CACHE=y +CONFIG_MP=y +CONFIG_MTDPARTS_DEFAULT="mtdparts=60000000.nor:2m@0x100000(nor_bank0_uboot),40m@0x1100000(nor_bank0_fit),7m(nor_bank0_user),2m@0x4100000(nor_bank4_uboot),40m@0x5100000(nor_bank4_fit),-(nor_bank4_user);7e800000.flash:1m(nand_uboot),1m(nand_uboot_env),20m(nand_fit);spi0.0:1m(uboot),5m(kernel),1m(dtb),9m(file_system)" +CONFIG_OF_CONTROL=y +CONFIG_DEFAULT_DEVICE_TREE="fsl-ls1043a-qds-duart" +CONFIG_ENV_IS_IN_FLASH=y +CONFIG_ENV_IS_IN_NAND=y +CONFIG_ENV_IS_IN_SPI_FLASH=y +CONFIG_DM=y +CONFIG_FSL_CAAM=y +CONFIG_FSL_ESDHC=y +CONFIG_MTD_NOR_FLASH=y +CONFIG_SPI_FLASH=y +# CONFIG_SPI_FLASH_USE_4K_SECTORS is not set +CONFIG_PHYLIB=y +CONFIG_E1000=y +CONFIG_PCI=y +CONFIG_DM_PCI=y +CONFIG_DM_PCI_COMPAT=y +CONFIG_PCIE_LAYERSCAPE=y +CONFIG_SYS_NS16550=y +CONFIG_SPI=y +CONFIG_DM_SPI=y +CONFIG_USB=y +CONFIG_DM_USB=y +CONFIG_USB_XHCI_HCD=y +CONFIG_USB_XHCI_DWC3=y +CONFIG_USB_STORAGE=y diff --git a/include/configs/ls1043aqds.h b/include/configs/ls1043aqds.h index 68f202f97a..31ef9941b6 100644 --- a/include/configs/ls1043aqds.h +++ b/include/configs/ls1043aqds.h @@ -349,7 +349,8 @@ unsigned long get_board_ddr_clk(void); #define VDD_MV_MAX 1212 /* QSPI device */ -#if defined(CONFIG_QSPI_BOOT) || defined(CONFIG_SD_BOOT_QSPI) +#if defined(CONFIG_TFABOOT) || \ + (defined(CONFIG_QSPI_BOOT) || defined(CONFIG_SD_BOOT_QSPI)) #define CONFIG_FSL_QSPI #ifdef CONFIG_FSL_QSPI #define CONFIG_SPI_FLASH_SPANSION From patchwork Wed Oct 3 10:44:18 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rajesh Bhagat X-Patchwork-Id: 978182 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; dmarc=fail (p=none dis=none) header.from=nxp.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=nxp.com header.i=@nxp.com header.b="CN8s109M"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 42QCfZ38Mtz9sB7 for ; Wed, 3 Oct 2018 20:57:58 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 32372C22088; Wed, 3 Oct 2018 10:49:40 +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=BAD_ENC_HEADER, 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 02184C2210C; Wed, 3 Oct 2018 10:46:31 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id E9C29C220E8; Wed, 3 Oct 2018 10:46:08 +0000 (UTC) Received: from EUR02-AM5-obe.outbound.protection.outlook.com (mail-eopbgr00076.outbound.protection.outlook.com [40.107.0.76]) by lists.denx.de (Postfix) with ESMTPS id 8B97DC21C6A for ; Wed, 3 Oct 2018 10:45:59 +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:X-MS-Exchange-SenderADCheck; bh=IKp51ZhL5UqAT44YqL8w2IhouTrK/VYE33NqCmQ3Xno=; b=CN8s109MRneZsglBhp8WzoqLLkQA0UCd52fl0VKgaAbttqrx9PMeDXULFWi2HH0rDWxHikSAoA19mbiQn4kE6mo0r1zFEKz47NwWbFim7HhjzW7EDrRHHkim3jeBDPyzXJO/d6M3edsjzhIWgdgz4+AxeFHLXOediDAQ3UDNbks= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=rajesh.bhagat@nxp.com; Received: from phoenix7.ap.freescale.net (14.143.30.134) by AM0PR04MB4849.eurprd04.prod.outlook.com (2603:10a6:208:c4::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1185.24; Wed, 3 Oct 2018 10:45:55 +0000 From: Rajesh Bhagat To: u-boot@lists.denx.de Date: Wed, 3 Oct 2018 16:14:18 +0530 Message-Id: <20181003104459.5444-13-rajesh.bhagat@nxp.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181003104459.5444-1-rajesh.bhagat@nxp.com> References: <20181003104459.5444-1-rajesh.bhagat@nxp.com> MIME-Version: 1.0 X-Originating-IP: [14.143.30.134] X-ClientProxiedBy: TY2PR02CA0011.apcprd02.prod.outlook.com (2603:1096:404:56::23) To AM0PR04MB4849.eurprd04.prod.outlook.com (2603:10a6:208:c4::26) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: d60fbc4b-32c5-49d3-f71d-08d6291d675d X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989299)(4534185)(7168020)(4627221)(201703031133081)(201702281549075)(8990200)(5600074)(711020)(4618075)(2017052603328)(7153060)(7193020); SRVR:AM0PR04MB4849; X-Microsoft-Exchange-Diagnostics: 1; AM0PR04MB4849; 3:KbCgxZU9EGa/h6VWVbThwW83eAD3HO+AmAtkVP9ew+9OocifIRfOIc2yUebx1hPotSgRRVM6PXbwHof2vzcbyTUod72M9rxq2raGoNXifdLxI+rKYSoHTpWeiQ2uSYn/t3hUQHl1TSmkBZ9xNHbzXanlNkkwqM81KNYc2SsCNw283bPT2y+e7Xos9JLGw7b+FPrcw4K7QXx270hUBXylMcQnBsMGQSNxD1Koj+xFDPWJjY5hwP0idBDqy8Wc2x75; 25:KK3KCF9d3nL99FnuujG3n3kX0NYDYDSf0hLLTA6J2hXTGbzUC+S5mz+xmwO6/Q086VzsqiXtIVsLZi5EPyt0QUeDICJ31rSk/1sALNcaKr0a7pjJmCAygl67K9qZOlnvHdMk4cSl4eYfq3kimdmj222zWdjN2e4Q2/zUakzwbbqswX/WqJ+SY0DsCPh4UT0S540rvvCdul/ZyZnQyDaV4CXTDJ8Qg5w+TtYIDHWgTEhY2ZkJ2WA0aEFioKilH0J6eztYTYdcv0OsX4jT8HTFHo0UEwpGtXKJcVzI4G3e3JKsGN+amjN22tMYB4lwWdYg293c0xbRplnTvTjUrsFFQQ==; 31:7KKXZJZU8h8yd8nE/YDsU5Wpk23j8fWk59piyS2mXvZs+bxTQ6JNu/APL+r79DjyvRHF1I9O6dvsgVQ8ZD4Ua6EP5w+dRB2e9HEhAj4DiwjXV1Ym7Al2SSADVRW5pNhR7kipmyPjv4OvlMuo8ac2sqCG7P63l6F90qnU/gO5UcUcZ7+8iCpH5fJoUhYxMgTrR0D4q+S4TPIsczC5DG4S0fkgYiMf5M5LdlRnlGXm4+g= X-MS-TrafficTypeDiagnostic: AM0PR04MB4849: X-Microsoft-Exchange-Diagnostics: 1; AM0PR04MB4849; 20:0kE0RRPaNSP2v+81ppjpGVGplKWEr0vkivGffMeds01RN5FVVHqUTbb4K2DmgYIObinb2wS+v544TOhBNaIwQQ/tGaFcjcw+HPhhS4xoqXBc+gcVMLpFHNf3WF2ZkOH+4N+T75+hKrqEnTR/yRgRCmL9wfcFU18qSRhXQV8JcbX3TCi9D4obiP3DrxImBdfBKbZ8xw+B9UWwkDeK56uTKC/VpVYggoPCQznOfOUZ7/lPIGqKY6qkCc1Tdu+X4TPw7irHpi2wuz4jC5Kt55P18to1rkvwugUlym1LEIB+LLeFRKgweenuf2wYGAiz64J7htxYVTrGC109G5gaGcSpAH7r0/BOjl013pKhCIofK5/Jd/oUW36RsGFMcDx3xMJZkbGbmRUv9JEU4Xp/ndDQeBXZrtI0Kwx3HFIwAJp9q3ghEZe7UZlMzvjDlzO3mMtSYyChWZyQWrKlkMIkb6XzmVMPaqSPBAGTJAEFHtZNQ2XrGHHJzSBE2c8qcPki6bz4; 4:q2FUUNQJCyIucvoMYqzDMoB5/lvk0U+Lyj2835vYy2LlNLmcNLD1cgD0fOmIbyYHTA2xHyBC1V8NxN453Wlf9j8dRmqDcVBcJITsTNS2dTktdTY0uRg4yKylukUXAnXw2AYoLNYqpgSUrayaeVopdt1BPJYSad3u8cHEmJWTdKk22r5RdbH/eaNYDqnywSnqa2JyvuwjW4hBVoSHzMt3L/2epL1t9nRq3b2X1Rq7FTymYzRk480otZe4YzT8pGsqKaL4XdS/SiLEYs81OP9nnqy3MU8CYKmKThMFfcdyYGid0qfvcCrJTyO7wWMdCubP X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(185117386973197); X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(5005006)(8121501046)(3002001)(3231355)(944501410)(52105095)(10201501046)(93006095)(93001095)(6055026)(149066)(150057)(6041310)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123562045)(20161123564045)(20161123558120)(201708071742011)(7699051); SRVR:AM0PR04MB4849; BCL:0; PCL:0; RULEID:; SRVR:AM0PR04MB4849; X-Forefront-PRVS: 0814A2C7A3 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(346002)(376002)(366004)(136003)(39860400002)(396003)(189003)(199004)(66066001)(50226002)(97736004)(7736002)(50466002)(55236004)(6666003)(6506007)(386003)(16526019)(53936002)(26005)(68736007)(6486002)(186003)(47776003)(8936002)(8676002)(81156014)(476003)(81166006)(5009440100003)(4326008)(16586007)(36756003)(5660300001)(86362001)(575784001)(2906002)(1076002)(2361001)(2351001)(478600001)(446003)(3846002)(6116002)(316002)(2616005)(44832011)(305945005)(76176011)(956004)(486006)(48376002)(105586002)(106356001)(51416003)(52116002)(25786009)(11346002)(6512007)(6916009)(110426005); DIR:OUT; SFP:1101; SCL:1; SRVR:AM0PR04MB4849; H:phoenix7.ap.freescale.net; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; Received-SPF: None (protection.outlook.com: nxp.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; AM0PR04MB4849; 23:aV2oxW2dD/btWPogE8zjNmyTIGHjxlhurM3eaisPq?= RFlfMlk9OiQgCgscVeY1Ik/5mB40FpmRe3l7PCgupCU1pp6lJihA7/Uj5xamwnMYBD7nO7fG2VRMtyBNgvqwPNXKtuRSaZQ2DSE5PSModaEKbL0RWoE0lcsMlJPEKP8UbnwiTtk6h87qxHdpn9TwZl5goVoKWLcYm+cp6clVZRDku50yqhigWfPB6YTkqkZFZoYO0CugnHBioGg5ukBCXukuwKSUR1xWUWRyDdiVIJWhVYdTBT9T4cu/C1atC9oFlOLs4UCvDRkh2Lx3SCMupzTlFN0LmCML1ks+65Nl1xD2psBg1sQgIJ7UVcv63UdOVKzcr7L4M8n3u6k3mclO+sZfdB9BtmHanpOvs7P91bXwSYTmcK8UndXsisnDP6I+G0FOVHI/9YrG49y8E7EakhHLH8Kscgo/S8iwqrpWc/9FST2Vkm09xjPq7eeoWImnloKY4QbaCJq/ZIR7gQrc05xnlCiCu5eWFnM/i6/8+FNRRyAdGFw3DEm8KmuurRnRZp7bhzKLWLVIcIQ+HdwtKyBgkhRxvmDSH2XKmnmYSEFUNRGQDvyC+wT1RvOHnO1bNVktMD75qNVrDzBQOLi5JYqX8bvvGRsHks5jUNl+r/qbCIPcjPZJnpe4r7L15mByjrfM5ongUwxjKl2RtaGl5mNiC0kjEJQ2UdSuSB5Mv1v9lPHosYkZwI8aUytCn6Jyu1oU9AtvtFY5lRtlRjY6VYr9XBNHVnHtXANIR9ztyqKNHVtAwxG11V9Ze6TQFuplpamuVdq4XzokUJ79vAcyQNyG4Iw5nsDte2rmBGbXHh4QikYDEHpXTZRmhOeamqOXjMRtMvZRiek3G/XK16TQ1OnUtQYxRObgzfggscze1NeoKfaL2nc1D0sMEcRLpMrUXqdM/rzl70B40O2nk8t78z6SxlPO5KlxuxieumO/wHJdpJ+peKuEV8UKz1eZxjdT8AORYVG4ArvEduupUDWxYYAGCY3KLRV7o5bj0e0Z3bQWz/nkVRJUjDZJ7kIVLF0V0aA7f9cFDXWJ/1Hkf6dHP09KbHKFmeQ3i7IyQVtpCMopDY5r5YhNPTIexFR6mgFEjzgkzhou7fgav3TP1aDyNPsChcD+nlKfB4hUVwOBMgFJanah7srm1PmTTSKOeewJLEyVjYf6ohrtwrIAEG/F1z8+fB3W0ztd7SBB/AIpeyu7t3fAUtnD678ndsRL/uc23/uFawuRGrFjg4UIAxPqlb2GX2nBfG5z45bMHWpvbFM8F1nSZccxPNg7l/Y+o9/3IO5zNNFodCU1JDQ+/AssDsURF8EiCzj0gSEv1l09FqiLw== X-Microsoft-Antispam-Message-Info: /UCxvHDlQKt43e/oA/fy7ENN4HcXSDjSaBoMyXhfcCiIQBtGR1Z7bAp0aLy7An9mA1rsP++mLtc6Nbn1aaWxwW2Fb1iVsWIBPz+annMNSsK/falVaPMPPCfk59mwqocQQMxRlBHVMd5YJLN148AyAC63JEm4EhA3d/qnd22R1z3NHJtfEo0tMSKThWCNnSJWSTwwqmSVBKKSvqmsYFK/a+PqjU0/Tj5LZgn743AVy1lKA4YGysUL9m2Ugdvsw2J7Oqgc8ACZWawlm6bfvvaS/tX/r52VReYTF3D8OG3QLLNvZ/PPzD+DNxdlJ+rOlhN78WBCDIShdTmK4M/iFxsiyfW5aWDDCMt5LRSygf/G4AM= X-Microsoft-Exchange-Diagnostics: 1; AM0PR04MB4849; 6:PKoBHCGer+4RedMi47WBMtzAryaND/j0LWDJkcyy7zH7sniltvGfl5x6A0fqzqIohjsO3zGwFOyi11hzgA6mkyGGtOqXEARGnc+NPXvinjWpXpIdZcn1yo6DSCJdXt/ssA1UF7HRVw1gtkYcKXQhO27ajjzVGufCp5CFqn7TMmvSrC1HEUqx6B+lyjIMh0c4WWBxH8WeVvxEbzubh0z3nWU9o+zVLWhDjKHf8Lp3IF7K9Ofgd0RHjJdTN79BmdiFFfVlV4Guds3TArgomwwX/Wf+sP/GJqHqRfV2uPy+N6f+ipvwyiM1huKgZaLXg+zIIHxlUymwKcOlKhLxyKsdex4OrnKfuwOylBqoaayhNAK1J+HgwLQuRkyaRpHrJjE1MkDa1SS/h+TCyoa5OUa47p6nOj3AXoGC1SPHBqKx7yzdL0LzQY+wV/Z4Eu7z+5ku7xBzS39Z5v51QWTPWV3eJA==; 5:sCvzQP2zVBcnzta/bdGR7htwMvUwJ8MHf9W/05mgkaIGzdyTrucc84/bx3m2Jm+lkStoCjZfI+Bs0FleZx7fYcfQG71Xy1n3ke+Er12m88Gk8VjfaynM6DExgILSFmmvHEka6jKFlQibgfsGAc4ebOuarmMZrX5hyXzbDvM2Lfc=; 7:0hCsJP9anRHF/r4Zcsw39zEL1HR/08/VyqESHv2pVr/1trz0W/+Je/OvxAHjUCjI5RkRfkQ+pqkNt+da93El9jlzpqR1h+QVNkexFx7E0+SssC7PWzqmyozbOkNyKrP9fdR5PDxA1FVUj+RjinSItR6DmI/aZiPTAtKz1uSOryhV/gDR+lnXJW5VbOSGxXX887/NuGxQSp5wcCcPZl08K37iuhV6RhyWW468ckTTEgiTFqgSpX4yWTubrTmCQf4c SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Oct 2018 10:45:55.8427 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: d60fbc4b-32c5-49d3-f71d-08d6291d675d X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR04MB4849 Cc: Pankit Garg Subject: [U-Boot] [PATCH 12/53] armv8: ls1043a: make environment address and size common 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" CONFIG_ENV_OFFSET, CONFIG_ENV_SIZE and CONFIG_ENV_SECT_SIZE made common to support all boot sources. Signed-off-by: Pankit Garg Signed-off-by: Rajesh Bhagat --- include/configs/ls1043aqds.h | 9 +++++++++ include/configs/ls1043ardb.h | 9 +++++++++ 2 files changed, 18 insertions(+) diff --git a/include/configs/ls1043aqds.h b/include/configs/ls1043aqds.h index 31ef9941b6..88736d0e89 100644 --- a/include/configs/ls1043aqds.h +++ b/include/configs/ls1043aqds.h @@ -382,6 +382,14 @@ unsigned long get_board_ddr_clk(void); */ #define CONFIG_ENV_OVERWRITE +#ifdef CONFIG_TFABOOT +#define CONFIG_SYS_MMC_ENV_DEV 0 + +#define CONFIG_ENV_SIZE 0x2000 +#define CONFIG_ENV_OFFSET 0x500000 /* 5MB */ +#define CONFIG_ENV_ADDR (CONFIG_SYS_FLASH_BASE + 0x500000) +#define CONFIG_ENV_SECT_SIZE 0x20000 +#else #ifdef CONFIG_NAND_BOOT #define CONFIG_ENV_SIZE 0x2000 #define CONFIG_ENV_OFFSET (24 * CONFIG_SYS_NAND_BLOCK_SIZE) @@ -398,6 +406,7 @@ unsigned long get_board_ddr_clk(void); #define CONFIG_ENV_SECT_SIZE 0x20000 #define CONFIG_ENV_SIZE 0x20000 #endif +#endif #define CONFIG_CMDLINE_TAG diff --git a/include/configs/ls1043ardb.h b/include/configs/ls1043ardb.h index bc639e586f..bd56cbd8aa 100644 --- a/include/configs/ls1043ardb.h +++ b/include/configs/ls1043ardb.h @@ -227,6 +227,14 @@ #define CONFIG_ENV_OVERWRITE #endif +#ifdef CONFIG_TFABOOT +#define CONFIG_SYS_MMC_ENV_DEV 0 + +#define CONFIG_ENV_SIZE 0x2000 +#define CONFIG_ENV_OFFSET 0x500000 +#define CONFIG_ENV_ADDR (CONFIG_SYS_FLASH_BASE + 0x500000) +#define CONFIG_ENV_SECT_SIZE 0x20000 +#else #if defined(CONFIG_NAND_BOOT) #define CONFIG_ENV_SIZE 0x2000 #define CONFIG_ENV_OFFSET (24 * CONFIG_SYS_NAND_BLOCK_SIZE) @@ -239,6 +247,7 @@ #define CONFIG_ENV_SECT_SIZE 0x20000 #define CONFIG_ENV_SIZE 0x20000 #endif +#endif /* FMan */ #ifndef SPL_NO_FMAN From patchwork Wed Oct 3 10:44:19 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rajesh Bhagat X-Patchwork-Id: 978180 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; dmarc=fail (p=none dis=none) header.from=nxp.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=nxp.com header.i=@nxp.com header.b="frjajuS/"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 42QCdn2Mz2z9s8J for ; Wed, 3 Oct 2018 20:57:17 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id EC793C22087; Wed, 3 Oct 2018 10:49:57 +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=BAD_ENC_HEADER, 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 18E79C220AE; Wed, 3 Oct 2018 10:46:32 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id A8694C22095; Wed, 3 Oct 2018 10:46:10 +0000 (UTC) Received: from EUR02-AM5-obe.outbound.protection.outlook.com (mail-eopbgr00047.outbound.protection.outlook.com [40.107.0.47]) by lists.denx.de (Postfix) with ESMTPS id 34E71C22093 for ; Wed, 3 Oct 2018 10:46:02 +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:X-MS-Exchange-SenderADCheck; bh=LUP8Wilz7qLKeQwil1FcjNLA/jJ3uSDvWN5OTzcqdtk=; b=frjajuS/vTHFz3vaSr5YIInCtB43sq37eyuMn6vX22fNh39VjBdKHDNMeR+Hl6HHG1Tw+9X6wTjgkOLBQSKf90kk4gDcmkKjf42PK/MaoBX3AeSBZv5RQbmQwPAGYJ6UbYlCt3zAJAqq0GbBYzQHevAKMh2litaVZlyDm1pc8eg= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=rajesh.bhagat@nxp.com; Received: from phoenix7.ap.freescale.net (14.143.30.134) by AM0PR04MB4849.eurprd04.prod.outlook.com (2603:10a6:208:c4::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1185.24; Wed, 3 Oct 2018 10:45:59 +0000 From: Rajesh Bhagat To: u-boot@lists.denx.de Date: Wed, 3 Oct 2018 16:14:19 +0530 Message-Id: <20181003104459.5444-14-rajesh.bhagat@nxp.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181003104459.5444-1-rajesh.bhagat@nxp.com> References: <20181003104459.5444-1-rajesh.bhagat@nxp.com> MIME-Version: 1.0 X-Originating-IP: [14.143.30.134] X-ClientProxiedBy: TY2PR02CA0011.apcprd02.prod.outlook.com (2603:1096:404:56::23) To AM0PR04MB4849.eurprd04.prod.outlook.com (2603:10a6:208:c4::26) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 38f5a40a-11e0-43d5-7574-08d6291d691a X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989299)(4534185)(7168020)(4627221)(201703031133081)(201702281549075)(8990200)(5600074)(711020)(4618075)(2017052603328)(7153060)(7193020); SRVR:AM0PR04MB4849; X-Microsoft-Exchange-Diagnostics: 1; AM0PR04MB4849; 3:9BmtGlBd70qRueUKqOir3WBMP76Ww4aKf87GT0rjGL3qPXqfLietLRGAEnrVHCMGDmmOKSbJfaPHM9n+soIyn3Aa1op9/Wd/uUgdzpSq+3loGeZf7IExd79KSbCndO5AUiTr1HcCsFuRiMtcxCn/RW8OUA9BERfwXG4LmRkg7TyQ3lzpJK0L0QDzhfZcd+ILPeSEC+k2Xce8GTNGlgWFSAA3WB0oV/DFf4VXdYwkocXROvLyP91tEX4lKU4lj83s; 25:sh7hsRWZpSaVhya/3NYfnGqa72JCYslFg6Ksg6QLpt7+P5wIHaLZCpWHv45GGhq2l2F3DsouY7AmQmBakHO3fRk11irgDSOT6wzMbRtFNqSaVXoWE/fWH7m36T5eXeeUrRfETDyCAZVkL9CB5TKgkTAmBbqB2KRY0xCeQzFMgx27PqGBbIi1oKQ2TXah1rQlGwXaHwgZ1B3DUxb71jYr9oYyrHCXUQ1pVW1Ez5O7oq9hdn6D9pU4pei/Z7hbjDa4M/nuDP7+EOoqZxC+X+7hHizD9YDZ0xIOJfU0uLy9pPG5vJj3FtaXo03awullzhvAv9EsDB6OKvg+OdW+ua/tPA==; 31:pFTHB//KSaZGN70A/2MuJ0dm6befvKpbPMRoq4mzmF3j4ZMS7FUxfBgEocNtT2IR5AlWXtLOVNEIr1Z6V1TyFl6WnFRM3cFmuYb/MvXPD1eMkE6mXsQa5wO8ezFDLF7Rb0DmX6FnDtpt7mo4ucln7m9GvrQsaqKiqBzlpATXoDfpdh9hf2X1uYEq/855LctSiWMMI6MFw48UlNNm1TnlJRRzSeXd9HgnTGmUHNgpRCg= X-MS-TrafficTypeDiagnostic: AM0PR04MB4849: X-Microsoft-Exchange-Diagnostics: 1; AM0PR04MB4849; 20:vwzxaOpz2oavZJRKbXNfffO5BR1zbTh/8VhD47NhDwvKbjSri6RJN4tyzPvxc4b/xNRQ2YN6cENDFVOPQ3pdbln1s2IhWXM0JKjVlf3gdj3dXlQeVOWU5eZWHCIRy6zpHW/USuShr107Qn0RboHYIIxfmc7jDrgLndxte4qUMA0VZvnEHKLdweB8K0hHSkLCvMmq8eIXnLxUOrzmto2eZr05Yr+vhfMZDjJA+cMpIBvY4eabf9n/tzXO/iZPctr4zlDEXgaJF+G2AWblLHM2QrGsVDm3cDgVSggWuH9LlOM8NqkajI8DbvR68aKc5g+9GG+KR1LIcOE1yuCnVgrCn7i28Dcwx+fEwlyPYe/YsamrIGi7BvqBOnSiuzEz1h46dbOeirK7JtsU4EK0PwHWdpd4IziGj0ZgYoNg9NnQz+DlS/BQfLOZ7SZnAKxj6DKFrEMuWbnaBTvWKGjWnmRGmu94c+NtU/k9aSXOMvdvemRiPw+nfljXsHGqiccVawJy; 4:K0GBbUqYlmNRoXUsBOlNqCr2ZFR1vaHti07GMTPkHxZrmTmTfSGgOGZ8Vjxg9ydzFpkDUQEUF9Mh4vAObZGthY9h5KRULJzVGhi/cnozzKUbvBXk5GgVBkRCTZWf6vi3abT42txLrgd910qqB1uTI6peXOmr0pq615OoKqGByimad8cSNmcZJkhEIyxQ1agD+wybBVY1fuwG3xtlC0ScOXgsxrw9NTTe9MTyC4Br+muZwMzZk2wx3dI0p2flzUZfmYo9/WVstk8PsUXEcBP0M9sj3Y1kS15F98yJRPuqJ4Tizxk7RuTOrbdNqb6HR8Lx X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(185117386973197); X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(5005006)(8121501046)(3002001)(3231355)(944501410)(52105095)(10201501046)(93006095)(93001095)(6055026)(149066)(150057)(6041310)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123562045)(20161123564045)(20161123558120)(201708071742011)(7699051); SRVR:AM0PR04MB4849; BCL:0; PCL:0; RULEID:; SRVR:AM0PR04MB4849; X-Forefront-PRVS: 0814A2C7A3 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(346002)(376002)(366004)(136003)(39860400002)(396003)(189003)(199004)(66066001)(50226002)(97736004)(7736002)(50466002)(55236004)(6666003)(6506007)(386003)(16526019)(53936002)(26005)(68736007)(6486002)(186003)(47776003)(8936002)(8676002)(81156014)(476003)(81166006)(5009440100003)(4326008)(16586007)(36756003)(5660300001)(86362001)(2906002)(1076002)(2361001)(2351001)(478600001)(446003)(3846002)(6116002)(316002)(2616005)(44832011)(305945005)(76176011)(956004)(486006)(48376002)(105586002)(106356001)(51416003)(52116002)(25786009)(11346002)(6512007)(6916009)(110426005); DIR:OUT; SFP:1101; SCL:1; SRVR:AM0PR04MB4849; H:phoenix7.ap.freescale.net; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; Received-SPF: None (protection.outlook.com: nxp.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; AM0PR04MB4849; 23:UUFntUu61wpgi1r2wNMaIunGYYGZiKrERHwbs1QQb?= g9bNTrYZ+d4yAcPKV3SkdFas6oS3ipl0lW10z717zIX1FxpCr2SiN3/UOD+LPRWrSZORISXsj+BCUgA2BH3UzcnMJq56lFlZyttfjNW1zB6Cnzk1VdmWgvNiBpHl109+dCnUTE+/NaNW7ZdzurNJoAMxTeXGD1k39tKlz421G5/CVfY7xd7cwlTN0aaE33Pn5IbFqfxeE3v33HvYOLwzduk+XjKTNGxYsFLUNjtd9Kqc9v+T8t7XNl9ToVl7ayf+ArptExZ0MkJWylCZn2/0B8wYgkxblGY4+9SsixgjL4L9OjmQiw4MO6YoR2vfIhZWKDaEmAXEgylKOQKbosQ1lFLIzjODByMlBitxG0yUy2BWzisxhd1Ruek7HLPBVqw6MAJWQYkuZWIFPKrhwVUGq5vDmoSb1IeHBnAsavOKQGK3bPgy7XshjPGJWTjiTHTLKOhpAloM27OS9DLFl9bn70sJeXpeFmQznLFtvXS1toDckBbORbkeapR7JyTk0YLlJstLVhLBGKYAnSIE9jxEjEn6EbxzSurhplvMeDdYh1wdq1U9pad6oSJzB1WrBl1ji2VhWAkk8ywRrcfvWrQ6NeoTshAZ2a7Nhoh6Lyud95hqRLxsZ6ATwxL0t1N64OyoL0N52ZMSQuCgbztx6ooA5hoDmC5eQFJrCnGGCZsfxH2p0xVCsuHsEGuC80KvkBqzQ/x9IHGFbFnK0JwzsZnajpJ8mmFzRFjdubGUJr2zyRF6OHqNp54qAQi0F5tnJUqNGWVUjVpHbGoREUFzExMMVAC5g0/d7BIEfT/1bDEhOQU55z5rCM4+m3TQqM36JZdyGPVZiowD3oNP0LIbv3MprBffuIKwJfLIzWeYB+DXnuonYJGu5mdsIfyGuNNnlQHqupeSxZrq6klghKX1Tgj/dis4racmjoMO4x7s0I4wRjvmtLP7TiCNuSAd/LQHP6eivjVa3a3DQZwh3tFnCJ9Di3pt01fikrAM4fITyIIZ/25RGGcnACTBecuTioMLwTlEVo+gocgArWYQaCDac/PM39hXE4vCCX03oya1GUPzfIsBr88cuasVKmMpKdunj6x+cgjCtj3m9GwW7y7xrWgEAohg6ki6hslw0BW5N2EadPBRK0AkGmA1PPZ/M8wPe6uuVKEf7XRC49bP1JArDESEE2JpOBwTXuBDI4llOrk6vIGM4lBEBpGw05l68qri7kmTdjg6W0dwkGFWJrvm6SkYKcmASN8LPcbR/PUtcBfsh0s7gvDI2QFaH3MJSYFJvYYhy4= X-Microsoft-Antispam-Message-Info: cYbE29SwDyFpLGcuJgbbE84SQl7lzhCqQmDgcySdBTT0aB6fOv0dtboHP14GN2xcwWfBcH/L7Mu3R5DmXUn1QRD1QjDsj6DU0nfLqoeI7rox5vGqUZTlrmJIlHCcWDoFZqHsDJ8/txUx5S378pcHGwMmjYHN0hg1Pu2JWlyeH8WWCzZhn5i3lLXWX3mTqS2hKhNjpCeekizmOLSD7X+HwtKdNKlvtbXoAfa0E8WRCWaMcoE2DX05vRsAx1SvVzRWJ495FIOvn9wR7O8e41yqcOzHan/rGVogXuC7ajLc1NSeSsZB7qQ4okvApHZb2g65c+//u9iMXrXPI9E0Tbj8gF0pnntTdA+P8baGEUQTuRk= X-Microsoft-Exchange-Diagnostics: 1; AM0PR04MB4849; 6:/Jd3XT8zaQ2JfTHS9+8GzmkVjyjt+slz83dyBwaXfzIFep9G94YZbGZ71tzfVY1wTp7TcG7+FuEe0WLPXh1UJA6x9zneyoo3qfNVqua4T9OsCN5yPs6u31RdB43KxzPZAj79gIFwZQ6VNHSGb/qGwm5UD8Fi7TxRLRE4kryzhGEIKuVlQ2qWU/Sn0VuGcxSMzg1GYdmkQYq0xwXsDIgCY5djBSaY3/gvp5NKo0iIzk1EsaEldjMfglY/xQxmVT8cVZ8yGLx4Pes2yDt9xUoC5U/ZPjpO/e1wrntQ3HizsZ1L7nz1AmjYM7k7KpGjuis1qZBgkNI9RdpxpEdr4fUofmoPpIoQwnwuuzY8qK4yA9pL/PbLzJjXjk7zvClNwVcZHRZgXwBAaoRxRo8b689RuTfqlPZKox97HPP/c9OANZAv2g54OnEWTVe++5fELjrhCbgiqT2zNPIKkfvF37FtBg==; 5:gbH0tBri/r22/guzuVw1f+cTcs5HX1DlpuEMmJnZjGs+gQh5KafkPJy+H5nZ5BN51xkRShtzvChU+SwKsVIh3iv3mcKrNYq/QhC6xe/JcvIfYvYekk5M1FRGqCwWgcONKgoV3U7OmEIX/75kCxRKy5jjNx8lgHURb7woA9P0Pvc=; 7:5VvgrhsMSL/U4WiAmYlTZL6iu2f/8kSQr0Q9vruJlnwn9DQW9pEuN+wVqV36J7kn9I9I8DDapkJG3C1jTPF0x/NbC6057d1kARV+MWHeL9hKjzfSADOS6XXCtAQvM0gIm9nd9tQKWgFn97yvdqWKCbkvqFDCMBECmRzOI/Z43ebGxQUiacGlrtZsXh5ZhgElj0xw8S3qu2oCqOIWBQ19xNfscHwjdrO9bE/vWnn3Vau2CIdfvpFK5GWvMPR+RUE5 SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Oct 2018 10:45:59.1250 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 38f5a40a-11e0-43d5-7574-08d6291d691a X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR04MB4849 Subject: [U-Boot] [PATCH 13/53] armv8: ls1043aqds: define environment address for QSPI boot 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" Defines environment address for QSPI boot Signed-off-by: Rajesh Bhagat --- board/freescale/ls1043aqds/ls1043aqds.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/board/freescale/ls1043aqds/ls1043aqds.c b/board/freescale/ls1043aqds/ls1043aqds.c index 5247d9ac14..1f317a4574 100644 --- a/board/freescale/ls1043aqds/ls1043aqds.c +++ b/board/freescale/ls1043aqds/ls1043aqds.c @@ -13,6 +13,9 @@ #include #include #include +#ifdef CONFIG_TFABOOT +#include +#endif #include #include #include @@ -396,3 +399,10 @@ u16 flash_read16(void *addr) return (((val) >> 8) & 0x00ff) | (((val) << 8) & 0xff00); } + +#ifdef CONFIG_TFABOOT +void *env_sf_get_env_addr(void) +{ + return (void *)(CONFIG_SYS_FSL_QSPI_BASE + CONFIG_ENV_OFFSET); +} +#endif From patchwork Wed Oct 3 10:44:20 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rajesh Bhagat X-Patchwork-Id: 978172 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; dmarc=fail (p=none dis=none) header.from=nxp.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=nxp.com header.i=@nxp.com header.b="RmfZdwSZ"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 42QCWw6Bk1z9s8J for ; Wed, 3 Oct 2018 20:52:12 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 84491C22011; Wed, 3 Oct 2018 10:51:13 +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=BAD_ENC_HEADER, 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 0F5A7C22116; Wed, 3 Oct 2018 10:46:51 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 984E4C22116; Wed, 3 Oct 2018 10:46:15 +0000 (UTC) Received: from EUR02-AM5-obe.outbound.protection.outlook.com (mail-eopbgr00089.outbound.protection.outlook.com [40.107.0.89]) by lists.denx.de (Postfix) with ESMTPS id 5BF5EC2203D for ; Wed, 3 Oct 2018 10:46:06 +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:X-MS-Exchange-SenderADCheck; bh=/DHXgCPhW+CuuJLfbtTaqvVdHp1o4RdmbqTmFlZQxkg=; b=RmfZdwSZFLoqLT8OtiPPsEOSdBeEh53Kz8IjY7EvIMFTzGhSjwoNwPckv16ODe+Moak7TUPg9VmS9mSudHuSbGuxP2m6OHFQuUyvjOuGOT2fU3KEAQfREwzvNLPfKVJHeEhPevYjE16qNj+/3dDQ6gWl5HiBzK7FAHD6EDTfgGw= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=rajesh.bhagat@nxp.com; Received: from phoenix7.ap.freescale.net (14.143.30.134) by AM0PR04MB4849.eurprd04.prod.outlook.com (2603:10a6:208:c4::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1185.24; Wed, 3 Oct 2018 10:46:02 +0000 From: Rajesh Bhagat To: u-boot@lists.denx.de Date: Wed, 3 Oct 2018 16:14:20 +0530 Message-Id: <20181003104459.5444-15-rajesh.bhagat@nxp.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181003104459.5444-1-rajesh.bhagat@nxp.com> References: <20181003104459.5444-1-rajesh.bhagat@nxp.com> MIME-Version: 1.0 X-Originating-IP: [14.143.30.134] X-ClientProxiedBy: TY2PR02CA0011.apcprd02.prod.outlook.com (2603:1096:404:56::23) To AM0PR04MB4849.eurprd04.prod.outlook.com (2603:10a6:208:c4::26) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 86a561c0-8505-46a1-1641-08d6291d6b2b X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989299)(4534185)(7168020)(4627221)(201703031133081)(201702281549075)(8990200)(5600074)(711020)(4618075)(2017052603328)(7153060)(7193020); SRVR:AM0PR04MB4849; X-Microsoft-Exchange-Diagnostics: 1; AM0PR04MB4849; 3:m98riNhzGEfbWXJl/0XTuCDaOufOoF1/u+2RhjqQN7r/gLZV8tIlKW3g+BrHpNxFdeKYFT7Hoz5N+d11fflbeKpDAHsiqwUd1SQ/Gh4HWTJU4Nj3sT0f1vnNCVPhv3QqB4tqGao/iv50SEp9BzkTlrcqoWoBhOBjJvf6KB+calYfpRUZUyrFMNHyAZP3z71AAxsdEx5Npjm6M3drgtYaXEpsyjy3QfwkOp7yjundC2Tcrmu6U52YgqD3f6qUrcCp; 25:S2EOIYL0wfjgzjuBkiZeSCh1Ih3SKRanrAi3FJb/bD7eC7fYt+0yzt9+BwNLibuUS3QNt52tPwKscoGxYTwMQK/gH23ql4y3Jgu9XFI7/D+K2nez2aS/jteTWK9/5kY4csQoDqECqC96ZoTaFmMSIVnTv0O/pok27l9erDGrt4xwpC7Uvd5ucODQEbyG0RuH3ESdXoVfudsKzRuo/QyOgxqkHMvYTUlMMKm328IRwFJ1qB46CEaWfM7w9D3K334bcc7SuUOWDpB/qtPzjzUA7Mr/wrwWyBGMxFwDywiUd7sImqwpPUeSR1PfkDBjDXmxJxitGHX63mBlcgpZtmElOA==; 31:Jz6BnbhEh8aAzvgDLTVKMNJ70k2ooiR+B8qFZN9Zq1YLzem0saO3fg5o7YQ+6uK9XjAZx4Hb4Lqa/HBR6lyl99ad72JA/7oXVO5bnCFWqDZ6pde3xx4hx4/DFLoY16M5MXmtCX2BBaE69PpDHzjOwrK4e8pU1f6dIG3R6HkhTPpYcYX3MCwHT4JHf2mdMsYQSPu/ehYEYCxjmCdRY6cqNvVO9uDveELTI2oraiwXQe8= X-MS-TrafficTypeDiagnostic: AM0PR04MB4849: X-Microsoft-Exchange-Diagnostics: 1; AM0PR04MB4849; 20:VsWeEAgPz3gGuL9ZqGRbPFPaWDsnkntUn+XGUEaTOLYMaY4Y3EYg7V5z2u8OHAT1wPS+tQxblh9DT6fILBnDi2DvBhhOvu9PZPqJWUp5/se5lmQf//GLzJ6RdjCtgLrqWeH90Yo+A+oLHdAhnrwJIAK75d6TOfGUv8YBjYgQXAt38uTKpe69Oytf/xZ4fXlfukPZC7SlZWSymuRfQX6KnRVfPY332NHPR60+i/Wa3XDQyOt36mQ+Ma5MP/thjsHtN7qrdM1OC++CaVtDddXAWFqyiowDUXWmlRSsRPgOSHtfL9HWXmCrBocjclsvuGsC2nIZy6FQUNt/r8/7tu48V9HPfIHxM5XEEinfW8p6AcaeyhqBNWu+mUGFQ4TYX7qY3j0ydGlpm5904DYbd4ovzRlFTX6JdVIkoXdym1Mlb2FH/e5Zd2+8POCPQUjTkDPPQJH3lkWtCPzL3ckpBT2s0EF1NODlUu+ANTIRX8RGoOA7szA8/hXoHAvX5WSIWCLf; 4:bzbIKXtmjJgAEC4wSu0FJ2R6KG8vuGOoZ1OmeV756WqE8EIOkh1z/8BW1giCh2DTe87CaWGlfwP7PxnZ78Pr/NFP/LEsTGl0z5FOqcRRathDKITU8/YgPrNAFN108YC05H2JXh/vuuE9vDT95z7llUbwdEHfNuBladOCYnm8HNNu5V3KXey+42BiWmUBkwqV9L6jJ0rACn5hP6lO2FM8TxiUYYmff9sA/AlDoSa9COlS/lj8bQLLWyCjazqM4cPbLOLU3Iy2XYgRr2iZ4xBLzfpZCkmimAYgSTIgiG5WywENJoKmCt/C2bEC7CBF+Txa X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(185117386973197); X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(5005006)(8121501046)(3002001)(3231355)(944501410)(52105095)(10201501046)(93006095)(93001095)(6055026)(149066)(150057)(6041310)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123562045)(20161123564045)(20161123558120)(201708071742011)(7699051); SRVR:AM0PR04MB4849; BCL:0; PCL:0; RULEID:; SRVR:AM0PR04MB4849; X-Forefront-PRVS: 0814A2C7A3 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(346002)(376002)(366004)(136003)(39860400002)(396003)(189003)(199004)(66066001)(50226002)(97736004)(7736002)(50466002)(55236004)(6666003)(6506007)(386003)(16526019)(53936002)(26005)(68736007)(6486002)(186003)(47776003)(8936002)(8676002)(81156014)(476003)(81166006)(5009440100003)(4326008)(16586007)(36756003)(5660300001)(86362001)(2906002)(1076002)(2361001)(2351001)(478600001)(446003)(3846002)(6116002)(316002)(2616005)(44832011)(305945005)(76176011)(956004)(486006)(48376002)(105586002)(106356001)(51416003)(52116002)(25786009)(11346002)(6512007)(6916009)(110426005); DIR:OUT; SFP:1101; SCL:1; SRVR:AM0PR04MB4849; H:phoenix7.ap.freescale.net; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; Received-SPF: None (protection.outlook.com: nxp.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; AM0PR04MB4849; 23:Sw7cejxcphMmjJuC0m25oAsHN+wNon6i2JkiPyyAK?= 91PMu5WJCvxutryhj6Ax1gwo019XXlRCjk7GUwPyYQzFdXzhPIQXUca8BqzQN8kxBOFTxLeKu3IwBzbugVpCz47GCOkXS6XsIrr/1gg0PSQBB1ytsQdolC3nbDIQqHVxb8F8A3x0T9jv8TiZMFYWUuX+GZTImgDcwLx9IDddKF1ceEEqlMLU09Lb0ZtjoXUMK82GpuXNdJ3E0Er4BWLZne1nAxaoWaeRhslBTWUWF1kQD9VmC1852n7kcD1jw2H+PHXJcBrV41BH5UaDnKx53iV76mPLqyVjZIvaV0Cmb5LpJMByIoYhiPS9fHh1dcJPluNprk/rxdFJ67ZNWsdKIrBfwLc3Q3QVdaGtO7GHkcrX1zpvVzUdOt6oUG42B/RPEMBPteXDXcr5SPwSF10vjPlvqYZN3FrPXslardACjUg5H/ELoBb8DHT8LJYc3XUKjX7SLbKult5pPDNlw9dDdRdouI+TWrAwa7VlWNueGz9HAr1dWhk+tbKN0HHDHHIG8rJiyLLiguHMCbJRlDPKyH6q0MrnX4P9ZXQ0hvb+xNtPB01vQhcnE+HbHleQk5Bx+yfIHbTsjnIAuZk5RDBERr4PjADh+8Ajqa6x10Owr3PXFi0MjYMNVPuJiHdtZ30LLZIMkBcov54zyC9/BrkUKtyncTKUvLmirVBY5mbUzILOLY25k+3XKni8zu6FZ6Lrn+jkmfwlIRZzQb+Qj2gupXXVPqc7dJ0f5f7yEOV+CTlDLbdhUyrgw/2dBjcI9aGSIWJYIJVyte8OEvpLTxcsQfnF6SgqYaLwJ9ShTVWbICwmNpX7O+vwuxlLDwjFx/ok3rWisVwlJ9Lp7LvEXWssM886uRAgbuuQ5QHhjc5Lv2tVxPajmc7Ns7W2CMiA1nh/R5Zsh00r/iI6sXuH99fwrzGVEKBgOcIhcct0rnSqY4wsxxqQAZZDNtiDuukyOQuk1NIpe6T2crFCL3tAw1zq69p/0Qkqf0YYnsD4562hatVrHf/KWg9dcE5U/EQgWNnM3hHDOuojoNjboBguC4z00ptoOBN0kyiRrvVUDN73PonKbqsavX9Le19fxD1GP2LhhNs6viZhOSuKOfH0TXP2yxib9l/SaJVfnZb1DWT1Y56cyZx0HsIg4bZ6suHMV4zP3RGf3gFjdCN0VzGOvBMZd614BU/qFLfWFhRWT7YBRqpbB9qHB38inUg2F331pnjPLZJdPsemDR0TYs58U8C/MTZV0jECov6uWkHssiKWNn2XF48I4rRqvKInIWKsu8nPBw= X-Microsoft-Antispam-Message-Info: 9K3+ixAfysGS3TA+wA7vF3JuqYBV8vkm1XvqH9Rgt/HFMwwxy01o4PvdWCEfxOcS4vvPfsmXw2M3bTz3nevR5JX/ch3fWqYPDydSEgub6MI+/C9RGN0fiuLjkubWntpjJh84oIHHBFrj5Rymr6DsuA68ueyRhBrRP40wwOT81Q43RH1Rih56ZVjotl2GkktbBJ1vCEEGBIbINLuEeNLfr+H5/ys2jD5OpAHlEJo22zmGqQYf4/yyGpBMBa+T7I2yj/ulwtqSqMYvgs4r6JXb7zR//H85H/bumjK3GuzLSOpPV/zLpnbC17RDNtrm+FNPIZ/1vPewa7hfmu4ASIRQKuCjxfeTn2GRuBnPdf6phTc= X-Microsoft-Exchange-Diagnostics: 1; AM0PR04MB4849; 6:OESI8kS93plbnrgKQ7GeBS9CX0t9hHzDRm0OVpmWagLioQQqMGOnP6rAecWA6Pub2hoJunnXClYyF5PU/8UEl/UGlbBYCJpob0sU2u1AgAtrNCh6lJg/1B0/YJmKqGx+ZyEU3Hy9cYdFogWpRXITNFGSZev6vlVncGx+wnL1/riDw7ihVI+mhBpMuU0qlzQpDBAqLrQLlVXuJ0w5qzBvet1FsEwfUX3v6N0DWJIIS6F/Z7HVIrxYTsa86QvCz0RT7Mr7ITIfmeVESGkfGAnDgk/yPG1e5ocHrn2DOAVs/kj2cmSUnfFdRtQLutnJxKE502/llZMWTpKJ07+OIsnAeyFN3BWwITN0tUL2t05mMgDf4ClptxJ67T2ZWyoZ6jhftfxaSQipbVOW8bbAFXMVngEY7wEo2u9K2xiTuS4e56B+6x0i8S1AFrbVI5mNDKBnl+NHqCiyFs5T9lzWEZaDuA==; 5:8dHLlIdWqY9zuA5nOxlWqiJVxB3LAiXMhTFS5Jxm518ZxUMpyqqjkulZjGBZllXZ1AZyRP1MkRBS1ZgjxkOJsYUph8dQCMcwfcFL692viEPAJh+wgV4g8yGPHOAABtnk6d+ngLt+6z7BsvsTgCfKjuOtnzbmQsg/2TMm/Z0NCro=; 7:ILWiEe+hCErGLaQuI+EgJ2RLvx+tRLaPMiekzwhJtKolPhQyyaIbqSSJJcifBQsHseKfVp9eX/JXJFjN+l/RgnyOIUAHMHVez9yIZq4DN0TxC8TjYYcj5UUnbIppFJtYUI/gphPPB1Edyb4Jc+QbXzeSZcI/PCEcOd1g8jzMJw7ic1Y9kLQO7O+UmsN40bT/GA2EB29RMqSsYefxMwdoJBsyuwnZIMEG16bTROu+a2s2GRAolbAtdoPurPRJQQv4 SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Oct 2018 10:46:02.2201 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 86a561c0-8505-46a1-1641-08d6291d6b2b X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR04MB4849 Cc: Pankit Garg Subject: [U-Boot] [PATCH 14/53] armv8: ls1046aqds: define environment address for QSPI boot. 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: Pankit Garg Define environment address for QSPI Boot. Signed-off-by: Pankit Garg --- board/freescale/ls1046aqds/ls1046aqds.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/board/freescale/ls1046aqds/ls1046aqds.c b/board/freescale/ls1046aqds/ls1046aqds.c index 77b21ac52a..ae401a38eb 100644 --- a/board/freescale/ls1046aqds/ls1046aqds.c +++ b/board/freescale/ls1046aqds/ls1046aqds.c @@ -13,6 +13,9 @@ #include #include #include +#ifdef CONFIG_TFABOOT +#include +#endif #include #include #include @@ -355,3 +358,10 @@ u16 flash_read16(void *addr) return (((val) >> 8) & 0x00ff) | (((val) << 8) & 0xff00); } + +#ifdef CONFIG_TFABOOT +void *env_sf_get_env_addr(void) +{ + return (void *)(CONFIG_SYS_FSL_QSPI_BASE + CONFIG_ENV_OFFSET); +} +#endif From patchwork Wed Oct 3 10:44:21 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rajesh Bhagat X-Patchwork-Id: 978193 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; dmarc=fail (p=none dis=none) header.from=nxp.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=nxp.com header.i=@nxp.com header.b="PnlPUz4k"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 42QCmc4nymz9s8J for ; Wed, 3 Oct 2018 21:03:12 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 385DAC22049; Wed, 3 Oct 2018 10:50:54 +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=BAD_ENC_HEADER, 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 7C744C2212C; Wed, 3 Oct 2018 10:46:45 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id C2094C22095; Wed, 3 Oct 2018 10:46:18 +0000 (UTC) Received: from EUR02-AM5-obe.outbound.protection.outlook.com (mail-eopbgr00081.outbound.protection.outlook.com [40.107.0.81]) by lists.denx.de (Postfix) with ESMTPS id 9A5A3C22088 for ; Wed, 3 Oct 2018 10:46:09 +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:X-MS-Exchange-SenderADCheck; bh=WXExtPYATptMKe16W2yVI72RhibRASeTxIAyLnW1P+8=; b=PnlPUz4ks+IATrb96ipbAH6DvkGknjZfuXlz1lx0PZEyZDMbp+J2qy5k7rdw4riIX2drimN0LD43EkL+TAVNssTPyPnxPn2X03O+np9W7O0htGN9MIPbTEZ2ffqrsixyCnYMxtNur3YEwoZEppohES27ObmmNgIjVMbgV+n0rWI= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=rajesh.bhagat@nxp.com; Received: from phoenix7.ap.freescale.net (14.143.30.134) by AM0PR04MB4849.eurprd04.prod.outlook.com (2603:10a6:208:c4::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1185.24; Wed, 3 Oct 2018 10:46:06 +0000 From: Rajesh Bhagat To: u-boot@lists.denx.de Date: Wed, 3 Oct 2018 16:14:21 +0530 Message-Id: <20181003104459.5444-16-rajesh.bhagat@nxp.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181003104459.5444-1-rajesh.bhagat@nxp.com> References: <20181003104459.5444-1-rajesh.bhagat@nxp.com> MIME-Version: 1.0 X-Originating-IP: [14.143.30.134] X-ClientProxiedBy: TY2PR02CA0011.apcprd02.prod.outlook.com (2603:1096:404:56::23) To AM0PR04MB4849.eurprd04.prod.outlook.com (2603:10a6:208:c4::26) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 9155b2f4-442f-45c9-a6fb-08d6291d6d95 X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989299)(4534185)(7168020)(4627221)(201703031133081)(201702281549075)(8990200)(5600074)(711020)(4618075)(2017052603328)(7153060)(7193020); SRVR:AM0PR04MB4849; X-Microsoft-Exchange-Diagnostics: 1; AM0PR04MB4849; 3:+REHMkNMIQAG96zuDVJQbko/+YceXsv68ksxcJWlZcneXvYRxz/gR8aVGgDvLmL5yVzkmRV2SpFh7qD0eap9/+ShbhSQ9wT7E9xa/KKR6/2xLQHBkt1bo5QXSKciFRvUN4XM0ANgazO52GVZM+QSAoeSbrgJjUwk1XTpEanl3LgBVr5neMo/DFq42oiorjr+jknX5+NGMBVXjomIUk9vH0Lb1vvKxYyj6vzi86j/Te/sGCyQVXC9vKdeOuK4nuB5; 25:o5d1MmuXIZ44kF++2Up/TOvhd4g4Gl3nOCbgkmlJ+YHj+BQl0YE6CY36oahYeTohcYtw7cj6/o0mAXcyAKZ/LqRw44GzeXB9O9ga4pfUYfc52SuSBUKg7rqTWu5fLsJNWifwlUVIJNih9oB5qLu3gh9oqyqXCQ2I2vDaFeTLJYRlYH2GSM2qErxIHVbX+eWIq5+0oEHsav9M6BQwBCzpC3qJl4rwc7PhEBOzTjPTLc91oh1aTLc8sGUUPBzXr6AjBV9mEHibhvJltkWGlPLK/0RGC7kLQ2Eh0Hs+dEI1/FwLsifqiKPanxL7wBbF60CBkmiH1soykf+cULHs3j4Yyw==; 31:0bXiiq/B7+wJ0cdu6sp0ZUbq5hTrJmV2FkpzqgILiVsT5rIxfd+r4sYRaalH2OvgttfiLrlefG5O5Mqai6Xt8OeSWQA8nTHJreL/32MkIhaaen3czOemAKUznpaEytVzf3BVGLbLwIuzl8+vge+1d6gE2/7lLaiNAWtuxf8oKGmnQNbi7nawcw/Z04Jpz7HAcGZAZSzKH65daRByNkzkP2eyvfWHV9D/R2GDx0dbO4M= X-MS-TrafficTypeDiagnostic: AM0PR04MB4849: X-Microsoft-Exchange-Diagnostics: 1; AM0PR04MB4849; 20:4u6Qqrg8jCIPXsHpJJlZlw1ZvBUHAJqoAjsQIVci6PJYLlleaHvyRamED5VzJTln8H9V6t3N6+oZAOSqav07Y7hjkxHbN+f843Kun9CMkuDWR85OosjIGlKaFgqqJAqzZ41Gzdi+KbZmNGdaoUVhyks/VGYZrF2U44iIc2xPRokK4cI64ubz0XNdckoviNBldqnXVZKAsbS39QOR0CZaYyMZ6fLbnZyzFirpywcfkuoNy9o68JlUGKIB8j4k5kgHxjOY3p9CzjlrMOVALmi8USiL2nkUh6rzY+NBpITsKuohdWp2xH7++yJeXwI1HdSQnyBBgSGRUcevSx+SfAPFMRLp/eqSSkC5j98B3kUcvr42A20/dG68ogWlY/JZWa3lGbPt4hNGzP2vpvRB+47xFBk21zWo6fcQQhbyTgi0JVmGrgL8IIRs3mqvwQ2VjrGpa2+FXSDBGCWtXSlPsri7fU2dtZRen1i5evP+5QPEmPBTXBCCgyV95gKhj6EEA4mo; 4:bQePpLSegM52+PgRTWOt5GF8gyeA+YJTNp1b+PgFZ9mGoZlqAM/dRN3Q+cnAq6ZbTh6OLD3amqDoBdk2HDLeEDl85wRyhuby6RpKF2kct3nrlJQecZhxntAEG/vnM7lKVPGP7uD3USfkYQd53errHsCzW0S3nfzu8ODN2RtKBCr8qtNiAmwLsNGnXLjXv9uQEusZeE8z6C/GzmZazAZBiarqJQmTj6zU5iDwJd/Sm4CGO2W1ffR6ZVqkhtCXX7fja3Ofl0e14nHmwH8zDMn0+nMv2OdbOiarCxlftd1maxp60iJVoALI52S3xOZxvy/3 X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(185117386973197); X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(5005006)(8121501046)(3002001)(3231355)(944501410)(52105095)(10201501046)(93006095)(93001095)(6055026)(149066)(150057)(6041310)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123562045)(20161123564045)(20161123558120)(201708071742011)(7699051); SRVR:AM0PR04MB4849; BCL:0; PCL:0; RULEID:; SRVR:AM0PR04MB4849; X-Forefront-PRVS: 0814A2C7A3 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(346002)(376002)(366004)(136003)(39860400002)(396003)(189003)(199004)(66066001)(50226002)(97736004)(7736002)(50466002)(55236004)(6666003)(6506007)(386003)(16526019)(53936002)(26005)(68736007)(6486002)(186003)(47776003)(8936002)(8676002)(81156014)(476003)(81166006)(5009440100003)(4326008)(16586007)(36756003)(5660300001)(86362001)(2906002)(1076002)(2361001)(2351001)(478600001)(446003)(3846002)(6116002)(316002)(2616005)(44832011)(305945005)(76176011)(956004)(486006)(48376002)(105586002)(106356001)(51416003)(52116002)(25786009)(11346002)(6512007)(6916009)(110426005); DIR:OUT; SFP:1101; SCL:1; SRVR:AM0PR04MB4849; H:phoenix7.ap.freescale.net; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; Received-SPF: None (protection.outlook.com: nxp.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; AM0PR04MB4849; 23:JFiX4uL1M81X9cYeIDqt55r3uvwPipXSTIp8dvZUy?= HgspPHuX5xyAWq1HwNgjfTlFsDPiVqpHFWqBpawxllOtsLXJaz9JtXDUePrpgz6HRIb2bwlT+7XbfUhzbceNQt3aUIEFl/PT47cVrJv1pn555h7R+rtIZwzs8+hQKX5TGWfkoHwg1XKJXO+LP78sMWzqcmYY5VCspAw5W6tqmE2hbO22DCYfGh2o7hTdygmecd1nKdImw3/C5Aq9vD6XSX9ORQFlXUwnZ9DPegKWP0clAAiHUpQL7cCCLZZ5senK91VqwUScjgHTPK6fNJbcDz5Yf4ppaH+rUpxCWtjjW7GjxT3k5Ko/hZ90RJcxSMxW2QoIgzeMGacpL9vHcvSwbbULTwYtw7sSqMtUYN5Icdp1dR3ne51ewc5EeQTAgj2J4k48+B9g7SHUQIQqEWq7uA1qi2wL4zvfrGw7cAuMi3isnRm65zyyzrl3BmYqZLLfDqNA1dAFzKXAVQn9dviZM7WjkhxA+iZt1NmjZi7xm6SQ1SyGneVtauGChMkXfn6vSxoSAgtXidgbcBymuU246A+ldNj+2A9ZTBECd+JP2DYu0ux2i93qQcY05YHQqBFQykd4o1SekzK1Dvl6gF/0qR1iXYIbaxjv6QdHhl/1JIIzme+07dDpMPquIwZVAx/+d0BDj4pg2jftf5O4YZQ2hAsOMHemXwJE+OZNyfPuPPyS1Yl8q8ZA2F0+xx4LjpBcXiB0EwU1TF/O6P3yBe2l8GRJRdl1zm3FC0vtPAHhr+kaHFKKwK1Hk0OQp3ptL+gXGTgLWpHikkj0fEsOoAQrPVA5NI9P5lTEdaSb+zo8mfqpq1Coq7WN16B3QtiadkKs7ABBe8zeNfFgDgheBgTW5C/ZauXcKwTaz5A65cjFcXucONMEpcexpe3CY2dTsHQfTUAgPk5Wb5ml6uVFqH2HH9jPAcKoP7vaCDje/GyXFr79hmepxXpsWccVyX2vhqXvtFK8DXrDmYi6yry1EOztSEwKzeOJ/Udc25z3L+ytp0Ht1H9SMZydgtkMER2FPwRNkmynHws6jT7DoTTObgzP7fJLSPNpOxKayRHdKb9GNPOq18Q4PAzsvKUSPDvj5Imv9EGinY9TwDliG0pPb7pCpJFA2BLRYcKOcEib6yxZ7PKTaHs7rvhRYeKKjr68PEkG3/u838eKuvzEZcxAenlJRCYOVHHEiaXO+M6TFext1jO6KPG+eWCBFtg8n/1UjJsSvMWMvt6W6lHiJM/FyjQbbmiFNhrvpjtJz29Q4FPatE4DuI6TdM5wyTRnpKAvbo4Fwo= X-Microsoft-Antispam-Message-Info: 98V9HjXpeHkoGEXGNHnM84pphjZYk1dVkSSPEYPN9FfWZCVa6EekXT1Mv+F1+14IJIvJrcS8uQ4Kdw7KrbSo12tayoijAQMaQJ9KsuJzwcrS9dBxgDxLUbFLo9UAUBQEL/4hpCrtM0tGPTJQRfYgEBTOK2ZSW4xNgaK9NfhHkOrd+04wTXNGAyvINAQklFyvBCHlKNHblm6LGgGmc/j7hycjxabagv1/OToJ6hBHLQwbfJmusLu6a0s39ZUqnBeXud+qsboYmftqgdDJAHCPC/RjZjnm3PMGEjznPx+ODoFTpTJfqdk3eu5BQwGmwyOlpgZAh+uUTm6yQ6CMY2faMjEGSQrfm+62LDpt29uz/BY= X-Microsoft-Exchange-Diagnostics: 1; AM0PR04MB4849; 6:2JcU+1O4lYc19jn5GsaTdSQVQsxAsx/Rt932KJkyBNSgiul9sKFFO8iYqx1vVjGGYXasnsBZQ5sMP/C+f5pMGyvnvbu0fGh9R6R/hVagDipd9Rt5O7Zo2tZEL8RCrZtOCBnpQX08IrzAovwu6UwHQjn2NSSJXW2R7fW+1t5Z139YKDsPkIWSjlQ9tt2lRWmpHHm6lEhEMQsL3aXJEwSHFdsFyZnZyZak0uPMlAQa3Olh1P4TNgcd8V9K23sBxKl284Ub8s01YKOxR02yRoqkwkyvxlahkv03mLoPRRmBQ2sLMlz46+124i1ucHXZCcqyzPFDSJv51MRiQo80sGAwqEDCbnEotP8SwSyB57mT4zjJjYZ16vOcNvZogfPb9zfUrR0lTTqv+GCUyerEwu0qQrSxPFxAgdvnwzsmoCgT0LA/5pCaP/5Gxh+tbc8Zo9GBGoxz6KVomzk/q3qBmFB9oA==; 5:0JVX1rDt3ch/kH0tNQmlc5EjisDt/RZecn0Fruf6ah0bQUJvGx4wmPzBL3reesEp7QQQmndXApsu5S12vfdR4cPnGyxwNWZjSvs40QPhJOeeL5G6fO9SqHQ9v386hzZgXwwZw+raPPawB/86yUsTGXQt3+D/INmFFmhEhQrMxQQ=; 7:eGZ2cJuhzwDXe5+gbu5wAc1mh/4K+TE1yeJWI92Rliya3l6DZ8Nd4nSHrh2tslwTFYVAlJ40y1KeODbxz7K2uOmtOBMr4nBkiDquw5hpuXFgNVrH2aUefroiBx+BC7F6niUoIBfqwhT6qXtIoMwIc/QvwGZgqXVMkxkPX6xOLiTSFvVGf1vmsrgsJHBHe50/vRC+9N4XTMrYBXY0y0JZagnT4iCqxemhPV/gNGUG57mPiMJfXCOjqPTw2lRm4Hmj SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Oct 2018 10:46:06.2730 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 9155b2f4-442f-45c9-a6fb-08d6291d6d95 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR04MB4849 Cc: Pankit Garg Subject: [U-Boot] [PATCH 15/53] net: fm: add TFABOOT support 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" Adds TFABOOT support and allows to pick FMAN firmware on basis of boot source. Signed-off-by: Pankit Garg Signed-off-by: Rajesh Bhagat --- drivers/net/fm/fm.c | 104 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 104 insertions(+) diff --git a/drivers/net/fm/fm.c b/drivers/net/fm/fm.c index 3327073bf1..427ea1a627 100644 --- a/drivers/net/fm/fm.c +++ b/drivers/net/fm/fm.c @@ -11,6 +11,15 @@ #include "fm.h" #include /* For struct qe_firmware */ +#ifdef CONFIG_TFABOOT +#include +#include +#include +/* required to include IFC and QSPI base address */ +#include +#include +#include +#else #ifdef CONFIG_SYS_QE_FMAN_FW_IN_NAND #include #elif defined(CONFIG_SYS_QE_FW_IN_SPIFLASH) @@ -18,6 +27,7 @@ #elif defined(CONFIG_SYS_QE_FMAN_FW_IN_MMC) #include #endif +#endif struct fm_muram muram[CONFIG_SYS_NUM_FMAN]; @@ -347,6 +357,99 @@ static void fm_init_qmi(struct fm_qmi_common *qmi) } /* Init common part of FM, index is fm num# like fm as above */ +#ifdef CONFIG_TFABOOT +int fm_init_common(int index, struct ccsr_fman *reg) +{ + int rc; + void *addr = NULL; + enum boot_src src = get_boot_src(); + + if (src == BOOT_SOURCE_IFC_NOR) { + addr = (void *)(CONFIG_SYS_FMAN_FW_ADDR + + CONFIG_SYS_FSL_IFC_BASE); + } else if (src == BOOT_SOURCE_IFC_NAND) { + size_t fw_length = CONFIG_SYS_QE_FMAN_FW_LENGTH; + + addr = malloc(CONFIG_SYS_QE_FMAN_FW_LENGTH); + + rc = nand_read(get_nand_dev_by_index(0), + (loff_t)CONFIG_SYS_FMAN_FW_ADDR, + &fw_length, (u_char *)addr); + if (rc == -EUCLEAN) { + printf("NAND read of FMAN firmware at offset 0x%x\ + failed %d\n", CONFIG_SYS_FMAN_FW_ADDR, rc); + } + } else if (src == BOOT_SOURCE_QSPI_NOR) { + struct spi_flash *ucode_flash; + + addr = malloc(CONFIG_SYS_QE_FMAN_FW_LENGTH); + int ret = 0; + +#ifdef CONFIG_DM_SPI_FLASH + struct udevice *new; + + /* speed and mode will be read from DT */ + ret = spi_flash_probe_bus_cs(CONFIG_ENV_SPI_BUS, + CONFIG_ENV_SPI_CS, 0, 0, &new); + + ucode_flash = dev_get_uclass_priv(new); +#else + ucode_flash = spi_flash_probe(CONFIG_ENV_SPI_BUS, + CONFIG_ENV_SPI_CS, + CONFIG_ENV_SPI_MAX_HZ, + CONFIG_ENV_SPI_MODE); +#endif + if (!ucode_flash) + printf("SF: probe for ucode failed\n"); + else { + ret = spi_flash_read(ucode_flash, + CONFIG_SYS_FMAN_FW_ADDR + + CONFIG_SYS_FSL_QSPI_BASE, + CONFIG_SYS_QE_FMAN_FW_LENGTH, + addr); + if (ret) + printf("SF: read for ucode failed\n"); + spi_flash_free(ucode_flash); + } + } else if (src == BOOT_SOURCE_SD_MMC) { + int dev = CONFIG_SYS_MMC_ENV_DEV; + + addr = malloc(CONFIG_SYS_QE_FMAN_FW_LENGTH); + u32 cnt = CONFIG_SYS_QE_FMAN_FW_LENGTH / 512; + u32 blk = CONFIG_SYS_FMAN_FW_ADDR / 512; + struct mmc *mmc = find_mmc_device(CONFIG_SYS_MMC_ENV_DEV); + + if (!mmc) + printf("\nMMC cannot find device for ucode\n"); + else { + printf("\nMMC read: dev # %u, block # %u, count %u \ + ...\n", dev, blk, cnt); + mmc_init(mmc); + (void)mmc->block_dev.block_read(&mmc->block_dev, blk, + cnt, addr); + } + } else + addr = NULL; + + /* Upload the Fman microcode if it's present */ + rc = fman_upload_firmware(index, ®->fm_imem, addr); + if (rc) + return rc; + env_set_addr("fman_ucode", addr); + + fm_init_muram(index, ®->muram); + fm_init_qmi(®->fm_qmi_common); + fm_init_fpm(®->fm_fpm); + + /* clear DMA status */ + setbits_be32(®->fm_dma.fmdmsr, FMDMSR_CLEAR_ALL); + + /* set DMA mode */ + setbits_be32(®->fm_dma.fmdmmr, FMDMMR_SBER); + + return fm_init_bmi(index, ®->fm_bmi_common); +} +#else int fm_init_common(int index, struct ccsr_fman *reg) { int rc; @@ -429,3 +532,4 @@ int fm_init_common(int index, struct ccsr_fman *reg) return fm_init_bmi(index, ®->fm_bmi_common); } +#endif From patchwork Wed Oct 3 10:44:22 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rajesh Bhagat X-Patchwork-Id: 978198 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; dmarc=fail (p=none dis=none) header.from=nxp.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=nxp.com header.i=@nxp.com header.b="yPFfD5fH"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 42QCpQ0F99z9s9m for ; Wed, 3 Oct 2018 21:04:45 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 8BB06C220D8; Wed, 3 Oct 2018 10:50:37 +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=BAD_ENC_HEADER, 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 69EB9C22119; Wed, 3 Oct 2018 10:46:44 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 8E199C22063; Wed, 3 Oct 2018 10:46:22 +0000 (UTC) Received: from EUR02-AM5-obe.outbound.protection.outlook.com (mail-eopbgr00052.outbound.protection.outlook.com [40.107.0.52]) by lists.denx.de (Postfix) with ESMTPS id 301C1C220EC for ; Wed, 3 Oct 2018 10:46:13 +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:X-MS-Exchange-SenderADCheck; bh=xeSh36bb0yhKcD2vrP2bSIttIGtra1n05B9/Ek0eGtk=; b=yPFfD5fHCzK7BDjbs3mGBalEMbHVnwzv2l0U1LWzdSJrxcyoCPHu88WdVRvD+D6gBHLqG8X3aRxrwcxX52mC4gd+vmIpRRi6e28tu9H+QqNDb8rptVq2UzdkeZXDGtz+3hMPgWHfev0S7QZphl6ni4o5WA/wiTM7I2oBvu1ZZ6w= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=rajesh.bhagat@nxp.com; Received: from phoenix7.ap.freescale.net (14.143.30.134) by AM0PR04MB4849.eurprd04.prod.outlook.com (2603:10a6:208:c4::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1185.24; Wed, 3 Oct 2018 10:46:09 +0000 From: Rajesh Bhagat To: u-boot@lists.denx.de Date: Wed, 3 Oct 2018 16:14:22 +0530 Message-Id: <20181003104459.5444-17-rajesh.bhagat@nxp.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181003104459.5444-1-rajesh.bhagat@nxp.com> References: <20181003104459.5444-1-rajesh.bhagat@nxp.com> MIME-Version: 1.0 X-Originating-IP: [14.143.30.134] X-ClientProxiedBy: TY2PR02CA0011.apcprd02.prod.outlook.com (2603:1096:404:56::23) To AM0PR04MB4849.eurprd04.prod.outlook.com (2603:10a6:208:c4::26) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: a2d911ec-d0d4-4a79-0457-08d6291d6f8c X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989299)(4534185)(7168020)(4627221)(201703031133081)(201702281549075)(8990200)(5600074)(711020)(4618075)(2017052603328)(7153060)(7193020); SRVR:AM0PR04MB4849; X-Microsoft-Exchange-Diagnostics: 1; AM0PR04MB4849; 3:EL2RdRta6SDIjqa4WYC2598GeXJFepMFc8AQjbxy6JNFcOsw0Se/swYjwzXb5CT1UQmvc/IaJU07Z40vySAlsFqLQoQo4udnWmqoX8+s/94GbTOJ+GAfv3eoL7U9OmdFqrx4Z4Gip1ZprTF/a6aFbyBwSiJaAi2ZwmNQ98K2AOo8bl4E/sVW+SqhCZgkIukGGbK/2z7J3J/fTBp9xN9NEcQXnNlWxZEPgGjxhkN5GPQe7EI7YjH6Dt8SCBbwOwXz; 25:UaQitbVSFJOAdaw96cN//SSd2vvP3WEKjzKTsecWBLW7pgUQkfUrphXFus+544lCJzT4u3BdHXEmPSeUeje7lOBn7NbdNfils6FqEL8N+crR8Hb8PGcbbExPW/3MCft+ewldayqhAvyLEgx+fj70BiU5WQxEBfBmwO7Ar8vEKPorzy7uOVD4MsYAyh35KPgjI43bPo7Ngz8mhUN5w9W66z6THTtTLMKI7uMGkIwU6eHaBe24DjuCTb2MlkDB+ntuWUDynrH4uAzLvniKVYIwa1DJMRUPXT4w1s8k/Xy2PnEGuu+XqBbRiuc0kc+a2xz9rRcCzytk8rQsXR6orNO2Iw==; 31:umcr1yFUDRfV7KJrMhJRQHtYtOauWzOX9sGqcczXDrKmm9oaWXG/H+NU6rk5xhgqDzFZF/jSkj5+QzYLe1buZ6js0RLT0UZTHc/FJCi+v2j3e7KXDrDXob1cVQ3clt0W/N8n5zhE5oTX5wiQVXvBeOWv+gXtD3MZU6q8hHnUxQplg0FATo4qjdURmMvWG5ZS4KFHRMYnpVbxlze43NcYVsG7A8LsN+jZgVD5F+WWgk4= X-MS-TrafficTypeDiagnostic: AM0PR04MB4849: X-Microsoft-Exchange-Diagnostics: 1; AM0PR04MB4849; 20:IXBgp0xJ3boFY09VzlyhD/sg6VSI2jSE3v5jOQ8WF75Z7KTJEbtv0WxOE1dIZLd47/mQxbFtLFEjm+Qik3MUwyrlnds/sLj75L1RVA+d9IhTS3/yZpjtUPmdpdNFhH/TBn5rlcZrInvRml4GQbol8C0Uxx7sBIT9JCnLHhXQMbF7OyjUmOY5rKFFjG8EW5rBKfxjpeZNFSUfQC4dc8SiFGcKZ+lcImAJycwf0gUL4bvMSU3nsIf6YQMLterq11AdhqhAeJwVBUt28ZOkZfxKAUoH5SX/aI9wnG8axs5vWkz1nSN9BXpMluToEWQQZO75Z718o6iD4HO3GfqKWeF/TtffsWlqCMR6WsGHWhYux4fDvngjrmUJUJ3LULaDOMA8ABQcpBKqjTwDUINq5/coH+oErHvDBJw6TlS0/hSz6QHE0VconWdgZeTyXvVYpW/lDQ5WCjhfFTzGy3nsx7XhQw4o8tdfXsb56b28NPW/hUrRtCnWhWdWRLneVzKY6jEP; 4:X8WFEcpSeNaSl3pR/7Mq+Ik73fV3iLt64cGBfqavKvR1uS8pvse27JCVf3l1isc6Y+fNzgcfend+lNoeQNNvOJ5MbcdJ+zSZsgB5G4LEeEz+fRYt2RVRyJSImkn2v6O4YDu3kFYp9g1GxU+TdRLa05RUBx/gFzNjH4VSBBVUsH35abtjx6kVtk4zCVZl26tdYbE/ezt3aMDAIca8kSMFdftBtIDJVkbHaex0JiE1PL5G0rlqMcLj2NRywY72P74OtrvRPVzQuixE2mmkEV2Ds3limfy7F6tbv9MPU02x7JkQqHF75MShnDREyGbh1C0A X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(185117386973197); X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(5005006)(8121501046)(3002001)(3231355)(944501410)(52105095)(10201501046)(93006095)(93001095)(6055026)(149066)(150057)(6041310)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123562045)(20161123564045)(20161123558120)(201708071742011)(7699051); SRVR:AM0PR04MB4849; BCL:0; PCL:0; RULEID:; SRVR:AM0PR04MB4849; X-Forefront-PRVS: 0814A2C7A3 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(346002)(376002)(366004)(136003)(39860400002)(396003)(189003)(199004)(66066001)(50226002)(97736004)(7736002)(50466002)(55236004)(6666003)(6506007)(386003)(16526019)(53936002)(26005)(68736007)(6486002)(186003)(47776003)(8936002)(8676002)(81156014)(476003)(81166006)(5009440100003)(4326008)(16586007)(36756003)(5660300001)(86362001)(2906002)(1076002)(2361001)(2351001)(478600001)(446003)(3846002)(6116002)(316002)(2616005)(44832011)(305945005)(76176011)(956004)(486006)(48376002)(105586002)(106356001)(51416003)(52116002)(25786009)(11346002)(6512007)(6916009)(110426005); DIR:OUT; SFP:1101; SCL:1; SRVR:AM0PR04MB4849; H:phoenix7.ap.freescale.net; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; Received-SPF: None (protection.outlook.com: nxp.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; AM0PR04MB4849; 23:XyVxQ+zlz/xoViygh6cC5JFDVNNdPUSS4OxHqgVWs?= H7an8sjvq9S/SvBHUpneRfGtAA70AeyaGqHXIaWbKfoRPccNIYBY9Eqj7n+Eha0JQsBckUZ6V2SCqmsfkRNkOFcdh9oPqjtM/a0fCnKIKbZpI5rnVqYYxPfs17ZBO+6tNw5WRID8Rs6uLnpqJXaKz0W0EZZ9pDIMVOZCIlOeKmq0cTt59/UcETK/5Qru1zAUf8HPq3N2YMSsWvZXecUgxxlVSqRQqW85VJNNFlSVg36RhG6TGmPBYxYeO1q97/RXdwpY02zBDecVu0I8nYKHABKX1vbWrHUrNi5r4Sn3EJpuxgDohXv/rci9KOvI9ssC2yapBWIuSBI09zMh3XmENeBY35MX27WZ3xNWKNXwsoBuo/0pv5KiVx6dpVPWt+/EVVp+LnWm7wHvao/tCI1IQfaN1T+DK0+t216Ryg1Ge/LrUvSmPFdddGHd3Fmuvj+NX6E5grVf10r0YM0LnPAZaHnNNp5vv1P/G6A3TXVFLPh6tFnbJIepz8gFZNWmurarDC9YYiOc4Q81lwBGc43JQx7fWJ2WNDbg2mj5Z/GvAJpiKjZCMkN873+3YD1pSmsZDS5MaonmO6RGLH2JDlJVw+JEsLcUP9kafS2NWD5brSpy4qZi3dYe5V8AfVSilI6pQCyxVwQ8IjQfeaOaCcb++XMj+v5PMNiTdhYZq0g2PIkT9YRd5t0ogcwEgdp/QatB1T8bHOjY0QBDP0V1z/g4pfV4PMrQz3FlEu1M7RvmRMrGeXkBjtEqduEBPxEFsvM2yAUUNk/yBk2/j2sLqqfQ6hbC0E1TSNOzYnVolIyewQNlnHh2jO/HX6sttNuVi1yS3knnhHMiTzcVPUC972R5CJKrWTdJVCqfkqKIRBXOsLPtfmnojg4yHb3YaPXRf+J4jv5AGrmgCCcaYyOfQmVM+Ta+xZVsKJCLkZACFmyY9puk66CD2gjU4Wb9pHRuhlngxMrK2aznNI33F+RPxH6bcDLsngvODVXP31HJRFldi12tjrlyBct5ahsCoKIb7ggtfAXLHG9o362ks64rwrvyjKcvfplu32VvIdcdhVshQZ+/Sp40/y9ehI2xdIO89wBK9WjR8pmqE8YL8g5omA3/GcsUw1bem1AqjOEF9MOJVDB1DBg9GEvF3fSBw9FTesMPVmV/GlQ/m+gZtsZLTlA3GS45iGunapiWg5tXJrRBYzv6IMh2ke39jBXxVijys3bkD4Nr0ilEcxnJjRlMWjKTeKD0Dn673PBQprX0ITmAtDWMBCa6CVbm5eJIy+fTad9iIs= X-Microsoft-Antispam-Message-Info: IpIWXIZpePp9pYel9NIhtF8c8OLfp5pp8/2YsJ9igqPTlfIZAPidcD4w0jsTMKRjNmnAwH7+LaPRBTqUx5/3Oanf5jQ7JuwX6UfLVC13SyUEtwuZVfBT9/I+rJSQ3QAysZ3PLJ81v//nZANxiosGS3dF2D3dYZWO50hOxgEpuW3kQFHL3uyiAlsq4OMhRbu7zf5vheq5AZ1rG2m5+0S0vNw8PU55TRkEJfU6nT0TSn6m3WyaTxDHUpxkNhwxiv8S1pDJ4iHhXB2KOAaDEHMDf3h2WlWt7agIt4tl623Pd47plDE7h1Fcosdygc0iq2R8rghEo6QAydvz6KNtLny/k7Mju0MlfHgEbc29qeYszW0= X-Microsoft-Exchange-Diagnostics: 1; AM0PR04MB4849; 6:0VIw/z7yK+vMdio28YeirwDihUWnf+2piGHdeJgLX2ozje57QnnASsnbUtoYP1TaoUMrIuiN6Y009RW1NrAeeg03hNieOA3j9oNIQZhxaZf6RixdcPRlWdUttbv6CGo4r+oBG+Q/XOJOttOPcHBjXT00AAd9QM/dXAiRWfe+lDFcTzIJ0OjsN3e3sHKSNxRrA4jVnxQ6UipXTEOxRxpGef29DV5nViVmRbd8jdnfKcKfnfx1dSpmHPTlGIuutclMsI+nagI88/S97t029DoXYWN/2887XW87V1osNd8wJHtHoI0I/MX/tFOkxs7vDyXcAcXDtassxmmYksN2Bjng4wxovM6AqoLBYQfMkjLZibCCSKY9AgakfxaiQgFpdt0IMmt6+U7RAefHykHN05Tn7Wn4mIzcIq3nZqLGNHQlYkqn0q+wRQVRBPViPEf5/q+p6XzRhlF+2344EBwKPL2HUw==; 5:VGHygQV+2vDomz+rFQbQu59HU9Vso6ryfKWIyOvnGO+M97amkW25JtecbF7Egvoovmf4HCV/PJw1e7AoGl9NblGX6oxcG6hFMFowSnQeEf6FlLL8TxpXJp0sYGcgbyzbM/33MWC86vY5dQ5027Mpbqi5atNDBlBaLYs/UHYqGFo=; 7:ZjhQm7eo+ZK05/t1zpgHOWMNg8PclOqBtCq60igYsvzJw2xXQlGyrvbM4szPyFgsZYoTtWREju9uCjB148MQ+R0nWZepeaJAAR42BpQLIFDK9Yz9M3/c5pks43569vIEb7deuuC5Ka8YfgcTpyjckpgSYGzsIaOx03jJIekDA7uF08l7YObR0HsZWntn7xKpB8EzhATLmthXJ/nVFOeRauYzsrALFmwXyuDu/pdrNGG/rVrUM5QLJV0K0Q/mFh5V SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Oct 2018 10:46:09.5653 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: a2d911ec-d0d4-4a79-0457-08d6291d6f8c X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR04MB4849 Cc: Pankit Garg Subject: [U-Boot] [PATCH 16/53] drivers: qe: add TFABOOT support 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" Adds TFABOOT support and allows to pick QE firmware on basis of boot source. Signed-off-by: Pankit Garg Signed-off-by: Rajesh Bhagat --- drivers/qe/qe.c | 81 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 81 insertions(+) diff --git a/drivers/qe/qe.c b/drivers/qe/qe.c index 7654df8008..d7e3a1b923 100644 --- a/drivers/qe/qe.c +++ b/drivers/qe/qe.c @@ -17,9 +17,17 @@ #include #endif +#ifdef CONFIG_TFABOOT +#include +/* required to include IFC and QSPI base address */ +#include +#include +#include +#else #ifdef CONFIG_SYS_QE_FMAN_FW_IN_MMC #include #endif +#endif #define MPC85xx_DEVDISR_QE_DISABLE 0x1 @@ -170,6 +178,33 @@ void qe_put_snum(u8 snum) } } +#ifdef CONFIG_TFABOOT +void qe_init(uint qe_base) +{ + enum boot_src src = get_boot_src(); + + /* Init the QE IMMR base */ + qe_immr = (qe_map_t *)qe_base; + + if (src == BOOT_SOURCE_IFC_NOR) { + /* + * Upload microcode to IRAM for those SOCs + * which do not have ROM in QE. + */ + qe_upload_firmware((const void *)(CONFIG_SYS_QE_FW_ADDR + + CONFIG_SYS_FSL_IFC_BASE)); + + /* enable the microcode in IRAM */ + out_be32(&qe_immr->iram.iready, QE_IRAM_READY); + } + + gd->arch.mp_alloc_base = QE_DATAONLY_BASE; + gd->arch.mp_alloc_top = gd->arch.mp_alloc_base + QE_DATAONLY_SIZE; + + qe_sdma_init(); + qe_snums_init(); +} +#else void qe_init(uint qe_base) { /* Init the QE IMMR base */ @@ -192,8 +227,53 @@ void qe_init(uint qe_base) qe_snums_init(); } #endif +#endif #ifdef CONFIG_U_QE +#ifdef CONFIG_TFABOOT +void u_qe_init(void) +{ + enum boot_src src = get_boot_src(); + + qe_immr = (qe_map_t *)(CONFIG_SYS_IMMR + QE_IMMR_OFFSET); + + void *addr = (void *)CONFIG_SYS_QE_FW_ADDR; + + if (src == BOOT_SOURCE_IFC_NOR) { + addr = (void *)(CONFIG_SYS_QE_FW_ADDR + CONFIG_SYS_FSL_IFC_BASE); + } + if (src == BOOT_SOURCE_QSPI_NOR) { + addr = (void *)(CONFIG_SYS_QE_FW_ADDR + CONFIG_SYS_FSL_QSPI_BASE); + } + if (src == BOOT_SOURCE_SD_MMC) { + int dev = CONFIG_SYS_MMC_ENV_DEV; + u32 cnt = CONFIG_SYS_QE_FMAN_FW_LENGTH / 512; + u32 blk = CONFIG_SYS_QE_FW_ADDR / 512; + + if (mmc_initialize(gd->bd)) { + printf("%s: mmc_initialize() failed\n", __func__); + return; + } + addr = malloc(CONFIG_SYS_QE_FMAN_FW_LENGTH); + struct mmc *mmc = find_mmc_device(CONFIG_SYS_MMC_ENV_DEV); + + if (!mmc) { + free(addr); + printf("\nMMC cannot find device for ucode\n"); + } else { + printf("\nMMC read: dev # %u, block # %u,\ + count %u ...\n", dev, blk, cnt); + mmc_init(mmc); + (void)mmc->block_dev.block_read(&mmc->block_dev, blk, + cnt, addr); + } + } + if (!u_qe_upload_firmware(addr)) + out_be32(&qe_immr->iram.iready, QE_IRAM_READY); + if (src == BOOT_SOURCE_SD_MMC) + free(addr); +} +#else void u_qe_init(void) { qe_immr = (qe_map_t *)(CONFIG_SYS_IMMR + QE_IMMR_OFFSET); @@ -229,6 +309,7 @@ void u_qe_init(void) #endif } #endif +#endif #ifdef CONFIG_U_QE void u_qe_resume(void) From patchwork Wed Oct 3 10:44:23 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rajesh Bhagat X-Patchwork-Id: 978174 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; dmarc=fail (p=none dis=none) header.from=nxp.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=nxp.com header.i=@nxp.com header.b="D+eUumEw"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 42QCXj6SBBz9s8J for ; Wed, 3 Oct 2018 20:52:53 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 8E13CC22047; Wed, 3 Oct 2018 10:51:30 +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=BAD_ENC_HEADER, 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 5C478C220B9; Wed, 3 Oct 2018 10:46:54 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id B939EC22118; Wed, 3 Oct 2018 10:46:25 +0000 (UTC) Received: from EUR02-AM5-obe.outbound.protection.outlook.com (mail-eopbgr00055.outbound.protection.outlook.com [40.107.0.55]) by lists.denx.de (Postfix) with ESMTPS id 700FEC220EF for ; Wed, 3 Oct 2018 10:46:16 +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:X-MS-Exchange-SenderADCheck; bh=zHXeqBTD+ag7LjGxCYZUDUxKASEhmlWLL25IsQ825mM=; b=D+eUumEwliLO6jtPq5nOuIea06283CEtS8hqb593auW2q7GBN5QWBSPLJh5N8OHbazTkQsYWMaZNc/lvBDvdrBATdHS0TgHW+wf/XpOAVlGyIxi6g3dAy32VMfIkZaDrUNjJGV6Lb452/hN2w8MzRrKbb8xFwErt4SzusdEoHm8= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=rajesh.bhagat@nxp.com; Received: from phoenix7.ap.freescale.net (14.143.30.134) by AM0PR04MB4849.eurprd04.prod.outlook.com (2603:10a6:208:c4::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1185.24; Wed, 3 Oct 2018 10:46:13 +0000 From: Rajesh Bhagat To: u-boot@lists.denx.de Date: Wed, 3 Oct 2018 16:14:23 +0530 Message-Id: <20181003104459.5444-18-rajesh.bhagat@nxp.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181003104459.5444-1-rajesh.bhagat@nxp.com> References: <20181003104459.5444-1-rajesh.bhagat@nxp.com> MIME-Version: 1.0 X-Originating-IP: [14.143.30.134] X-ClientProxiedBy: TY2PR02CA0011.apcprd02.prod.outlook.com (2603:1096:404:56::23) To AM0PR04MB4849.eurprd04.prod.outlook.com (2603:10a6:208:c4::26) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 1b7efc8a-e5cb-4c64-7e0f-08d6291d719c X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989299)(4534185)(7168020)(4627221)(201703031133081)(201702281549075)(8990200)(5600074)(711020)(4618075)(2017052603328)(7153060)(7193020); SRVR:AM0PR04MB4849; X-Microsoft-Exchange-Diagnostics: 1; AM0PR04MB4849; 3:J+Qco7qSzDlXfh9r7t8Whlgf1VW7caR3KriyO+JWqKEEVL5RgU/O+H7aVWfwHV3K1Aam9coy6JxD0YSIUFzfbROfmIM7Ozhq2uqWHNyMMWZh9sTzypq9mOf+vdvgmY/sQPDEwrkXmsCF/oD2MRR+1ES5A3JZtMuGsa38Dtifz+OsrAMcLbyxXz+ILpstjeEJjZ78FwlARr1nuoq1UIJT3/EYPJaxPIWf34ievVCN7gu6QS+bsqP0A74PlflEL1J7; 25:4ts+i6cAaFpmTW5QOZyLzXMqzeME4GQd8i782ouAyz62E1bvHGNmBC/Y8BNBNd/0A/MBqija0h/n/Z0C4a0dVQH8C4lDAI+mUkkaopV/AGGLabebNWiSh2ju4tm6/TdmlQN72EGTBm7EF2wlgAVlyyPlfnMhLPStOY1jnbjzeSgqDjM4E6y7ZAH2JretCfh0FBZ1eF+cpn0a2RmoQfw1DpmH9IFjIdcAwPdD2VERCR6SsZ/+0NFanR3wZgFqM7/snGvPj+LfWKtcYbgAIEH4UxOihpcTw1V5+J9/t8wGoSIjCSno017Fax4G8ib92OSidOBltgcSNeSYQyYbH4TJLA==; 31:hm4Tw+ZrpTxkAZsbwa7Qj7GwRlsVZr7m04Z7npz1ceA5e6tRhQmG5q1S0fbsBfK4mR9ns1Irdh8Y4DUk50/dWUs0RVoxL/pEChfPoHbfm6B5EYatS00NYaYafdta9O5aIjN5k1RHe2bclMU0DnzCeERLFTdtr1/gWPF8o9TrpK6NwSRBXqbSUERdlA/a9QVQ+995cesum0RP4b0Miculosvba8cMYYxyWOEFZ7FSvs8= X-MS-TrafficTypeDiagnostic: AM0PR04MB4849: X-Microsoft-Exchange-Diagnostics: 1; AM0PR04MB4849; 20:cDlsx2Qp4HHyv0+G64td0iY0XzxTxdtrFRmk1n9e5KT2hrpqfrWmUpPHDXJQiePpb5xXWTLWe9vah7To9BkZuLzw9N1Tk1tXpvu2KAxtc0FqOmHL/oQtLxaBHy9wH9kOlO8p8b6PEpbfaSUdjyAhAet2tLRHTejiKty7Bu7XrLOZ5ECzZCMWtSMEWDHixceRUHxRo/g50debdtYrNT3TL9zs1uW7qdNF0YeXlyZwYt016oIF51WujfcMAfpd2XS5+nLZ5DBNmoX7rv+MmnOFNR8gNaEZHcw27XsTjj4FmRQE08loVjXsSQezPujn1xG6mCdexrTK8oMG7rnF9KkV4M5XTvKsQHEYHKstfiSIoIvR8c60vnDLKT8KpgIsdAnAuf1fRJVpqvR4NeVRbuJUUXLuxvzZl6G9ZsG91NJUoEmxL1UyBckpN1BRZf1PhgZb2eQQGvU63eVOybro26Q6pWjO0rKPciH8QjrzvcACISKDuaIoSy/npcw7nsdAiDMP; 4:FK0PrA+Ri6Ej+omiq3xQW5NTIaKSpjVx6K4vneEuj7py4SEFk4N3VUrGXRnX8Ft1ASh73u9PzjyGzsow/fNfgJ8CQhNMee6ABqNUMVsMEYSbeopyGxrSpKjbjUeno+r1bZo1VxArKvfs21GqEkM1MtCBd7rkunj+xabMbniNZ4Sno/dIuvI0mNryGqxMZm9ee2uDdnLNHed1jLn7prcyHw58KJwowCtfWrdVOgQZ3mkonSdEbyb75omdR6ktc+jWfqkh4pwoq7t9USUPntQlwutgT4e3isU48Qt1TTdtQ92PJkWrpzn+d1nJMtR4fcEi X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(185117386973197); X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(5005006)(8121501046)(3002001)(3231355)(944501410)(52105095)(10201501046)(93006095)(93001095)(6055026)(149066)(150057)(6041310)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123562045)(20161123564045)(20161123558120)(201708071742011)(7699051); SRVR:AM0PR04MB4849; BCL:0; PCL:0; RULEID:; SRVR:AM0PR04MB4849; X-Forefront-PRVS: 0814A2C7A3 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(346002)(376002)(366004)(136003)(39860400002)(396003)(189003)(199004)(66066001)(50226002)(97736004)(7736002)(50466002)(55236004)(6666003)(6506007)(386003)(16526019)(53936002)(26005)(68736007)(6486002)(186003)(47776003)(8936002)(8676002)(81156014)(476003)(81166006)(5009440100003)(4326008)(16586007)(36756003)(5660300001)(86362001)(2906002)(1076002)(2361001)(2351001)(478600001)(446003)(3846002)(6116002)(316002)(2616005)(44832011)(305945005)(76176011)(956004)(486006)(48376002)(105586002)(106356001)(51416003)(52116002)(25786009)(11346002)(6512007)(6916009)(110426005); DIR:OUT; SFP:1101; SCL:1; SRVR:AM0PR04MB4849; H:phoenix7.ap.freescale.net; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; Received-SPF: None (protection.outlook.com: nxp.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; AM0PR04MB4849; 23:dKu98C+ThI8mSKMHg9dvCkSd652FwAUNla9Kb34MQ?= GkbFSa7X4GUjZD+XqIbUh926OAGOBGeY9vGHLgZNZj64iQBaerMTjXyfosqfkqwIHwYdFHQjN/qGuA4aAN61zWLaKf5U0rbNi3L8PQPTrqVbAzrSS/m9Lc/ZLz1F56igYdVBrRXoNKBkmCnz65RPzRFLL6BXpPYdX3NPfks6YTV79XqYu9jheN7diS6NJsIDKSVYZ85ZpdOFmav4d7D1KgfT7fafbaH9JoHffVp80EjtIbzsWOzFvQdrSvv3hZbl+GLAh7skwk6cdX/ZpoAAIJgnaBNEjOHl7znN3++ZwQmbkonqMDSqD5j6ogp0FC88qy6aeo2tc5NYUWRwJZptdUXuX292osemztd6OvxMlnc85dBWcNhDWq51nIlZFaEZf7mf3ZWfBpfzuBdjne0GasrwvAI+Tb0XsjGf3KWF/4R6WHn+V2Is7y7ZsTSy78epg1fnHsohvuPwaXSk1I1XOsB6LouA69kGeas7Mfl4J/5Jh+/nEpg5EmlJHvlM5/+q958Fv7oj6f/sOg47ZSzR1B8f5ESKlmHa5VSFm2CicjlciC7uAmaWwUH5/xUv3KqKn1bJmgIckXnRV3QSWoyZWDJ/VFw3xavLKoRwsMANouxioPZIIRRuG17bADVtz8LNPJFpKfAgmXrDx8roVa5ZTvYvSj1va4nEbQxwe/9eKgEiCXx02FCnpgzjn0aplbPTxQI3h1faRNm1O8vSQMfw+6jiwsd7vaLSRIgHP0PaTBVkGBcxnNPpL6Novga9b48vRcex9vV8paXbjzXtl+Gz1na3+xzcZwPW4zdIs4na5tzQrPonmK3Of6zPaVWU6qlV8u+YsUwBa4cloZqYsX4g3gN55Tlr0SN9fLBKnf+r9oBJFEtj0hPt150GG4qWqt5+vqe4rDNEPujrbjKMM9Ld77xGnJmp+nHJq99YQgIyNQ+VCSDK3hbsAkw3ApotyVQfOp9wdi4/7Nxcy+f8TgqAt2tQAesnjouQdolOSfHxHXSjG+yGPnzYJSjfzmzm8EPOmZzAiuan5NbfLXqpPbw6POUOT0L2X60bNUkJ8TNC7wLctPb0s3oZzgSS3D9IfxEXsypn0PHJI2eUsjx+EMTB30Gr4P9Mm6PGJ9WdrOHie3ADUwV2Y5+LJisSWQSB0iQgQBsxgC3TS6biatwCrF4t2HLiWnwhXARl125H0kypfqAr2b8nGJIlm8eiYwBRNHVedn4LYTY1WAYxeGKd2HpQ3RsG3N4r4afF6ImWleTtj0GNnQh9WjQ5qByN/3B72Qcps0= X-Microsoft-Antispam-Message-Info: 0u0XZxYJWrLo0OvJoPiE95OomSV8CO1irSECwYWIzeZt2I4wgRT00M/5CeaNVGQtkl84Vm49N5kWD6YOyJpW2YVQFv+i1JA39Eod0ATcj7r7HH40BJaTItuPXIU3caPYcUQMOxxC80+PkJ8fSsGipowpWFUDCm+IBO0nIYaJJAE2TlLfryYck1qiuL7FPL6qQ59eXAJMH9hRyN70195iX0d2eh3yA5uWF3Oca9NQ+BKVuATpGgTtCGcg9yi6r9JKIkMmv6kvHT9hRZNDam48S+Ma9Cm/21+NDe0gUkrKvdLsEGdEYc1VIupOPX6GxXj45a+7bi35wEuZ3E0oO/mz6+R6Q06bWjgq9oNExVkaAAc= X-Microsoft-Exchange-Diagnostics: 1; AM0PR04MB4849; 6:GhetM3Dd0LNb4MgMsROHMr6cMZxC1OembU3aZWM2lCdqVB+zfzOufHYNIaVB+TRj04QnwVI5QSOQF4tMMALeFVrGG7JgAuqr/XAA3j8COodfU8pe+VWui8O2pkes3XWM9krhaRcnx7rmFW8fVSR81YiV9JUPqetN3u6quNH4AbQUyky1BfWh5sModw3DsQL5V8BGJko4F1mCrFu1Dr13APfDrut2r0zm9JHdircN49HfWfqSc84E4HFs8e57jzxoE453/YD+K6yO+ND6zp1nM+1Uk2HadD3NjUKouWlsHk8iv8YSau8sa8Fd7ZUFQDocm+f8T99i7jEzY9fWqsGxzreqfS+6L8MugFgRbfR/CeMuNTD541kGErk69pMwduqYutcbJ9onY2WQ41cl2R9igAAPpk0MHVVZevl9TEBBX8lzD8gUS2LDJZhhYVc1GjIWefnZ7P5iNiZejrLPO7XzZA==; 5:TGzjuL8XZn8CsUWJbvu9T8YSw5RHGcMV5dGbI44ZMbSItI/hmri5GnLCukzSVqCMKk1JLiY5fSZ7wxeOURWtavh1xe7QqNNimATVBQoo3B7YNZlmwwdo3GPFf/9n5JTUBkwgtLnBdTRUd2r+FS/pBYkeJYFT4alrbta435ifrso=; 7:QJPX8ZgVjMpC8XhNauiATTi+kc5wjr1gMOdNBkAOvugwEojpbJmKYH0zDjrwlFzIg3FDZ8Cbtb2GTppG4OJvkI+BNANOp2hhY8s7GSfgFRsLtIjw+IY3xKQ/8Nd33fPh+dUYTi96XXmNPldMGhnrC1MpXSoMz/Uf7xU/kQ/5qeRjyajv7kpxE7Z4Txd1amh+0x7e+/Dx/nauHIEqzf00qymH/IWFr9216W3/cPPJGxTMd76ZqfxfxMShBA/CArU9 SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Oct 2018 10:46:13.0297 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 1b7efc8a-e5cb-4c64-7e0f-08d6291d719c X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR04MB4849 Cc: Pankit Garg Subject: [U-Boot] [PATCH 17/53] armv8: ls1046a: make FMAN address common 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" CONFIG_SYS_FMAN_FW_ADDR made common to support all boot sources. Signed-off-by: Pankit Garg Signed-off-by: Rajesh Bhagat --- include/configs/ls1046a_common.h | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/include/configs/ls1046a_common.h b/include/configs/ls1046a_common.h index b6ec5bdf66..6e36c9339b 100644 --- a/include/configs/ls1046a_common.h +++ b/include/configs/ls1046a_common.h @@ -169,6 +169,13 @@ #define CONFIG_SYS_FM_MURAM_SIZE 0x60000 #endif +#ifdef CONFIG_TFABOOT +#define CONFIG_SYS_FMAN_FW_ADDR 0x900000 +#define CONFIG_ENV_SPI_BUS 0 +#define CONFIG_ENV_SPI_CS 0 +#define CONFIG_ENV_SPI_MAX_HZ 1000000 +#define CONFIG_ENV_SPI_MODE 0x03 +#else #ifdef CONFIG_SD_BOOT /* * PBL SD boot image should stored at 0x1000(8 blocks), the size of the image is @@ -191,6 +198,7 @@ #define CONFIG_SYS_QE_FMAN_FW_IN_NOR #define CONFIG_SYS_FMAN_FW_ADDR 0x60900000 #endif +#endif #define CONFIG_SYS_QE_FMAN_FW_LENGTH 0x10000 #define CONFIG_SYS_FDT_PAD (0x3000 + CONFIG_SYS_QE_FMAN_FW_LENGTH) #endif From patchwork Wed Oct 3 10:44:24 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rajesh Bhagat X-Patchwork-Id: 978192 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; dmarc=fail (p=none dis=none) header.from=nxp.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=nxp.com header.i=@nxp.com header.b="OWzmDO/+"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 42QCk82Ns3z9s8J for ; Wed, 3 Oct 2018 21:01:04 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id EA994C220ED; Wed, 3 Oct 2018 10:52:11 +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=BAD_ENC_HEADER, 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 140CAC22043; Wed, 3 Oct 2018 10:47:10 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id B163AC22071; Wed, 3 Oct 2018 10:46:29 +0000 (UTC) Received: from EUR02-AM5-obe.outbound.protection.outlook.com (mail-eopbgr00062.outbound.protection.outlook.com [40.107.0.62]) by lists.denx.de (Postfix) with ESMTPS id D3C83C220BF for ; Wed, 3 Oct 2018 10:46:19 +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:X-MS-Exchange-SenderADCheck; bh=tRvCzhRKPl7XA79PVYxjR+qAYI/JtvVHbOi8dyRMTcI=; b=OWzmDO/+Im3zKBs2fKzin+fIimVpsefuPjVO4sqc5WkBtIq49qWn3xz1hpHwEfPusX/EcqSf2MsiBzuqMuC+8YrEVA4q/+z6op8tzEcfg3XFWQhuQd4IROigNqwIa7XwmTJOqjrqVc4AvL1+AtWBRvM18Zw+OpYnrvyWsy53vf0= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=rajesh.bhagat@nxp.com; Received: from phoenix7.ap.freescale.net (14.143.30.134) by AM0PR04MB4849.eurprd04.prod.outlook.com (2603:10a6:208:c4::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1185.24; Wed, 3 Oct 2018 10:46:16 +0000 From: Rajesh Bhagat To: u-boot@lists.denx.de Date: Wed, 3 Oct 2018 16:14:24 +0530 Message-Id: <20181003104459.5444-19-rajesh.bhagat@nxp.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181003104459.5444-1-rajesh.bhagat@nxp.com> References: <20181003104459.5444-1-rajesh.bhagat@nxp.com> MIME-Version: 1.0 X-Originating-IP: [14.143.30.134] X-ClientProxiedBy: TY2PR02CA0011.apcprd02.prod.outlook.com (2603:1096:404:56::23) To AM0PR04MB4849.eurprd04.prod.outlook.com (2603:10a6:208:c4::26) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 40e61269-d574-42a0-8e06-08d6291d73a6 X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989299)(4534185)(7168020)(4627221)(201703031133081)(201702281549075)(8990200)(5600074)(711020)(4618075)(2017052603328)(7153060)(7193020); SRVR:AM0PR04MB4849; X-Microsoft-Exchange-Diagnostics: 1; AM0PR04MB4849; 3:cej0DAoblyIRm+Ia11yDhezqABf0pG8l8IOt10khUv0fSC0RvNMTLFAuq6K8YxIjHIXDDOVlxN/ts6b7kJcAXTHBkLq9yU1R1z0k6O5vuJyJ0/Ov+RFTA2pSU9qNa0o3+pN4IehJExJJJkkXkNct2pfnjMiPiMl8riar7T/hyBBdOXLno2OnbunFjc1rjEqLej8P2MjO+dFQNaSiIRhQtNvSsRchgrs6vFbcozABU2U64q4ULIJ9NSC29llh6zJv; 25:p+DpqRaiUiYU+wR/+31+CfxVcccV58pPvkvVcKDEkzPFyCby6+lAPrAmBJWH9LhWaVrxB96ovqu5Pp8RfOsVhwe4jqTvsmJ1Wh5FwuBjv5IYsdD+DXQQpgUwfI43IJQzGQKZoBIf7zQCwJEXq4vmZgryeLzFXuEuExT5qMuSOoSYf+zXD9TbQtZTXQAWmVMRbnBLgM5pyjWNPeE4duflr5SZCMJNah/sbWSplY3N2LlD8LXrDZ9AsncvUHzSoe+2RUCfR0Q79VZKE+u3ePpBs8gcSS0u2C5smqJlKUjbNeIdSmkqgrvkSI9YOdLaFrJ32nckDb49nq7nhWZSK/AVzg==; 31:RB5RQh+xNiESPfH4Jm6QmMORnfISfWAqRy2Ug80g24LdwCMxnEaB/wCAy2gAL0dBBcRmWdzx18k850bDYxokFLgHKSSx4GQSbBncMyX60gIHeqtMoMjZsVsG7rgIvhNfxJ/ZrYyWACQsly2bsGNGANFG2yWCokEDEMigNvMPVEUqbz7I63oYYkK7XtcdZ30tkCqEqEwfpKc+INoSszL4VoTCRFJu8r0LRBHn7dKhcOM= X-MS-TrafficTypeDiagnostic: AM0PR04MB4849: X-Microsoft-Exchange-Diagnostics: 1; AM0PR04MB4849; 20:HypexFdGOFLHUbhrpq02TE4lKTCLoAiUMSml+nVHfmYA0VKk00hyWhDP4oBww6zaOZaP0m7V8HF6KN/WeYvSv33IK37zWZFXDbh0xJzGAZBsCu8UpSgkeNcrd7uj4kNqJ6Tsh1JrlsMSmwebZE00BnNEhD/FFGP1V1AQHpb9ozURGMBzQ8j4iKSQcJ8NebpmNuSj2bgLq5flsDsJZ8D9PJOYtwt3JCuj4SQTTf8Hrma7pJDYxU0VsSM/IzT9dlWr4c15+oCdXpHRY1ryfuT/bvzVJCnvaGqf3ofSvcoHTruvaPfrHoOqNv7VzLddpesbRvlHRtyNLlmIw80WWauCMhPlvH49qx+S9HkI6U/qW0lYZmxvHpr60t1zhmrty6yg7sQPfdzRVtZDY5pi8yHoLgfhr9YdvrKl7ovTigFbe3lvCCc8slbd6XarnUVxc/C9DaMCD7B/DhBxMyVADkn8Sz61iDaOdIqV6KKiuBwuT/POaRe/Oa6zsp1SC9EUA0dE; 4:J3eqs5byfmq66x/hOyMFHwBR6hQElUENfy9LP/KG5CFHeOjE8k/V+6GrDEKfQ3Oya2KrXa6R4XLSh7mCfTORErH6RsxrAyy2dRE4YXK0eza3p9OQvJeitLp96itL8Sg/mOMeGFAGRXg/Qp06MTmR9o6Ugk1MAi1cxsG/4+/DxdlMFEGJRuuobOcFClUeW5oJeeJM968pj/WUfvo4FyfRltUFznCRZxkgKnjmmeQBuHcJehe6F9EX55tBwOzSmt75Fe9vR9+ASuRMxjaF1BkSG1FJOKXN9e+eWNBMimGrqqPt195CiVMwjRzD8plg5LZw X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(185117386973197); X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(5005006)(8121501046)(3002001)(3231355)(944501410)(52105095)(10201501046)(93006095)(93001095)(6055026)(149066)(150057)(6041310)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123562045)(20161123564045)(20161123558120)(201708071742011)(7699051); SRVR:AM0PR04MB4849; BCL:0; PCL:0; RULEID:; SRVR:AM0PR04MB4849; X-Forefront-PRVS: 0814A2C7A3 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(346002)(376002)(366004)(136003)(39860400002)(396003)(189003)(199004)(66066001)(50226002)(97736004)(7736002)(50466002)(55236004)(6666003)(6506007)(386003)(16526019)(53936002)(26005)(68736007)(6486002)(186003)(47776003)(8936002)(8676002)(81156014)(476003)(81166006)(5009440100003)(4326008)(16586007)(36756003)(5660300001)(86362001)(2906002)(1076002)(2361001)(2351001)(478600001)(446003)(3846002)(6116002)(316002)(2616005)(44832011)(305945005)(76176011)(956004)(486006)(48376002)(105586002)(106356001)(51416003)(52116002)(25786009)(11346002)(6512007)(6916009)(110426005); DIR:OUT; SFP:1101; SCL:1; SRVR:AM0PR04MB4849; H:phoenix7.ap.freescale.net; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; Received-SPF: None (protection.outlook.com: nxp.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; AM0PR04MB4849; 23:2VYzHLKl7ObP7CYIQnt8/zMMF8iQ05vuKRSOt3pEW?= Lipe+38W4k3SKC+VzD8G5Xev7muLpe8lycJbjHCtmKtBH1iKgZFDpElbJ7OfOJjfb28LlhGnjPXtGzimA14UQVXrZGJwukmjjouZ8Uv7S3psv3l4CUtByAcetEhiqVwTgaCovmcZZzH5C9ytrppKAJbReGSpWq9jEM/9K5ab+jnfnKjtusvX3mbe4JE+Zimz97w+xNMsR5/OkODNug/91bdlwI5ECZw2otvq8kZ2XZwrGfILn/rO5yHaKSTvV0Kn2PT9KyMzVMGIzlaftW8b4c8SstzqRnoIDv6biCFK0axmKBG2nwKhMHe1HBYnLW9n7e45S58yLtLlHClDugW8Nz7mZnO8eyBhTiBFJgOQctvJcwFCYaeWB9oSOMgW501kC3PwWZjyBQTBISe5jvjZlUz4tnKl0bIKsBug8CUbOf2nOPbDmNjt8CUAGPvAmdjQFv4RwrbllATbiclFZxmZhYxBzTCetoToc6aEIDau4FcvJgrnp4cPe9fo4WwZtOL6tVbgPibcCHyAgE8h+D1lU2nHjuYO3s2J9D/KI5MW+MUkN8r62JSP/BS2HsMweCEvdTuVxNfFpX8o4ftBKS7UwWnSe14qEhq8bpiDNXB22BC0r0FHMIMeeHZQ6VtSBO3ULsFdr5zuzEC8qdf5Rd9eldqZtvAFy2OgwZi8pd4GmUhcf9eKmT/vw8DE2bg2lIIZzWyHQENfKVpb9+ZkJ1GLnmPFmax6drjPyFXTQHhyfZ9R1+pZfKJPZKPvHiqyHqcAjfj/+ffhegA0cBzU4UVy7P3TDCpX/r86CDdPwCXW5LkQj99BTn4lYBWmX5z2tjUAXWVK1Le2YLUctyiAv224W+7kxcF+LK8qFJhmDerruGIcIrdl8Sl8VdkVP3C1Pu3C7oN59nyYoLofMj2PGfX+lK10DHXmfBR11AMSQXqFbi70qm8tWSJx2pJ34QuyjSaBsqCBDkXAzKaRQ9UJjvmPIqTKiDDih68oW76FRgrW533t1fdzUbs7VxvOGngGAdkrciFQqKckc+6hNOMvY9snXhLxUs7LyTKSpelHLrWFBScOgwb02Sk3Pi56ew1IO6y8lH6e8KkM0rwt+wes8gWnVvGMHZdsPqtQCuIHGOeTjpEoThI3pAoqb1hZFEAEKsOkUF+a037wsOkQQe0SQKWKV4gIUdjBuuccMQ3BgeEpXjXA3AZMz/MZVH/lpxxd0jD1bAY00kzuIwcKMCv3aLg/QKkdhF9zpXqQnOdC1ZUI1o1UFhPZvxv23mEuuF3zJHOouY= X-Microsoft-Antispam-Message-Info: LVnnhj+CN1YIF/8xqgQW6wLwVQuTBaTLQm+OK5+v+BfrFDbKB3Uw+tKHSMHYXYQQFSqs06yh4t8q3wNjsRkfqXQX4qF9vvjanZVjNqjO7sSdSBteKCZH3O0rf0Y4cEjLTUY00gUS1lQphQ3/VqTb4BhrV4HkoGufnSMyd5AyctmLOxTVr8P8c0/kfKn42H9OqoOi5mbRBBhyRnJRVuKM6ECCi+Ns/K+6qx74KRLvxF9NfUb37q7soGtM1HDA5LMSZx7tLqAcWB4ZIVKpjwc7cLBTgbyb4q5mzz3UUmbWkzHHkpkjrg1DLjGGOwbr8KSy7dzdXprT49jYswswDCV+XnmRPg4ZPk9v7Dhwxy22Sk4= X-Microsoft-Exchange-Diagnostics: 1; AM0PR04MB4849; 6:hZVh6XK8BbiDpRUcxjIWmnPNHrFVamw5b8W9mPlVBbnsYZ0GWdWxinzQCf9+eQeZbaDCtmpbyC+yxqynYddCZEObeSlU7jBwXMglsAqkkvwH1RPXnj7SSVHnC9lHLZuEYqR2u8WpoSl4Fp+eZL0E1mNgbMkhcOWs8MDAAAuXCCT1wEqHT5va1Q05ofTrwFTWdbR6DHwLe1yrMhM71vAMqCxz34NTqvxs7l8U0AiN50kXUorAX+QXc5NkRJItsIx9FLIKCVmnganN7feqtyH5sKKZQ6rTZjk6orDf4bMSBSxikuV6kvYNP7FIAzyvWmisEiCNKm+6s7xjMkRg4ztkojVNTMqyswsknm1rOHL/15awoJX1XwMv0xotpzoYNA+HplLFfA2IUFXBG6D3lWzTwjRFgnsIUZgHtgl0IyIwmVxTSZfHKOHzJIMHUMIUy1hLRcd6OUnw0zcPcNhjDbH+ig==; 5:Lejeqmq4CUlQh1QNYtS3RqKtclEwKlRythLagHJbduCERnOVVXV/3QE3tqzH1bJYCAgZEbaLLlNd6vPhHFuyTmp0BP0x1LcrWxqxNWC++W9N7rlncg73iGcQgSt6FAIGJAsPH4Dcpf8tFy0aKiASa4k+3WqlzkBS3NlFQjsGEYY=; 7:U9ew/zQogpTvBURmtC9rSntXOHoOn/H8qiTUk4wo19ORgsSxRSrFXBkiTH8DUe1sWp/u4mKIejVmaAuqGYWfIYcyIvdSJm2tHcPujDYJljVRKIRvMtSuEpJO2sogRiCgLLlTXwC+L+Hyc6xcC1MMOMWLtN+7CNFeJAjvOdi3Ts83p1dw8IgEmWMVQ5j/gwkDqdyXVf0GrnpNtilYRQdByvhQ36gaRhuXIFmyl7qRRylzDeHINkiO5xZpoWeOO10K SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Oct 2018 10:46:16.4501 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 40e61269-d574-42a0-8e06-08d6291d73a6 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR04MB4849 Cc: Pankit Garg Subject: [U-Boot] [PATCH 18/53] armv8: ls1043a: make FMAN and QE address common 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" CONFIG_SYS_FMAN_FW_ADDR and CONFIG_SYS_QE_FW_ADDR made common to support all boot sources. Signed-off-by: Pankit Garg Signed-off-by: Rajesh Bhagat --- include/configs/ls1043a_common.h | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/include/configs/ls1043a_common.h b/include/configs/ls1043a_common.h index 80676487ae..e8b6657b83 100644 --- a/include/configs/ls1043a_common.h +++ b/include/configs/ls1043a_common.h @@ -190,6 +190,16 @@ #ifdef CONFIG_SYS_DPAA_FMAN #define CONFIG_SYS_FM_MURAM_SIZE 0x60000 +#ifdef CONFIG_TFABOOT +#define CONFIG_SYS_FMAN_FW_ADDR 0x900000 +#define CONFIG_SYS_QE_FW_ADDR 0x940000 + +#define CONFIG_ENV_SPI_BUS 0 +#define CONFIG_ENV_SPI_CS 0 +#define CONFIG_ENV_SPI_MAX_HZ 1000000 +#define CONFIG_ENV_SPI_MODE 0x03 + +#else #ifdef CONFIG_NAND_BOOT /* Store Fman ucode at offeset 0x900000(72 blocks). */ #define CONFIG_SYS_QE_FMAN_FW_IN_NAND @@ -216,6 +226,7 @@ #define CONFIG_SYS_FMAN_FW_ADDR 0x60900000 #define CONFIG_SYS_QE_FW_ADDR 0x60940000 #endif +#endif #define CONFIG_SYS_QE_FMAN_FW_LENGTH 0x10000 #define CONFIG_SYS_FDT_PAD (0x3000 + CONFIG_SYS_QE_FMAN_FW_LENGTH) #endif From patchwork Wed Oct 3 10:44:25 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rajesh Bhagat X-Patchwork-Id: 978176 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; dmarc=fail (p=none dis=none) header.from=nxp.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=nxp.com header.i=@nxp.com header.b="TAW3/zN3"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 42QCc447dSz9s8J for ; Wed, 3 Oct 2018 20:55:48 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 29EDEC220BF; Wed, 3 Oct 2018 10:53:17 +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=BAD_ENC_HEADER, 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 E90B6C220F9; Wed, 3 Oct 2018 10:48:01 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 0E4BDC22047; Wed, 3 Oct 2018 10:46:35 +0000 (UTC) Received: from EUR02-AM5-obe.outbound.protection.outlook.com (mail-eopbgr00044.outbound.protection.outlook.com [40.107.0.44]) by lists.denx.de (Postfix) with ESMTPS id 5F169C22102 for ; Wed, 3 Oct 2018 10:46:23 +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:X-MS-Exchange-SenderADCheck; bh=PXFYYWaPPjOEFW1kMwaAMkI5XKZtECjzSXoU+XYKtm0=; b=TAW3/zN3U9fSyMinsSJRS8Q6o7o+J/8CEMcDPKocstj7I8xIsXH+GQIPAit7uUfkxRM35BBQx7oiRkwIqGXF7ud3HCfroWcPgQ/qEccE62cOu/nBP+Gpl/ACoiqpFn8gLYH5mFGzDsD8+QRSZ3kmyGqAYcTkD0dZ7INYNdTVifE= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=rajesh.bhagat@nxp.com; Received: from phoenix7.ap.freescale.net (14.143.30.134) by AM0PR04MB4849.eurprd04.prod.outlook.com (2603:10a6:208:c4::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1185.24; Wed, 3 Oct 2018 10:46:19 +0000 From: Rajesh Bhagat To: u-boot@lists.denx.de Date: Wed, 3 Oct 2018 16:14:25 +0530 Message-Id: <20181003104459.5444-20-rajesh.bhagat@nxp.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181003104459.5444-1-rajesh.bhagat@nxp.com> References: <20181003104459.5444-1-rajesh.bhagat@nxp.com> MIME-Version: 1.0 X-Originating-IP: [14.143.30.134] X-ClientProxiedBy: TY2PR02CA0011.apcprd02.prod.outlook.com (2603:1096:404:56::23) To AM0PR04MB4849.eurprd04.prod.outlook.com (2603:10a6:208:c4::26) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 89b24af2-8d01-4070-ccb8-08d6291d75ac X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989299)(4534185)(7168020)(4627221)(201703031133081)(201702281549075)(8990200)(5600074)(711020)(4618075)(2017052603328)(7153060)(7193020); SRVR:AM0PR04MB4849; X-Microsoft-Exchange-Diagnostics: 1; AM0PR04MB4849; 3:JM5o4kylpcYp1DmWSLDWqMtvl7mewEPZXX7NOfizoFvOwjvBzHoTuGMLR0bWr+m8q9FKcHOYWO8J88+u2xzoWLOlkzZwR9a0t/PaNgxi0D7+NTnh7GSCiBnZTdNc9vA4JCYpGHmEl/Yr4uL3OKF9vnAOsA/cxi/wYUjue3zpkYykQw67R648Dhm+umFPmVsBb7F9XeeOZY5yyW5Tjr1NWoe/tYkn44lCwPItFliGjm63AGbXWoZyHdbQV1xJGfjj; 25:HNS1F0Lqv5h6gxhbNSNxiHV+Vz/fUZdd4f3EtaIgyGsf0P8cVQeBtPWvIhmZwuqPOhBtziouDq2tCl8PjVk0c4l+Ww836NWI1Y4waO1MTsBAP2u/4rJQzibntx3T2qn+cdph/6oC+gKs6fnpIJsyDifZAZ6zK20/DAxY3N4Wx8q4KuaZmVLABUxrx8XSTIYrMbUoVMYHqGPcuAW/Dr0Sb0+0GLeUzQxJU2huS4VvryfbncIBmrW6KcjZZdrMcIJbE7j0J8kbAyXjPOsuPil0wb/jcS7MbqQBz9Qz7KPAPBbLFuCiAHVqoBa+RAHoq2VtBmzcMr0EK8VOWvxsM+AQtw==; 31:bEIwkHsDINdWZ1aVJf+wvuxRXKkiD63roOVPdTzGTyT/G4nG4mwe/fIfJw3fKOrzn8CN2Y1Dz370KcrLvzgzbumygB87FRT05kgeXVkv2wiCzfK6vnRzh5x4JW5kR6Twsl4M1dWJGB7RvgVyLpirn+/aBZbzs+ESQQIDL1yHJwz08fyPUGYqxytvXQmPwZ/x6dp+H1fbCfjuFkIGZ/fkg8ZHaslKtIrQNieksPX4iMo= X-MS-TrafficTypeDiagnostic: AM0PR04MB4849: X-Microsoft-Exchange-Diagnostics: 1; AM0PR04MB4849; 20:lXIRu0O9rELOnnUPcvxo178xJLCi3MM91tWEcSlTh+hI0NnmpLUwzpHDdbIm79tPjbqT1nA45b7yzYDF4tQjQn40cvV1Ozj8hRviNqhpunmYD3m0FthqvkoSY/AUCvpOe1nTm4CjFyY+VTl9X4X/GBK/08jFTEeN6Xq45FSnnVM3DeBNoz1GFuWcUc/V4rQw/qzgRQpQh6zvX+S5MRQ5/j4T1V2H8uBNZALiZNDqSDOAFjV4KQwd4YswcwwwE2oIfQQWbg6Px+3bqbsEwi7kq3JmdQjufLaQAYe8tmrZf1HZRfOt5fR8RWF6o/dmMa8fntLzJ1hrf3XVS6K2QihvNJnVQmWPkzCiam0GPXfGCupee8hZ0ZOq4uspiwn3uBC+UCrO+1bzZLp1WZjx7M2kUnWL5eXj3tkfVOMgtIWQGumM2j/Dzwv3TG78O9/ojcn4rxrJ739KKID/KfB/TIuHtM8VNYhmhh2ft02HvV0T1xlq/NzxJJkbmmUnZu3zhgYL; 4:JE4h3MA60qSZ6F7rCwMP9nJJwR78qieRI7Ik6dFqR2A0DAC0BBXkcxYvbJMXmNppDKrKzvAgcoZKLtpOAt0P+jDJsj4eLpIYjmJS+PFOSB2u+EeUQaDsX9ekPKutul20zfzeWjCen4MidJ4a5ADqB4i5za19UYQkOM54eY2ENWLjrD8+L9bXJ6QMLaNNf8HjnGMAkEp+YJ7CDxIwsoDzpEF4Tj/NWCDCYTW+1t/TmmW5yunckO/2Cl8g0W5xzItY8jDrPk9zy2BXtKdujqaWbjtzuqUbuZgEf/LVCie4d9C5qE/crPbBse9nEwqPC4C5 X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(185117386973197); X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(5005006)(8121501046)(3002001)(3231355)(944501410)(52105095)(10201501046)(93006095)(93001095)(6055026)(149066)(150057)(6041310)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123562045)(20161123564045)(20161123558120)(201708071742011)(7699051); SRVR:AM0PR04MB4849; BCL:0; PCL:0; RULEID:; SRVR:AM0PR04MB4849; X-Forefront-PRVS: 0814A2C7A3 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(346002)(376002)(366004)(136003)(39860400002)(396003)(189003)(199004)(66066001)(50226002)(97736004)(7736002)(50466002)(55236004)(6666003)(6506007)(386003)(16526019)(53936002)(26005)(68736007)(6486002)(186003)(47776003)(8936002)(8676002)(81156014)(476003)(81166006)(5009440100003)(4326008)(16586007)(36756003)(5660300001)(86362001)(2906002)(1076002)(2361001)(2351001)(478600001)(446003)(3846002)(6116002)(316002)(2616005)(44832011)(305945005)(76176011)(956004)(486006)(48376002)(105586002)(106356001)(51416003)(52116002)(25786009)(11346002)(6512007)(6916009)(110426005); DIR:OUT; SFP:1101; SCL:1; SRVR:AM0PR04MB4849; H:phoenix7.ap.freescale.net; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; Received-SPF: None (protection.outlook.com: nxp.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; AM0PR04MB4849; 23:qUqzAXh3qVGgnX8ppeCIN6srRNRPR+AzyE7Rqf13m?= OMWeCDJdRn20GsdnxemA5iUEijYxHxH3o21j5MlgxgViJwkTDvOBIWbp4Ig4XzWBWPALIg+qTl/eGhQqb1+hCax1NCVxZ8jeXONAKh+S1yOzPX7mssmj1hfa+EHe2ZZcHcmboQPPfEgDOxYYTwFEg6gJN2pJwj0JpbsN7Dn7n4Z5Dzdy8PTvAngDrrnIivwt7zA/Gqm7mlSw3BD1OlK3Yi1X+8gj0eviK+kmPfoFhUzpRuU6dCfNc4YJQC2RDr5MHO4qVthU/p1GEFRDc1KzPiyqlJa0aN+LOMFu8VUen/9QdQWaONP84K1KpkZ4WfL59kbsCQZpgPF07Ja+h+OJNI0RK67vWdw8o7FAb3WMBDgx8Ic9/yoYWnBEB4n0KaXqkDWpoQlU1DAOnErv0fYY6Fx03MmsZhUoShxjX9JMN4NmGRonweYYAtPA0wdd6Lymae46TAFmE7zIIX0BxnZmKWB81CyWH9PPCsiNHSaqO9SlxGrH76LwNFJmv2CZmenW2RZFnsiYSjbJPywf0MTDiWf8kekhifBi/aRLs/J7Sa/MTh4FilnHvquH3ez00rIB3SKSahjVDJwRHOTQj1UtgZCeQpEqBCWon5R8HneXt89X7UkJO4JmCGgK19vQ/s/dNjM1MS91feH326ckDezpLNdX+Q0E0t45rSjeWroTuIi4rZz1D123S1V1BGq/J1+1vPHO2AjkOdcvERr1Hk5ePewHnuZPwznUvV3TVGJe6pIGyeNIOxTjiwHV7EY6rdO8ytBaxchGzlKiyauwi8oIMQy+04XwS7QaGizdcK9/8jW8fftV6R+ZdERAJisnJKW+Nh+kb+9NF2SiF4Zlbhu+MmY+NdOCM/l0u2WCva/msHamsH9eRo6Xol7i16p5l1xOnDJ2GzzlnxKmXnjZCBOhWTnGH55o/ZcYTLf25juFB/nXns0TnfkXpknZSL+cqcyBjAMJD2UQvvUnaqzG1lWaflER676L0NSnEM6l4Prf86gjWhVd5GEITJFXEutIESeLP35swbafjuAKkQz5MIgsyxyi0MfObHP27WL0MPzFmHfVgQoG84Ta87DICfLZIhKZY9HK23BMCXmulvc3wHy3ujLR/yLQgCo3aSKHBQGPswp/jYjhuOyx7z7efm2mVWINRAkZ7V8UacBmMh4CLixl9UlwhH7/YSPEZup3NCTB8wCrJALukZdYLNlHUZfeJx7zJhwA/Q7pe4gD9J9XaHOluRNlbNZWMTPX/wE4M17R4HWraaHoMaVp3RQXArpEcfxk0E= X-Microsoft-Antispam-Message-Info: SJ4A9kBfdzgipv6ub8vQtlFVFCB+OaMHVQM13iTJKebZthZnaaEHYGhCr796RLHRFlmORKZNMKozccWtc3N0rkqXck6Bi1nLrycVL2U+P0PyB+XnXe+hv43ugkuzy+3jF8LClbZ3DN1IWvdvoS5IJ1TCwQCAeCiT99ei0WZ8VIVwfDQl28RR8m1sOesMOHKAn4qlJC0FDDELyb1lbMNQ1zNpDbaQGrL+JioR0sMJsK7aVxn5LRDyb4WS0hnO2Y99QU9ZP2u0l4TTfFWfWani2dKfAZee5Yb1bWmB5y/Z5TP9LWg5qml7VGE4u2i+uSkpFJQ3Y3eryU2H0i0kNQTK+eWlkbjkw/v8mM9gpMtlDu4= X-Microsoft-Exchange-Diagnostics: 1; AM0PR04MB4849; 6:DV10lB/P+cFMUYyTMvn5tZXEX1FFr5urSRJdvq5d+vykCA25Hdv3rAJAfeTuleN8qeqC+PkG/vNFFIeguNSuTY4FcbHUQWHZ4O24qOhAg3fvd9SsXGb2lEpF74SiAd+MjlwH7S8xMEOwHU3khxggJ+zzVyUnTxx8Xa4yFcXNlcHPwB3HDQAj3zcJaSYZ4uPx02nXQ5b/A3a+gEU+xFPL4EV/PZ6AK6wwWGrhwBhsGTciwMqj8R18jrDmmtZwbxW6VfoUDhvYYr1rcoGZtCHfGXD+gmrxbRcmaN4lsRALDHX3rL1pvLLuWAFcwEnDYBuAcXISO+63ACmqiT9QEeXSeiZlMFPEXYsjZOXj/qWELa1mWZ7djiMk/GxsJv9JxOfxPNjTs1/cQH9/tM3V1uvV6L0dHCm95x9f8y8DI6mgwnhCClL69b7C4o0YRbtR/ebWbACjd7IB6XQJtiouXEmNig==; 5:ks/Pulr6CuMavlYdlkImiP3oaBXoUQQk/c01HYaxBRJyfVvy0hFjLteeYEa8Evu2IlAf2mZReY+C6AB3xPt7kVGeU0ENseTfnpFIWRdCTGNQ3y1bW7GeP4r30YYxo/uwxvGEJzO8iun/RbXy9WzJnFFlhDJZB5fH9PUHM7qsY0c=; 7:r75FZWFbg1xMPeVjfcjbVVIB6wkf+tnOQJniHnaK/o2daSMqQflfAfs1bWB3oHos/ZkEChQr48QZGVCD8WVT9cVggCEV/O9LWTpbb77M0t5wl8OubGjD4GucLoNDuuRIuyPotcsqL3j9hSw6AkHSIyZIJerZhHnwxYTno9+N9195lBxsmbuY1ukK/TOaBJrWuxzabOsEywNghUhhphGDEx2xeh8GYY6vCURk2auYMogiZ5KVslmWnRk5nCkGkA/3 SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Oct 2018 10:46:19.8434 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 89b24af2-8d01-4070-ccb8-08d6291d75ac X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR04MB4849 Cc: Pankit Garg Subject: [U-Boot] [PATCH 19/53] armv8: fsl-layerscape: bootcmd identification for TFABOOT. 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: Pankit Garg Adds bootcmd identificaton on basis on boot source, valid in TFABOOT configuration. Signed-off-by: Rajesh Bhagat Signed-off-by: Pankit Garg --- arch/arm/cpu/armv8/fsl-layerscape/soc.c | 69 +++++++++++++++++++++++++ 1 file changed, 69 insertions(+) diff --git a/arch/arm/cpu/armv8/fsl-layerscape/soc.c b/arch/arm/cpu/armv8/fsl-layerscape/soc.c index 3f15cb08ff..1e701c58df 100644 --- a/arch/arm/cpu/armv8/fsl-layerscape/soc.c +++ b/arch/arm/cpu/armv8/fsl-layerscape/soc.c @@ -679,12 +679,81 @@ int qspi_ahb_init(void) } #endif +#ifdef CONFIG_TFABOOT +#define MAX_BOOTCMD_SIZE 256 + +int fsl_setenv_bootcmd(void) +{ + int ret; + enum boot_src src = get_boot_src(); + char bootcmd_str[MAX_BOOTCMD_SIZE]; + + switch (src) { +#ifdef IFC_NOR_BOOTCOMMAND + case BOOT_SOURCE_IFC_NOR: + sprintf(bootcmd_str, IFC_NOR_BOOTCOMMAND); + break; +#endif +#ifdef QSPI_NOR_BOOTCOMMAND + case BOOT_SOURCE_QSPI_NOR: + sprintf(bootcmd_str, QSPI_NOR_BOOTCOMMAND); + break; +#endif +#ifdef XSPI_NOR_BOOTCOMMAND + case BOOT_SOURCE_XSPI_NOR: + sprintf(bootcmd_str, XSPI_NOR_BOOTCOMMAND); + break; +#endif +#ifdef IFC_NAND_BOOTCOMMAND + case BOOT_SOURCE_IFC_NAND: + sprintf(bootcmd_str, IFC_NAND_BOOTCOMMAND); + break; +#endif +#ifdef QSPI_NAND_BOOTCOMMAND + case BOOT_SOURCE_QSPI_NAND: + sprintf(bootcmd_str, QSPI_NAND_BOOTCOMMAND); + break; +#endif +#ifdef XSPI_NAND_BOOTCOMMAND + case BOOT_SOURCE_XSPI_NAND: + sprintf(bootcmd_str, XSPI_NAND_BOOTCOMMAND); + break; +#endif +#ifdef SD_BOOTCOMMAND + case BOOT_SOURCE_SD_MMC: + sprintf(bootcmd_str, SD_BOOTCOMMAND); + break; +#endif +#ifdef SD2_BOOTCOMMAND + case BOOT_SOURCE_SD_MMC2: + sprintf(bootcmd_str, SD2_BOOTCOMMAND); + break; +#endif + default: +#ifdef QSPI_NOR_BOOTCOMMAND + sprintf(bootcmd_str, QSPI_NOR_BOOTCOMMAND); +#endif + break; + } + + ret = env_set("bootcmd", bootcmd_str); + if (ret) { + printf("Failed to set bootcmd: ret = %d\n", ret); + return ret; + } + return 0; +} +#endif + #ifdef CONFIG_BOARD_LATE_INIT int board_late_init(void) { #ifdef CONFIG_CHAIN_OF_TRUST fsl_setenv_chain_of_trust(); #endif +#ifdef CONFIG_TFABOOT + fsl_setenv_bootcmd(); +#endif #ifdef CONFIG_QSPI_AHB_INIT qspi_ahb_init(); #endif From patchwork Wed Oct 3 10:44:26 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rajesh Bhagat X-Patchwork-Id: 978195 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; dmarc=fail (p=none dis=none) header.from=nxp.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=nxp.com header.i=@nxp.com header.b="h6Zc5ZoW"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 42QCmw5qCGz9s9m for ; Wed, 3 Oct 2018 21:03:28 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 869A8C2206E; Wed, 3 Oct 2018 10:53:01 +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=BAD_ENC_HEADER, 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 DD255C2203D; Wed, 3 Oct 2018 10:47:44 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id A1977C2208D; Wed, 3 Oct 2018 10:46:37 +0000 (UTC) Received: from EUR02-AM5-obe.outbound.protection.outlook.com (mail-eopbgr00044.outbound.protection.outlook.com [40.107.0.44]) by lists.denx.de (Postfix) with ESMTPS id D38FFC220FF for ; Wed, 3 Oct 2018 10:46:26 +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:X-MS-Exchange-SenderADCheck; bh=SIq0DRvIDmZGrbljdQSYeONt5h3tnS+svWhdwsP9Tv8=; b=h6Zc5ZoW1b7tf735NXbT30kGcL3MFoVlqIwgmxpcxFpgW1WOq0vIzKUKBljxoP5/MY/qiBLyh0xhFc073VZ1KD4q0rMCnS7IGcdCipa88Wte+fYv+lrdclhJtYhm4Zj+BZ236Gq0fcP8BW4Bj/YvXsTOojag4UfndwwAOJf3nF0= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=rajesh.bhagat@nxp.com; Received: from phoenix7.ap.freescale.net (14.143.30.134) by AM0PR04MB4849.eurprd04.prod.outlook.com (2603:10a6:208:c4::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1185.24; Wed, 3 Oct 2018 10:46:23 +0000 From: Rajesh Bhagat To: u-boot@lists.denx.de Date: Wed, 3 Oct 2018 16:14:26 +0530 Message-Id: <20181003104459.5444-21-rajesh.bhagat@nxp.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181003104459.5444-1-rajesh.bhagat@nxp.com> References: <20181003104459.5444-1-rajesh.bhagat@nxp.com> MIME-Version: 1.0 X-Originating-IP: [14.143.30.134] X-ClientProxiedBy: TY2PR02CA0011.apcprd02.prod.outlook.com (2603:1096:404:56::23) To AM0PR04MB4849.eurprd04.prod.outlook.com (2603:10a6:208:c4::26) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 29247ed1-e102-492e-429e-08d6291d77bf X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989299)(4534185)(7168020)(4627221)(201703031133081)(201702281549075)(8990200)(5600074)(711020)(4618075)(2017052603328)(7153060)(7193020); SRVR:AM0PR04MB4849; X-Microsoft-Exchange-Diagnostics: 1; AM0PR04MB4849; 3:8+tqpksRvH8vVaozI4oh4oggNiGIrh55cjnpKGkazGypGecKDpg5AQUnPzZ1HAPYvr/+7QQXQkYspHXO3t8dgAIHSf1z71NoHRLRqpjPrXfe7ZVNCObFnbSwIBGBIgH4zISufJZX9YWOT4U90RnFCE/uaFcqZv4ZatB3sQ7+0ePzkmHmXrEQhwP68UqOk/Xzyd1pIcLZTNBouiLlNcjr4vNkLpvutkyOwHqiQluOBcHklub84tf9mciYLybNeTvP; 25:x8IZQAGZ2YrjcURQ00Xi0iX6OAwHI3qChD2G2XQnnYiKcMOJXVgtD4vuMVzZCShHl72gnGlQ2RYBVQp7Gb79AvBGC1FTuue1pEWyASFlhHXa1zqmVUTeDOPjDg3cRzAKMY/qJBBjqpVrxHK7xU0Kyl4HcaOpvmMgDcgCt497fbo961gBggktD7I+OXvs8rPLdaLaX9aedE5CC7I+lyJpLCXiDVxCpZSiumIvSMw3CoMu67C4033q7GoVEMhVQ9MyYSky2SoGHzdFc7YEqEltJ2b1O9aNkRQvbK9vVMAqTE8gTIqBPHanZaU/frerZlU5CPzShlx3dh6VYZpSfhZEQA==; 31:ZKj5BV79H/dROU1rtaKhll/mvT2rqj7FFb741cCEp2+UaSXrPZa1fKLQYpkoSedA+tlssRCBCrtz/7XBNOfOqn4w5UGrq0MjNny4r7iS9IuREhDutQbMrKrpAs4U4qkayhSzLhxkmH7lRiqp4y1zzjd0MQ10tIxyGeoOrtSbb5S4pfIH//v+pg7Ch1AiwKiGBkmZ7v+tC0Twx8ZExxk+N0F7wbUtUONcG1YYW1cKINg= X-MS-TrafficTypeDiagnostic: AM0PR04MB4849: X-Microsoft-Exchange-Diagnostics: 1; AM0PR04MB4849; 20:Lzb6zIfkud8AwLEHUqe+YG9XkgiMwYye0FHtUSK1OyIIwGfs/CBHxy96/M+Mv81dmzXE4/s0QFBy1iFHTm+xyflJDtD2A+Mvhhe/uexDUKcFpu5ozm6eOrvjnACLqmyGC+Seu6p6laQulBwKhtHwcoSIpHspTmTX6roqlbgngJLffSX9nEIZG+2sg3ExdWNVquNgNcfPDliCDKXI5Tg6RBe5feTfcAwmHVlemrOdWquntuJGT28iHaRg8dm8ZLccGM6SJKM9iavdEX0SbDJvISsXx8C9fnM6/YeFJY3QysTalyFaOrE9qky6GpTV5pNnFUVOJiMXG/a2CMluWXAAtIIRF7p+DBqkD/MVOtbgYlWZ0Ef7ldM1I9edw9wWUAtWIvzAoYcBFowJFyoNqzvHAtR6vek9/GV7gagef/6u0VJWwMrQkcIcG2FZrctu+hKsiCtktf9b20aq/UiqIUdvYrxzHIEqfI8Q4/o3UEPVSqlhpTOH/XNx6Z7vbKel9m3N; 4:dPVzuLOjpWSkCcNS55gChlBI4FFE/yDCl+ggObDy6oCoPEp/u+y0U7ctVxiZZDSSvu81/amuLoj0KfGFFp9KMHAU2tfaKU073FPdrVmtr2/VrM7Os5BqlOeFFeu0elVZTmKuff0zbATRMHA+XAWbXq+rLxCjkPR1fsM9cDr+RDbKClU1rpWFe6shHIgouiyfzGulXMIbj0YdMVEwhFbnpNkGYfjwrRHZAelJMs6LOAD4Rl4YFkkWGE2qsq+gQUQpkmVUVYr9fAyLt0XE7Vwv75K+i+dAiUrxYS2R9Rp3ME3suMC9IWW3fjHl5/ICpoFk X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(185117386973197); X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(5005006)(8121501046)(3002001)(3231355)(944501410)(52105095)(10201501046)(93006095)(93001095)(6055026)(149066)(150057)(6041310)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123562045)(20161123564045)(20161123558120)(201708071742011)(7699051); SRVR:AM0PR04MB4849; BCL:0; PCL:0; RULEID:; SRVR:AM0PR04MB4849; X-Forefront-PRVS: 0814A2C7A3 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(346002)(376002)(366004)(136003)(39860400002)(396003)(189003)(199004)(66066001)(50226002)(97736004)(7736002)(50466002)(55236004)(6506007)(386003)(16526019)(53936002)(26005)(68736007)(6486002)(186003)(47776003)(8936002)(8676002)(81156014)(476003)(81166006)(5009440100003)(4326008)(16586007)(36756003)(5660300001)(86362001)(575784001)(2906002)(1076002)(2361001)(2351001)(478600001)(446003)(3846002)(6116002)(316002)(2616005)(44832011)(305945005)(76176011)(956004)(486006)(48376002)(105586002)(106356001)(51416003)(52116002)(25786009)(11346002)(6512007)(6916009)(110426005); DIR:OUT; SFP:1101; SCL:1; SRVR:AM0PR04MB4849; H:phoenix7.ap.freescale.net; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; Received-SPF: None (protection.outlook.com: nxp.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; AM0PR04MB4849; 23:vo5lqm1BIumS6Vw+LsxgeFd2BTh7S5uAbwWq2wjcV?= SgeC9fYItvLfHCezXOzqSSik+X4g+iQ8pPtYk8Apfk/2LTfP29hy0Ajjf52AM9J3rh1HxUL3JSCW3YSEH89L+N+vjb/F43Et+mlJh/OI3m7F2RpkhoSwbZziUzG/DlNh9xFb1ZdxhL65rJ0D59Spe1w9mooo3xa9hqzbeqHgYKR7Inj4q4OjgLRfuYgS2/6rTReUJt83g14lENICf9dVJ9ultvhDoygTaA8Kz3TTihbHnFwjQ7QzqWHy/6y3K9VN6z7Rk6mOvHgT99nuvI7+zLEjQuWFGNPpWqrv9DYnXnBJK+YmwTUj+hKlx4OgIb10ITJDLwdci6rjJsrle1X2a8KdRvhwanFDTZzG2CXfDF9jn6hiEGLTrPiJBZaHwgZfiLsEJXwJdRnqVYRe1ldd1xJ8WsTxXVtc4THFRTXD4jINA3IISJxkTx5GW6UFChK3ntjHkK5+8ihPXo4t3S/Pq8yAU8rMSysT5EQ8NLbkaTvIV6NAJCAMA0fri5FLYNZ6fa9i+sE7fS0VSldHyqtc6N9Gt0gbMgekXIAft+zOvb1MG8sM3TvnzNWv6yRFynKPvj3qTO1vzEJWtNJaUutmqOFPp1mDTntpeTJ+ttvkKAXln1S59lECYD2EH2Y5liMgI7W6KJHbp5Dv0ZGrDRZMqTrbzH8dO9o7zoV9Ri+6Np1fID6Pe1NlgMVtTNwxHd3SVwnDHBfKiAq0Q0EEBvFiyigY8f5HW5LbK5rNxXZoVlXSp6+2lK79PDVrtWLlqWlu+ZHuxWpZ4rNetaMtKTZ96bD/IhNV3HUN298bweplM8I4FYUT6V5ghZhTPFy+xu1qJf2M5wsU4Sbx6jI9fzPQR4MuJUJBmu4APLLAFwstlZIe6GDvqDt0XRBEv3Te6urnqftmbMH+wJf3D/SrOtE68imczLGfaFWWZL+V+a1poJbCX/2QqvJTZ/x+2h+D11opmvE1gK9j80X/jxqqt+LawCt2jSOmpu8+GAqiPeWeOPe68M6IaSkekBFECmthVR/xTcCpj67AcvHYXbj5Qd5QFuVVGc6jJ1l9LHDAYHXFFrf3b7s4UWEKc8azPWELh6nDJ9W0UXXavQ+TRUhMyglLc9tVGKvGINy6XKmDXRU0rFaur1RkbbXNnj25zk2EdNm+A3IaMgkSddLoo38af9fwTyLNJSv6/SprOogNXoab/iW1lqyHNFeAEb8bjyeRgQf/7FLzQWdEqEFsFSBjLrd2dFQmBeew8pClGRfZMFwAtXMUEzBle6FTehmI9miMlAsFF7Cjzizz+t3jufRc1cF3Nxz X-Microsoft-Antispam-Message-Info: dbl7nxOPfUJKzLwOfiG0pUnUoHoR8K0qD5XELIOsgXeAtJ9nou9lN9Cv+2EMZM8WiwbVF2RQnFJIiSk9YexMaZLX3R55IwMpNnvpItb96mboIZq5H3sUwUE6Wr28n983pK1pLUgm04JiZy5x3Q6ARsE8dc4r2Of0W/RgdWWbXo2J1A9ueh/QiEbHlaScguzBjGzszjOYtgiATm5l9Zr+yJs8NTgeT1M2V6HS8Hvy8/GtB7AjTHmcQkMl2oYA71YVNppo/RkSCch4rA49VsIHIhPA5C/V7Zjlt2gcSihhu1zhHsBGp5LV9x4kWY+usFeiMLIUAa9IT5gNGeNf9Mbf3RTlIAQXlDPWjnCHST3EyMw= X-Microsoft-Exchange-Diagnostics: 1; AM0PR04MB4849; 6:wLl0AJNxlkHz7xq1K4OGdO5eCVOpyzD9SgZPaN5Eyp9bApqqr660zQbUcY3HHucPLZQsuoMv7B1BEgmv6R4F/WFjVaOu2FdtQmP4g9MDkUBoeWXTW7xPgHGxIYX13xjT+EDoCfAzzRcc6arW5rFSWZ8xQ384XqPXkvIU2fiAgRtFNjzQNbUTR+Ql9t+ERDiaujIXq4x4glfGshPE06E8K6T0fWTLnpDss0QIQm7MhfzDdY5vuLbP5DHg3yjd/uFwk56uioWACBW0tR9ttpJ9aX6aPYlpHpUpkhSKgkb78Q8NIGySDvSVZNlmpjrObP5BIDeDZVVTiIClQRZrCqfT+4VW1GGTU9x6i2SBLI+8rQKEUq1Efjc4qYMM6nnE/7jFac3WJgHfsUFXCQA0aYIlJGmLEv6ZYLCCDE/K+K+GcFqOEujBZNCfUyD61dcHyDiyIWZEloZhnF/Azxod/+zNrg==; 5:3wuI9HrI3HjNldGgXGO1Zr8y+yJZVORf3ofEVAU+Zd89qiDx2zY/uJXWiuYVIgqJoQVY5AV/k5fTlcawyWp81+qPnUbTrMDU15DZ+VebggU4lqJsZuZJFBQWjJ28vZTQ3Zi+IBEM+1mtlXfk240Py5uYalAser62Xpt/TUm6IHw=; 7:7ZzolwCUuxQIw8v4wTvbvUereBwaDpbJltboNo3GhJB60E9cb4QdRY3f9TTxgTlv/9B1xtyqyVl0QRVkFLlv3nE1hMDsvBqJzoxczZL7S4/9ajnonT7aO1y7LXXiKL3J/KBoJJqbGgheayIug/LMEy3sEodnGn2zMwQfJge/mljuOTSZ7MR1qbHinLMIMUIDaFXHexX0h5BCUvqzCcHH1LL38QZwa1WSy+UZlXWn9tqs0AfKPTf1geolh7xqSnTE SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Oct 2018 10:46:23.3239 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 29247ed1-e102-492e-429e-08d6291d77bf X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR04MB4849 Cc: Pankit Garg Subject: [U-Boot] [PATCH 20/53] armv8: ls1046a: define BOOTCOMMAND for TFABOOT 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" Defines BOOTCOMMAND for TFABOOT configuration for supported boot sources. Signed-off-by: Pankit Garg Signed-off-by: Rajesh Bhagat --- include/configs/ls1046aqds.h | 9 +++++++++ include/configs/ls1046ardb.h | 7 +++++++ 2 files changed, 16 insertions(+) diff --git a/include/configs/ls1046aqds.h b/include/configs/ls1046aqds.h index 765a21e00f..2a30cef0e4 100644 --- a/include/configs/ls1046aqds.h +++ b/include/configs/ls1046aqds.h @@ -432,6 +432,14 @@ unsigned long get_board_ddr_clk(void); #define CONFIG_CMDLINE_TAG #undef CONFIG_BOOTCOMMAND +#ifdef CONFIG_TFABOOT +#define QSPI_NOR_BOOTCOMMAND "sf probe && sf read $kernel_load " \ + "e0000 f00000 && bootm $kernel_load" +#define IFC_NOR_BOOTCOMMAND "cp.b $kernel_start $kernel_load " \ + "$kernel_size && bootm $kernel_load" +#define SD_BOOTCOMMAND "mmc info; mmc read $kernel_load" \ + "$kernel_addr_sd $kernel_size_sd && bootm $kernel_load" +#else #if defined(CONFIG_QSPI_BOOT) || defined(CONFIG_SD_BOOT_QSPI) #define CONFIG_BOOTCOMMAND "sf probe && sf read $kernel_load " \ "e0000 f00000 && bootm $kernel_load" @@ -439,6 +447,7 @@ unsigned long get_board_ddr_clk(void); #define CONFIG_BOOTCOMMAND "cp.b $kernel_start $kernel_load " \ "$kernel_size && bootm $kernel_load" #endif +#endif #include diff --git a/include/configs/ls1046ardb.h b/include/configs/ls1046ardb.h index b8d9419b48..cc1f5f5f55 100644 --- a/include/configs/ls1046ardb.h +++ b/include/configs/ls1046ardb.h @@ -216,6 +216,12 @@ #ifndef SPL_NO_MISC #undef CONFIG_BOOTCOMMAND +#ifdef CONFIG_TFABOOT +#define QSPI_NOR_BOOTCOMMAND "run distro_bootcmd; run qspi_bootcmd; " \ + "env exists secureboot && esbc_halt;;" +#define SD_BOOTCOMMAND "run distro_bootcmd;run sd_bootcmd; " \ + "env exists secureboot && esbc_halt;" +#else #if defined(CONFIG_QSPI_BOOT) #define CONFIG_BOOTCOMMAND "run distro_bootcmd; run qspi_bootcmd; " \ "env exists secureboot && esbc_halt;;" @@ -224,6 +230,7 @@ "env exists secureboot && esbc_halt;" #endif #endif +#endif #include From patchwork Wed Oct 3 10:44:27 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rajesh Bhagat X-Patchwork-Id: 978183 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; dmarc=fail (p=none dis=none) header.from=nxp.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=nxp.com header.i=@nxp.com header.b="VEFToyEw"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 42QCg50lkBz9s8J for ; Wed, 3 Oct 2018 20:58:25 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id BDA4BC21C6A; Wed, 3 Oct 2018 10:54:17 +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=BAD_ENC_HEADER, 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 8F001C22130; Wed, 3 Oct 2018 10:48:12 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 049D3C220FC; Wed, 3 Oct 2018 10:46:38 +0000 (UTC) Received: from EUR02-AM5-obe.outbound.protection.outlook.com (mail-eopbgr00087.outbound.protection.outlook.com [40.107.0.87]) by lists.denx.de (Postfix) with ESMTPS id 3E519C2210B for ; Wed, 3 Oct 2018 10:46:30 +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:X-MS-Exchange-SenderADCheck; bh=xuYBniUB5peZ/BsDBPrmC8u+D/YkyQUOAlCC78cF0LM=; b=VEFToyEwttz3auz6/TZFw2CywV+XlWN7Ezzm1Jd/U1n5N///c9mDxmhPnmalteejT6fsiA8KMpWkKUX/JkwYEDtPxewmuQWvEOtzsbFWCjKZS5V9EbgJoZy4NYOjb4gYYPN8a5do+3g5+OIgnh9EwMadB0SPDEWt2IIilGK9CGQ= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=rajesh.bhagat@nxp.com; Received: from phoenix7.ap.freescale.net (14.143.30.134) by AM0PR04MB4849.eurprd04.prod.outlook.com (2603:10a6:208:c4::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1185.24; Wed, 3 Oct 2018 10:46:26 +0000 From: Rajesh Bhagat To: u-boot@lists.denx.de Date: Wed, 3 Oct 2018 16:14:27 +0530 Message-Id: <20181003104459.5444-22-rajesh.bhagat@nxp.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181003104459.5444-1-rajesh.bhagat@nxp.com> References: <20181003104459.5444-1-rajesh.bhagat@nxp.com> MIME-Version: 1.0 X-Originating-IP: [14.143.30.134] X-ClientProxiedBy: TY2PR02CA0011.apcprd02.prod.outlook.com (2603:1096:404:56::23) To AM0PR04MB4849.eurprd04.prod.outlook.com (2603:10a6:208:c4::26) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 8c6f6442-ab46-4059-a6ed-08d6291d79d0 X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989299)(4534185)(7168020)(4627221)(201703031133081)(201702281549075)(8990200)(5600074)(711020)(4618075)(2017052603328)(7153060)(7193020); SRVR:AM0PR04MB4849; X-Microsoft-Exchange-Diagnostics: 1; AM0PR04MB4849; 3:SIllCcBzulpV7uCA0FJ/Y4rr1uZ7Avbk6xeA8u7qVsvyFSPZdAhAYLgCDjFqPRtH4wqK2ugCvKEiDxU97i+oK17jz8PjWSo1+eqb987C1cDxBi5Jmzh9SCQbEgn/+9p/4c12xg0z+JRm1i6jEqVJ5AnSIFydJPK0zbOKJlPO4+kN7FcHOWr0zwkDp1emnATRRXl1i2PYNlqSWWV2u5VBBcl7PEnSNJ/KN8Ets8r7CfagCGL8E4bRL34H+0FKO5P8; 25:agkLPhLRlEQW80ee6hBJJCSHjT6Px3Eag2F5me5PPI3FS2AaxQd168bx1PfINUWKSlTSYZT9G+7oNEBQeb33e6BlJQLqOlkBuk06MxfNzlaKSef+CzruLj1/ECXyHVnY3nVClVSz83T1kGVCnJQER3lZCZ1TQkEC552+eXtSEjEQrrBKBMSpsYgryZV6XzLs8ulj4aUj0CPQlIx2GFjE1LrzflzhCbH+km1TFE8YcAbFdytCO7QeQrll35ZRc93LSRLY9Appevjwelj3/dtDEZhdZsg2AfnaWCX2xw2jczg6A43e+v0ErbuW+Wxf6CPiZI0w3GdplJsNleSGpd/xyg==; 31:NQ3/ZI3n5vFSa+IBocbxDLCZucFXWlOkVwphIiWf1Vh5Dz117h73/TCp/Fn5HdSehzhFos0mTOmOcfUcChZFBawmZqq74ClffuiIH21G4IcpcX4loQS/a9Xj5UrqaHUho9sPBQJF/dwrZq58AhvH8UePH2G1AJyZ3hVfslsksWQOtBfZWH2pS4Qle5gOP7YclvsLAWDKRftt5XUJGrDW2PabWLhjW43/uMacDUhxzqU= X-MS-TrafficTypeDiagnostic: AM0PR04MB4849: X-Microsoft-Exchange-Diagnostics: 1; AM0PR04MB4849; 20:og8oTYRWSAMxQa4xnUtHwZp9r4ol7YFqNxz/znIUwkXu47+LrGsk7qIWdeBfIK1+gtlEdZvNFIoiQhg+f+jol9ZqlviYjPU0AB3z53tsz3u3BXZwvY7ChScMJeSnsBta+Oo4W6rLtsAJ42GcjoybbUqupKmHt54JAi/PK9c/aN76PUq0EJpAJMvo+PGLA1VZKYeJ0ThVZMoLpsJpnHTsoF4AYq2gd2gOTRqbSZIrQkpWsdd+UPneZrTG6804Ec0d8y4FlGkp6bCAABOvMVTdsr4I3GDDXAeniV9ZRlARqTtsH22awODYeCcUyit+3UhP2ZESzJnkIuTVORhPdr0MChGazmk3HA922wCcUE8JptxCaud93FtB8UAFuU3MQD7jBM+3/5G6taChAdBM6qfvR1u6pANmAHlHpE2Ua3qO6IKoILMfO+4wOIZc25cLWl8COLg7z4Ktrk0YgfDNpKr11D3i8LDojZF2x8P45sZqv+4l7yyPbsnsKrHWhPjjU1dA; 4:P6Z9m6O7GVMvnYFjd0tWPIFQkzc8lj/frPrAo+c3RTuyXnaFSfdk4komUOyeVKTYPuveftM7PvtK/1jTzOvtrtnNdePPohLPaLZmGWPsygHnI7KAHJ6UpWiof0QuQmFx63rWSEkbam5dHWwUxZTkpX/Np0ZoYY3U3WkDnY4GWOrYSh9iO+rbPWWvmHd8Kos6jSGAimjxmnfWEjcYL2UfOcYiHknXWK1sF+fTONnqMdHH+56FI2n8qPVrHfkm0fd0Socak3r/XKJkOSKxrgt6viJA7GH+OFUooK0arl7Pj/0giCGiIroBknglCwuHc0p2 X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(185117386973197); X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(5005006)(8121501046)(3002001)(3231355)(944501410)(52105095)(10201501046)(93006095)(93001095)(6055026)(149066)(150057)(6041310)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123562045)(20161123564045)(20161123558120)(201708071742011)(7699051); SRVR:AM0PR04MB4849; BCL:0; PCL:0; RULEID:; SRVR:AM0PR04MB4849; X-Forefront-PRVS: 0814A2C7A3 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(346002)(376002)(366004)(136003)(39860400002)(396003)(189003)(199004)(66066001)(50226002)(97736004)(7736002)(50466002)(55236004)(6506007)(386003)(16526019)(53936002)(26005)(68736007)(6486002)(186003)(47776003)(8936002)(8676002)(81156014)(476003)(81166006)(5009440100003)(4326008)(16586007)(36756003)(5660300001)(86362001)(2906002)(1076002)(2361001)(2351001)(478600001)(446003)(3846002)(6116002)(316002)(2616005)(44832011)(305945005)(76176011)(956004)(486006)(48376002)(105586002)(106356001)(51416003)(52116002)(25786009)(11346002)(6512007)(6916009)(110426005); DIR:OUT; SFP:1101; SCL:1; SRVR:AM0PR04MB4849; H:phoenix7.ap.freescale.net; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; Received-SPF: None (protection.outlook.com: nxp.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; AM0PR04MB4849; 23:YJAf7y2hQ3F4PMon9RZ2AkKOALqknyHCA9LCs9IHF?= ZhKweTlbGa7rfEtXl10Xl9cmxocwjxKFWr1m9PpIkPZGTcC8oI3yhaPmqFcVOzh+2XVRT2RsPqfy7d/RS5GyO7oUXkleMS8399RS0OllBWhwdVI1FXN+43Ht6AAXxjqyIM+7kPSYZTIjFw95y5hF04c1VNXDiz9fEXAz8wg5NG23NnmNkG4wddQCcsGJQTNeaDNgHqKjIOYO2eRki6ckUo+VCZEfJ77bXUbRLFIZajGzMYBY9KdpfRhHRPhn6GNk2+sh9qrKkIsf4vLmNYAsjtkxS/0Ep3121par3S9COHT/cOgsNVqAQVpJsV97pUYXTAf+MM+ksB9YYKiigJ/DdmAIGIFhqPdJHGMmWhRtX3ia2xy/dS6mDr6JA5dzMTd4PaRkXyQfrSM8ua6ZaJiFtHnD9MGcsS49zo0lkW1z3jbjlBTDlDf+8gK8YCxOdPxPASaJos5f+mRDKbK9JfQ2eInWGUgWBAWNgQDjimWcF0s3VSWJEiimBFGZr8vohZdDtP8xh8Gf+TrMLFj6l7ElyDd0AVPGi3uVgSdOQWSvLLcYXW4Y2g87OhhuUndfrRC8DoGf8srcmEb3vHqgxGd3fFqpquKvCM7u2rCizHi5l5q2YP7FRj+NuxaTdfHX8yVx9f55RNyjO57TYSdNmVP4nIqTp16CQ6iaEC+lIVfVjYRebCPyLAr1/9chGLMoK3IA11wrRQ6VZf3X7isP1ySlwnDSknM8ScXfz0kpW54yls/XED/HsvN0ssvuzPwYXNG/pFcyuYW2qJqT58mIZYnnaKdQHmOo6jGyosJQA7sRv+NBq9NVkOCRnas0HJwXv/8pYCe1HJxaQf3Ls3MzI+kcAChj9TBxOulboWPZjsW9SqiYH4alCw9ee8YYZMqso8Nec/eB5DyoQrp+fKpBKn24N6GhGV0zQIUts9+HfzbECbck+C0Gb1/N3lPb0PtF8C1H9xzB+K5PK6rHIJOKri1z56BMvbrtFD2VKRWvU5NligoL4uLLWsgIFpc3lT51wjwniq+/FHwiJtZ7dn5q1Hhod/sTHQhUuMd6PTQsSiJd8ta38A7EIR5E0y5dGgerARjXT31uckLPVdoADVIUuZjQMFbHddOH15ASViylsnn7flGznci5vQDkO2mnJhn8lGwblMFcFe73g4JnXUiwxTkHl1pRKXOt68KQGuOay0VRpz/ADE8+lgjUvEdq+OtFYUr5IOPqTNQkCGBL3zkYFJkf/ZTh9TKl57RN/vrEGdnL+zwAoLWZOumxI77ZMmZ8KlMSDI= X-Microsoft-Antispam-Message-Info: 1nRNobqmg+byDzjjB88WcEjgjY+LZumCRXxatUCizMEhi+IkZvb05LsPeQtyV236QCSclnPJDsK2QgsIIukmBftoX+A9CAHbSFFC9QDYHkFfZX7BeaH3DoG3oVvrOcnIlUAVndibz2Mu9RIHWcfVsBELVen561L6/d/zMRu3ts1oKOBr6FTgpd6Xqk53aqFqlMncoMAbWhe9bTgHQnA2bxrmtmZ4ZAvgEzlfUv3WqQ/9N3QoQUjcf+5vyne5ZXbFmdT1LouSNrlADkiGlWcPikGO184QoxKfvh50BrCveJ23naUiI42Geq4VZntuxPUTuaw4MWxOq77GDYnLoin/3IEA8nOXorvKhaxSEmJ+UJY= X-Microsoft-Exchange-Diagnostics: 1; AM0PR04MB4849; 6:AghB30QzyZ2HESZEaCubHH9mAeRlCR3XnshhBVl0HHhMNz6Hi3q6yNC+pfYsJCy87L9XeibKSTiFWV2y1DzMzYpyAcf/pOaC7xpWlKniNeaEmqhDpkz8EEOPaNxC6gEZ6hi5SuWkdkYvWOhpakD/USIeyqZbUXPPLZcYQn4sQiSap2BFjbOzaFrFVUbDoZZO9rRZgKsFrVmR6JX1ROAgnccgKYbOze4DRlybUOGWwYW6xuPbivbCf0y6HPO6QsTPXsFHSHBtT4CyYKMgXVKC6VuoiTg5e9bk/FqIqJEeoni+sng4p81uvUHcsoHf0exP2Sc3IF9XPOtvWKsd5cVtv1rIuFubZ724x7/QhfbEhM0CyfqH/jlOaN0hjtskZJciV8ywimopskj2f79wz+3nrQRkJrGP3pOtm7pNuHd7/KRb4mxTisLTNbMrcwO1tmst2zPOe2r0fX8HkoMAZPuEjQ==; 5:nZItXK+mxKsvf7iJ2peZTbWUeeR86Ki0WaHDmVquT6y6ecu/9DFm9jaqle8cgSp85HLUneZMd4AVY3a4+mvRE6zxEe4a+6PB9QSk2kxkoHB0bTnw2Kts1M07PLH9QXCYWUy9y8rrC6DAkB7iGl5lwYMQtDWW1+aRdvFU5wCsg9o=; 7:9KXcqri98JD+dfOT5lObt2OVDlcX9oPWFxfreZ9X4B4Kr9CmG2Yc03P+VNwj6xa/pjOGthcneigLRndAz++NPR3+h/SWNzM3NcxrPb48ww0XV90gwFHAo3J+byNinxF44+ixNw8VJMyZCC5RXwY2V7xdusC+HD4DfnNo4wIZCy2pqJIxbwre5/hX1kms3DpynQuhDngKUMF9IqqUsO1Yf36mhGX9ygC0HZ5XTgZGVkRhrbRcbKSR07xZBSd+awGa SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Oct 2018 10:46:26.7933 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 8c6f6442-ab46-4059-a6ed-08d6291d79d0 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR04MB4849 Cc: Pankit Garg Subject: [U-Boot] [PATCH 21/53] armv8: ls1043a: define BOOTCOMMAND for TFABOOT 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" Defines BOOTCOMMAND for TFABOOT configuration for supported boot sources. Signed-off-by: Pankit Garg Signed-off-by: Rajesh Bhagat --- include/configs/ls1043a_common.h | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/include/configs/ls1043a_common.h b/include/configs/ls1043a_common.h index e8b6657b83..7875bf4bba 100644 --- a/include/configs/ls1043a_common.h +++ b/include/configs/ls1043a_common.h @@ -319,6 +319,14 @@ #undef CONFIG_BOOTCOMMAND +#ifdef CONFIG_TFABOOT +#define QSPI_NOR_BOOTCOMMAND "run distro_bootcmd; run qspi_bootcmd; " \ + "env exists secureboot && esbc_halt;" +#define SD_BOOTCOMMAND "run distro_bootcmd; run sd_bootcmd; " \ + "env exists secureboot && esbc_halt;" +#define IFC_NOR_BOOTCOMMAND "run distro_bootcmd; run nor_bootcmd; " \ + "env exists secureboot && esbc_halt;" +#else #if defined(CONFIG_QSPI_BOOT) || defined(CONFIG_SD_BOOT_QSPI) #define CONFIG_BOOTCOMMAND "run distro_bootcmd; run qspi_bootcmd; " \ "env exists secureboot && esbc_halt;" @@ -330,6 +338,7 @@ "env exists secureboot && esbc_halt;" #endif #endif +#endif /* Monitor Command Prompt */ #define CONFIG_SYS_CBSIZE 512 /* Console I/O Buffer Size */ From patchwork Wed Oct 3 10:44:28 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rajesh Bhagat X-Patchwork-Id: 978188 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; dmarc=fail (p=none dis=none) header.from=nxp.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=nxp.com header.i=@nxp.com header.b="rTryVmKf"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 42QCjd1vsnz9s8J for ; Wed, 3 Oct 2018 21:00:37 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id EA187C220EC; Wed, 3 Oct 2018 10:53:58 +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=BAD_ENC_HEADER, 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 8AEF5C220FC; Wed, 3 Oct 2018 10:48:11 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id B252BC220ED; Wed, 3 Oct 2018 10:46:39 +0000 (UTC) Received: from EUR02-AM5-obe.outbound.protection.outlook.com (mail-eopbgr00070.outbound.protection.outlook.com [40.107.0.70]) by lists.denx.de (Postfix) with ESMTPS id A5954C2211C for ; Wed, 3 Oct 2018 10:46:33 +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:X-MS-Exchange-SenderADCheck; bh=VGcYzE5IT+r1TFdat36DhVLwKaPB5fTGB0cnNBe8qBc=; b=rTryVmKfL28h0EIvkSlVXQZ8J4NUasCDkNIJBD1CYYMgq89H+KmQjc153a4Y5DIfndPMSKvUZ3uoTSaD3JO/ryiTuSB0WpPu5xNQwPcDzkXXafEwESYq2CN2OhTlIAdjZXcD9nykpOqWRCDnI1kRCbebaxH2yx95C27z7a48NZw= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=rajesh.bhagat@nxp.com; Received: from phoenix7.ap.freescale.net (14.143.30.134) by AM0PR04MB4849.eurprd04.prod.outlook.com (2603:10a6:208:c4::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1185.24; Wed, 3 Oct 2018 10:46:30 +0000 From: Rajesh Bhagat To: u-boot@lists.denx.de Date: Wed, 3 Oct 2018 16:14:28 +0530 Message-Id: <20181003104459.5444-23-rajesh.bhagat@nxp.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181003104459.5444-1-rajesh.bhagat@nxp.com> References: <20181003104459.5444-1-rajesh.bhagat@nxp.com> MIME-Version: 1.0 X-Originating-IP: [14.143.30.134] X-ClientProxiedBy: TY2PR02CA0011.apcprd02.prod.outlook.com (2603:1096:404:56::23) To AM0PR04MB4849.eurprd04.prod.outlook.com (2603:10a6:208:c4::26) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 1b5f3e23-a64f-4b6a-4f60-08d6291d7bdd X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989299)(4534185)(7168020)(4627221)(201703031133081)(201702281549075)(8990200)(5600074)(711020)(4618075)(2017052603328)(7153060)(7193020); SRVR:AM0PR04MB4849; X-Microsoft-Exchange-Diagnostics: 1; AM0PR04MB4849; 3:9FrP1iVJ3lKtM16SAOs6R/EZpMCYCKEYbHTvi+O4pr9N0z16zLON+07tPrfmr7uNCRnXcmK04mFUINJkLdgTMkbt03Ev0y476C0fV4jyiYFEZAjePzuvYm9Q233s5cCSle6ccnd0mixFikszP3PpbMQJSZm+r1tzw0AHCXGK4/tuNld98F40lxxoYtNMqjhNhUC03IfVE5F8jdrJelO2r9BHv5aR+iyxUVBARIPnfbErooAQUtvnd1rGyRTaRKdA; 25:QIJczmf5BqsLCrh7nk1VJtC4JEK4jTXruiMi8h6pRp6skDVRJ1ILSrsvHp+1+ULdXzjRniXgykxb7HibOwBVkpK1xTZhycwNtN1V6t2qPA6Y8jcwlDGORfpAXtm0vsCKWo0sg7v75R8/5YT8UHMk5m5J/jvvDSbIQaO98GfwGFZtE4ihBtKT4ktwIZjQIQP5IRT+4Fc1bYtBS5QtxcjKdwHABfCnFsvTx9Ns4vjnmOxjhpReH5FNbnFnj0CQvHKrMZETdpf34lg/MLO7dsiyZDR+XgyCIVVgYMr7WCOad80NfRm0IeFuJ1g3CuUedpOMZvaou9UndM1HVuDRMVMq4Q==; 31:BcppEdJUd0ccvOc/ACpsR6H3LfkFhx8Xne5ILE0ioDtvrpbEpfymLd4dFCOgqjVOCzrnENn52Ih4rDS0e8tSvTTcEb0yMaAGfhTm4/5wIgQFyJrYynzFhNaMSgtKyY+PA63o36hsPUBcUItVpNv/2BpY7+GGIEl4NkxGf9RN/Squ3FFEtKuapAAwiZxjVYIOgU4oTnJRXamAtehrFC3LdhSV+9E8Wp0VbuH2TgtsCJ4= X-MS-TrafficTypeDiagnostic: AM0PR04MB4849: X-Microsoft-Exchange-Diagnostics: 1; AM0PR04MB4849; 20:zMpr01OQF90cnyqcHPiuwdu8+QSWxfJ+Recz+z0sZh78iOKVFgFJLoywkYMRPdR9cV0W9ckqoZYr+UWcGuNokAQ3Hg/nc5zuaHwqaRPnyfV6flg4zmUD/vPFjN8fuuOqAGnXfOT76aFRxyhMENj5hsC/QyAChWOpccTHxPliEkG7s8V8QcSREtJDyXNuwC/1YqyaSWFDz77kfFl8pZcY6UQq/IJtKC2n0H4yHyMQRfYzTiIblkJNwDjFSrnYfWQEzW12Q5f98wsF7N9BbIfVS4qu+q7Fs2luuV+xJBzhw69fbiU9ixYr/ScaTQdk8EGz7Neasvdd7v2p1tfx/t+q62IAqruMsXASimD5EakqUV4c+I38K5wg10JhSfa4kaLzLsJtr6+WSM8FRTAj6gTK4j9+BTMztwG6x+OZjldjzaGyJ/5/KK8wAriCpWIPsZep3xyah7ZLVog0WUoi8my4LeJEH2I2ivDAvoxAzm//BfLpgVuvtCQa8wgMOXIFBbVC; 4:Pd+qdOQ1jWZ01jmKcDz+XMEnzgjXzXE/0QihV1Yc4egGZDV/5Byd/+m3NmWqYP1Rr6BN9P0Xh8Ga2j1cFjDJbmyMPrtUGaee50PhVaXL9NCZlDK3T2yZyaMWHAvihGmibfSe751kxm5UesipEhIZCxzqeNKPg6EW/HXnAwJ+oS3zUPo3O9JJFSc2w6J1SjdFRJGCuzcWxUYZ/VeVmnobpRPLLU3HjX1GOhXaHcbV2WYZISiNc17Sm+YZQMvdGwNG2qIMd4tKogzuQair6CXc2x189L0a3rsc3BvEUp8Q6XRBrV5Aqn5Gj3liyVPLtfPV X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(185117386973197); X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(5005006)(8121501046)(3002001)(3231355)(944501410)(52105095)(10201501046)(93006095)(93001095)(6055026)(149066)(150057)(6041310)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123562045)(20161123564045)(20161123558120)(201708071742011)(7699051); SRVR:AM0PR04MB4849; BCL:0; PCL:0; RULEID:; SRVR:AM0PR04MB4849; X-Forefront-PRVS: 0814A2C7A3 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(346002)(376002)(366004)(136003)(39860400002)(396003)(189003)(199004)(66066001)(50226002)(97736004)(7736002)(50466002)(55236004)(14444005)(6506007)(386003)(16526019)(53936002)(26005)(68736007)(6486002)(186003)(47776003)(8936002)(8676002)(81156014)(476003)(81166006)(5009440100003)(4326008)(16586007)(36756003)(5660300001)(86362001)(2906002)(1076002)(2361001)(2351001)(478600001)(446003)(3846002)(6116002)(316002)(2616005)(44832011)(305945005)(76176011)(956004)(486006)(48376002)(105586002)(106356001)(51416003)(52116002)(25786009)(11346002)(6512007)(6916009)(110426005); DIR:OUT; SFP:1101; SCL:1; SRVR:AM0PR04MB4849; H:phoenix7.ap.freescale.net; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; Received-SPF: None (protection.outlook.com: nxp.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; AM0PR04MB4849; 23:PY3/9Npu9m57NJnsxaFVjdOyXL4RnVSlWuPF/L/tp?= Gqmtc1KBszSCliXAKMLxmML9in7+GTR5xrV4MS2yRVQ13PkDDdfnIS1BwqGF/K7JCCP2AqjAex1EcDTEPQ0e1Q08zxjGsXNnpDWEvwrNQTaNFjjLRIqgjTlZfslSYiM440RO8CRipl06PIkx6BB8KDxoG09J52O0JZQOxcsJphxycME1RaPgPBQGnpLuyr2ElVYkkqGRkfR655hU5MVBBg0b2BnuXC4va7LSMw+ILsftRhIpDftbWExv1w6XssiPIbR5shd3ikY6q5yeEJ+OKDjw5GnUQRMxj90SvnhhnM3ra9Ku7wHCGZho3EnrA+R9ohVEC0H3q4NRyUhoGVXUsS8Y/my/dsqHkhphVaTl/mjRd0dTG7ufOZB+3a+f0y52udYI4qPoyJmSvsv+HSTuKJg3bNJ02jx2gs0qjticN/H1AAeqT9MAar3ZxpObZKtHMUbzbhtN0wk/wHJOTkwXwgHTNYj2Kf/VyjC29kb3TpMtSKve73oBx93LHQXYwNPUkSlsoH0FLAXU6Y/iZk/kTNFQmwCMFzVNJljHsBoUf16H+W4CUUFmxchVSrl6Zb0lHkqNNYu22pJg+ttCq6r28KZoVWCnLrrZLcyCBwLmXOUgYzNNdIj8KSsKxY1DwX7iPU5S0IXnfHY/VGj6axU4xXfCuuchZfq+AGy2WavXjcOPZYqcddeqCCFtL5hmuGH8GoVhnuqlFVfFnvka4Was1hI8q661iBTpyB03xbM+lcav9RgArurtwtZUQG1QLDnX3UCxckeWk6BxHQc4Y4e8aydhZcohCRlzzFdWmuxpPS5YD8ZxsmZYKqpxkT2f5vEmAY1+LsXrWGv4Uetzg4BL7llUD/LyLVzfUUqgA1ZN/ssVzfaYTQlrBQfAbAVtJOcaWcRQZT9Hu4agLGGeFchmgZkZr6yzlPmeTC4wF4CfmQCJOC46U+XHZRajskFVKe3BSr38JhrJSw6GB4agK/CY9IFytZO4JeHHn+k6bvmZvqwDXbW0i88riC+xl5rz557HL39kioXJYNKguzr/Lvhy/bjpwJsmG6lKYPu2gTo4PKYNluyf+ovt7c7k8aJZELHntR6alcQzPGqcVMEBHu5K9E9mxjyfvg5j1VZf3WsCO+rREoSVW1eTm80/PGAFRxofp8/9Hwq1RSJabi6TkN6SGv4MyNrJEWIg9vzetTeLTET+ksdAuufsankWrhoEbzS+jLraI4CSvb4QZf1reU1+a6wBmbxBZVils8zInHd1EJ+rzDdGqyP0PTdH/qLN391Vcs= X-Microsoft-Antispam-Message-Info: QZIhUfaf5YvWBGgTLa9PE07riA8uJNY6b8l6/YcczZ/f5pYpIe7JU85hZdeiezP4AFtROi0IBbwd/8bjLbeG/9qHFa+01WN7qXvzHz9pQeE/HdyWaSj5ieAxH6YVjGE05aXYkG2wQxbL2jBJNfvkgyNSDRoZb//XD12RuQ9eDmmD6UWi7LHOPU75sqcBmh2OC6REMS/ENOthhcwqwiM3OmTU6jR1RmX+kThGsPoVgTbAXwjay+JHpGROlQkxJuMVby1w4nL+AIMZabMTG9zZTSG2O4+u69kY64broPFFbACMVXzTPZLKtMB/ffUmqDB6/q3afQZuOrLEd94A9lYCfrNeiaLTk2bmelKkj7s8bBM= X-Microsoft-Exchange-Diagnostics: 1; AM0PR04MB4849; 6:xxXRhkbluExp8OCzvOltX0wUapLRL4u7lX9Ug6xeyRTMyyvHJHTfHYjFXcBSqPtqns1mb5MpPr+5spbA7QwuFNz3G4izli4kCrGmVuvnYtKf9E8PfIE0GChZiROeNTrgT6i3Yule/whCziOW7N2x2V1kjAMVxZcQa9WPuuRC1B5VYaj6NBNidYHp5Pr5Jn5i0ZXYxo5kyZLYk9LaQBLZS0vobA2joodMdLIbqWS7wftnGEcFTfz42LssuYfeCJ7eugXWhielargK92XqQK1lwel3/dTUjCrRJ0UFoCtPlxzoKa5+4CPUZxHjvzye9uS9J+fXuT0LIVE/yj9Z0hh6hbUpC3mWWRIWR6gHvzlX+0kFiAup2Ix2FvlMf2MK01cMg8PEGCaK16+HPQIywW4JH9r4n0AjRBNDpX09SreIWtGdpqZm/80KGUJ82G9FIwjymT7mk4NGbIRzlYMdVQvH1w==; 5:QC4kzqhzNq45LpfRaioaP9vxEfcUjVamIuuVqLoi4UhcpeL3I6JsVVCeO4g4Pj54bhbhsbkGC5Ko2cq6WcZWP6JkPc/VdoCxQW24V54ldgJJSLfjvy7nTGLLkVO6MQVJ0Xaa8arr0MQiHXJcL2hXeiub9Anvw9GOlMVQ3+q+F8E=; 7:V01Vpix7RwScmZAPwHNrZXhLZwbG0IMLkYnr7Kcj5ecPe0vNrUUsbSBqMQomExWrXnaZ6YAxdf+We9YH2oBt1v1hjActIoRScm+EXTGsYaN2ZlWvgGGZJJaOuXWyHG/UTH97lyl+dJlTp+nZ2KEgxgPvi1lWfbXh9DDGq5XLAF8Esrvb92XGU88y9c6TOY0mc38d8M3WOEBUq5uYR5CkH2xMG/dkEoEwof0DCAly6gH4H8uAJCr39od2zaa6H8Ds SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Oct 2018 10:46:30.2317 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 1b5f3e23-a64f-4b6a-4f60-08d6291d7bdd X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR04MB4849 Cc: Pankit Garg Subject: [U-Boot] [PATCH 22/53] armv8: ls1012ardb: Add TFABOOT defconfig 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" This defconfig is for TFABOOT, to be loaded by trusted firmware. Signed-off-by: Rajesh Bhagat Signed-off-by: Pankit Garg --- board/freescale/ls1012ardb/ls1012ardb.c | 11 +++++ configs/ls1012ardb_ram_defconfig | 56 +++++++++++++++++++++++++ include/configs/ls1012a_common.h | 6 ++- 3 files changed, 72 insertions(+), 1 deletion(-) create mode 100644 configs/ls1012ardb_ram_defconfig diff --git a/board/freescale/ls1012ardb/ls1012ardb.c b/board/freescale/ls1012ardb/ls1012ardb.c index 888f8500d4..f59749b87c 100644 --- a/board/freescale/ls1012ardb/ls1012ardb.c +++ b/board/freescale/ls1012ardb/ls1012ardb.c @@ -87,8 +87,17 @@ int checkboard(void) return 0; } +#ifdef CONFIG_TFABOOT int dram_init(void) { + gd->ram_size = CONFIG_SYS_SDRAM_SIZE; + + return 0; +} +#else +int dram_init(void) +{ +#ifndef CONFIG_TFABOOT static const struct fsl_mmdc_info mparam = { 0x05180000, /* mdctl */ 0x00030035, /* mdpdc */ @@ -106,6 +115,7 @@ int dram_init(void) }; mmdc_init(&mparam); +#endif gd->ram_size = CONFIG_SYS_SDRAM_SIZE; #if !defined(CONFIG_SPL) || defined(CONFIG_SPL_BUILD) @@ -115,6 +125,7 @@ int dram_init(void) return 0; } +#endif int board_early_init_f(void) diff --git a/configs/ls1012ardb_ram_defconfig b/configs/ls1012ardb_ram_defconfig new file mode 100644 index 0000000000..e594bd6b21 --- /dev/null +++ b/configs/ls1012ardb_ram_defconfig @@ -0,0 +1,56 @@ +CONFIG_ARM=y +CONFIG_TARGET_LS1012ARDB=y +CONFIG_SYS_TEXT_BASE=0x82000000 +CONFIG_QSPI_AHB_INIT=y +CONFIG_TFABOOT=y +CONFIG_ARMV8_SEC_FIRMWARE_SUPPORT=y +CONFIG_SEC_FIRMWARE_ARMV8_PSCI=y +CONFIG_AHCI=y +CONFIG_DISTRO_DEFAULTS=y +CONFIG_NR_DRAM_BANKS=2 +# CONFIG_SYS_MALLOC_F is not set +CONFIG_FIT_VERBOSE=y +CONFIG_OF_BOARD_SETUP=y +CONFIG_OF_STDOUT_VIA_ALIAS=y +CONFIG_BOOTDELAY=10 +CONFIG_USE_BOOTARGS=y +CONFIG_BOOTARGS="console=ttyS0,115200 root=/dev/ram0 earlycon=uart8250,mmio,0x21c0500 quiet lpj=250000" +# CONFIG_DISPLAY_BOARDINFO is not set +CONFIG_DISPLAY_BOARDINFO_LATE=y +CONFIG_CMD_GREPENV=y +CONFIG_CMD_MEMTEST=y +CONFIG_CMD_GPT=y +CONFIG_CMD_I2C=y +CONFIG_CMD_MMC=y +CONFIG_CMD_PCI=y +CONFIG_CMD_SF=y +CONFIG_CMD_USB=y +# CONFIG_CMD_SETEXPR is not set +CONFIG_CMD_CACHE=y +CONFIG_OF_CONTROL=y +CONFIG_DEFAULT_DEVICE_TREE="fsl-ls1012a-rdb" +CONFIG_ENV_IS_IN_SPI_FLASH=y +CONFIG_NET_RANDOM_ETHADDR=y +CONFIG_DM=y +# CONFIG_BLK is not set +CONFIG_DM_MMC=y +CONFIG_FSL_ESDHC=y +CONFIG_DM_SPI_FLASH=y +CONFIG_SPI_FLASH=y +# CONFIG_SPI_FLASH_USE_4K_SECTORS is not set +CONFIG_FSL_PFE=y +CONFIG_DM_ETH=y +CONFIG_E1000=y +CONFIG_PCI=y +CONFIG_DM_PCI=y +CONFIG_DM_PCI_COMPAT=y +CONFIG_PCIE_LAYERSCAPE=y +CONFIG_SYS_NS16550=y +CONFIG_SPI=y +CONFIG_DM_SPI=y +CONFIG_FSL_DSPI=y +CONFIG_USB=y +CONFIG_DM_USB=y +CONFIG_USB_XHCI_HCD=y +CONFIG_USB_XHCI_DWC3=y +CONFIG_USB_STORAGE=y diff --git a/include/configs/ls1012a_common.h b/include/configs/ls1012a_common.h index 787adbc382..07998f7eee 100644 --- a/include/configs/ls1012a_common.h +++ b/include/configs/ls1012a_common.h @@ -16,7 +16,11 @@ #define CONFIG_SKIP_LOWLEVEL_INIT +#ifdef CONFIG_TFABOOT +#define CONFIG_SYS_INIT_SP_ADDR CONFIG_SYS_TEXT_BASE +#else #define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_FSL_OCRAM_BASE + 0xfff0) +#endif #define CONFIG_SYS_LOAD_ADDR (CONFIG_SYS_DDR_SDRAM_BASE + 0x10000000) #define CONFIG_SYS_DDR_SDRAM_BASE 0x80000000 @@ -34,7 +38,7 @@ #define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + 128 * 1024) /*SPI device */ -#ifdef CONFIG_QSPI_BOOT +#if defined(CONFIG_QSPI_BOOT) || defined(CONFIG_TFABOOT) #define CONFIG_SYS_QE_FW_IN_SPIFLASH #define CONFIG_SYS_FMAN_FW_ADDR 0x400d0000 #define CONFIG_ENV_SPI_BUS 0 From patchwork Wed Oct 3 10:44:29 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rajesh Bhagat X-Patchwork-Id: 978184 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; dmarc=fail (p=none dis=none) header.from=nxp.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=nxp.com header.i=@nxp.com header.b="RiwtcxcG"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 42QCgP3rlLz9s8J for ; Wed, 3 Oct 2018 20:58:41 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 2CF3EC220BD; Wed, 3 Oct 2018 10:53: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=0.0 required=5.0 tests=BAD_ENC_HEADER, 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 2A7F3C220CE; Wed, 3 Oct 2018 10:48:10 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 546A0C22047; Wed, 3 Oct 2018 10:46:40 +0000 (UTC) Received: from EUR02-AM5-obe.outbound.protection.outlook.com (mail-eopbgr00076.outbound.protection.outlook.com [40.107.0.76]) by lists.denx.de (Postfix) with ESMTPS id F0824C22116 for ; Wed, 3 Oct 2018 10:46:36 +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:X-MS-Exchange-SenderADCheck; bh=oRTkHVz+CFVWUl9AIO58o1PJYv0gxA+j1t968ryY1yA=; b=RiwtcxcG9guXXEv9zBV+2hfjmCdTgyLG9Kf4j1jiwauSASPuOrhtarKr9hRbo3zP5bpSJAJ+JwrnamDMhi0f4vJYl2jtnLRLYaMsXEb0X3xBOmKILwNF+F/khXQ4jW6Mp00zQcQqep8tl4a0dzdlII4NRanTmlJ0N8RPHwjXG0I= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=rajesh.bhagat@nxp.com; Received: from phoenix7.ap.freescale.net (14.143.30.134) by AM0PR04MB4849.eurprd04.prod.outlook.com (2603:10a6:208:c4::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1185.24; Wed, 3 Oct 2018 10:46:33 +0000 From: Rajesh Bhagat To: u-boot@lists.denx.de Date: Wed, 3 Oct 2018 16:14:29 +0530 Message-Id: <20181003104459.5444-24-rajesh.bhagat@nxp.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181003104459.5444-1-rajesh.bhagat@nxp.com> References: <20181003104459.5444-1-rajesh.bhagat@nxp.com> MIME-Version: 1.0 X-Originating-IP: [14.143.30.134] X-ClientProxiedBy: TY2PR02CA0011.apcprd02.prod.outlook.com (2603:1096:404:56::23) To AM0PR04MB4849.eurprd04.prod.outlook.com (2603:10a6:208:c4::26) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 986239aa-31b2-4538-7284-08d6291d7ddd X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989299)(4534185)(7168020)(4627221)(201703031133081)(201702281549075)(8990200)(5600074)(711020)(4618075)(2017052603328)(7153060)(7193020); SRVR:AM0PR04MB4849; X-Microsoft-Exchange-Diagnostics: 1; AM0PR04MB4849; 3:cFhPkmBqQbGUg25kRpZrhNpnIMDCGmskfk18Kop27GhtiyvGN1FNIKYWek4qsR8GDfpnG+ErVOxDV4QP9LRJRE8h3OeP7lfyAUGlzHnBEb24mFgm2UHUlq5j0lhPwMOixoglBahu4GCRJvCYZ6blTMcjp3JpmrbqtAzqahhjMxNwooBa57vEV0IHIx1xAx8Aopx33YdAQK8nK0PsWWm0bWFY5pXkUEuftXd51eNqnhIpxiAowB0tkUh1tYYeIivc; 25:S6hpfv0bAx/fCNBc04jHfp/ZNOvZIy/52qIPC6QPpuzego2G8O/j9sOpcZiPLM3EwZXv1OiqGLxSmbVtl+LgKRYm1teGRhwj2LQmswyK2YqmSJdZegIMWdxuTmKrFxlOSh8rrHgKA0hdX4ny4E4nX9qLs/ZX6L1B3abLy/2zcN3rdCoNCqG8PJz+k7JVm/t9EVHt2OTld0TWNsYnm1PdD9mqAZgaUmPSFPyhP+kBbb28fG2BZNZlSFLQhED6yGumQ9XyB25n2NqpzlxX6BGCk6etIG9AintR1K6cK8JcG2Jsx3bA57U5mkHAXQNRcNBGwRXQkGoL+otujLzIE7Qhqg==; 31:jc5fbAW1ySeN8TGtXm2J1dvdoefjd0bLgZAIDab1LycgwipMeezVEVb73EoUP23VKGSy2dzBjAytSpBJ+XvdaKNQsbjgr9VoANLukJe4o3CCD1NPQE4SAAi0JNROyHjauMFUvzjGuedoroHDHCWfdIl1AvMYt/uvUHux7kP3h3ehTmT513z0AaAF7SHhW8qY+r+gs3qsKGSV1nP7eJU9YAnUF1vmD62iHCa1JmTFL/w= X-MS-TrafficTypeDiagnostic: AM0PR04MB4849: X-Microsoft-Exchange-Diagnostics: 1; AM0PR04MB4849; 20:RIcZYjZDzVk/qGpueyR8mlKpp05hLp0goTJZFVLqWD1dJEpQXjreyOYyMiSvchtI6tbDOTmIP/IKwIAVbcVnKNqPA6LNABbEFLCtNvkOYGprG6O1soQVSMZe8YzqTAsEvpShfswO2Q4uqYc6JBogILoBG5ZLKk5dwmzaih7rM6wQaURvMNtmN5bstfbKWW4/UwMxKYgWxNAB8/ceuYthxGmAlF2e761cfoNxOZmmRMxhFLH514Zq89YVRCvZSfyEGxuElBPS1Vc09BZsFVd7lj0eNiH7uryYP1PEaVwDJx+K97BhRNOkDOiBu014Rle0nCnQdTwZfXWipto7IekH6XX6uN3/B5A0vuLUsN4Gs6XyiL9uFx7PWXz+6+4xMSvBmV4vaUNkaHsuoS7U1JWHjCB1Ma6gA2hAF2B/u7LiMNbYk43vP/qabhDuwFyJHHHZeQ6u8RT7sMDax0vzU5JSm/FTMeQBUzZVm0ue+aGJ5tqMQNKpEik0YmDKUb0kOjC5; 4:7kEc6Sphjoi7yfihoQWy/+d2vqiOJmn0XsVrm2ew9MnI+lrFsx/xK6U3/8g2MtJNOzIY50YqOwjkVguwVKa6KJBfk2XCXerkJ6KzhttGcLghD8JqMN266au1y2PIF1R/k/WUz/TRS9jC9WoKbHBalH0B6SwIE/t1Xswpx60xhTcWu5/zTN7vgZ2Sum2IbsLsmW0Crj02yfVc60M0UUXdJJ9U3FQcvbV6mkyn1juMdGbv3FGgc1eWuv4s2TUz0hkAP/o8GDrkNAnonHBqJ53adOP3u9O14l5/vU8YSA/VaYYiAqhtMHfz4NYGCp0p10i4 X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(185117386973197); X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(5005006)(8121501046)(3002001)(3231355)(944501410)(52105095)(10201501046)(93006095)(93001095)(6055026)(149066)(150057)(6041310)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123562045)(20161123564045)(20161123558120)(201708071742011)(7699051); SRVR:AM0PR04MB4849; BCL:0; PCL:0; RULEID:; SRVR:AM0PR04MB4849; X-Forefront-PRVS: 0814A2C7A3 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(346002)(376002)(366004)(136003)(39860400002)(396003)(189003)(199004)(66066001)(50226002)(97736004)(7736002)(50466002)(55236004)(6666003)(14444005)(6506007)(386003)(16526019)(53936002)(26005)(68736007)(6486002)(186003)(47776003)(8936002)(8676002)(81156014)(476003)(81166006)(5009440100003)(4326008)(16586007)(36756003)(5660300001)(86362001)(2906002)(1076002)(2361001)(2351001)(478600001)(446003)(3846002)(6116002)(316002)(2616005)(44832011)(305945005)(76176011)(956004)(486006)(48376002)(105586002)(106356001)(51416003)(52116002)(25786009)(11346002)(6512007)(6916009)(110426005); DIR:OUT; SFP:1101; SCL:1; SRVR:AM0PR04MB4849; H:phoenix7.ap.freescale.net; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; Received-SPF: None (protection.outlook.com: nxp.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; AM0PR04MB4849; 23:9fxpotviMhsaFZStz1nwLNjE1I1rTWrMN2H7S9mKG?= amlPPihSaMt1zZ8fHMmAFLR7/ypGy3IWyIZ9/PGKQcly2rmkl/AUD/u0KVbxPe+vWkWcctOu+hWY39Hc6OIFSNgLJ44WLg09SelxzJMNCu9VReLeVMeUYGyxyNh8yBPJ86Otwvlc/OTQkG+Ly7l44kPxnz1JOFincTh2xLq4MV0dDJkE4xjj/ft6TznzYcfRJtamlGtnH+JTszHhcG1s9osJngbP+vb3E6uDJ1nt318QvEdgAPvNT0lpuf54HM5YQDrPX8fwFfjIhetvUYDjS/ztjpM71z0ajmvgs24cdlLxhXtWx1hHSfRaejyNqiqs4FcJXPYJ5p21lG9xuYrYhvc+aHlWGHZsDqzF4iwb8rZBt8vxwtIxay14gPwYeb34WE+Fs9iow4aUEuY+5NhFA1ocZ4kivwSWFrWSx988gjevX+YEoxHUrtyJMzI6wbvsvWi0xTrvxCxxo90tMIy3mkHD0BA99a4DqddOyuNL0EoBwFbHTt2L5VtzIDfTi6WZlnD9u0EeNixIcjhJWkK/uvdgIHnWtytnc83lCjwRk/m1Val/Gc6G5L8UqIhc/J4Qa6sULdQ3SMCndSNWghMC5Vg/MFYuDy3R4wIhO/wN5Aq+L7gDf+hxk1OWAFHxOT8Fd4LILiDgxFg9N0cNBIaNufmFUZS3az4tyRRV0B+O9hc+ZnireSbgknAyEyL0E+yjmCKr4lPJjMtRQzGtY/lEjGqhUulIFDej4n+gg3KXHPpgysjfkbbSsHgW+7nW1Fr8MPrTcMMu4DQFexLCHENiKpNQnYJJOzKlLRUiJGZZ4jKJ3cHhvm1RiSwVVWPGz25IBG9gEUFH7aSRNraJow6dieh1rKr2X2FHN46ES8ErNW6fo7tez9D8hAf4KK7Zp5fyyQ40TNrilH9v2LP5tR0YXeTAmhei7E4vT+m5dKjhaLm5s2C04MlWtH4mPxxA2S7tiEfPkM/ySrM+GOPzpojpiEO/Vj/ryu4gE65IiJDl8f/h866Vwb6Cu6pyBjqrGaBimQHbHvxmL3RLqySK7ofT5Ix+ZS624sVULy5xeYaRt7GXaJReFEChnRJcAxlFoxi0PozoSucbErvFjDe8fvbIiwyfJrqHeBee0sHJhONIZ9z4UdmUo0nqrp/6CpBS9UrlVSwIY5tjxRLFiIiPEyW5S8eE9bbpajpCS5FQSKnBcitk9vw5FJFC5WgEPPWlMoe6pHrxCuPcPLdv7fJ0wi7IC1wBC5vHLz00fhKmdimlPbo1Sv8pDZMUkA4rbH6/D46AOQcGh9kc+iAnHIx49xcKkTP X-Microsoft-Antispam-Message-Info: 4V0+NiyELHfsCx5Q+lDXmNFb3EGC6W1jUURkYApl66yyNBAOa/mgAYkM33r2uA159UGC42lr9DvD6BBBiu+ZDsEn/oWiFZ+dWjLImweLQNCxYefZLgEWihncsXOORIfMio773Px5Ppzo1r+300mC2Pj1+cGJsrMFJw40VNz50UNOglkRT/MPIBd84sQdNh5zponlbZmFGlp5Z1VwLT7gQjv0nkWOv8JzoQ+kOP8HxshwvsnCJo+SSxYvEC8y+OhzMx9uNqUv6aMt4evOSVygFsuplr/NEugXf3Wb9ULBGf7BtjNwjh/4Hmf0PB2/Bk7HPx/YNLJt7rKR8lBreBiZ5PK0di4pvKZYtPU2EMoSgrI= X-Microsoft-Exchange-Diagnostics: 1; AM0PR04MB4849; 6:mr3E9Jm/MlgihboZKTf8oz/Icf1oyFdHlXG3vYwlPOEe9wn/R+HTHAiMsNPOtBuBMTux/FOOtU5I63xFKWK/PP4dT78O2K697HTpCg7iOsyFZStF8k0ujG174FLiVBLWlNHeTFSuRJryFqAaXSiGbaHdPaH0yCz3nsk23RKmMUAlt9BhYu+B73o2WR9D0eIF12C1JE9jSWTe25adkOTPls1VaxcKXsmkHDhHigItbuaITpS5mbCvGfAvnXRU3K9hWj5hvBF3DrrCr860IbqKIH67NZJOeeu4qw5+WVYZT/09GIPfmkElwAOo+rdU0PLj0YJ5OM375VMaIWPqwshNJ+aTOTI64qrM0h/vPi7dkrb1QZWEtLpmG6kDgzAR5S0X3t5TdIQSkoLYIqrm2U7vZ+RZxOAmNoURVNVqb9DhYklVPfKGEtd2ZpB/Du3yUz0Bgy5MBxmoeT3M6nFIYKyp9g==; 5:48m2bnummLQaUoZmmFatFEgtzWupqGh4jiLbanzMo84I7jedydkgncLO0ulh5KkJk2D2MX89VE1e+ni03S0/MhzjHYgTKMhA23wx6RrnI1A1ifQnNPTSke3YKqR9CjvIRc26VtDmv+steRsyZKB1jIw2LZCiUQ7J3MJzgGppUrE=; 7:vncljQui8UZktZdXztB37R5KhF7RsdRf0+GscG5mQjIqYVDkNTfaW38zoN6Z5qmtA1hgK2H+H4eBQPqnQ3PVXy3GkhHtuIMYNjp0WsC8+QbWgWIe5PjW6L7kdepWTh4eLDYHwY9/SkS+otdeMBrqARGNXFp6fCJxyN+eQOIe5TeJSNBagy3a4vk6D7apXCtbWSJrjZgDq2Xg/lahsedqWxT9PwjGqSx1nKptn50YokRClNdgBAnxaDrlPxsWzDWb SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Oct 2018 10:46:33.5890 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 986239aa-31b2-4538-7284-08d6291d7ddd X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR04MB4849 Cc: Pankit Garg Subject: [U-Boot] [PATCH 23/53] armv8: ls1012aqds: Add TFABOOT defconfig 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" This defconfig is for TFABOOT, to be loaded by trusted firmware. Signed-off-by: Rajesh Bhagat Signed-off-by: Pankit Garg --- board/freescale/ls1012aqds/ls1012aqds.c | 10 +++- configs/ls1012aqds_ram_defconfig | 62 +++++++++++++++++++++++++ 2 files changed, 71 insertions(+), 1 deletion(-) create mode 100644 configs/ls1012aqds_ram_defconfig diff --git a/board/freescale/ls1012aqds/ls1012aqds.c b/board/freescale/ls1012aqds/ls1012aqds.c index 7102237756..f312200433 100644 --- a/board/freescale/ls1012aqds/ls1012aqds.c +++ b/board/freescale/ls1012aqds/ls1012aqds.c @@ -55,6 +55,14 @@ int checkboard(void) return 0; } +#ifdef CONFIG_TFABOOT +int dram_init(void) +{ + gd->ram_size = CONFIG_SYS_SDRAM_SIZE; + + return 0; +} +#else int dram_init(void) { static const struct fsl_mmdc_info mparam = { @@ -74,7 +82,6 @@ int dram_init(void) }; mmdc_init(&mparam); - gd->ram_size = CONFIG_SYS_SDRAM_SIZE; #if !defined(CONFIG_SPL) || defined(CONFIG_SPL_BUILD) /* This will break-before-make MMU for DDR */ @@ -83,6 +90,7 @@ int dram_init(void) return 0; } +#endif int board_early_init_f(void) { diff --git a/configs/ls1012aqds_ram_defconfig b/configs/ls1012aqds_ram_defconfig new file mode 100644 index 0000000000..39805ccf9e --- /dev/null +++ b/configs/ls1012aqds_ram_defconfig @@ -0,0 +1,62 @@ +CONFIG_ARM=y +CONFIG_TARGET_LS1012AQDS=y +CONFIG_SYS_TEXT_BASE=0x82000000 +CONFIG_QSPI_AHB_INIT=y +CONFIG_TFABOOT=y +CONFIG_ARMV8_SEC_FIRMWARE_SUPPORT=y +CONFIG_SEC_FIRMWARE_ARMV8_PSCI=y +CONFIG_AHCI=y +CONFIG_DISTRO_DEFAULTS=y +CONFIG_NR_DRAM_BANKS=2 +# CONFIG_SYS_MALLOC_F is not set +CONFIG_FIT_VERBOSE=y +CONFIG_OF_BOARD_SETUP=y +CONFIG_OF_STDOUT_VIA_ALIAS=y +CONFIG_BOOTDELAY=10 +CONFIG_USE_BOOTARGS=y +CONFIG_BOOTARGS="console=ttyS0,115200 root=/dev/ram0 earlycon=uart8250,mmio,0x21c0500 quiet lpj=250000" +# CONFIG_USE_BOOTCOMMAND is not set +CONFIG_MISC_INIT_R=y +# CONFIG_DISPLAY_BOARDINFO is not set +CONFIG_DISPLAY_BOARDINFO_LATE=y +CONFIG_CMD_GREPENV=y +CONFIG_CMD_EEPROM=y +CONFIG_CMD_MEMTEST=y +CONFIG_CMD_GPT=y +CONFIG_CMD_I2C=y +CONFIG_CMD_MMC=y +CONFIG_CMD_PCI=y +CONFIG_CMD_SF=y +CONFIG_CMD_USB=y +# CONFIG_CMD_SETEXPR is not set +CONFIG_CMD_CACHE=y +CONFIG_CMD_DATE=y +CONFIG_OF_CONTROL=y +CONFIG_DEFAULT_DEVICE_TREE="fsl-ls1012a-qds" +CONFIG_ENV_IS_IN_SPI_FLASH=y +CONFIG_NET_RANDOM_ETHADDR=y +CONFIG_DM=y +CONFIG_SCSI_AHCI=y +# CONFIG_BLK is not set +CONFIG_DM_MMC=y +CONFIG_FSL_ESDHC=y +CONFIG_DM_SPI_FLASH=y +CONFIG_SPI_FLASH=y +# CONFIG_SPI_FLASH_USE_4K_SECTORS is not set +CONFIG_FSL_PFE=y +CONFIG_DM_ETH=y +CONFIG_E1000=y +CONFIG_PCI=y +CONFIG_DM_PCI=y +CONFIG_DM_PCI_COMPAT=y +CONFIG_PCIE_LAYERSCAPE=y +CONFIG_SCSI=y +CONFIG_SYS_NS16550=y +CONFIG_SPI=y +CONFIG_DM_SPI=y +CONFIG_FSL_DSPI=y +CONFIG_USB=y +CONFIG_DM_USB=y +CONFIG_USB_XHCI_HCD=y +CONFIG_USB_XHCI_DWC3=y +CONFIG_USB_STORAGE=y From patchwork Wed Oct 3 10:44:30 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rajesh Bhagat X-Patchwork-Id: 978179 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; dmarc=fail (p=none dis=none) header.from=nxp.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=nxp.com header.i=@nxp.com header.b="A6WH4dze"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 42QCdc4KCLz9s8J for ; Wed, 3 Oct 2018 20:57:08 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 5579EC22056; Wed, 3 Oct 2018 10:52:28 +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=BAD_ENC_HEADER, 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 48CECC2208C; Wed, 3 Oct 2018 10:47:17 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 81038C22094; Wed, 3 Oct 2018 10:46:45 +0000 (UTC) Received: from EUR02-AM5-obe.outbound.protection.outlook.com (mail-eopbgr00048.outbound.protection.outlook.com [40.107.0.48]) by lists.denx.de (Postfix) with ESMTPS id E52B4C22118 for ; Wed, 3 Oct 2018 10:46:39 +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:X-MS-Exchange-SenderADCheck; bh=ooCqPovgAPSOGeIArUdQUnYLYXvWy26PfUxksbpogiQ=; b=A6WH4dzes6+AyEc0V0opoogO2Z68unpcClF/XyjR9+qNDeQGX8YeJ8MAvK1Ck0SyM/lWkEBy1D3/1slDD70KMMgO7Phia1a0siThnmYpHl+lUTFJJCzKeNqQd07xIedJ2trxH2mgvn3D/3uzinEEkbGcNA4yN8f7O2e1N/9ebHs= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=rajesh.bhagat@nxp.com; Received: from phoenix7.ap.freescale.net (14.143.30.134) by AM0PR04MB4849.eurprd04.prod.outlook.com (2603:10a6:208:c4::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1185.24; Wed, 3 Oct 2018 10:46:36 +0000 From: Rajesh Bhagat To: u-boot@lists.denx.de Date: Wed, 3 Oct 2018 16:14:30 +0530 Message-Id: <20181003104459.5444-25-rajesh.bhagat@nxp.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181003104459.5444-1-rajesh.bhagat@nxp.com> References: <20181003104459.5444-1-rajesh.bhagat@nxp.com> MIME-Version: 1.0 X-Originating-IP: [14.143.30.134] X-ClientProxiedBy: TY2PR02CA0011.apcprd02.prod.outlook.com (2603:1096:404:56::23) To AM0PR04MB4849.eurprd04.prod.outlook.com (2603:10a6:208:c4::26) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 96734345-da05-4c35-d78e-08d6291d7f9c X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989299)(4534185)(7168020)(4627221)(201703031133081)(201702281549075)(8990200)(5600074)(711020)(4618075)(2017052603328)(7153060)(7193020); SRVR:AM0PR04MB4849; X-Microsoft-Exchange-Diagnostics: 1; AM0PR04MB4849; 3:KxIvWnCfL1geuU07ZULbaC+5ylT7BK2JsAVJaZuQKNEShTZoTi8znCqfAFimsPinUUl1DrCqdEQtAx/sRZ+HktVki48l+uUAwJZ7A7+F6B+nHerV01tBd1T83wxkUoDasHB7UF0kXvICr8dcwucJRMgzpsMpz5WihnTHMLnLlQfH70vUeXOCzSx1Pa/3xq7rmWUJA/bmS2sBpOoaPJNx/nN+QXrgExHzKvZKfLOgfKWAaYkP1nB2BWLEiaw+uqAQ; 25:gtiIX3OKtj/i82D1R5LrBp8ozInem+dqvCRY51Mn9mAptWm7mLFuRZ3guScIHxZ4nTB91aOt/EirL5XTKX4Tl+2Jny7r4Y1LrhIzG+5B7Gr94Fc69WorMgFqNglnx7oCUxMEAiqOKpn8HI7VVR8/LbxbWfaHsk9ZNgekxbm5o2t2NOKSyIDRkriTOUWA61TNlCk827wdaI+k8HQOUHmZqSKB92fLmKwLvSe7/QLXOOADDhmADHZFkFLYLdsYFQGl7svQiWdT2+VSUDz0GhhpXrfZztsz5Q4AohQGrViJLGDeb4hHPYEHH1iAEya94LpjqIAmEG2osmoGc22LCxQm6g==; 31:RSAdrE2zHsKdMmCtRZQYjzlPfVE6Xlb7VbBqaBaz/PnmkbAs15bdYyLguAzGOG2q4sAIJ8D8UP3wkIWnrkv/2FfLg8ytYD125v6LlO4gdpJMhM/4GW0jVFy/K92rJ2JkHIpxhdoCvuKF2sBn/6YRVCubK/vVbMnLLp8ye1ibcFwonATepIEJQpTrlbLVOaCbIxOCE1Ze4H+dA/vqQA66dBCxkxT6tD+m8ifVkN4NBkA= X-MS-TrafficTypeDiagnostic: AM0PR04MB4849: X-Microsoft-Exchange-Diagnostics: 1; AM0PR04MB4849; 20:NjNwaUnKLAhnhZ1fgSNwiAUqxpyJhbbafmQCJnCRSVsEUU+TXY84IIZ3bl1LGOXOKTovVml5wjmHHwq5Dt4iedHlhgLb8WS7qMLPnbQJR8O6IY7RJqXIAiuO5sKsOGenuHJ+ueuN1NcUCWYaiW+CCYLQv4RdxxtnKxau1RjIrAfiBX5yrdUkNi7nydg3MJcE7HiSSF5BCcgzZnsJoec682bBOdmITZfPQC3rog/JntYPmz6smbbhjk6UipNFf3yeeUp81DBcM97pS2FgMkhTHuzQsnSOxWczThxIxQAQphdMKzESHoVmvn0F++GoB73N6MA8Nin3TXS0P2eDspzP/eAND52ZpRQJ/RhQnajhQkjJwLnsrqO2RQzdJ2SVEXkyqJTYQh3CixahpC1YyVadCkC3Ab/v6giymEd8uzHrq+PAx01rx3hlJpsOjsTPFpTFAWQ4a26WAvCV32AUFZIxv9xVF3oPuHuAfiwthudSoBQ9rqntw+HmaCfPhmNiyIQx; 4:AfKUPmujllMq5cgMFTdBHhyG27pRlsg4z98IwdTvQnyuB/8ySSmtXYm5JVFuKtYylNekvdCRmquScMcEKwt4O76dSitd5gxy5qEjDetOdP+yKmrqdc/fpLjD+85nprZYaJ14JabvC6kzXgOiKVGpqd4cUZE3IB3tfTLhD1uQZ+BBK02zgEsVgwvoHAznOF3GY3UpZS0JzROAzxgRvx1yzGrqgtzwQOrGHsKPxQq9oaSBAsFfwGsJ874oo9MvdpPsPl98ieuISmMZZBMWUOkmVEq3yuXmEziio0ihilI6qq4auPLyCGDacJ+Eu3KZ3fq8 X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(185117386973197); X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(5005006)(8121501046)(3002001)(3231355)(944501410)(52105095)(10201501046)(93006095)(93001095)(6055026)(149066)(150057)(6041310)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123562045)(20161123564045)(20161123558120)(201708071742011)(7699051); SRVR:AM0PR04MB4849; BCL:0; PCL:0; RULEID:; SRVR:AM0PR04MB4849; X-Forefront-PRVS: 0814A2C7A3 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(346002)(376002)(366004)(136003)(39860400002)(396003)(189003)(199004)(66066001)(50226002)(97736004)(7736002)(50466002)(55236004)(6666003)(14444005)(6506007)(386003)(16526019)(53936002)(26005)(68736007)(6486002)(186003)(47776003)(8936002)(8676002)(81156014)(476003)(81166006)(5009440100003)(4326008)(16586007)(36756003)(5660300001)(86362001)(2906002)(1076002)(2361001)(2351001)(478600001)(446003)(3846002)(6116002)(316002)(2616005)(44832011)(305945005)(76176011)(956004)(486006)(48376002)(105586002)(106356001)(51416003)(52116002)(25786009)(11346002)(6512007)(6916009)(15650500001)(110426005); DIR:OUT; SFP:1101; SCL:1; SRVR:AM0PR04MB4849; H:phoenix7.ap.freescale.net; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; Received-SPF: None (protection.outlook.com: nxp.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; AM0PR04MB4849; 23:DL5qsEwQLVL+bmFKlZpnhpceQ37ZMjxRA1sPBJDsp?= J3ounvbhGu2rdKrxhcUiUWWl2uQ1gcaOq8eVqQx+FYrGh2u6DYhh7a2n+1dul15YOoLgy0Blzcjq+Owb200NPcMo1FpFUwRV0leNt5HNm8XfYGiov5ctvgLH7PmtW9uUTa3GqRLr9kV617O/D3C9n35VKXrQhI8Vyg8hi+kiCD/H5k4vI4jYF1UqcHlBS26Q3PD68qOow7y1Kf3i1o1YtRh1X6mtNZD6Tf4//MBzDUv2ppNLMGLE6UnUpMLU1TvPjeJ8e1JckwGk5ROi1i0IpxRazIOHVBdCuKH670twDy1GMrOkaHsau0WpcvUsx+wDRLSTWC3AV4E7VSMFFzHSSIXyr+8CjQWl8DzUtQ+XmccPIcXUGz7hcJKV9nS+L4CdD5evkv3u1xKJhbdCKubSo30QIh31OusNjjLQbb719Igz2Q2/r3yK1yptBbdfIV6Pb5CSRvt/IU7LJ+vUo8Q1DzAia4aqeuJ4+eqADRCj6GLymmp5+jotCM8/C2Ksidwyoo4060eJhRTSVGAu+x6+jJeBlu5gQqWqur1vqz2GZ8DhatpIv3LxJ1ZxP9rkNOP9u2i+VKxhkoMD5bEI/8Q1F5curN+zIncQy9txCOJ9FAoVkhcONpHhXU1vh19ECuoIQ11u/0MCfJWyi9IDdg+hl1XCQymx62PqhMFFeEaBtPZNq58lv8i16jPHrsKPOt4tiD+veZk2JgD7n+hux2Nb6rUzfCEk/jKk2YOSxQXVbgjT0ZxB0D+sCkX5aZoFIot4oUOtzN/E13HJ0XTLnsvdHtBFsWTLb7RASjim0+vOskpGWGDqvMObds/nLuw4qFOofTey3DRp9HQaMQn/VQJwbZZhcf7s7CWHqq1+8B+h1rAU3BXEUoD382+XDHiLQGxYnv4cLA7t3kZDE6VMwzqPInGSm7CFR/tMoa/IlhLSv06rrreBvL4jDtAqRFS+pLi9I5ymoUy9aInfC8Xbc+DV+Igl+aAkPlZa1I8p6loFADwFzMluL3tN0Im9fYTLJ3n4W4EA2KMPSfFzfEh4Lt4V+mq10ytVz0SBvGNl2YIaLv4kott/gIxud6aX47D93PV+7fq5ho+WQdH9Ar5VW4proc8Nuho9XaYsgovNTFx/ykgIwxWyNVG9CYxe3DOwHVORLhpT4ZuQr3CXIsum7WOzfPkpR4ivDKdYSDDqZmUMZOgX3EwVMek8tsA/xqvNAkht9A4I4xQ0+wFg2Gj0kT1PJfcFTZCRUMwSAUI+nPfiO5lSO1yb8gWanrAKn+ePQPLWUzKSLMHAJndjqOpqN55I32Budcx++X556Qll0dO1+OAvsdDw6PgLMo/8DbR7NbM0YM= X-Microsoft-Antispam-Message-Info: PjiAIp8SnQUczJaUeOAqluQd30wYbOluyAk9rSDYs8KyJVl2g0Qocq77SCNI+h0Mopu46SjlZmHQ632DnTxp6fP2aVX86CKe2HrYJaNtXB8k10HhKtV7RCkolJ5uJokyFjYcWbJyPSqcv65GeSDNEng3J/rLtBYdqoMSA0X34d/2DUWqtJJMJQrlwoNF2EZV+keI8pJnH/uOWb8zGkiwjXF2RH/JeqYv9YNbFY7YYOOPIzoHtW+DQZNpHn6gSy0ccRWREi45rjOG5yZFmR0D1/DwCYkRj+ljM8vorMNtoJxIBPjD55W2qV82XD6PhEWugUeMqo8Hsk9aLVWprgbQVWSqkgNqmpSsngIAn4H2UFU= X-Microsoft-Exchange-Diagnostics: 1; AM0PR04MB4849; 6:l8z9H0cHSMwfWlRyPIxL4ua7L9s0+LwQO1izrO3FOgB5rzko4Pkd5WGqo34S9pjDsHolKGG604ZJ6tKXO6n5PqfdNwfCP1uI+zzkKeGkrInqsnxyvXl87FW8nVJFNhv5FwyWQflYRkudmn7tt0QRG3ylyVdkeql02upIcj1eVfBAQ53qduebNj0fCgERQc9tp7TDTvk+Ja2+laHT+1YEWNMgvJYtzwDziZGYZIqknjPHh0DU6NvuRGThXQuwVAyLanMNWpvTIB2DE40H8Fq98PU1rUN7VNN7y8TrcxfFbBtPwqQxE+JNPFlr21LJj2D8PJOP1+3Ti8ccPhW8y7FoL2nCDeFdOxNaXGZNhiMQys514qyEgaOycNM2cNvrMfPe9MnnC9KCaAWYaHUbObSvoHo7bymS3s0lqZ63hC+MZ6OGobLFBh53N5EC5+w00y6JiBiqsrzaBcmdTojg12CkIg==; 5:XW/k9C8ivk1vPMtMg5g+ac91NHdr+dFa+uZwAQTKahb2413H5mlE47d+OLrBjGmwQGbTl3yGTuKxSWVfUPZrCmy+u65cpR/VZslwO8/+SeqPB1HhHh+juflWbCnZ6OPT9jqGcF7kcSaqZ9+h4nsCHT5TUj7vn82CVZDHjQTrVN4=; 7:Np24ivmvX+qhk+0P2dsj7VT4qxt5pVhvQZbGPZrah+je5clD5GQb7cb9MVlh6MQSxvA8gURX0+RGbXyKeaB9YWPEq/hchVFwpUM6bmd1ghgzJiCPJcabK8j1YbqLo8kcTGdb+FdFTyg2asZ2x1WftvXM53ChzwEbZK/MGYNOSpkBZLdVlUpHkHwpdSLP0y0/bBFqnQIUpX9MrA3mMbDrZ4/7ur4xWf7zKtvajosCwuTXm62mqOzjy4azJBHLBPFr SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Oct 2018 10:46:36.8933 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 96734345-da05-4c35-d78e-08d6291d7f9c X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR04MB4849 Subject: [U-Boot] [PATCH 24/53] armv8: ls1012a: update environment address for TFABOOT 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" Update environment address for TFABOOT from 3MB to 5MB offset. Required to support new flash layout used by TFA. Signed-off-by: Rajesh Bhagat --- include/configs/ls1012a_common.h | 4 ++++ include/configs/ls1012afrwy.h | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/include/configs/ls1012a_common.h b/include/configs/ls1012a_common.h index 07998f7eee..8f1f63920e 100644 --- a/include/configs/ls1012a_common.h +++ b/include/configs/ls1012a_common.h @@ -62,7 +62,11 @@ #define CONFIG_ENV_OVERWRITE #define CONFIG_ENV_SIZE 0x40000 /* 256KB */ +#ifdef CONFIG_TFABOOT +#define CONFIG_ENV_OFFSET 0x500000 /* 5MB */ +#else #define CONFIG_ENV_OFFSET 0x300000 /* 3MB */ +#endif #define CONFIG_ENV_SECT_SIZE 0x40000 #endif diff --git a/include/configs/ls1012afrwy.h b/include/configs/ls1012afrwy.h index 8129595d51..ae85ec1e72 100644 --- a/include/configs/ls1012afrwy.h +++ b/include/configs/ls1012afrwy.h @@ -31,7 +31,11 @@ #endif #undef CONFIG_ENV_OFFSET +#ifdef CONFIG_TFABOOT +#define CONFIG_ENV_OFFSET 0x500000 +#else #define CONFIG_ENV_OFFSET 0x1D0000 +#endif #undef FSL_QSPI_FLASH_SIZE #define FSL_QSPI_FLASH_SIZE SZ_16M #undef CONFIG_ENV_SECT_SIZE From patchwork Wed Oct 3 10:44:31 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rajesh Bhagat X-Patchwork-Id: 978178 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; dmarc=fail (p=none dis=none) header.from=nxp.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=nxp.com header.i=@nxp.com header.b="i9/Dj8RW"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 42QCdR1D9Yz9s8J for ; Wed, 3 Oct 2018 20:56:58 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id ACD83C22049; Wed, 3 Oct 2018 10:52:44 +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=BAD_ENC_HEADER, 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 8158AC22138; Wed, 3 Oct 2018 10:47:18 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 81442C2208D; Wed, 3 Oct 2018 10:46:49 +0000 (UTC) Received: from EUR02-AM5-obe.outbound.protection.outlook.com (mail-eopbgr00050.outbound.protection.outlook.com [40.107.0.50]) by lists.denx.de (Postfix) with ESMTPS id 52B8EC220F0 for ; Wed, 3 Oct 2018 10:46:43 +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:X-MS-Exchange-SenderADCheck; bh=oO0gX1K4LUDvKN57MdQaF8LUDZtMRzTNUI+PQcVPy4M=; b=i9/Dj8RWXPoPFgq9M0ncLEeR5ecwjlPhr/x4fSYO/XM+5lxfKmk0SywSGol2vYgyhXniUvCo/VyyqD07QBB39q/lEEIWO7g9n5gD+i5BFbgYTqXA/X7UGurUIXb7fg5veSuKOR/S+NVH6HsPYbqZ+4R8TZH7EC56/Gx5UHbd7iI= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=rajesh.bhagat@nxp.com; Received: from phoenix7.ap.freescale.net (14.143.30.134) by AM0PR04MB4849.eurprd04.prod.outlook.com (2603:10a6:208:c4::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1185.24; Wed, 3 Oct 2018 10:46:39 +0000 From: Rajesh Bhagat To: u-boot@lists.denx.de Date: Wed, 3 Oct 2018 16:14:31 +0530 Message-Id: <20181003104459.5444-26-rajesh.bhagat@nxp.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181003104459.5444-1-rajesh.bhagat@nxp.com> References: <20181003104459.5444-1-rajesh.bhagat@nxp.com> MIME-Version: 1.0 X-Originating-IP: [14.143.30.134] X-ClientProxiedBy: TY2PR02CA0011.apcprd02.prod.outlook.com (2603:1096:404:56::23) To AM0PR04MB4849.eurprd04.prod.outlook.com (2603:10a6:208:c4::26) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 02e49471-b261-4afe-7611-08d6291d81a4 X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989299)(4534185)(7168020)(4627221)(201703031133081)(201702281549075)(8990200)(5600074)(711020)(4618075)(2017052603328)(7153060)(7193020); SRVR:AM0PR04MB4849; X-Microsoft-Exchange-Diagnostics: 1; AM0PR04MB4849; 3:dSxRHi6VjzQwX61VpJz6Iq33M4BCjH0KQTDIH50agFYsYVIaKen8EjDJB7hi8y7+qUlpw1UDlGfIxu3hzUaIoBQScpPfCKMldzyMMRqgXp7OBnu3Vnd3vUaitT2aue59u5PldXAYdSr0PIz9MMtqGnSilJpWPx+WWPQ+lrzFFKrBGlgdwkHLn+iMjjysEgT1WWd5TNTlKAfNfhWTYmgdfX+zWgTepJ8uZqLXrwEla0w3/ZA7TcvB9C7VyAdbxSZV; 25:Mm1U1meGWW7YPaR+9syaRHjUTkB1vyRscXagaT4Q53eVH0UpfNT7pbH9zQJMSj0zEyepw7NGrs7mSND7PWIIYDDv1dnwxjmF9Gucp0ma+uE9isBc9sNigFR3N01NHRV7tK9q3aMtnVJmpWHSuafVLQ8l1dL0WnvjZRztsjPkH5oMw17jFnwHsPwV7m227/imebxpX9X7RTXIgTtknfedRrmO/ewo0JUsd/5L0Z7IylJY4aOqaPlqu18nvwYZbB0o8J0g34l57XrRK9TFfnhUwCFXIB6qyE5FaIonxB9Y5rN8Be8Rtj/vnbYM6OGySbjlifFkS+3E7R/zAVZOU96pKg==; 31:AU+32x6f2PtNkLFQuEk/GoFHz6ICBIyVg6mKYs0E3tGCTKf/yalhytXNsUVO/9HwapHKJgVnIESuk3uwNrOOzq6/Pmt0/sVqxE7Y4OPjyL20yn6pZbmDGq5Gh/kbYLgj0rdnqaifl2HzLXDxgLiH5cw2K7emntpDILsUV0bmqM9Z3Uj9ZMO1IET4d3imsVcM7vKufFGy/Au7hWe7K0A5JZke0i2wos9qdwK70GA1tMI= X-MS-TrafficTypeDiagnostic: AM0PR04MB4849: X-Microsoft-Exchange-Diagnostics: 1; AM0PR04MB4849; 20:iwzLPgNLZpYdIHx19ZLIfyySk0/8JYUNE0H22Lp5bfZvKSyF/OoaksOe4t3U7EZ5Q+CpksB5ztFh7DlBYlArcI6FNntpSt/06ugteADM9FVEO+RrbXlegqpM/c8yvwn80H+ZoDWCYMWMFmuXdnYgKAh1BW4z1wJUK++RTlRq/2wai0s9jliPZxTxa5w8Kgye3bHhvc8Ici8/ybjV11oBcyvaazOD7UskH5HhMiSVq86HnWTxvfT0bOpba14VeJRi/Z+97tzhGn3svvTxQsmCQKUjQBYRfGuhhAEWr3YSDRvZYyPW3ew+jmQba2OMfcbr25/Qb02mwf1Tm4igHZlB8CMuLqxDSKk7SNgKbb251VD5qE20md80i6zZ/e/oonVHUZNjMNkugKYf9kcUUhLXL5iBcpnwHjCcIGMcL+q3tK89a+iqGBOW8ksdWCT0e08NkySpBSey6RSEHlnEcMIm7dM5Kd9MTYvWUX0fIGbSmaP33G1EZ4DFAHxG0W4SRbLo; 4:UsusdgQsyKtAY4JpsRcIRMVjDHdvaIQCLKmCdlA0M2obSgZ2xwgx8gwDCkAB37tBhFzn7vo4hSSk4yY4y+KLux2v4VA4DDQNg9tCTqbs+/0ntEIq6A1flikeaSlho3IX6IM7Mqn4rOYYFcWXkcjzytvqY2oVcSoorrSgSBxnVUR6ZoDaEaqnFUt8x3vykaOjoudNTmEQrg8F0MghBHcjI+ZyW/PsaaN0ddCLoEwd9Dl/0wwj6PmGRz2eF/3ntuemZ485cRhGIBFtosnNFjW4V+d2oQiMX8W0mN/RZKenoqfQ1QPfosJxGR3gsnRjjR/T X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(185117386973197); X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(5005006)(8121501046)(3002001)(3231355)(944501410)(52105095)(10201501046)(93006095)(93001095)(6055026)(149066)(150057)(6041310)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123562045)(20161123564045)(20161123558120)(201708071742011)(7699051); SRVR:AM0PR04MB4849; BCL:0; PCL:0; RULEID:; SRVR:AM0PR04MB4849; X-Forefront-PRVS: 0814A2C7A3 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(979002)(346002)(376002)(366004)(136003)(39860400002)(396003)(189003)(199004)(66066001)(50226002)(97736004)(7736002)(50466002)(55236004)(6666003)(6506007)(386003)(16526019)(53936002)(26005)(68736007)(6486002)(186003)(47776003)(8936002)(8676002)(81156014)(476003)(81166006)(5009440100003)(4326008)(16586007)(36756003)(5660300001)(86362001)(2906002)(1076002)(2361001)(2351001)(478600001)(446003)(3846002)(6116002)(316002)(2616005)(44832011)(305945005)(76176011)(956004)(486006)(48376002)(105586002)(106356001)(51416003)(52116002)(25786009)(11346002)(6512007)(6916009)(110426005)(969003)(989001)(999001)(1009001)(1019001); DIR:OUT; SFP:1101; SCL:1; SRVR:AM0PR04MB4849; H:phoenix7.ap.freescale.net; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; Received-SPF: None (protection.outlook.com: nxp.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; AM0PR04MB4849; 23:m6W7/rzywjyWlRriadpVjVWfk2NTTcAYvXmaSvkGI?= 4SC1KovTzD33FdeXuVxpI1EuiHuzVfn8/0KUEFYu7qEVkIMul8dhqXaGUnowlt9N54PBIakVMNpH5aL+AxWqJ7B2O9bXRmbzg/cEkFrC20kXiR5Alg9WMF45aEFEpDwz8vJ20kMjxS2SVVA3qTpHxFhtUvx4gzV6izVs9IkKByeAzRB95lGocJjwSByV4dpNuALxDJgJoaZdniNhzsnyvb+7YeEpNRzsTtQX1QAOolSfMBKpT4c9oZLR2/xHyyBWftfQLAc5V/wG1ZyV1dUnJeFGY5AsFZ1E8k9Sf9h/LI4gzVNyjYzYN47CQ9ejNoH2dP4WZIdgi6B62VkiyUVynIjn3z05pZeiqpEp4nEkfFcWNal4IUgvP6Szhh/DCvH8utGu2Qo2gmfVlnQzyT7dipil3IpbENPmL/6MsTxfiUgWG8pRt4I1URij8a1xp0Ss7cGADdb9w863XLCg5VJaGKnfg5FySOanAq/uKoIlNkTe6fYB27SUMyfiZsR9k8AK6UI1+aHb1m045vE+qZ3jhGF05Skr6g3+7MPJe1dWMs4xAGBHAwNk3u5Ktwgim6Gip1LAHdYjhXYKeuXs4VNpAjLxG/btF792TFBs4QlUZxf5bIZTa3BsKgcGOAiGdcLqQanGYMeUdETKUSwULU6/8NxHJvl4yui41AQBGWB3NHbgzrtBjzAlOOUZoKJBLbFIvaMNmKQbyOBr4WoI23B9V/CGLTVIukRwTiUYhbsFasANDGElK+pMspy8h1AlBCTE2yoW/NjlIl1iVbtuwmGzg9w/KyExzHxWx9ZouEUBgislOFbsvtpckekz42+1eJErrnkr3vrkdWxM8b+GVFE705Rq6EI9eaMs6/n8E6QghJtzBL8sST0UhDxYVyRLa+ILuvL6MFNiH8GP4oHi6NYR4bFn4S4bPLwRuwdppjzn+pZZsVkNhjTM/mdqMkDt+K3vgYaR4KK97OJU3jx9YYB+lg8z+kHPTjZmP1he3s7tirLO7esHT+/pTEvNlDrrU0fF1HQPXl+Ibcqr3R/VrHmFTbWnvrrPiTPVjPxOBaCiZZusMfY5ADDaUPS0cn0nVIrfbouuVWCHTAROUMY6LGsJw2D/Uvy4IEh7PYfqNBkGnuknVQI8yMHyZZ4sjEjTa5Qyvgek6dh3pZX7GZymemcnLPxkUjNdGj2YnwxeUNGPXyMF813kz3iua8y57YZyTd9v9/jguta9ExWoUTdfuhhRh+YZY00zheovYjiOTjAkU/EoKcS0DG7o9araXbJ/jwj2P3ILaVkKtJOAqCIZTwln9Gk5RF0DCE8lgE6ne3zEPv6CNob7ru+tZyhqAHuNSBYun633sNGyQmF18Zx0hLs0DromlZniGxafRHqON6eUlEQmg== X-Microsoft-Antispam-Message-Info: 6cMdazD96CR/DAx/m14caokcMqYgfPtB+n9UFhArY9rhGYYQ9dpxIifXMbXTpl0H6A01MUjZwfLylR8W8VsCxANx3dFidBVC2JzkAHKOw3bOhpY/iN0NzOOPj+FvBMNLKj6omsA7hMYJkNMdpQaNpcD8XoTUyl+3Yc7uX5RRj5dmkrAVusWHPGluULHPHgrNRQ/CcyDbbiLOrusEhSo/d6ZIx1RDmEjV8GUyvkbUjgdNvnEF8nrweHgbS/84WDJytnA/nt4/BK52D8IWtvtaQPeA9YJr5/sx3sGnIINGad3b2Q0ULBz5FngZxdKraLVkyAq4HkpJiBo3ykye1ShvpoiBBf8oxFbwg75DX+0Gu78= X-Microsoft-Exchange-Diagnostics: 1; AM0PR04MB4849; 6:PuiETBz6hcil+XOqWVqAnuT/G8WGEkvPZN0yRGyESIRDj6ym13T1SX4Ccw2ZI5g8xCAvcRDWf6gdmNh4fB+0z5YHlm8Fn5KlEB679QXm8qDTd4PHrsrJNOfhXHg9ypfmz4GQmNyY/gipoedhYNifJ+WnUqvNxWWGz04RaOIHgy2HAfQ9VT3tPUwPNB1JZSGeYIK77SA4ZI6szqHQTbj8X4yfciu1e8BTJQ+2+cqg8GpcgPYnZhaJKtP19UkS1mqcxPdiwYiD3BvVwH2WSrR1qZeWauD468Wkl8nPwCunwOYeRjPX/iRPXCAyZ22SVow9HXwmLhETsm2W7oydJ3O5eUou90j/aQpRzywBgMl+ldVlNeHfOKTnzeRn/jLVqhcUxxtafXtvsao9zZ613I6j1Hn5jACGIpsaN1P8YU5qmo1FBSeLKOAk3/ZjyD4Rc176VsE1XyVDdeizamX+GEgZxA==; 5:bMZQCSv5hMR+t5rGOMFN4qAjD10SOQI3xyyEX75IoVDPpNiDm4aDMSc5nopJ6LAVbbAz/0P0Pqlx/mmihY7Ck9tIYQyKmjGJRP57tU88zRnt99QGT8KobMfX/WZVOgCo0mv59vrgnzNfEfrUlYHoBvTfrXKBZK3VI8qxoyZeXh4=; 7:b5ahtpKFRogJJIsUcdDkRyrzqBjaUvuPDkHPALe2xtAWrvg6Rq+zpctR4F9M3RuIduTfUNX7eyFDs/ngVQBL1NxCnYVpiuNgssSPT65Em6WIr9nzh2so0MsXtULei5bY+L1U3VAT81iQ/wB6ZiYBSouf4pzs5mTUVqBLmOfkOU0t3/udWcRK67Pyf1D14d8uIGaVbQuDXZYdH3hj4+6aOMUBD9ONHRh0jDY22CLr5T0MbNKRDqSIZe0tKaX9d26B SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Oct 2018 10:46:39.9265 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 02e49471-b261-4afe-7611-08d6291d81a4 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR04MB4849 Cc: Pankit Garg Subject: [U-Boot] [PATCH 25/53] armv8: ls1012a: define BOOTCOMMAND for TFABOOT 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: Pankit Garg Defines BOOTCOMMAND for TFABOOT configuration for supported boot sources Signed-off-by: Rajesh Bhagat Signed-off-by: Pankit Garg --- include/configs/ls1012a2g5rdb.h | 6 ++++++ include/configs/ls1012a_common.h | 6 ++++++ include/configs/ls1012afrdm.h | 5 +++++ include/configs/ls1012afrwy.h | 6 ++++++ include/configs/ls1012ardb.h | 6 ++++++ 5 files changed, 29 insertions(+) diff --git a/include/configs/ls1012a2g5rdb.h b/include/configs/ls1012a2g5rdb.h index 71e4a8b427..cb329385d9 100644 --- a/include/configs/ls1012a2g5rdb.h +++ b/include/configs/ls1012a2g5rdb.h @@ -93,10 +93,16 @@ "bootm $load_addr#$board\0" #undef CONFIG_BOOTCOMMAND +#ifdef CONFIG_TFABOOT +#undef QSPI_NOR_BOOTCOMMAND +#define QSPI_NOR_BOOTCOMMAND "pfe stop;run distro_bootcmd; run qspi_bootcmd; " \ + "env exists secureboot && esbc_halt;" +#else #if defined(CONFIG_QSPI_BOOT) || defined(CONFIG_SD_BOOT_QSPI) #define CONFIG_BOOTCOMMAND "pfe stop;run distro_bootcmd; run qspi_bootcmd; " \ "env exists secureboot && esbc_halt;" #endif +#endif #define DEFAULT_PFE_MDIO_NAME "PFE_MDIO" #define DEFAULT_PFE_MDIO1_NAME "PFE_MDIO1" diff --git a/include/configs/ls1012a_common.h b/include/configs/ls1012a_common.h index 8f1f63920e..324dba2b7e 100644 --- a/include/configs/ls1012a_common.h +++ b/include/configs/ls1012a_common.h @@ -114,9 +114,15 @@ "kernel_size=0x2800000\0" \ #undef CONFIG_BOOTCOMMAND +#ifdef CONFIG_TFABOOT +#define QSPI_NOR_BOOTCOMMAND "pfe stop; sf probe 0:0; sf read $kernel_load "\ + "$kernel_start $kernel_size && "\ + "bootm $kernel_load" +#else #define CONFIG_BOOTCOMMAND "pfe stop; sf probe 0:0; sf read $kernel_load "\ "$kernel_start $kernel_size && "\ "bootm $kernel_load" +#endif /* Monitor Command Prompt */ #define CONFIG_SYS_CBSIZE 512 /* Console I/O Buffer Size */ diff --git a/include/configs/ls1012afrdm.h b/include/configs/ls1012afrdm.h index 7affabfdba..8c7d4e558d 100644 --- a/include/configs/ls1012afrdm.h +++ b/include/configs/ls1012afrdm.h @@ -65,7 +65,12 @@ "$kernel_addr $kernel_size && bootm $load_addr#$board\0" #undef CONFIG_BOOTCOMMAND +#ifdef CONFIG_TFABOOT +#undef QSPI_NOR_BOOTCOMMAND +#define QSPI_NOR_BOOTCOMMAND "pfe stop;run distro_bootcmd;run qspi_bootcmd" +#else #define CONFIG_BOOTCOMMAND "pfe stop;run distro_bootcmd;run qspi_bootcmd" +#endif #define CONFIG_CMD_MEMINFO #define CONFIG_SYS_MEMTEST_START 0x80000000 diff --git a/include/configs/ls1012afrwy.h b/include/configs/ls1012afrwy.h index ae85ec1e72..75ae329e11 100644 --- a/include/configs/ls1012afrwy.h +++ b/include/configs/ls1012afrwy.h @@ -123,8 +123,14 @@ "bootm $load_addr#$board\0" #undef CONFIG_BOOTCOMMAND +#ifdef CONFIG_TFABOOT +#undef QSPI_NOR_BOOTCOMMAND +#define QSPI_NOR_BOOTCOMMAND "pfe stop; run distro_bootcmd; run sd_bootcmd; "\ + "env exists secureboot && esbc_halt;" +#else #define CONFIG_BOOTCOMMAND "pfe stop; run distro_bootcmd; run sd_bootcmd; "\ "env exists secureboot && esbc_halt;" +#endif #define CONFIG_CMD_MEMINFO #define CONFIG_CMD_MEMTEST #define CONFIG_SYS_MEMTEST_START 0x80000000 diff --git a/include/configs/ls1012ardb.h b/include/configs/ls1012ardb.h index 17554ea955..f149a604cf 100644 --- a/include/configs/ls1012ardb.h +++ b/include/configs/ls1012ardb.h @@ -112,8 +112,14 @@ "bootm $load_addr#$board\0" #undef CONFIG_BOOTCOMMAND +#ifdef CONFIG_TFABOOT +#undef QSPI_NOR_BOOTCOMMAND +#define QSPI_NOR_BOOTCOMMAND "pfe stop; run distro_bootcmd; run qspi_bootcmd; "\ + "env exists secureboot && esbc_halt;" +#else #define CONFIG_BOOTCOMMAND "pfe stop; run distro_bootcmd; run qspi_bootcmd; "\ "env exists secureboot && esbc_halt;" +#endif #include From patchwork Wed Oct 3 10:44:32 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rajesh Bhagat X-Patchwork-Id: 978177 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; dmarc=fail (p=none dis=none) header.from=nxp.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=nxp.com header.i=@nxp.com header.b="fTfbV7/C"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 42QCcV3xwsz9s8J for ; Wed, 3 Oct 2018 20:56:10 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 43970C220AE; Wed, 3 Oct 2018 10:51:51 +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=BAD_ENC_HEADER, 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 E1B64C2206C; Wed, 3 Oct 2018 10:46:58 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 77C4FC2206C; Wed, 3 Oct 2018 10:46:49 +0000 (UTC) Received: from EUR02-AM5-obe.outbound.protection.outlook.com (mail-eopbgr00069.outbound.protection.outlook.com [40.107.0.69]) by lists.denx.de (Postfix) with ESMTPS id 3C5AAC2212E for ; Wed, 3 Oct 2018 10:46:46 +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:X-MS-Exchange-SenderADCheck; bh=IbIuIRzZMxyvKEr3vTDGAHZ5QVi+GegnmytIpK3PVvo=; b=fTfbV7/CiKYUE3nBbi+WBVttwj5K/Y3FEOvMU8fq5W38ROBF2TeHGDzC8XMUw/N0mT9yGpf3Wk3CdnhPKfETwL9HyJnJWJs9XwyroM6OWqffI48QWAhxLXu1i+2/znkLygTYQUpw1oYjGyqwLOO5NM9HvHb8N0ZGkvY/JPnBig0= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=rajesh.bhagat@nxp.com; Received: from phoenix7.ap.freescale.net (14.143.30.134) by AM0PR04MB4849.eurprd04.prod.outlook.com (2603:10a6:208:c4::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1185.24; Wed, 3 Oct 2018 10:46:43 +0000 From: Rajesh Bhagat To: u-boot@lists.denx.de Date: Wed, 3 Oct 2018 16:14:32 +0530 Message-Id: <20181003104459.5444-27-rajesh.bhagat@nxp.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181003104459.5444-1-rajesh.bhagat@nxp.com> References: <20181003104459.5444-1-rajesh.bhagat@nxp.com> MIME-Version: 1.0 X-Originating-IP: [14.143.30.134] X-ClientProxiedBy: TY2PR02CA0011.apcprd02.prod.outlook.com (2603:1096:404:56::23) To AM0PR04MB4849.eurprd04.prod.outlook.com (2603:10a6:208:c4::26) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: d4e9d5d9-233e-452f-8174-08d6291d8369 X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989299)(4534185)(7168020)(4627221)(201703031133081)(201702281549075)(8990200)(5600074)(711020)(4618075)(2017052603328)(7153060)(7193020); SRVR:AM0PR04MB4849; X-Microsoft-Exchange-Diagnostics: 1; AM0PR04MB4849; 3:a8iyc2LB1GuqC0kp5zNyu+2RjCI5vofeZHbSlGZ3YpLVAtwKgjhQccKwOupRXTpDsI6gdpCHsv/xOzkEj9KAx/lKmcqdN9927O70UMt6QL5zf0sPSsZsfhPcfyjl0Qol1XAD3THn3PyiG2c/D82WZTqnc2knv8YucREN1Ni803yDCAO63Ke/nzlCTeoPTPkALDy1BKjaH6dedB3htcknUtk/bRMummVc8FMYnPp/yR0YNOPczwz/GQcex7zLHvjy; 25:maXFthenTwYT6oGnAQgiW+BSxEx8iZ4rIcH7ZmMjuANMyy3/c7crtiMHHDhh4bCQVMA2wdCBjiAQSoSN5qj1tN1uKXyCVuv9qmnGZMfQ0ilXNXeEuUcS72XL/bo9cHTAPiJODwmfttofLO7mLleGEMErc31P1vqpcTy7iAZ3DFsC1whcTd2lAvDn+wgipOqYUHUWS7Tbe3hCQHaRXwMIiMqcpHPBRiqZzQh2ivdJgPgmbmNFT58ya6fTDWSUE7WTGw634Z3ziVGdbIDdQvi3Y51+leoEXnCzprvvhqqahFSuCTJMIQrflceW2eejeE5cep+G2GJ/Z5N4FwC51DXWKw==; 31:dmIe+LYU9kopETL3nLwEO2wLSY1fK0bHkYLN/4kA3jELP1MI81kzGPcC3Zi2KKJGma8D5Pil6MSuWHiCKhNtZ8MqeuD6EGDSbPt44z+LCXzas6saFzwna6r3X7pfF8+HuG6Y08pLxH9A4moKscFAJyuV2NeeJF6+xY2RuvS99jBfMpNpBV2RPdZvJwbc9hNy7yKNx/8sPCE49oNU6sbLe1HgHNUWAIdcC8yciWdL9i0= X-MS-TrafficTypeDiagnostic: AM0PR04MB4849: X-Microsoft-Exchange-Diagnostics: 1; AM0PR04MB4849; 20:m3136geKG3lCQnwZiPux0tXRVozj8Ufca6NKTG+qNWwibdc4J2hKBULHHRIl4avZlcktABnCD1OI9qB2za8nRVMNFtutBHwiBxhrqpwyY/wguOGRaIlzqr6mE4YwzmzyX8OGiWgNPm5IQhbotqcnpEUQHsGnRfxgrmeHOTvjQ6RUKqmoRfGqDVYH8YdP+BXJXpOquAlLHL56SErmuTNGFSNWQjomuum7MG3H4ZipGAMxXFKVB+5CquJoS0I8zNwlMEbvwVE8+s6yuw1kQ9bRi9T4jp2aNffE3T2kN3/YV2JRIvhMNhtERIgcalbMO0MIR8f4v8oi1sqRMAKAcHO8n/oJl40i9ZXXAV0HyS3TMvRum5d39GfQHhjTdQPykZJzKezPGK60F797JDUsfe7ddYA2ptuQUyba2l5p1CSSxMrLTNnEmCzljUR66K35myh2jN6CswJ1p8IdaHnOTEqLwkBRIEnqKkkWpdsVrRLoK9fNkNO1HGuwKRYI/MolOiZE; 4:vAIGflJMG+AxMLftbhDI6AO1m31yjkK+u4eYa4J/NyM9d21Nid+cwnGQ45qC3UqXFI8tTAtAFgfy4qRkWLS8QQA0XUak5VFTVEpHZrH19Z0cL7r4NoULUfdLzCi+ygz5B42STE/dHzcAaanZ4EduFULhiE5B2aWmDYV+KMvf/begC+HJiQ90xVTtBkH96f5Hk17I62h+yNSu1NB/JTF5pBj04RNMzBNsuk5GDTiUkEWT2Mr9qi7NyTMetuE3U+q/plRPEGBfvz/4b5gcLVDGYMiYZ8bGbyGWLmkScFgxMn28k4LCWKK/fvbQPewhO8eu X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(185117386973197); X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(5005006)(8121501046)(3002001)(3231355)(944501410)(52105095)(10201501046)(93006095)(93001095)(6055026)(149066)(150057)(6041310)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123562045)(20161123564045)(20161123558120)(201708071742011)(7699051); SRVR:AM0PR04MB4849; BCL:0; PCL:0; RULEID:; SRVR:AM0PR04MB4849; X-Forefront-PRVS: 0814A2C7A3 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(346002)(376002)(366004)(136003)(39860400002)(396003)(189003)(199004)(66066001)(50226002)(97736004)(7736002)(50466002)(55236004)(6666003)(6506007)(386003)(16526019)(53936002)(26005)(68736007)(6486002)(186003)(47776003)(8936002)(8676002)(81156014)(476003)(81166006)(5009440100003)(4326008)(16586007)(36756003)(5660300001)(86362001)(2906002)(1076002)(2361001)(2351001)(478600001)(446003)(3846002)(6116002)(316002)(2616005)(44832011)(305945005)(76176011)(956004)(486006)(48376002)(105586002)(106356001)(51416003)(52116002)(25786009)(11346002)(6512007)(6916009)(110426005); DIR:OUT; SFP:1101; SCL:1; SRVR:AM0PR04MB4849; H:phoenix7.ap.freescale.net; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; Received-SPF: None (protection.outlook.com: nxp.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; AM0PR04MB4849; 23:9EDuUnUvv0Wep1A/N7kHgGGMhRIlJnzv53kFNHH5o?= F7ArCOd6P4a3w/dxfmYzSCKLd19tCgoAwMyDXH/44TfTZrGCg1cS9piCPP0q8SvpQgx1ai27b3wFHb4489CtwLCcmv1cki1k8yaM5r2BMZ1r5AWy6VnQ4WrHLPDQbrlqr0yywIFIqZrtj1Uot/eLGdN8otfBrXZLLx5oX/1dHXtehJkw/vDGbuu5DUJQ0PNabr/EcwZRLYn3EBA3J5oG4qXoFOv0dVQmwQnlENeMp5OPRZnVOKvlSqBnNX5ngEzIcI2veLGcbSs3cUHDWdvPp8zk9s1CJRRtLK4O6Ny6WN2zDWx1glcflTnAtLsn9DrOawdyguoq8nrvJv9fY1Uq+altRVVIX/+V/rq/KfMa77TC4znQFzwMS4b1ft0M8iVltlpxUr3dnfpCeCMOu5/Oom4az8h8ylHZrmBE7bnQpGS0RBnITbNkAGUIEKHIm1L65b5o19cJlz8/sf8smmw4Y3NSwx392WmeeN+mBmRTcVsjxYFEsSH/Y+32VzRzMD2gObpT1BtcYzPYvMzV7lsgUphitCnmPkhX0nDBICnu8WHcfbUfLl5SeaEa3TDcgcIIRdptI47ivc4mHqkA8WC4me12zf6ZlAfp5/NCuWoNqfgMMnoho8mG/LJGtdInwJB0mN3xI30Mwys2N9l1s8FX4aI4sI/LrlB350VeZ/wxg2T52CWny8BRIuFqOlY5bPi7GHF01bMx3Ury8vJ5PI4ZNasKqQzT88vssX+YrkapPcZJdtSZQNwUEmlj2lWyXp9V/595D7CV8JkGMlUSNCZE4RZL5MOa690h8CLBbjEBl0amvMBDJi3x8o09rQ5xZDNF1ML8eHf9e+dYeF4V5GkgozCkLahErL9MvWgaXpu0HQwb/jILGTpnbHRm+5CacgfpSoBTOPhwY1Bqtfcxbsg19cNHpTOEw67SwN/LMQTdPwULIwUUBsr0a2zG3tVr5e0XC8SCGkWnaHzMleTtgKks2iv6hN4L/TiDlErWS64Kf47hL+fuJwpFyiy9jmQNJX51C52TUh0Uhzr0myvbtUK28BJY3uZWGpFHX4j/5bAUFj9KR6s1uycsjYEo9jzMDS4Hk4r/1zu4cXFeBbfrQS0Dt4tXfC2aNcQFUdtEStBQyxruwIXo0NFvBiYBdxXmAlhAAyBkSpjGvSjV0xlDl/KIQORYpFkoE42Kh1T02gAhS7UAq5vdaV0U9ig8LMKx6kbbHNszrCIILao1Xnb5Wo5fTK1ijCyHkaJC4WwW7MdpUR7w4MvP7olTBX0KMpz8QFZTrI= X-Microsoft-Antispam-Message-Info: fPqfB8l/xmTT+6NIlhQ1PX6wHAfn9M2TrPrJE9wQWyNqEIfVO0f5wQetRarJ23n67kAMZDuMvpG/15097jtkf2SQing+P5WqVIGr8LYKWcquiRJkNvG0UULxwR6xMoE/36X4tfIPYhL51I51kCpS00DZEksrqJpvjQ0IgGnIm5XKI6oLlxhpIFsmRsA9uycaIgqsOhpt/hDIsRdeXHKIpA/FpOu2v75DQWcoF45Xq6xWyx+yvkxNjo6AYyrz4/H84z56ZvE08A5pYVF9HjbtNKtbQEJm7e+jatthWHuHqQkuDU6z17U5mJE2oexScRJAgstTHqN2POE+GvxzelNOajFAvlui64bsIVa9yS2gy78= X-Microsoft-Exchange-Diagnostics: 1; AM0PR04MB4849; 6:EMxLmHWSMsXzZptvZIrZwSbeQ6J1YhOWM00EtwPdAqaNd+T3qPxwnnvTWX6ksJldbjRmgCjowl0QvKi4XHXIy6yfBzAMk1WMFmu4A1qVq8+5uQrG3AgIU5uKUIlQL6rxb+yAWJ7NIYgPp9jGyNGQ+kPvP7z/ukRgigRec4iTN/Zv8bzQWiJl5LpI4Ddpfw75kbYI0IxTfWZNm3M7oBQ52Kxglk0F0RYpeWLqKHZKoHMwGVgsh/GkyuzfLOG4VeLBw66sk7X4gwJDNXiiXn6D2ittp2UvG6pYCy0DiSJdKlTP41N0O1snvItf24M2v8C+q8wTiL7RmMmnXdxV2sXBJEDd8cLB9BY5MGBBiua16nFWSbqGB6HkDL/PU/gdwawYDExFcBTEwT1fCyKWu9VLd/czdG8VOkBGHKRZPqIqZlKey9VZJ4gDoHLzD3YqpL2yF2g4JOYp9N+kWS9FFttDAg==; 5:MmjrCLdxG8ROEEEpKTuw/5iRJczT7joPwtjRf7ahe6HqpLYxFCPXfLNlSgksj/I/ntj+a5H3LmyuJjuHgqb6QrDUruu9YzKRBu9A1rzsLAFU1StKiusEYNh0cfzCtXl8liqJhg9AytwT1oRQ3wlTjncBDsx53YoD8wxWgibzX0U=; 7:78easDpB3JZ325wNL240vnVGicdJ7gMKmTa6VC/R1XA+lk4t29wX+doaRoFQiax2E0fx0wLZUkMrbD3VYIdCER9nc0+t5a2kFhiF79hq6d+jXVvOyzxlcMVy8EdfdHHuu/7Ol4iND3Z3p2J08PsgSzpkuQTcdt4DZl7L+jsXFvynec3aKCJHYamlMH06tkAxrb5X1DYDbS56g3XcJ1V/o7hkmbCQFqNSxgzEX1PkfOZ0VTQjuPTO1j5c/6xic6eq SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Oct 2018 10:46:43.2658 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: d4e9d5d9-233e-452f-8174-08d6291d8369 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR04MB4849 Subject: [U-Boot] [PATCH 26/53] armv8: layerscape: remove EL3 specific erratas for TFABOOT 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" Removes EL3 specific erratas for TFABOOT, And now taken care in TFA. ARM_ERRATA_855873, SYS_FSL_ERRATUM_A008850, SYS_FSL_ERRATUM_A008511, SYS_FSL_ERRATUM_A008336, SYS_FSL_ERRATUM_A009663, SYS_FSL_ERRATUM_A009803 SYS_FSL_ERRATUM_A009942, SYS_FSL_ERRATUM_A010165 Signed-off-by: Rajesh Bhagat --- arch/arm/cpu/armv8/fsl-layerscape/Kconfig | 24 +++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/arch/arm/cpu/armv8/fsl-layerscape/Kconfig b/arch/arm/cpu/armv8/fsl-layerscape/Kconfig index 9092757d1f..1872c66dcd 100644 --- a/arch/arm/cpu/armv8/fsl-layerscape/Kconfig +++ b/arch/arm/cpu/armv8/fsl-layerscape/Kconfig @@ -1,7 +1,7 @@ config ARCH_LS1012A bool select ARMV8_SET_SMPEN - select ARM_ERRATA_855873 + select ARM_ERRATA_855873 if !TFABOOT select FSL_LSCH2 select SYS_FSL_SRDS_1 select SYS_HAS_SERDES @@ -22,22 +22,22 @@ config ARCH_LS1012A config ARCH_LS1043A bool select ARMV8_SET_SMPEN - select ARM_ERRATA_855873 + select ARM_ERRATA_855873 if !TFABOOT select FSL_LSCH2 select SYS_FSL_SRDS_1 select SYS_HAS_SERDES select SYS_FSL_DDR select SYS_FSL_DDR_BE select SYS_FSL_DDR_VER_50 - select SYS_FSL_ERRATUM_A008850 + select SYS_FSL_ERRATUM_A008850 if !TFABOOT select SYS_FSL_ERRATUM_A008997 select SYS_FSL_ERRATUM_A009007 select SYS_FSL_ERRATUM_A009008 - select SYS_FSL_ERRATUM_A009660 - select SYS_FSL_ERRATUM_A009663 + select SYS_FSL_ERRATUM_A009660 if !TFABOOT + select SYS_FSL_ERRATUM_A009663 if !TFABOOT select SYS_FSL_ERRATUM_A009798 select SYS_FSL_ERRATUM_A009929 - select SYS_FSL_ERRATUM_A009942 + select SYS_FSL_ERRATUM_A009942 if !TFABOOT select SYS_FSL_ERRATUM_A010315 select SYS_FSL_ERRATUM_A010539 select SYS_FSL_HAS_DDR3 @@ -62,17 +62,17 @@ config ARCH_LS1046A select SYS_FSL_DDR select SYS_FSL_DDR_BE select SYS_FSL_DDR_VER_50 - select SYS_FSL_ERRATUM_A008336 - select SYS_FSL_ERRATUM_A008511 - select SYS_FSL_ERRATUM_A008850 + select SYS_FSL_ERRATUM_A008336 if !TFABOOT + select SYS_FSL_ERRATUM_A008511 if !TFABOOT + select SYS_FSL_ERRATUM_A008850 if !TFABOOT select SYS_FSL_ERRATUM_A008997 select SYS_FSL_ERRATUM_A009007 select SYS_FSL_ERRATUM_A009008 select SYS_FSL_ERRATUM_A009798 select SYS_FSL_ERRATUM_A009801 - select SYS_FSL_ERRATUM_A009803 - select SYS_FSL_ERRATUM_A009942 - select SYS_FSL_ERRATUM_A010165 + select SYS_FSL_ERRATUM_A009803 if !TFABOOT + select SYS_FSL_ERRATUM_A009942 if !TFABOOT + select SYS_FSL_ERRATUM_A010165 if !TFABOOT select SYS_FSL_ERRATUM_A010539 select SYS_FSL_HAS_DDR4 select SYS_FSL_SRDS_2 From patchwork Wed Oct 3 10:44:33 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rajesh Bhagat X-Patchwork-Id: 978196 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; dmarc=fail (p=none dis=none) header.from=nxp.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=nxp.com header.i=@nxp.com header.b="FF2fFXC9"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 42QCmz0XWfz9s8J for ; Wed, 3 Oct 2018 21:03:30 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id C06DDC2210A; Wed, 3 Oct 2018 10:55:14 +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=BAD_ENC_HEADER, 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 9BB2DC2207D; Wed, 3 Oct 2018 10:53:17 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 9DBABC22011; Wed, 3 Oct 2018 10:46:56 +0000 (UTC) Received: from EUR02-AM5-obe.outbound.protection.outlook.com (mail-eopbgr00086.outbound.protection.outlook.com [40.107.0.86]) by lists.denx.de (Postfix) with ESMTPS id 019A5C220D6 for ; Wed, 3 Oct 2018 10:46:50 +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:X-MS-Exchange-SenderADCheck; bh=TbWouSKF/eNvXcj++r6AB0VQBdCyW2bb76fcWUJ8GQM=; b=FF2fFXC901bdF7YZP1ihkueE8oPsew/RHBPCBPE8xDEqZf5EBRvDWEYBzBIhwmlEWTZD0jDC0H91Y7S2SoZa7iNrGrAY4KfOioIrG2jrIBnF9Q7c5yq21cWbXA8Dd8phzd7TOl8YAIKkQT50FXGjNxtgzskxEh/i492RU/miQd0= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=rajesh.bhagat@nxp.com; Received: from phoenix7.ap.freescale.net (14.143.30.134) by AM0PR04MB4849.eurprd04.prod.outlook.com (2603:10a6:208:c4::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1185.24; Wed, 3 Oct 2018 10:46:46 +0000 From: Rajesh Bhagat To: u-boot@lists.denx.de Date: Wed, 3 Oct 2018 16:14:33 +0530 Message-Id: <20181003104459.5444-28-rajesh.bhagat@nxp.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181003104459.5444-1-rajesh.bhagat@nxp.com> References: <20181003104459.5444-1-rajesh.bhagat@nxp.com> MIME-Version: 1.0 X-Originating-IP: [14.143.30.134] X-ClientProxiedBy: TY2PR02CA0011.apcprd02.prod.outlook.com (2603:1096:404:56::23) To AM0PR04MB4849.eurprd04.prod.outlook.com (2603:10a6:208:c4::26) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: cb873be5-ea9c-4105-9a9c-08d6291d8597 X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989299)(4534185)(7168020)(4627221)(201703031133081)(201702281549075)(8990200)(5600074)(711020)(4618075)(2017052603328)(7153060)(7193020); SRVR:AM0PR04MB4849; X-Microsoft-Exchange-Diagnostics: 1; AM0PR04MB4849; 3:/4AwQZlUm0jvWqxYSOOCuALROoZkB3/vFlQ+uDpuTIpebWpZT5KYQVvzr8nRDMpdQkP4rSUvvXDEYkErZIvfRacRKtvHw2ZXMtH0rAxWdC6ab0q6g8pmt/VaUptMGYLxE00qm126kbGXz89teNRHblrtP87KKyCU/CYKsL+wTRWuXy8GWvt99BYZV6/8G46ayTE1vudUhWZpNZzZjpXq7uFGs5+gdcu7K/QrqQQiVD8jBSpiJFgDq9PSWrABawWr; 25:oHVz24QY2gWe9TViqgBVIdyQxgoxN/f8MbNzh79QH0H/HjdzHBkbdQczx07V+ka6TTqw+FbtD1kBSgL/Mtkjx4noKmBu+HIGYSCdX5uuvjr51nF5+pN5HgQ2d+XJyMK4oBp3mRiYKjKY2o7B8yOu6sPjWlD8U1UxK/p4nhVu8jqMDXvDRGmMS6mSKCkv52tsSKjcvv1knyp7R4YTCDBsnqLtU86nfhQNzwpha8yWoo6LUyfp7oWpWuwWvk2UxIGKrMh7Urkwyqdrpt7LBYU5BgQFnowjiPua3HT1Rg2FCvzlniw2K7tCje5hLKiw9FvK1ZrN2utjJewIu4bx/ljYMA==; 31:eeLtfnGW4P2EdSLFA7C+//1nyMY1ZiMtPze4FzG9xU7eRLg0FofKz+lJYmCFfv3wtmsP8yG5ZAsRiJAdDkRlw0Ui0R4ZHncHDDyRI08ma9OmlDGlIYkyx/ZQ8ez4OvBFkHohD9AgxxkGn3wzK927bGpOdyNmg0TzvO1r8HTvIJGL5lPPHSTwYbzo29TJMk2c5nQIgObYDjji91EGCn1d3qe7uhXg82qC8ohrPSVmS08= X-MS-TrafficTypeDiagnostic: AM0PR04MB4849: X-Microsoft-Exchange-Diagnostics: 1; AM0PR04MB4849; 20:Wex2AY272gaZQuM7xbYuM0M3RBcorLIBkpMncm2XAUlgxZa/CJDkn1jlpJFtjVdC8ymT+vox4e4j5CrYQprkWKEBhymTIkl8owPOGbl33gEh8E4JgnlYqouFHscAUvm0mAoCSOe3zJsQFs2Wqi8F3MqDsFeJJVCsK+JgfRRPHaADmqyooA0CxTDa14SrZ0cbHsZlXYrpffOLYpHWX2lbSCacYQLXAS4EWYSJstsEJ75swPs+O9dg/RvjfSTZyYiPEW9FgEsuyh6jgn5ZZ1fIuY+wYaI/95ieJaAzJIhBfWWMCccqv5Jzz2+/jykasKMh0luA19RD3o+oko1Z3n53D9LJ9xuuCzHS1NrUFHV8yg7P36j+3xy/UZSf5RCTTdRJ2deuLU/yqJV+D7g95qVuhVgGZyOkG5DBAlHn79HLHu/n8Gn+lcxlD3iDNvP8eJs4PN0YIq22MeqZ+Ah1HCYit+MAIWHTxVcSi0XkcVISFVYIa54irSgXP9FcuLC3BEkR; 4:u+LBxIHnLwSQay2mnPo7dV8cs9jBEcfJkGBQWePn+GES/BmHTwWb/YqgNHcjA+CglMGjGvHmEEkTzwHuR7uQ2IPOoJ00XmTpj+DJ2JfNTTZwHP71akNpYtwZXvaJ5vqpf6hnbVft7/tnOi8rI+9RlZzBEYHb/EtRoEYK7si4kID164qD32crVozSWwdDQWRjKLPohl+Ea922/rP2j4uMMHFLc19UEPkY9cp59M9JQnJcjmj0XM1MaAD2JugtAyVuQGtlPalcwT7n68yK2PRty1014ksdo9W7wma8t3MxNBi+4Lw5CPtE2MK5Jd/ArpE+ X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(185117386973197); X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(5005006)(8121501046)(3002001)(3231355)(944501410)(52105095)(10201501046)(93006095)(93001095)(6055026)(149066)(150057)(6041310)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123562045)(20161123564045)(20161123558120)(201708071742011)(7699051); SRVR:AM0PR04MB4849; BCL:0; PCL:0; RULEID:; SRVR:AM0PR04MB4849; X-Forefront-PRVS: 0814A2C7A3 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(346002)(376002)(366004)(136003)(39860400002)(396003)(189003)(199004)(66066001)(50226002)(97736004)(7736002)(50466002)(55236004)(6666003)(6506007)(386003)(16526019)(53936002)(26005)(68736007)(6486002)(186003)(47776003)(8936002)(8676002)(81156014)(476003)(81166006)(5009440100003)(4326008)(16586007)(36756003)(5660300001)(86362001)(575784001)(54906003)(2906002)(1076002)(2361001)(2351001)(478600001)(446003)(3846002)(6116002)(316002)(2616005)(44832011)(305945005)(76176011)(956004)(486006)(48376002)(105586002)(106356001)(51416003)(52116002)(25786009)(11346002)(6512007)(6916009)(110426005); DIR:OUT; SFP:1101; SCL:1; SRVR:AM0PR04MB4849; H:phoenix7.ap.freescale.net; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; Received-SPF: None (protection.outlook.com: nxp.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; AM0PR04MB4849; 23:hI1eh3863bf6Bm1jbk3fwoIcyd/+a96yfnExcxmW/?= Q/QlU7T+MuF63uyaA4WOhuIV1Amaoh0P3xAyn3fKvffjpiHb0KgzaF6j7Yu0tyiu+MOV2Lgi0tdVmrXjImZ5mI9YaL5wsrEjp74ZSmiu7unXqdacGEG29GfdWVdgyTTnPsM9z36dYn8t45mg3m05FKUQTqlHDu6e7ofqkjdkzkaFVJHgrZPm3q++Vwz5YdoBGR5b13SX/njVGS40e6YriU78kB3ynMKlwT6a+J1stw01f6wm9Iexl46PZTwndoO+yqcOO6xF3tJMhX8GE+3kRWqVjqjQv4uaztaOhtcYafHaiXZoAEqxVMxISf9xMc1/XSla5K4IecBd8xuI4Cw2iS4CzP4kUCXpUiHPdHQnVKVjINbpxD+G/NbudeXFlflxUgyen+jpHs8i66O1LpRNgbnUWB16V3FHw0JTBd7kbMzdopxUXA08+PB0zhtIopSwdohKRGrPLbMhrkronyWBGzBP1mRIfxR+e4gzWiMjAb6eOmQyAE33cYGEG9YyIByo14B2ebuaAnRm04c7aw3bmhGlX+Dz/jol+8lB870T7f33HNpagk1k3Mh3DINVySy8egTk8x6WwEro4du/U/W+/ZIidC8aaVvMhYby8ej9AN5e/Dnc9DfxvT4bxnhB8Qb81l+NZ5r1N625Qq4PTZvzKjS8NlSPp4d5k/K7RoqShrniNlZoGjfsl4ThTjaUZQCC8hJhZUpLno88KdSOj0ei8udINX88ewazhyNgJmG7o00kjJjt0bEqa9K9dQ3OFyMY+6Q001rBD1J+s8I0ZNkugpDngnghoXJsFMRwfMr5wpEZ9sV7RSCwNZPvERaqZbC02we2bmdymyQeZWI3hrv0dKUpXO3VnB7Mk5tNTZh44i3VyyHlu/kiNn1hhfDSFUlnGs8sIR3TgrWVFYfk7o8ceFhgoili/SWE/PRQ2F5z2JNAP4Mq4/3vRX0AmbO+svoqJw3jMcc0GButDzcut+07RPkekUMvl+nKztIZtBDmZg/2spWfSvO+pdVK75Y3wy8jg7uHPQ8q+6Ix5SrI9R56/axiECdmIFdWDDDGqKGV/T9DJbr2MpsISOWHlhyUTAPsU6jzAMyBuRYNDUZCE6RyJSPbyVVxFgPfUQ3mpInGA3fLsrDHqchdvMAlSyX3MoT4s6O16vxBfKkEbYlOYdRMwG56pWEbrRRoS7AFINEYDR8ss/GTIhxz5XbqYkJKJ9a65wUrB+RP6n4PzTcX2ZrpKjQhRmPvg6Q+soGsdw621Y7ZIUh1x30E0JxenrcuNrQRqcovvgESDrsfSV6SpJ9pQLw4miwOTfCc/dTTbz1X0EW37F+vJs2AS9sOqk0T2dfH0I= X-Microsoft-Antispam-Message-Info: e7ehM8T9smL4k/KX5ElnqhuJVPFkqRfDcTk7qlcGytjS+LtiM0WgCi8H8bU8rz9xgLo0Fm1vYekB710XRHWYiFa2Fsz1DeyThoq4W7BXI6LLF7VueT4A5hRmobdbuhPaEdhiQjG/cUzZkiA2mNOZgcF8ckYT0ytuC+ShB6mynf0OVUqlBp8UHv981JmkF9VxmZYVf/lVACGnRW/B2NTFzWZ8sKrOXiGRUqO4rAJp1+uxQu2hp1SYr6WoO/R5DIfHiFL6pFo+XdnlV0rm37QGcqTwc5D7nYjoxwRZrdY1yPb6u0jKrKV9k1TfB3uS0536RofkKsSS3x2qgGhiQPQ7YcFxu16nfLEQx18N8HOwmSQ= X-Microsoft-Exchange-Diagnostics: 1; AM0PR04MB4849; 6:O75dslV0XmQq5omTX+7aTCspfKW2oOn+MOWwti6IyvWtteSp6viGTPUBmpgBhtIYp/k9EhkCvrp+iPZR8mH92AyoutjRU2w/LQtjchssv+x/fY+kLFtcGHuW8scKnmDGPmyVaTAmGWSQ9tWr3jiPlA6Rt9PS9z7KG0E4IMCw/7TZ4BhHfBU9t+tWueSJkEi7ULMIDtNe1pWvrFp65Eb4QEI0V4ja1fongXjHhwBnVTcc2r6cCDfA6LY3XOhQpIZelHQLlfY3ZYCdjreRqWbLYo24v5pTVDq5tA0tuW8BLvhYVweGeRxUjPEzV74RDU42tLT5vxLkHWcCpx6sCo3XNOc91IzpI58e8QXV2KoDziWiP5diUMS4Hp4tOPTD7YB+mDpeY33KvOvCyANp+h+PFJ07rHXNwBwFRfobY/vPAke7pHmjIemcA8W9k0A+FNW5MdxmmcXGRNTuednPpf7Nxw==; 5:s4NsiHZcMYtWfaL9cAGc9js6WrYgUHaTvFMuwSnzwRbeMjiUrbNa1RWMk5ZFzBQ9mrhet72uMFfJTIXbBzCDpnMxSbXfzo3SX+nH9d3P8KV3gnn4FQQDeci1bxeOPTK4eSLfF9DzZVVSzL+bRxjbzvemCT0nwv+0Tk25VMG1pwk=; 7:iCmjIjSdQNny9qrU+YuwLqSyOhvelchCXcbwShh8+sw77WPbJ85YvOvMoeIcQykSoxKWFTu0QQ254Izbz6dSieROowWvYrr0GftdpTjTpnUQlhcErTW33QO1Rahu7pWWpJstitZN5G+YFiJVr8D1MxfgYNQAgUS1HWHJ6tJqcFYm4dE88J5Jq+G/Kka4FKvL3Om4dfuFD+gNG8HVPq2Y1fyv3qgWECs0JSO5xQBEZ4V6+BwLek81azw1jogbOfuP SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Oct 2018 10:46:46.1808 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: cb873be5-ea9c-4105-9a9c-08d6291d8597 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR04MB4849 Cc: Ruchika Gupta , Pankit Garg Subject: [U-Boot] [PATCH 27/53] armv8: sec_firmware: return job ring status as true in TFABOOT 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: Pankit Garg Returns job ring status as true in TFABOOT, as one job ring is always reserved. Signed-off-by: Ruchika Gupta Signed-off-by: Pankit Garg --- arch/arm/cpu/armv8/sec_firmware.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/arch/arm/cpu/armv8/sec_firmware.c b/arch/arm/cpu/armv8/sec_firmware.c index a13c92e246..8dc0ac9266 100644 --- a/arch/arm/cpu/armv8/sec_firmware.c +++ b/arch/arm/cpu/armv8/sec_firmware.c @@ -348,6 +348,10 @@ unsigned int sec_firmware_support_psci_version(void) */ bool sec_firmware_support_hwrng(void) { +#ifdef CONFIG_TFABOOT + /* return true as TFA has one job ring reserved */ + return true; +#endif if (sec_firmware_addr & SEC_FIRMWARE_RUNNING) { return true; } From patchwork Wed Oct 3 10:44:34 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rajesh Bhagat X-Patchwork-Id: 978186 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; dmarc=fail (p=none dis=none) header.from=nxp.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=nxp.com header.i=@nxp.com header.b="OA5MptTl"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 42QChg4rsvz9s8J for ; Wed, 3 Oct 2018 20:59:47 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 4AD8EC220CE; Wed, 3 Oct 2018 10:54:35 +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=BAD_ENC_HEADER, 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 F2C22C22092; Wed, 3 Oct 2018 10:49:46 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 660B3C22093; Wed, 3 Oct 2018 10:46:56 +0000 (UTC) Received: from EUR02-AM5-obe.outbound.protection.outlook.com (mail-eopbgr00077.outbound.protection.outlook.com [40.107.0.77]) by lists.denx.de (Postfix) with ESMTPS id 7391AC22138 for ; Wed, 3 Oct 2018 10:46:53 +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:X-MS-Exchange-SenderADCheck; bh=UoCWVWr+Odcpl8ZPupVMDMRn3mXPbiTR2HghvQZUQqY=; b=OA5MptTloeTerEgywZygdm2XyTvVA+W/R/VFuens9tOCdEe3ViOJgJpBZC406bHpp8U8C/QNBHi+BhkHk37lauxqiKFPfjXHYEqmS7dwaGTwyo7na3DFgttLVmHoyODYNyxv8+UUqsu3os9A2gqyMyi2nKqtbsKM4Wy6LviDR+8= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=rajesh.bhagat@nxp.com; Received: from phoenix7.ap.freescale.net (14.143.30.134) by AM0PR04MB4849.eurprd04.prod.outlook.com (2603:10a6:208:c4::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1185.24; Wed, 3 Oct 2018 10:46:49 +0000 From: Rajesh Bhagat To: u-boot@lists.denx.de Date: Wed, 3 Oct 2018 16:14:34 +0530 Message-Id: <20181003104459.5444-29-rajesh.bhagat@nxp.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181003104459.5444-1-rajesh.bhagat@nxp.com> References: <20181003104459.5444-1-rajesh.bhagat@nxp.com> MIME-Version: 1.0 X-Originating-IP: [14.143.30.134] X-ClientProxiedBy: TY2PR02CA0011.apcprd02.prod.outlook.com (2603:1096:404:56::23) To AM0PR04MB4849.eurprd04.prod.outlook.com (2603:10a6:208:c4::26) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 318fec50-a51b-4373-8b20-08d6291d879d X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989299)(4534185)(7168020)(4627221)(201703031133081)(201702281549075)(8990200)(5600074)(711020)(4618075)(2017052603328)(7153060)(7193020); SRVR:AM0PR04MB4849; X-Microsoft-Exchange-Diagnostics: 1; AM0PR04MB4849; 3:Jdd6ElsUUcDEJ+65VsLaSBI0zMqW+b2hNh4w9OS5Hi7tsRtVpXAAMvFxG5qVSiqVzhpJI8jEvvP2pf7pGil2XXh2GtimW7C62BOtruCGwwzmbiwNtFAi4qI7CBKU5Nx5QT9VjpUxDAZxtwWFJpVJcUeSF068GtHu0zO6vtZgvH2HTcVX1enVdD5QyDwnUbL/gt7BL6jM/SWIU1sNC35vBmnfV2gU4BfCwGl9yhgwNetExfXPZokxAqjRZSgU9U2F; 25:YCePX7gDIpUCE2fRPx+e9SHGInYj2XixkJzpy7mke/W9av2gUqh/RiWSbjo07ZLoEaO9JED2iRy27roAaEWIbZNYSaMby52GJEFQ+pHRI7GwSe4kRWavhzyhH1Z/YF7LAjLtntME4Idv2wYEqPOq117wZBc4OofKc/gpIEIsxyoeKqJnIKEaIWyMHapY1HZD02wX9CtAEEbckcc/8QonT8Dyo75J2vivPcuGxhO3MDqHHm4MTljZpNoVpaDuPoatVxUZo4KYfcwCtOes0XmKPMARvhfi0KssFnNIUbmC/R9kOOWvCEEMxIcPbQ+wPkWaAU9fhka2CVuWZSBA1clWJw==; 31:82I+nIR4aJnI2PUJ5FK5EFxQk/MCvhoRzahJGpI6e82lox5tsNjL2aRMpyVk1Z3h0Z5yh7CwoWkSTnDD++fqbNx8epq+VsHHrbayaoZR8jl7xqrjkSLWEuw/kysfucF95rtqzIu0TDVIk1G4jL/Ca0sfCDa6XafL+Hs4OMY2HARB8G3yC4bgb8NyhVCo9QT77R06l6TCmZcApkdOAtvSTktxr+1YhTt+BU1Y+bUe43s= X-MS-TrafficTypeDiagnostic: AM0PR04MB4849: X-Microsoft-Exchange-Diagnostics: 1; AM0PR04MB4849; 20:uqmnqrq4sgaiL9Y47xdbZWE6Yge8vT+lVdxFaGKLQM4Xy25jk8ipFu8jfpaUbohel6k6Jcf2dx1QPKcD+q4+fceRapQ63Aec73+3XXyD7oSgCwmiBbJsOJf99TT3o6I320KUVNyMFiDMSO3v/5XBuaLiLizb19t4niZLCO5oFZn+UpcucAGJu2auJucYsV86Y1aTAvVhyO6WIN8lClIF5xxVz4u0nCbCo23k1KdudcYO83cvYTdQgx/NLbR84vE9ZUo/9Y2gsEXpNwjZ/LdECniYxYkaB+sBMKuRhqOfziZ4W6hFGqjZldgie7rUkW85OMnlWRTb0WI4Ml/eT3f4bUQouBeavX93n/Dljqmq0MWtUyL64kDdnmF9XYzakC+q+408SXyJP56A4JXj5CJQ+NYdFzpRW+BMEr3IaxAL/DBzpP6p0hNgptIlsQk8grqyhDropKNJmEa9d6KPHBZvbJmpZu98/6SQLXGBav9OFqDEDbRm8c/yl7aPhfN7zhkU; 4:tc/Bz+Fgjv51svGHn+n8Y7aCx1ekcg8e46+M75DGML1obtNZhZbszeAkdSy69FBugnamS+K3f5AcSf865ESfxTS0QX3CsJ966Ju4Wtn3Nh+KwXIhw+jds9LVzAsMw0sz6j/xClNGofqcXExzSBnnVABd3pZAekbIKAHeMoEGgDWFmRJmwI4t5AXNPFnK7ur8U80xMommg07Cn1+TlPHg5jD4zI/raF5plyrD7dgV+Uz3odZpwbkIr2ldArrkPWNFQ4J0jpC99pL7O4TBgbLZ2fE0TF25JqH93UsjrtU5dPEE/lEmVWXWPEdZ5oghkGhd X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(185117386973197); X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(5005006)(8121501046)(3002001)(3231355)(944501410)(52105095)(10201501046)(93006095)(93001095)(6055026)(149066)(150057)(6041310)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123562045)(20161123564045)(20161123558120)(201708071742011)(7699051); SRVR:AM0PR04MB4849; BCL:0; PCL:0; RULEID:; SRVR:AM0PR04MB4849; X-Forefront-PRVS: 0814A2C7A3 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(346002)(376002)(366004)(136003)(39860400002)(396003)(189003)(199004)(66066001)(50226002)(97736004)(7736002)(50466002)(55236004)(6666003)(14444005)(6506007)(386003)(16526019)(53936002)(26005)(68736007)(6486002)(186003)(47776003)(8936002)(8676002)(81156014)(476003)(81166006)(5009440100003)(4326008)(16586007)(36756003)(5660300001)(86362001)(2906002)(1076002)(2361001)(2351001)(478600001)(446003)(3846002)(6116002)(316002)(2616005)(44832011)(305945005)(76176011)(956004)(486006)(48376002)(105586002)(106356001)(51416003)(52116002)(25786009)(11346002)(6512007)(6916009)(110426005); DIR:OUT; SFP:1101; SCL:1; SRVR:AM0PR04MB4849; H:phoenix7.ap.freescale.net; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; Received-SPF: None (protection.outlook.com: nxp.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; AM0PR04MB4849; 23:EX3Eq7ecDxpc7MjTjcMr+wQ9hEHnlK9+ezwA2ubSr?= oTmHM0YxQ1ywYwPbK6rQT/oDkoDgK0i7LnGkp/NvUMJqQp2Nhu29hDGG+tVEpwGzAEI3rxC6f322DkibXvuNU5F/GBfJ7pcdOXgrNhOCCbp82TMPm6cCM8D5PC6Ada5BGTReIzEYc46FCoRjHUvR6KMzMXOLpuhTBhiuSZ+e91v1p7J4kS4USmTADHoE8sPuDUhe3KKO91LFX/FIUEpq4H1cN1bAARIzPI6i1t0DkwUFD9HA7uS6g0RoGvKCoWt4S+fkFOTTCapzsOhNXlgSCrlU2FnHuwh0XAe43mfbQLyWx4IiiJCv1WkaHDXlp0xxR2DZnyzqRolViLXGb8iSPm7LTd7W51ziOabC+xPDn9w9mVSqXnggElrR4sA7Blg1VfrhRT73Mbodu8GrKogc2CF2dNwzUvHZCxO1L6sPTLAHrYsfKnyZ3lziOBSZzLvmpnGz+XmBelccljbm7EDQXpITKAQyNQjvsWaaqWtMsrawuZ08Z/DleBaRrBuhP4VBResexgl0HtjU3QikgKCsk88B4zpoZ2txBjWRrKPijN6VG0EH9jb6qpkCm7dBQQCC12gtHk1aICYIFLmaonL0c5mTSdVlOW7CS63rWxHIYV6o4cl/iqSpMgREy0oZgJ5de63LPQPweNguClJHiwOXi+eq9MsRITluQNdvhhwsaOiZSXqo7Z19Nw74fa0QcyomFW1VDGlC1auI+fjvRnNWT8Q/+FPJCfBw2FWuvZ497Ta8PYYsq7FjZMQq0DILijKRKH14ytIE5PAyrR7WdZDCi/zwJbohBFxxRh6SBaIa7EpXS/imOvEWK7JNwjXGStWiSAqnlPzZnTPVk6jcNuFAFg6JYfKy49bnZ2IfsWYxacdNgiCEFp3lsx+gokRSEPyDMnKFRKp+fvsL5ypVJPAt17lHxCsf3YQFCAF7FbOeVc9RV8bl2vTePeNCyVo1YA844LAQC7nYbfRkl8BJ4cuHG2pa47EhtCxHVqDrCeJg3Ipp9bkE2wunjaExJuschWyoxgRbjZH1kY3xYUO2Rn+VbuwgL5kKOgln0oXvkFRZJ7SXaPGsxED3r5TIQJrLwuXT7TEOr/aiOd5+ZchHtXy5aMNmPrWew9dvTh70so0R/k0XZuQvFAg6ChGnMZZxO6+OgGSkuhtdko8aCribzrz4rn78sCJG/ZmkDvz5rAjUFYyRVi4vWWt7OcLlAbj05+aAXrIy8kGBPuNjANGZ4JcUmDkKHQigS2UbKv5eC+1uZ5VknEXuj1OtjA7Rm6u6VWUujqLK4HSU/vO7F0cXE9/5yUL X-Microsoft-Antispam-Message-Info: NPXKEtOwRoOs/ZXBsCX8KXH9ba4M1L5+FdqzyEoRAR5fn7m6gpYfW5FTcQADJisfiM/XRKZ2AbyAmLpqmYXqEIBcig97QWJmTwcxS1tBsl1HKaXbAaqxrhofCZM9cLWJ/1JnryMB/rVrFcVnD87rrID+lJQ3b0ntxxV/1tY89uII1qmm9keHeSX2RuwBcyBbH4SCX8B93YBzv+FXckUEkE+ATD6j2mTRM8zoaTgBabQREyRZQ39WqyKW89Gkm/QHfCiM9fVurfT3n1CAX65b5XPl1DvrwRcp+d0OxxNU43PKRUB5iYmJUnfdMjYRXC3tMsT/9Yv514diOh1dtyhAkXEhU6ZbMM4WecgpXBH0z1A= X-Microsoft-Exchange-Diagnostics: 1; AM0PR04MB4849; 6:PeSK8RdBfFkBT37/QTtQ8StUKjoq1apBl5pX6ePgHdVlwElgD4/FD+WXi2CRV3e1kJM/Z5LzcyVHBjrVr2wfl03Nxp69p75TyYrCu/qbgyY9/H6Sspd4dvTeYXm9PBXqvJ7atP+UYMUif/akKnifPXICUxPBsV6n+qTLop10wHvjDdyxzyahTzw5B44/hN3mQ4wMzcWmqTnvm/fow4v0fcPbgCIw94fXs1QPCvc+rFKs30uMuxhtE62s45AEHEJ4FjIzlWZ4/JhAI9bnVqxcHkJKnDZoW6qZ2mpKKs0ugQqBvvLlrTbJ5IdNDDPUrWQ858eRK0Q9NpzgPosRuKFCwjQnc6wCs+oqHd7T7gbY7488FAJiWWeeulICrzCz5rjeFCwywFw0NuUFg0hsVzHuEzJYIdH+XAN7jK7efygU2NWpPffSauiv5aQzZsx9V+z+D9tkKKgB5/7oJEVyhxgu4Q==; 5:pZ80hGJrJnYHoVpoVItIQEEVp4RkRqxfNXDhY5bTnl5ZMpv4SS3qC+quCu5niWrKCwdQkRaOh2oeqoHexJuiaR1gOovGys3SZwL5tx2AbPu4iXqf8VrZN12y+wnw+TyamDH+YNHYI4YVrRFLnIZ3+mXT7OXPG5KP2+BdXXHiE9E=; 7:zBIgMQCn4IjYDDZEbRq29sYe3H3w/OdjrqVgVoO8mEjYTlhAH9xMro2Ne70BErRAgHMUwTWvFAao4RzqI6tS0HcsepKYmEUEqFzkftYmyNjASSSDF8Fl6YQ11uDBxjEvtUstM/hjpZyOMEUb4wA4xToEcyMHMwSWJ5KjHuVu2JTloVOKBqQzgushDeZAtigko10z5wCJs/6Q0VUqqby9NBQjVfCytbzYElwMlsp9Xsg9tvYftbVJE+Jqc0sem2Ri SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Oct 2018 10:46:49.9465 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 318fec50-a51b-4373-8b20-08d6291d879d X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR04MB4849 Cc: Pankit Garg Subject: [U-Boot] [PATCH 28/53] armv8: layerscape: secure boot support for environment selection 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" Add secure boot support for environment selection. Signed-off-by: Pankit Garg Signed-off-by: Rajesh Bhagat --- arch/arm/cpu/armv8/fsl-layerscape/cpu.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/arch/arm/cpu/armv8/fsl-layerscape/cpu.c b/arch/arm/cpu/armv8/fsl-layerscape/cpu.c index 1ab4d93638..063a8fea55 100644 --- a/arch/arm/cpu/armv8/fsl-layerscape/cpu.c +++ b/arch/arm/cpu/armv8/fsl-layerscape/cpu.c @@ -33,6 +33,9 @@ #ifdef CONFIG_TFABOOT #include +#ifdef CONFIG_CHAIN_OF_TRUST +#include +#endif #endif DECLARE_GLOBAL_DATA_PTR; @@ -738,6 +741,14 @@ enum env_location env_get_location(enum env_operation op, int prio) if (prio) return ENVL_UNKNOWN; +#ifdef CONFIG_CHAIN_OF_TRUST + /* Check Boot Mode + * If Boot Mode is Secure, return ENVL_NOWHERE + */ + if (fsl_check_boot_mode_secure() == 1) + goto done; +#endif + switch (src) { case BOOT_SOURCE_IFC_NOR: env_loc = ENVL_FLASH; @@ -765,6 +776,9 @@ enum env_location env_get_location(enum env_operation op, int prio) break; } +#ifdef CONFIG_CHAIN_OF_TRUST +done: +#endif return env_loc; } From patchwork Wed Oct 3 10:44:35 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rajesh Bhagat X-Patchwork-Id: 978181 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; dmarc=fail (p=none dis=none) header.from=nxp.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=nxp.com header.i=@nxp.com header.b="nNasW5BV"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 42QCfY57cQz9s8J for ; Wed, 3 Oct 2018 20:57:57 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 5FD4EC220BF; Wed, 3 Oct 2018 10:54:51 +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=BAD_ENC_HEADER, 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 E5023C220FD; Wed, 3 Oct 2018 10:50:05 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 3F98CC220C5; Wed, 3 Oct 2018 10:47:01 +0000 (UTC) Received: from EUR02-AM5-obe.outbound.protection.outlook.com (mail-eopbgr00071.outbound.protection.outlook.com [40.107.0.71]) by lists.denx.de (Postfix) with ESMTPS id EFA3CC22063 for ; Wed, 3 Oct 2018 10:46:56 +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:X-MS-Exchange-SenderADCheck; bh=m/8vuFgeaexZr3Hq3i3CgolpICIg6SxSKmAgp9LA+RM=; b=nNasW5BViD3D/vdcjGRKbDvy0g5IWIMg5cNDTtu5FvToSAvWO2jYzxHbD835FzduPH1Cl+MA1CwoKkcrnEQK8mXgrQ25pnEJbv4bQh6lgiCVio68E3e1gILAt6Pa1Sto3bJBZAiYttH/8F8m3Gthj+ACjAXR7pNancsgALrqy1g= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=rajesh.bhagat@nxp.com; Received: from phoenix7.ap.freescale.net (14.143.30.134) by AM0PR04MB4849.eurprd04.prod.outlook.com (2603:10a6:208:c4::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1185.24; Wed, 3 Oct 2018 10:46:53 +0000 From: Rajesh Bhagat To: u-boot@lists.denx.de Date: Wed, 3 Oct 2018 16:14:35 +0530 Message-Id: <20181003104459.5444-30-rajesh.bhagat@nxp.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181003104459.5444-1-rajesh.bhagat@nxp.com> References: <20181003104459.5444-1-rajesh.bhagat@nxp.com> MIME-Version: 1.0 X-Originating-IP: [14.143.30.134] X-ClientProxiedBy: TY2PR02CA0011.apcprd02.prod.outlook.com (2603:1096:404:56::23) To AM0PR04MB4849.eurprd04.prod.outlook.com (2603:10a6:208:c4::26) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: af9f5693-d4b2-4f2c-2079-08d6291d89b4 X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989299)(4534185)(7168020)(4627221)(201703031133081)(201702281549075)(8990200)(5600074)(711020)(4618075)(2017052603328)(7153060)(7193020); SRVR:AM0PR04MB4849; X-Microsoft-Exchange-Diagnostics: 1; AM0PR04MB4849; 3:Np+nDTE7ZuHiQULCc1ab0vY9x0nyjD8WXKBPmRFoIyF/AxznndSeT2Ed3sK5i/Q2lEbB/02dUa62oadIyWY146qn3UPVO6impO6j8gtmcMXjsrCZF60TEOZWRCH/cn8DsD9kUR8IigMPPtSnT+OFonzYH2A79494wtjViZqokR083T2TSTebrY6gWKs08FWOLI9c1qo/aKdWn2RwR0aX4l0yxL/Td2oDc5Ps6RCV4C8kGM72yWNixMssU6cu1AQL; 25:+FY6kMDIW7QZQpw7HxMWCiEmNuHhsEFRvGdsfv6s7bYidVHsSJvE33fo9pJmVjKVrZZ0JhnrJBLl4ZivvCCWwBER1iWltYa6yTy4kzWArPgB9IM3miEtyaecnLM5yt8PfV/ldxErRPAg9UXdyKl3mu77U0klff50bqa2Fa1VtYkpm0zWORBOban8DXrsWtoALxMOMeBG/zq74bL0PStZcr4HlKxdafNJHSrIDXkb9ijTv7WwQL0JyMj2vo8tk26CEjmVhXzq1yseNWvBkcJNYvMs/IJqh5EWY11chTZft3N055ofGUj31M8KYqFjNBRtvhZSdpFbFA39/0JempZH1Q==; 31:Zeg5uSUk6tfTdFDNST6QVZi+jqmbVD2B4dwDptAx3BPctqmhli9RHRwIigPAgW8hw1r7ZfLTc4C2x4w6XkxT1UxtbMjC87ZXU+PoZAu560wXko+xYPWE1H/4EaJskMdYRA8TbI+lT4w7wPgJNPRpjMzdwcUzJNmVYju9y+4yEmDOQwIuEUSOHIjKXADURe9xQu+Fpy8/C7nkACjTxfoMiuXT4gerURkC2nVD8u+5g8o= X-MS-TrafficTypeDiagnostic: AM0PR04MB4849: X-Microsoft-Exchange-Diagnostics: 1; AM0PR04MB4849; 20:l0Qs4knkS8ia1GKCOLkN3sRjL78H85JU22UDXa186nqlrelf35Qhd3LrXrNkrrSaoAnTthyFkiNhSWT4vh4wvwrjRD1kVLgT9gb2fM1OhkuPdxlXhoXm718LNyaoG4fMkHn9aJQhOMXbvRx+lxJekxoIleM9QvYpSZuzioS/lRJnHAcpr+vlVFeyD3MGvXOhDI3qwE1VXjkDLhyCiqmC1vRTWUuPOwzLHohQIe5KZieXsExLUZwbDKVbUpVPspm6UDQ/JxqR+UJj/3/kPiSmzNx9sDiMbuDLpql11SOE9JXBlxkN5Ol0Yh+lYa+OTPwrts1GMaRKySs2gEzVTWT2zxn3JX65jJH1b6zpxye+ASZS/zhzYiFQbJxvxvM6yw/YbWFhu5XMuxWLk5bH8hcFQuHtJL4870gSkfrOLWuobecWgMwQklljZ8+xlobKscC0P5VP4U0QA22LhbF4OAWO2AgNqBkDrXoTsNykyiRwrZSxZUbQ5kEp1lf5BEQzaDo5; 4:0rDcjFFAy7VyrYl9cLHUVskBf3YOtWUonRmU3ENyS+Swy7SPinTdRjC6BOPaXUwhu5VAEvYaQPInCW88pDuOpNJYkDgCuhPn4ybsd//qKj3tif+iRQacrtvQuDrUh4RgVql3+9pXoRc1q5SGnpmzZw7csMbdUJpuoO5b1LKjIfGxttahnw99Q0jSL1LByOUHtHzXfqQdETTI+22xJtMCBkue3EbnimSsS8gjq5lfU/gLjCFl9J36dHod0+AYgST+NxvYdGgAIVmo59d6nvC7z+t0IoW3iwjHLSK50viqFmsQVTQWiwgQtOzkm8dFWcqPDtAVHHxfetZFYEVX5Pr5wS1IQ0a2fZ04nGT/HUcbJNk= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(105169848403564)(185117386973197); X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(5005006)(8121501046)(3002001)(3231355)(944501410)(52105095)(10201501046)(93006095)(93001095)(6055026)(149066)(150057)(6041310)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123562045)(20161123564045)(20161123558120)(201708071742011)(7699051); SRVR:AM0PR04MB4849; BCL:0; PCL:0; RULEID:; SRVR:AM0PR04MB4849; X-Forefront-PRVS: 0814A2C7A3 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(346002)(376002)(366004)(136003)(39860400002)(396003)(189003)(199004)(66066001)(50226002)(97736004)(7736002)(50466002)(55236004)(6666003)(6506007)(386003)(16526019)(53936002)(26005)(68736007)(6486002)(186003)(47776003)(8936002)(8676002)(81156014)(476003)(81166006)(5009440100003)(4326008)(16586007)(36756003)(5660300001)(86362001)(2906002)(1076002)(2361001)(2351001)(478600001)(446003)(3846002)(6116002)(316002)(2616005)(44832011)(305945005)(76176011)(956004)(486006)(48376002)(105586002)(106356001)(51416003)(52116002)(25786009)(11346002)(6512007)(6916009)(15650500001)(110426005); DIR:OUT; SFP:1101; SCL:1; SRVR:AM0PR04MB4849; H:phoenix7.ap.freescale.net; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; Received-SPF: None (protection.outlook.com: nxp.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; AM0PR04MB4849; 23:p9BEvNXPjFLFGzHMD1Rpfugz2pi8w1FfZT3a9bwuI?= /OEsQus8n020BDas/N0CefLMW0uh3h1C55kRPWojH0UpGLInuYsNrOhJYw7hryesdw+69lHbF0QNKIcRlTIpWYFM3WSYZtqoKDWQI+DPEihTD3ZCm/XLfLGS2YgGPbAc2bAVNACoO1+tf7tXt223JFN4aDzRmKhnycZSP7png9PNJF5cQ9rUssqt++k+pGI9MM9Yk/LhBStzmaDvL/NLciU6xy53vhSy9w/G3RAVZ+CED+apcNGG/KMin5kjUooLBEkYN7HCsgui23nI4KGSUpmxNGlJe0GTlGDA62CnWjCejVhTEKICpy+IKCSPZd3sJT+q160tbBD5u/xltwtCqsDld0VVjUVGMqL9YvrsmaoEQgNX67UJ2+T5g8XU05BUgQamT1ICmv8RY5RACBk6Hck3S1AziW8ei6870ZMQ8DI9tvXR1M+BucErBJeyjJvPPylIUQ7xwSZ4FqmPfeSzuEpqKBNaKn0xNLT0pOsgvovWXBvMMI8LfJuWhMs56JYH+hCwx4nak+0zIDJvoXgHl2EEMZA4HWoo7nGcpRNrSwcBQdmNi+fl61ExpFf9ZcdHmbMrNsLzjniAx6rDd8BNM3Gb9mhnLkeRQLexJW5aSLyzdBQ3dblbLcjUW5gDV8OVtcoZIzd+rtKayJpWd2ioNPUO7xXwAIl8PmG/lvjpWtMxs0y7CShhzoYWpOhvyFTBFu/myfCiEzZb9xCIKsJu22cVYA1GKPMKAtFhrm5/zJz3kwX5ubMVtI/ZcAJIBJcB3v8d8Aexmtp/oktbNXH7kHAwoJK7gtKGUBZEp9x+Z/bUzbFTFK9DwS3rtzQPj4sqW6KLIkY0AV1S6ZJBwixHjG8ZVeiAlG1YWFzfZ2pHrD9H1z2/P7Me6HWuvbjtJEw/tUvwy3tv8bZ14VahFhdgse5ZD98ip1BT0JtfJ/Ll7qSgiHS5VjeOc+HS0ow/iV5ZEzAXlQpVWkCz8BydDPLFVzRjs9QIRGo2ZiVShfQQKfyr7PXdyrMVswtiOMNDpQs2nde0hz+NeVwoy7xfacrInPHYh0l9RtiZBDcDTtO4/+wXr90Cw+RbCdLq5ahi/u+KjyylmvGZs+APXW+ydyItoor74ELs5zlALI/2mAC20Vd91fTyuxK5F5gANwkAlrhDrKHmNLb3iCjBQq+MR9HoFU725WCfDGCpMJGcLRKHuwKgLNJ1/5/RVAEKqWOOlm7i/jIrHQfdWebevSyS4Th0Y76tLhw1/w/PVp0KElMUZStSbAhicrOwYc+O30nykQJllasqkXcA/xG57BAAETvxzyUIIOKm+PQ3suQF/w5ky//Bw== X-Microsoft-Antispam-Message-Info: 5NAh8u3q704QyDujvnM0ruFeOc3u5a1WROWd5u3WfYQgktHhNHVHuofP2cBICxjWpKLEiEzNY4FntjwiryJKNnWcatSkhllw38fR3f4/uLeOTRrQlyUyzYxh4PA0miD3KHSY9pr8VypOReKXgBjJ0JSdC75flnJsZhfIb2CcCOVCpyeq7Ruf6hwt9mpOaJru02ZRMKhE05E9yrJI6/rHC5s8xLml0bJYRABU6JUO55jdn3+I9zcfCr2pc5xXO3LejPwzCmtuUz/CAc70uhRP2WgIlhK0O0mar+HEdKmq0bwNUYugfh6ygRHFx9l93IktN/jc2q8rsoFp3iyo2dgrqzKeLgtbYorI9YawjMKI0yM= X-Microsoft-Exchange-Diagnostics: 1; AM0PR04MB4849; 6:0xEgwgtv0ofHvZBzL7RCdrQ6T1WrOQ8tQrx4tjclFFilY7tj4UL7yPDnN616jpDVKOCtDZ46CQnFrQpVmN9Qjkq8Ubu6Uv2tFoHwsBHIhhbfl+F8AOG+SDnstdZSkgZBnZgMGSwFep7O08K9R+05WbFtaZGyMtbCVOMIHJ6nlgwgGuGdQW9UPCJheN8RUss7zYzSRQdPTY4wXP2VNV1qdU0I7tpBa+dsBDXv0JOo35KQs+/OyeWePkNJaB1fVh7V5RfeubNaNJUhHvzo3FdfNYDsE73n1EeE2Yug1pov4o+g+jfLFLr6UBnSNeHnH+CfqYkUAdlspV+tzEASVFboEeiZfarHlk8JRlrSd48sIG3tQJBBeGDMcRzVado7N+YpoXF4SjbAkUt2DYAYmuEVGZSCyCVbO7SXa5F8Q7+DYHOL+EVpY4sdP/IsfwkUJ8DPdOnGLeruLhqfzURKu5Jjwg==; 5:/YNllKitEsyvzzwiLDe1LezNhxxBGUfGacBBZ/XeKGIwyg4+s388pXsLI9vMhFG4//P0JMRIdqj0XtOPThD9idsvAHTetaaP8+989e0nw4fh7hTwN1oTSUBj7cB/7KmLtTBmRb+Tsr+LS5ktJIGsU2wBED3ER9Kx5mdhM9Bev40=; 7:GCQ6kVkCkMpIaXu21KzWJ22ART5WHo+3o7SrjGrx4zfxTHV1OaojJ0KX5N4qzwHC1bAUebp9VNmI1RwRiF1mkK7Ive/oBoeQeVLUNA4GhiiqcFToUa5GgeA7EcSj2Dz9EIRd7YZ4974utX8WCa89tMWBY10NDuCY8A/y4uqfFg7rV3biuGrpOIh7b9iZFlWvDSKzqs/nPR9UgFz9Ypg/zXAz3Gyxqmoyq/5Xw7mA7+uc8NwjZa4RZSPc85n5GrzS SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Oct 2018 10:46:53.4469 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: af9f5693-d4b2-4f2c-2079-08d6291d89b4 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR04MB4849 Cc: Pankit Garg Subject: [U-Boot] [PATCH 29/53] armv8: layerscape: add SMC calls for DDR size and bank info. 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: Pankit Garg Adds SMC calls for getting DDR size and bank info for TFABOOT. Signed-off-by: Rajesh Bhagat Signed-off-by: Pankit Garg --- arch/arm/cpu/armv8/fsl-layerscape/cpu.c | 84 +++++++++++++++++++ .../arm/include/asm/arch-fsl-layerscape/soc.h | 4 + board/freescale/ls1012aqds/ls1012aqds.c | 4 +- board/freescale/ls1012ardb/ls1012ardb.c | 4 +- board/freescale/ls1043aqds/ddr.c | 14 +++- board/freescale/ls1043ardb/ddr.c | 20 ++++- board/freescale/ls1046aqds/ddr.c | 14 +++- board/freescale/ls1046ardb/ddr.c | 15 +++- 8 files changed, 147 insertions(+), 12 deletions(-) diff --git a/arch/arm/cpu/armv8/fsl-layerscape/cpu.c b/arch/arm/cpu/armv8/fsl-layerscape/cpu.c index 063a8fea55..024600c694 100644 --- a/arch/arm/cpu/armv8/fsl-layerscape/cpu.c +++ b/arch/arm/cpu/armv8/fsl-layerscape/cpu.c @@ -1227,12 +1227,96 @@ phys_size_t get_effective_memsize(void) return ea_size; } +#ifdef CONFIG_TFABOOT +phys_size_t tfa_get_dram_size(void) +{ + struct pt_regs regs; + phys_size_t dram_size = 0; + + regs.regs[0] = SMC_DRAM_BANK_INFO; + regs.regs[1] = -1; + + smc_call(®s); + if (regs.regs[0]) + return 0; + + dram_size = regs.regs[1]; + return dram_size; +} + +static int tfa_dram_init_banksize(void) +{ + int i = 0, ret = 0; + struct pt_regs regs; + phys_size_t dram_size = tfa_get_dram_size(); + + debug("dram_size %llx\n", dram_size); + + if (!dram_size) + return -EINVAL; + + do { + regs.regs[0] = SMC_DRAM_BANK_INFO; + regs.regs[1] = i; + + smc_call(®s); + if (regs.regs[0]) { + ret = -EINVAL; + break; + } + + debug("bank[%d]: start %lx, size %lx\n", i, regs.regs[1], + regs.regs[2]); + gd->bd->bi_dram[i].start = regs.regs[1]; + gd->bd->bi_dram[i].size = regs.regs[2]; + + dram_size -= gd->bd->bi_dram[i].size; + + i++; + } while (dram_size); + + if (i > 0) + ret = 0; + +#if defined(CONFIG_FSL_MC_ENET) && !defined(CONFIG_SPL_BUILD) + /* Assign memory for MC */ +#ifdef CONFIG_SYS_DDR_BLOCK3_BASE + if (gd->bd->bi_dram[2].size >= + board_reserve_ram_top(gd->bd->bi_dram[2].size)) { + gd->arch.resv_ram = gd->bd->bi_dram[2].start + + gd->bd->bi_dram[2].size - + board_reserve_ram_top(gd->bd->bi_dram[2].size); + } else +#endif + { + if (gd->bd->bi_dram[1].size >= + board_reserve_ram_top(gd->bd->bi_dram[1].size)) { + gd->arch.resv_ram = gd->bd->bi_dram[1].start + + gd->bd->bi_dram[1].size - + board_reserve_ram_top(gd->bd->bi_dram[1].size); + } else if (gd->bd->bi_dram[0].size > + board_reserve_ram_top(gd->bd->bi_dram[0].size)) { + gd->arch.resv_ram = gd->bd->bi_dram[0].start + + gd->bd->bi_dram[0].size - + board_reserve_ram_top(gd->bd->bi_dram[0].size); + } + } +#endif /* CONFIG_FSL_MC_ENET */ + + return ret; +} +#endif + int dram_init_banksize(void) { #ifdef CONFIG_SYS_DP_DDR_BASE_PHY phys_size_t dp_ddr_size; #endif +#ifdef CONFIG_TFABOOT + if (!tfa_dram_init_banksize()) + return 0; +#endif /* * gd->ram_size has the total size of DDR memory, less reserved secure * memory. The DDR extends from low region to high region(s) presuming diff --git a/arch/arm/include/asm/arch-fsl-layerscape/soc.h b/arch/arm/include/asm/arch-fsl-layerscape/soc.h index d327c7ba1f..ef228b6443 100644 --- a/arch/arm/include/asm/arch-fsl-layerscape/soc.h +++ b/arch/arm/include/asm/arch-fsl-layerscape/soc.h @@ -55,6 +55,10 @@ struct cpu_type { { .name = #n, .soc_ver = SVR_##v, .num_cores = (nc)} #ifdef CONFIG_TFABOOT +#define SMC_DRAM_BANK_INFO (0xC200FF12) + +phys_size_t tfa_get_dram_size(void); + enum boot_src { BOOT_SOURCE_RESERVED = 0, BOOT_SOURCE_IFC_NOR, diff --git a/board/freescale/ls1012aqds/ls1012aqds.c b/board/freescale/ls1012aqds/ls1012aqds.c index f312200433..7582f5e430 100644 --- a/board/freescale/ls1012aqds/ls1012aqds.c +++ b/board/freescale/ls1012aqds/ls1012aqds.c @@ -58,7 +58,9 @@ int checkboard(void) #ifdef CONFIG_TFABOOT int dram_init(void) { - gd->ram_size = CONFIG_SYS_SDRAM_SIZE; + gd->ram_size = tfa_get_dram_size(); + if (!gd->ram_size) + gd->ram_size = CONFIG_SYS_SDRAM_SIZE; return 0; } diff --git a/board/freescale/ls1012ardb/ls1012ardb.c b/board/freescale/ls1012ardb/ls1012ardb.c index f59749b87c..66554bcf6e 100644 --- a/board/freescale/ls1012ardb/ls1012ardb.c +++ b/board/freescale/ls1012ardb/ls1012ardb.c @@ -90,7 +90,9 @@ int checkboard(void) #ifdef CONFIG_TFABOOT int dram_init(void) { - gd->ram_size = CONFIG_SYS_SDRAM_SIZE; + gd->ram_size = tfa_get_dram_size(); + if (!gd->ram_size) + gd->ram_size = CONFIG_SYS_SDRAM_SIZE; return 0; } diff --git a/board/freescale/ls1043aqds/ddr.c b/board/freescale/ls1043aqds/ddr.c index a79d8e2120..d29a3ad797 100644 --- a/board/freescale/ls1043aqds/ddr.c +++ b/board/freescale/ls1043aqds/ddr.c @@ -108,12 +108,21 @@ found: #endif } +#ifdef CONFIG_TFABOOT +int fsl_initdram(void) +{ + gd->ram_size = tfa_get_dram_size(); + if (!gd->ram_size) + gd->ram_size = fsl_ddr_sdram_size(); + + return 0; +} +#else int fsl_initdram(void) { phys_size_t dram_size; -#if defined(CONFIG_TFABOOT) || \ - (defined(CONFIG_SPL) && !defined(CONFIG_SPL_BUILD)) +#if defined(CONFIG_SPL) && !defined(CONFIG_SPL_BUILD) gd->ram_size = fsl_ddr_sdram_size(); return 0; @@ -132,3 +141,4 @@ int fsl_initdram(void) return 0; } +#endif diff --git a/board/freescale/ls1043ardb/ddr.c b/board/freescale/ls1043ardb/ddr.c index 1fb1635dfb..784e482f32 100644 --- a/board/freescale/ls1043ardb/ddr.c +++ b/board/freescale/ls1043ardb/ddr.c @@ -205,21 +205,32 @@ phys_size_t fixed_sdram(void) } #endif +#ifdef CONFIG_TFABOOT +int fsl_initdram(void) +{ + gd->ram_size = tfa_get_dram_size(); + if (!gd->ram_size) +#ifdef CONFIG_SYS_DDR_RAW_TIMING + gd->ram_size = fsl_ddr_sdram_size(); +#else + gd->ram_size = 0x80000000; +#endif + return 0; +} +#else int fsl_initdram(void) { phys_size_t dram_size; #ifdef CONFIG_SYS_DDR_RAW_TIMING -#if !defined(CONFIG_TFABOOT) && \ - (defined(CONFIG_SPL_BUILD) || !defined(CONFIG_SPL)) +#if defined(CONFIG_SPL_BUILD) || !defined(CONFIG_SPL) puts("Initializing DDR....\n"); dram_size = fsl_ddr_sdram(); #else dram_size = fsl_ddr_sdram_size(); #endif #else -#if !defined(CONFIG_TFABOOT) && \ - (defined(CONFIG_SPL_BUILD) || !defined(CONFIG_SPL)) +#if defined(CONFIG_SPL_BUILD) || !defined(CONFIG_SPL) puts("Initialzing DDR using fixed setting\n"); dram_size = fixed_sdram(); #else @@ -238,3 +249,4 @@ int fsl_initdram(void) return 0; } +#endif diff --git a/board/freescale/ls1046aqds/ddr.c b/board/freescale/ls1046aqds/ddr.c index d2afe62cfc..45b1f373a7 100644 --- a/board/freescale/ls1046aqds/ddr.c +++ b/board/freescale/ls1046aqds/ddr.c @@ -92,12 +92,21 @@ found: popts->cpo_sample = 0x70; } +#ifdef CONFIG_TFABOOT +int fsl_initdram(void) +{ + gd->ram_size = tfa_get_dram_size(); + if (!gd->ram_size) + gd->ram_size = fsl_ddr_sdram_size(); + + return 0; +} +#else int fsl_initdram(void) { phys_size_t dram_size; -#if defined(CONFIG_TFABOOT) || \ - (defined(CONFIG_SPL) && !defined(CONFIG_SPL_BUILD)) +#if defined(CONFIG_SPL) && !defined(CONFIG_SPL_BUILD) gd->ram_size = fsl_ddr_sdram_size(); return 0; @@ -117,3 +126,4 @@ int fsl_initdram(void) return 0; } +#endif diff --git a/board/freescale/ls1046ardb/ddr.c b/board/freescale/ls1046ardb/ddr.c index 8fe0794198..321222d68d 100644 --- a/board/freescale/ls1046ardb/ddr.c +++ b/board/freescale/ls1046ardb/ddr.c @@ -97,12 +97,22 @@ found: popts->cpo_sample = 0x61; } +#ifdef CONFIG_TFABOOT +int fsl_initdram(void) +{ + gd->ram_size = tfa_get_dram_size(); + + if (!gd->ram_size) + gd->ram_size = fsl_ddr_sdram_size(); + + return 0; +} +#else int fsl_initdram(void) { phys_size_t dram_size; -#if defined(CONFIG_TFABOOT) || \ - (defined(CONFIG_SPL) && !defined(CONFIG_SPL_BUILD)) +#if defined(CONFIG_SPL) && !defined(CONFIG_SPL_BUILD) gd->ram_size = fsl_ddr_sdram_size(); return 0; @@ -118,3 +128,4 @@ int fsl_initdram(void) return 0; } +#endif From patchwork Wed Oct 3 10:44:36 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rajesh Bhagat X-Patchwork-Id: 978197 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; dmarc=fail (p=none dis=none) header.from=nxp.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=nxp.com header.i=@nxp.com header.b="bu40FAAb"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 42QCnR4fqlz9s8J for ; Wed, 3 Oct 2018 21:03:55 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 3FCCBC22093; Wed, 3 Oct 2018 10:55:49 +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=BAD_ENC_HEADER, 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 93714C220C5; Wed, 3 Oct 2018 10:55:46 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 33FFEC2203D; Wed, 3 Oct 2018 10:47:03 +0000 (UTC) Received: from EUR02-AM5-obe.outbound.protection.outlook.com (mail-eopbgr00050.outbound.protection.outlook.com [40.107.0.50]) by lists.denx.de (Postfix) with ESMTPS id 276B2C22049 for ; Wed, 3 Oct 2018 10:47:00 +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:X-MS-Exchange-SenderADCheck; bh=qad+M79PD7LQvE4koEPmyWAHIOv7ZtXjHabyzUFBBIk=; b=bu40FAAbxHiz6nj+LJ5TO3a8BBXp7svLeIniXV3aCSzFyAc9ES7YEdeakKfmyvTI9hOQGF/2aN/Hq4LRvPOKI/Pn3lm2onyy86mIOKCHzfblWBUFU60W+MY+X0K5sZjXDVO8VVx/kcRLZ3bHMmEvq/7DSyKLh0w/RCfl0LbN/jU= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=rajesh.bhagat@nxp.com; Received: from phoenix7.ap.freescale.net (14.143.30.134) by AM0PR04MB4849.eurprd04.prod.outlook.com (2603:10a6:208:c4::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1185.24; Wed, 3 Oct 2018 10:46:56 +0000 From: Rajesh Bhagat To: u-boot@lists.denx.de Date: Wed, 3 Oct 2018 16:14:36 +0530 Message-Id: <20181003104459.5444-31-rajesh.bhagat@nxp.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181003104459.5444-1-rajesh.bhagat@nxp.com> References: <20181003104459.5444-1-rajesh.bhagat@nxp.com> MIME-Version: 1.0 X-Originating-IP: [14.143.30.134] X-ClientProxiedBy: TY2PR02CA0011.apcprd02.prod.outlook.com (2603:1096:404:56::23) To AM0PR04MB4849.eurprd04.prod.outlook.com (2603:10a6:208:c4::26) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: aad4d686-a804-41ec-d224-08d6291d8bb1 X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989299)(4534185)(7168020)(4627221)(201703031133081)(201702281549075)(8990200)(5600074)(711020)(4618075)(2017052603328)(7153060)(7193020); SRVR:AM0PR04MB4849; X-Microsoft-Exchange-Diagnostics: 1; AM0PR04MB4849; 3:Sd8wQmXd7AO/NIOvZJqim/zurfoy3XJ3OZupGkACVoFEKkDjshA/+0OUs8eVhQ3OhmCT6aOm3vEQ8P9wkw1TkshFjdldLVjIpW0TgAEeoF8SIbFr70ABYvMDwPBAgg14v2KmxWpBWTAd/Uh762zM2DJxLtmzALhb+99awDM7iaLNNqx0I1XsVfgewtmH22R2wk14SJyaNE14zCNG6MnFlz/prZbqLyf0K0KI5D4C5+cvGOMeeF8c3GaZHADBk5++; 25:PGO+P7GiMFSDEfz44Cc8pYjJO7VGwF/AvAgWkD1ZzBug9vMAMu32SIYJJlQ3TNMyLMXJRMTSbj59kGLW2lzNs2btxZDXjOEjL19I6tHURdm/JK340BEueT3azOqUyAGdjz4+edXNwbQCCcS8GefcIp0xge6SoRx2ik8H1j/A7K6FjPqNFC3iIjpxqD5mGMZYAU2rFNre09CSTJPURSn90MY/bWwzDLxN0MeAy3M26fUY+SCQGfQ9d49q9UP9NJcCtejV2LrxNuYbaSmE9bhUqGAUYozmxVHPMniNLWBRArsLRAzg0CTZrby+DE5353la0Rv4qH1i1KnkU8QhOodg6A==; 31:oaxGiH2sswfc3G509dF2e0/vvG3GRsi30uidAPw68Aeiv1p1eR9OMU40RddEauJD1zom7kY54xeIbyoNSURh2lusJNi6k0KFdpE3h09aJmGOEifzeHrTj/kTddjE6dEtrq3Np233S8qT33BvB6vMsVTbQ6q/BH6QEt07lQlSb8yl605xJ6zhhq1tcWnG/1EUOcG4pvL8dYhCVHrbvXn0wgKVL6K/kwpFGBii5SS6p5o= X-MS-TrafficTypeDiagnostic: AM0PR04MB4849: X-Microsoft-Exchange-Diagnostics: 1; AM0PR04MB4849; 20:Yj35+F0Zx5uUQS245FAidtw0jFmNcDu/vWCLhMQhiDd+9BCR5vq7HzrB7sV0FUdNn+4pbOd8iUwdfQpDrq0pKtVk8B43A2xfPtQ4jNb3A8a2HJ1p8R2bFWRCmp+k+R25t06Mn5eUp3GJ6Z+Gj3OJ3xeV8Q6LRJFLIMfw7u9u85VCYdcrbQEeMHeNJdUoeEKmXq/jQquWCZPal6O4owwbMfw8h0ti6XNhk6FVnYmW3UbpebRdM3GkSmv9NGs/Hn8KGV/qJ7HYofb6wNwZEmByfD1vF8XDEAzR9lEuonlXsavTjiXck1aMjgGSN8xo+1XAgQzYDlziUVXVbJvCe0Coq9EK0vGlOJAely3wzGEI8qSum+SZQ36X+OjTXOLQanYkqCUvBVgQiICWfD6BF8+lKhrcoR52mCEgnQXAXqXeerD8DiCPm6sC73iy/uVvJmmw6TNN8kHMcWO7l13B1dBBfIfFIkOvNEOOjHbuauW/0F3h79PFQaGplpeu5WAtm4Ep; 4:bDzdptbsWE8Mg2q1jlZtQiek+B/r8XoxcoyD/TFp0GgB/RIlWLm1ZmIv9QUwMG7mgtdj8H8PARJ8DEBIv43UqsaAy0+Y2VG1rnLR89z0VWc5saKV/ZoHNznDNtng6hQvoXBscUZ0XQCULc6D3yu2v9f/AqqyAdcCnJ4bJmZJOB9CNXa/EgTLQ0bgioBY+Hs/QcEKEdbtzbMhdR+LTrMpspodcry09mcDTtjSGQr40OzKUX2l1RPn8vdAj9cIIZ7fLO5wbxxYYSXUBZTg6TIqN3f+43Ym4hxRWDLX6k2NL+oc5KuRb6Qq+Ez5rBZQNDBC X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(185117386973197); X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(5005006)(8121501046)(3002001)(3231355)(944501410)(52105095)(10201501046)(93006095)(93001095)(6055026)(149066)(150057)(6041310)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123562045)(20161123564045)(20161123558120)(201708071742011)(7699051); SRVR:AM0PR04MB4849; BCL:0; PCL:0; RULEID:; SRVR:AM0PR04MB4849; X-Forefront-PRVS: 0814A2C7A3 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(346002)(376002)(366004)(136003)(39860400002)(396003)(189003)(199004)(66066001)(50226002)(97736004)(7736002)(50466002)(55236004)(6666003)(14444005)(6506007)(386003)(16526019)(53936002)(26005)(68736007)(6486002)(186003)(47776003)(8936002)(8676002)(81156014)(476003)(81166006)(5009440100003)(4326008)(16586007)(36756003)(5660300001)(86362001)(2906002)(1076002)(2361001)(2351001)(478600001)(446003)(3846002)(6116002)(316002)(2616005)(44832011)(305945005)(76176011)(956004)(486006)(48376002)(105586002)(106356001)(51416003)(52116002)(25786009)(11346002)(6512007)(6916009)(110426005); DIR:OUT; SFP:1101; SCL:1; SRVR:AM0PR04MB4849; H:phoenix7.ap.freescale.net; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; Received-SPF: None (protection.outlook.com: nxp.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; AM0PR04MB4849; 23:QZIrkUtWt19xis961n1rJHSKOy6vQBnwMHohaZmbT?= biOhVk11KztwqlKoSpu30TP/37d8KlKtH5WYCCko0lOw7ehTfvz0bEaOoywwb22/IXQuClzMNKUEOtM88gS2GHoVh85iWsO0phSMyLCY58vzHgwTq3Z54HGPTlIqCo0UrB4IwoX7okIS6UMoRdnv7cFGq7jAnlnMSG4b6p2lV2PyhYo92kAo2XzELGjNv/bT4QI2h+WjgOlTPbddD5fyEQQkTU2eqxecwwdQ6PafFQRh4Y1qqtpwoMmhtb8uJPJQWrFKfHU21apFQUjGWq/uwEwubutvcWSyencrTLZGWQi5egHXAB/OKOui7psaGOD0K6qU5cgqtZxT5UAdRjO7sFzlJoOt/fDupaEaWrQ4+r1MgjWCmdMieZNGyfF0fhbrfjcP+HqQw1AmfeP8fVlARhNf0viFtOyBh3HRmFYJjUqMZxAwDcitLRhDWpDwegRS1rBEoAl0xPfKN3xDjn/jCLAnsiOdJMnbkv7ibq4BWQYEughPOpyV5twR6eKQdRM0jA6FvD0j8nbxq/1O2X7fXr5rSdggMPno0nazImGJZU6ia95WmhfcrW8Dy+f6t9Bo8K8KUOnM7kjxJd+kFy8bRESrThwbvcP8asBrRaIUkiAixb60ecYT/yViICY50tUyRTXTOkAB4gc801mWRiya3TmpGl/rbmE65KK+8CQVCCw2T9hTi3jCxoSMXti9H79hXwMG65JzbVYExH+yWgg0f+3994cqYaw+eJo4zNppMe/cQiZZmrvphkt1R78AbluzG+XoKGT2Ke9I1YcGtdpzGG+IJs2vrWbXrLv1fv495hn/XxQ2b9ww3JBpfzEofCf9Xim+/sGRqszuj6aBf1uimQGn3tVpK4GlyLXEuYBxXwCgjts4v7uqp0Msh70AuRtqaBmOZqIhNYJQ5WcES6u2zVXss5i4x7JGkntPT+/rZduZcApSiUXFCGXjQZJ+4w0eDBlYMsiglxNxAWkiGcUXDGQhojDf+YsdwaUJHxk2E50qycq9ZYW7VOMVuMYHmCMAzzMmdlspgpC03WDXhL6pZQSekOGk6gRHpE0MJ0KUwpnWnuBNdviZLJeUNsa7RBF/7+/h4Ms4gonZffW0hfShPPius89rzmrPz4cGiKfpVxpNIyqQRX6gP4vJA5xtBItXf6jlfYoKmCzRdtuuXS8vg/xIQnT5fpUQMczfu1mBZWsVXnzT5St3iL3p359AhjnnbvazllS6/9pAO9SyGn/XNecEwMfQoWrL+45uswAL9CgGaLtCxNFnkJLKUcsvhV4HrEUos7K2sPZ2i6oC6H0djJz X-Microsoft-Antispam-Message-Info: 37Iup9OTe4BGWeG4xmDdkOk1kQcZjtYKQcuFeC1ujWqx+D+4FSZYFR/87RDkFPTBROsXXEl0IKAjyOE0NFxpxd7hzM5OHeEXVtvmnBYiDRzxruplgTP7WW725DJPP7NDjpk/AUf7FLlSzgDJRGQ9nF1qg2wxpT1JBsTOuGg1iJCpFwwphTLid+7riZDvANijW4+xLa5CEXKIZ25CPYQ3u5CG18gv3SrmlbdXl3RJ0QHumYrOUmwczql9DnEZ6ObNsevRLRqac0qQH4sa2aVRiBG570z8KZrnlikwhB9VOfGWv2p4FF+Na3IEUleawUGml89XcUJIGhntOzX7WhIJ519htYyL7DzFnFXueSSQJcQ= X-Microsoft-Exchange-Diagnostics: 1; AM0PR04MB4849; 6:8g8eH64LsnBNxszeumeiy9sJ8Ll3o3iMlOKZH2V/zOqGbzM2CjouS0nMJ1/dwbiLNh+X5CeGz4uLQUiNILiy7glYmG/pDQRV06p6BIh1yJrOU8jHOpbClk75HECghaIxgeFeuc/3KXUsU4YEG3SVXl+W2kj9QmQZ9/3AqXB6GaipCqhBaGaIE+yRFLjY+4D1ng6E0AEiN/q2JJ+lGKSUkL000Ov3du8yXHj+q1v6DzpNxfJYhc9TK/5vtyUHtvorIVRlvGEARLdV3wdb10K3x/8UvK7oQ0hSxSgndHSHXyAuhQ4hzyGgMzToA61LXapJ+q+fKTl7E8LtPKJmdNQrIGpguza/qiv4S0QaFpGz78su88jkPwc/LndNvGCrNqmPy8LYXa/jGXguytMlHqEhdT5rnDH55H58+zM+9pykghaTHnyebybJZjkVRw5im6wx3ivPIPkrB9FFdjhYvIcoPg==; 5:zgxnjhKJlcEBAwVHwgFITeHN27vQhF6LGyAIijP6/Ag6xBsBn/kDXMzRKiqSNBpzkhQo0m6eHeL3oDWeuRu8gU6iioyyFJAD5CeGwMd3yj8SJeDDsV2Fc9ljcAQq3B8+7QdYxDmgHUWxAZwdhISXlog2mGudGAa6n0G4FfFg1lg=; 7:NJtLMhfWM3/AdOv7lOC4O/lneAOoJXtuMj5Xj+3Fg7DwN/CKJuitieArZknhMu06LrMriiCFBafQP7wxkMaRZRDpVPZzxtVp1jidDxQHVOhuHTMkHAjkzYOm73UA++XlV/Bv9KzO9FsHt2Alnq7PHGIM17IzB25VW+s0a687LWPjx6p0Qcww61cTbtkHojlAS91ry/56S79vN/NO2QfQfSwZ3uMBVuGBnQFxlxl6wh3lPUsNiYoC+YNNwK1Qug9u SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Oct 2018 10:46:56.7862 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: aad4d686-a804-41ec-d224-08d6291d8bb1 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR04MB4849 Cc: Ruchika Gupta Subject: [U-Boot] [PATCH 30/53] armv8: layerscape: skip OCRAM init for TFABOOT 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" OCRAM initialization is performed by TFA, Hence skipped from u-boot. Signed-off-by: Ruchika Gupta --- arch/arm/cpu/armv8/fsl-layerscape/lowlevel.S | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/arch/arm/cpu/armv8/fsl-layerscape/lowlevel.S b/arch/arm/cpu/armv8/fsl-layerscape/lowlevel.S index ef3987ea84..acaa6d6e37 100644 --- a/arch/arm/cpu/armv8/fsl-layerscape/lowlevel.S +++ b/arch/arm/cpu/armv8/fsl-layerscape/lowlevel.S @@ -295,7 +295,8 @@ ENTRY(lowlevel_init) 100: #endif -#if defined(CONFIG_FSL_LSCH2) && !defined(CONFIG_SPL_BUILD) +#if !defined(CONFIG_TFABOOT) && \ + (defined(CONFIG_FSL_LSCH2) && !defined(CONFIG_SPL_BUILD)) bl fsl_ocram_init #endif