From patchwork Wed Mar 29 19:21:04 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ruchika Gupta X-Patchwork-Id: 744819 X-Patchwork-Delegate: yorksun@freescale.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 3vtVF33tjBz9s4s for ; Thu, 30 Mar 2017 01:16:39 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 26299C21C2D; Wed, 29 Mar 2017 14:16:36 +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=2.4 required=5.0 tests=BAD_ENC_HEADER, DATE_IN_FUTURE_03_06,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS 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 A0857C21C2D; Wed, 29 Mar 2017 14:16:33 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 89082C21C2D; Wed, 29 Mar 2017 14:16:32 +0000 (UTC) Received: from NAM02-CY1-obe.outbound.protection.outlook.com (mail-cys01nam02on0061.outbound.protection.outlook.com [104.47.37.61]) by lists.denx.de (Postfix) with ESMTPS id B94A0C21C2A for ; Wed, 29 Mar 2017 14:16:31 +0000 (UTC) Received: from DM5PR03CA0020.namprd03.prod.outlook.com (10.175.104.30) by BY2PR0301MB1958.namprd03.prod.outlook.com (10.163.196.16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.991.14; Wed, 29 Mar 2017 14:16:29 +0000 Received: from BN1AFFO11FD048.protection.gbl (2a01:111:f400:7c10::150) by DM5PR03CA0020.outlook.office365.com (2603:10b6:3:118::30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1005.10 via Frontend Transport; Wed, 29 Mar 2017 14:16:29 +0000 Authentication-Results: spf=fail (sender IP is 192.88.168.50) smtp.mailfrom=nxp.com; nxp.com; dkim=none (message not signed) header.d=none;nxp.com; dmarc=fail action=none header.from=nxp.com; Received-SPF: Fail (protection.outlook.com: domain of nxp.com does not designate 192.88.168.50 as permitted sender) receiver=protection.outlook.com; client-ip=192.88.168.50; helo=tx30smr01.am.freescale.net; Received: from tx30smr01.am.freescale.net (192.88.168.50) by BN1AFFO11FD048.mail.protection.outlook.com (10.58.53.63) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.1.977.7 via Frontend Transport; Wed, 29 Mar 2017 14:16:29 +0000 Received: from perf-idc04.ap.freescale.net (perf-idc04.ap.freescale.net [10.232.14.49]) by tx30smr01.am.freescale.net (8.14.3/8.14.0) with ESMTP id v2TEFea5022593; Wed, 29 Mar 2017 07:16:26 -0700 From: Ruchika Gupta To: , Date: Thu, 30 Mar 2017 00:51:04 +0530 Message-ID: <1490815265-30405-2-git-send-email-ruchika.gupta@nxp.com> X-Mailer: git-send-email 1.8.1.4 In-Reply-To: <1490815265-30405-1-git-send-email-ruchika.gupta@nxp.com> References: <1490815265-30405-1-git-send-email-ruchika.gupta@nxp.com> X-EOPAttributedMessage: 0 X-Matching-Connectors: 131352705893079967; (91ab9b29-cfa4-454e-5278-08d120cd25b8); () X-Forefront-Antispam-Report: CIP:192.88.168.50; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(6009001)(336005)(39400400002)(39850400002)(39410400002)(39450400003)(39840400002)(39860400002)(39380400002)(2980300002)(1110001)(1109001)(339900001)(189002)(199003)(9170700003)(36756003)(105606002)(50986999)(8676002)(8656002)(77096006)(4720700003)(50226002)(8936002)(76176999)(33646002)(48376002)(54906002)(189998001)(50466002)(81166006)(6636002)(2950100002)(106466001)(53936002)(305945005)(6666003)(6306002)(5003940100001)(356003)(47776003)(5660300001)(104016004)(85426001)(38730400002)(4326008)(86362001)(2906002); DIR:OUT; SFP:1101; SCL:1; SRVR:BY2PR0301MB1958; H:tx30smr01.am.freescale.net; FPR:; SPF:Fail; MLV:ovrnspm; MX:1; A:1; PTR:InfoDomainNonexistent; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BN1AFFO11FD048; 1:CQVDcAPzNm2PLu/IuSz9Or6Lv8UdS0f5HmXguPSW8LawGVwFyXH61AJINfxd4P6EY9nVvX4oaxWVqWVwEe4B4FEjO7mpVz2+XMz+iYzhk6TLUjQA9E/+As7RwDHgrJPfzajizCFTwtxS80oqcYN5Srcpa9ycn+CuHH4e+Nu7ZwBk1nnCPQ6U3kyQeICo4fk9Leh2EWSbx6RM4x9P1c8oizHPE+8zTOMKchQHOsaWHSDLOZS6j7uOsSTX8xlq9MfS9+YOWRFW88Hq57ucCW/Zo2sxCFKiGJ8X8mgSciBPoZq/ulWgizmIbkOisBkrsLaiOjMYaf3insOcxQ2BH+WmQZpk3YLc4gzNTAnhUchyc9JE1hBDmcAnIdTeyUSPs3ywFz3n100Sf/XSnaBhROHK1xwcNKbkiiR+HZcos1gtf4MBJL47iXqBIo3JBrLoNsgz3H2SnfFrtZnfz9uyveY9qm9x8ojuH+zJuKR/Q+ZvuQpCLznRYrPI8kG3BwenWY3z+tA17WnTcNpeC+1DGfwFh/qxx7KLdOSVHYxseHh9shzPrgiKd8xE0a1R2AWVuCii8AwqSavMdZd71CQSsK9AztNv46SQYeft437puFcQ/DI8CPwpUtsHXsMUDHActLYJBUnOucIcb5/TxzCokIqDz6F9gm3tadq8L0zeC1LX8ARnlxQv9fmcZppSgRZo7cpDhEY8xQADHCfUVHmeTV/tFw== MIME-Version: 1.0 X-MS-Office365-Filtering-Correlation-Id: 6c086a84-bc81-4451-1b9f-08d476ae3182 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(2017030255075)(201703131430075)(201703131517081); SRVR:BY2PR0301MB1958; X-Microsoft-Exchange-Diagnostics: 1; BY2PR0301MB1958; 3:i53XRw4E6qJ3HN+35P7CeEjd9f9HYboF2mjBIyXFrbkweZFuZyfXULP7Qft/sq9qh/4Rb5+oxgbGjavm1M9Xva9BwnvkUOUwBgJ0w0HoEoOmLnTGSercwdaQPCm6tuZtfPn1h6Dt7x6P+xJjFzJaoT3MH2sRJYll8c2qqu3Z0OMj5ASiZE7GauGnmXjQIlo3F76rVvFcSpkZ67mAgWWqoR42Quny2G/QKyiglUe7PLiGBin0i/C0oPbuliB+LSNpQ8u5K9EM2T9X4qlEhCq2/UVlGvFrj6b+B69qln7UlsDESMDrDAhnKtxdKjPeqRpHTmvEY4g1Du9Rak4DyLKG4EnzTeQJa5W1ooVTg2nu82jOulkFj01OHeilHIXlpZ7kUwo8rfb2CFnGi70bmVvWsboDhDgRofPrUJBGM9eghAkwP6xC62q7QDFfEyoroR252+9/TBt88eAnhjO/0EwlLw== X-Microsoft-Exchange-Diagnostics: 1; BY2PR0301MB1958; 25:JI5PeeRDOTKe5Y30ngse8Cl5kXOUBPCaWS3QyJHv5e7SWXbY482cveDop7TKEB18VWKKAcxvrCZkQVUzFi0Vg/W1Fp7HsDqh4MdcXDVDY1sDkPbYwgWDWbgNhvF9/wtxm1U94a0VgLsOF6oiX3t/sGSmxi0gpEzT3nLoYlFKVu5HWvYXiJ8uz6X/6Em7ANsyMbTdBUjqEriDZ8ze5LBWACE/koxmWht2tVt3S6Wf5+d81CDHKdQELxQiFeNlkztjCQzn4QZCkbDZAnAK/NnA8hPoY9dBgwIBKiuVHX9ViC845TC/1lKm70Vvgt57hont8/ETxzZqDYDniIA//4LYwHCHsuXKW2EA86a1Wvln8qmsUdf2+ooXuwXlJvWbTgrFffBeoQO2SNCCwXi0fkqiCueVnCRWjUrEqjZzeHuoFJHRUfLue84ac9So91J3oYt7R8lWOmqyFaE/SnXWJ598SQ==; 31:k5cXsHTqnJ/nd8prB36SxCIriIFhq5xqHRx6WHMrBkIMDkfWWHItSwjXXbsWq3IvHj8ihVlmF6cNalBD5QL68PdtSdTKQyjN/3bRJ4DX/hJuxCLYBHPMi1/wW/wqLelUB8WxpE6cFZwo0R056D7Rb9sUgzrD1CnKMAVj8z46dMHvTdPv9hC0ijbLYTvEu4Co0TRJKdm5lfrqCyxfEGJpPou/rppeeNIJac4Eqczb5UBuvsqES/fL+EEPkVhjq+Pz5Z2sUyKWzHpdFL6J0Zhl4Q== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(185117386973197); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6095135)(601004)(2401047)(13023025)(8121501046)(13015025)(13017025)(5005006)(13018025)(13024025)(10201501046)(3002001)(6055026)(6096035)(20161123563025)(20161123561025)(20161123559025)(201703131430075)(201703131448075)(201703131433075)(201703161259075)(201703151042075)(20161123556025)(20161123565025); SRVR:BY2PR0301MB1958; BCL:0; PCL:0; RULEID:(400006); SRVR:BY2PR0301MB1958; X-Microsoft-Exchange-Diagnostics: 1; BY2PR0301MB1958; 4:tc3BOD8wqJe7qAqgtnyXiMLlVLybTuqCWPHBuh1/m6mzwUxo0enI0bCvBrmQ6yrRSjN/RG12uHpF3Ro7ijDiCcLIvdJrX6/cWeZrwPDMv2dj3okIDyXulKo94kK/gs4oTYLG4VzBFIILNg/ADhtt+bKa8rnG83NmdAPN57hHiKD9hkhY7C3/JUx2VbriiXHTs35ghTAPaqt1EjgQPNfSdECV3VV3iAenjbyKn19CKLpxLWE5PiXI+w3xvmgJH1ZkTxoha9iq5VWOb+oYzBdkMy2UbCwW5/thxLqYc6w1GpfHfz8lOnaUk75Wz+G880/vPa/qFSKfksxSPTMYRynkCxuuCtUd7xe2MxrVKDZkabI0ydMDXeXhF6GIjb+eY5/MC8R4BGL8qEVnY/N6uHhDk84AdwObGhMrAG5z4ICKbQy5MQTyjWzhV3X5zFnbrx1y+laTCKS5EZIqoiYiI1deHPJYbaCchyW7oVrLfXYlU3QbDBC6hHa8swrXjoiOZccUk89TzWK91iOlSIRmJr2eKlT2q54YaKEKc85dCDQdNnYiZ4v91fvKqZAJjL9FjD2GB/dlu7eDAQl8Hyvg4KEIsMEzJVlcuprpTAneC9r9+x9I72AtEH80tdeS/MltLDVr+v5KKcSTY+HFmPTWjxPlGMk/fvuBPadWLQRD3rbixROh2e2Tx3azHORXTCX2QsdJXKDFMcPZ8HkPXmP0GjcyyEVIYiZz279a57Q2tRCNNFfA3DSjhqE8zNIUlknlx6TMifNwjLSuIwovCHy7cSgB6hEPCowxS9GMyHWpicdXIs8XyukrnCFT8KCBoXKHcZtDeZ5G1eVZcqlJGPCNeLPzZtBlRP36PgUvDhWeTFroSitjYW/+84puIxBYUWDm14as4pG5E13ofxbAlh+TRAGyvIic8FQxRIoqovedDFiSuZc= X-Forefront-PRVS: 0261CCEEDF X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BY2PR0301MB1958; 23:I4RIqrxLqlK5gm29ZDDKFdla3/NMNnxAi/SJ8at?= =?us-ascii?Q?k0fod84AGIHhebHzDDOaic00hebdfCaVOvcw/kEVCu5V38QYSR4xBEdtU2y8?= =?us-ascii?Q?20HGvox2razW5XVKRHZv36V7KfZVXmZZyLUHop1U5SrgBOKghjCMVf+kQWPB?= =?us-ascii?Q?EfprSu56gzoHr/28zfcBlGEmIyrGcH6Slpm8gmfjdGmLTlVejrz9zUguY5pl?= =?us-ascii?Q?SnFjIw2DhAWnVNnwhb8k3f9c3lLOF7ysc8BB8It7NgaipmKiPbbNmStxFZNR?= =?us-ascii?Q?Sokiq+VkSYuF/4vQ8MWlDC+7r2rJQe0oWuYPaAwxTs8Smeb/lI+ZWrh6ILCT?= =?us-ascii?Q?UD8wGkNZOgeAY3tDzppSbZeNhOKlEfemopHujl7LGx+BQALJi2C4m/iznL0e?= =?us-ascii?Q?2Xs28zA4fxkaP1LyeHeCLBPhUybJaCGFoA+vH2TtgEUfePfhhpFaWmTNmBlv?= =?us-ascii?Q?NLgEvvu4L6t4YQYCb3OQ3TzFYcoJR4ZEB4Qos1k8EPVMoYXULAP3uQOYtxlC?= =?us-ascii?Q?8pij9ltFCZ3X452kq2dJCd1NGYOM/dV+o5krfDd1h6k9ChRiLSx/IDr2eFxq?= =?us-ascii?Q?el5jq4J7hhg++6d0oiZCGPwK/+WoG+QIw6g510hDGDXpamSBtrsSdoJk6hje?= =?us-ascii?Q?KB/GjvF0TGYcPGqkWarIY4XuXIjxUe4+GisDvX9zQ+taLDvUmdgsf812SfUS?= =?us-ascii?Q?j5ME8er20aHzP+2zKIhSTCmHPCDdXObZ/qekc1JpND1eYIJR1S1y8INGHUTT?= =?us-ascii?Q?ntfmZlLuR+amj0X38zCMQh4mlI7x5oydX+IOnGBgu/PnowalJzE3ukGM2GuS?= =?us-ascii?Q?lOg15/HDQV6vYWiVH1AMWT5oMl2qb7HXjZ9O34d5Wj/xbfvvscc+sJetqWk3?= =?us-ascii?Q?uZxUOYnsLIVE27vBp6ySESBwQGj2TMyfiGTaVz2UzX0Q3GFOBNllEij2fE5o?= =?us-ascii?Q?YkPPnX8nLAzGrCaxABl/4NrEDWElFSc3dm5OGG0itGbqZdkPb+mK+DFVo9hd?= =?us-ascii?Q?7sPXdPbXWVPHXACRNP2QzvGuAszuUzyHpRYb/8VjPkp/hneLmAL/qQPo3t/z?= =?us-ascii?Q?LgeJhYIjohoUO8RsrQWFV3BdQ8yYLklNdZ1zofiuviSrxcE6XKJephnzBzHY?= =?us-ascii?Q?4TaO4Sh5UpYWQ201vW1U/fxxm5AdbWIzChrDkvxKe1JOoxJNHtXKXNW1pRwy?= =?us-ascii?Q?VyGsdF5sGednWYtuVvjQ7YoMgL94VVKV6b2QVgZujH7LrSkAzHpFwDH8n3A?= =?us-ascii?Q?=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1; BY2PR0301MB1958; 6:KLrd2gInLiwJiykkPo3N7vf2KSKxHv0vZRFDtj7QlAv+b/PbA7pfS3MZaMLX9Zz4MJ4+xmi/DlDQTS0SZzNRsts7FBfRyblaVGbeavu1YACMWIi6zc+waQGEs+QhuerSvyL8Hpjr1q9yztsf8tSBRJgk684pNEYXK5SLf04x0V8ibLNtWeKVhqFzmKF0pbJYIRvHUoB9oj1FG3q9cFQV0yTp1gkOr30fsXJE2VJZfiM+vQ/Rp+vU4Jzlp0eJoRaMGr/licCFGxYVdaunB16/Z3qGPJ8NDsBi2NPmAk/8Iee9zhzVaOdSFv+e6UVdGKBiqG23hgfrXbM+Z545CfJvOyEVh08x8cV9dl7uafoRo//U7dt/5aaxGcBAjNJHgDWoHD18AA9GHeThuUMR3VT6Vg==; 5:L/xJE7gZaK29hb66PIfHEWDOAviNUBxwKNvE6NLxD9ctxUB7bGZwNBLzr7cVt5UCfDGaeDppNaUazrL6UrUQfdCio78/aq7u1s5jtOwdtTYqDOwtaYHoOHA4ofMWVeagttQLpv6MnRaJEoxYjMCHWLqkLHupU+k8LpOpG/jB2yXisnaDnHUtLOG1v7aac7yH; 24:MLqiymqo0mnVTvoTAIqBHAGilWar+AIxXaP++T3Wf8AIJdKzfJoJOICYOeqtxzc+bsyBoTCVpxDMHluWU6TjOYVIHDK34a0cAO2gYLhZ+gY= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; BY2PR0301MB1958; 7:MsEDfCeCEYinmMPU4l/ALH0Nosx/NN6zhvS9opvP2ofi4yODQa70GTvqgoXQhhJti1t72nSNSCbniLaiTwTclEBxbIYv045kaN98+dGmrzkvU8Dffd7VVIOpKylP21fiFiNLE4dpXT+S+o4YpdaslrDIbEKPy1ZlsapciVUB+DjO0KgSnxlds46OcfZ6PNfP1ehSFljGlDb2MUMpmvxCOsJeWJFaN2NMmrDotwxi4FBUdRrhca7Ee/vA9bhoHV05oRW4SRDnN5SOnNO+Qwo9EX91bQwk95jt4iUdMS27sOBmZcb/4WpX/B401vxuWpAj/jG3ZxuRZNBcE5x96yAr/w== X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Mar 2017 14:16:29.1363 (UTC) X-MS-Exchange-CrossTenant-Id: 5afe0b00-7697-4969-b663-5eab37d5f47e X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=5afe0b00-7697-4969-b663-5eab37d5f47e; Ip=[192.88.168.50]; Helo=[tx30smr01.am.freescale.net] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY2PR0301MB1958 Cc: Ruchika Gupta , Vinitha Pillai-B57223 Subject: [U-Boot] [PATCH 2/3][v2] arm: ls1043ardb: Add NAND secure boot target 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: Vinitha Pillai-B57223 Add NAND secure boot target for ls1043ardb. - Change the u-boot size defined by a macro for copying the main U-Boot by SPL to also include the u-boot Secure Boot header size as header is appended to u-boot image. So header will also be copied from SD to DDR. - MACRO for CONFIG_BOOTSCRIPT_COPY_RAM is enabled to copy Bootscript from NAND to DDR. Offsets for Bootscript on NAND and DDR have been also defined. Signed-off-by: Vinitha Pillai Signed-off-by: Sumit Garg Signed-off-by: Ruchika Gupta --- Changes from v1 - Rebased this patch to the latest dependent patch-set. Dependent patch set: SECURE boot target addition for NOR on LS1043, LS1046 https://patchwork.ozlabs.org/patch/742548/ https://patchwork.ozlabs.org/patch/742552/ https://patchwork.ozlabs.org/patch/742549/ https://patchwork.ozlabs.org/patch/742551/ https://patchwork.ozlabs.org/patch/742550/ https://patchwork.ozlabs.org/patch/742553/ https://patchwork.ozlabs.org/patch/742554/ and SPL size reduction patches https://patchwork.ozlabs.org/patch/744755/ https://patchwork.ozlabs.org/patch/744756/ arch/arm/include/asm/fsl_secure_boot.h | 7 +++- board/freescale/ls1043ardb/ls1043ardb.c | 1 + configs/ls1043ardb_nand_SECURE_BOOT_defconfig | 57 +++++++++++++++++++++++++++ include/config_fsl_chain_trust.h | 9 +++-- include/configs/ls1043a_common.h | 18 ++++++++- include/configs/ls1043ardb.h | 2 +- 6 files changed, 87 insertions(+), 7 deletions(-) create mode 100644 configs/ls1043ardb_nand_SECURE_BOOT_defconfig diff --git a/arch/arm/include/asm/fsl_secure_boot.h b/arch/arm/include/asm/fsl_secure_boot.h index 266db4c..2cefd1f 100644 --- a/arch/arm/include/asm/fsl_secure_boot.h +++ b/arch/arm/include/asm/fsl_secure_boot.h @@ -70,7 +70,7 @@ /* Copying Bootscript and Header to DDR from NOR for LS2 and for rest, from * Non-XIP Memory (Nand/SD)*/ #if defined(CONFIG_SYS_RAMBOOT) || defined(CONFIG_FSL_LSCH3) || \ - defined(CONFIG_SD_BOOT) + defined(CONFIG_SD_BOOT) || defined(CONFIG_NAND_BOOT) #define CONFIG_BOOTSCRIPT_COPY_RAM #endif /* The address needs to be modified according to NOR, NAND, SD and @@ -96,6 +96,11 @@ #define CONFIG_BS_ADDR_DEVICE 0x00000940 #define CONFIG_BS_HDR_SIZE 0x00000010 #define CONFIG_BS_SIZE 0x00000008 +#elif defined(CONFIG_NAND_BOOT) +#define CONFIG_BS_HDR_ADDR_DEVICE 0x00800000 +#define CONFIG_BS_ADDR_DEVICE 0x00802000 +#define CONFIG_BS_HDR_SIZE 0x00002000 +#define CONFIG_BS_SIZE 0x00001000 #elif defined(CONFIG_QSPI_BOOT) #ifdef CONFIG_ARCH_LS1046A #define CONFIG_BS_HDR_ADDR_DEVICE 0x40780000 diff --git a/board/freescale/ls1043ardb/ls1043ardb.c b/board/freescale/ls1043ardb/ls1043ardb.c index bd72e30..ff985de 100644 --- a/board/freescale/ls1043ardb/ls1043ardb.c +++ b/board/freescale/ls1043ardb/ls1043ardb.c @@ -51,6 +51,7 @@ void spl_board_init(void) out_le32(SMMU_SCR0, val); val = (in_le32(SMMU_NSCR0) | SCR0_CLIENTPD_MASK) & ~(SCR0_USFCFG_MASK); out_le32(SMMU_NSCR0, val); + printf("Completed spl_board_init\n"); #endif } #endif diff --git a/configs/ls1043ardb_nand_SECURE_BOOT_defconfig b/configs/ls1043ardb_nand_SECURE_BOOT_defconfig new file mode 100644 index 0000000..66c89fa --- /dev/null +++ b/configs/ls1043ardb_nand_SECURE_BOOT_defconfig @@ -0,0 +1,57 @@ +CONFIG_ARM=y +CONFIG_TARGET_LS1043ARDB=y +CONFIG_SPL_LIBCOMMON_SUPPORT=y +CONFIG_SPL_LIBGENERIC_SUPPORT=y +CONFIG_SPL_NAND_SUPPORT=y +CONFIG_SPL_SERIAL_SUPPORT=y +CONFIG_SPL_ENV_SUPPORT=y +CONFIG_SPL_DRIVERS_MISC_SUPPORT=y +CONFIG_SPL_WATCHDOG_SUPPORT=y +CONFIG_DEFAULT_DEVICE_TREE="fsl-ls1043a-rdb" +CONFIG_FIT=y +CONFIG_FIT_VERBOSE=y +CONFIG_OF_BOARD_SETUP=y +CONFIG_SYS_EXTRA_OPTIONS="RAMBOOT_PBL,SPL_FSL_PBL,NAND_BOOT" +CONFIG_NAND_BOOT=y +CONFIG_SECURE_BOOT=y +CONFIG_BOOTDELAY=10 +CONFIG_SPL=y +CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_SECTOR=y +CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR=0xf0 +CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT=y +CONFIG_HUSH_PARSER=y +CONFIG_CMD_GPT=y +CONFIG_CMD_MMC=y +CONFIG_CMD_SF=y +CONFIG_CMD_I2C=y +CONFIG_CMD_USB=y +CONFIG_CMD_DHCP=y +CONFIG_CMD_PXE=y +CONFIG_CMD_MII=y +CONFIG_CMD_PING=y +CONFIG_CMD_CACHE=y +CONFIG_CMD_EXT2=y +CONFIG_CMD_FAT=y +# CONFIG_SPL_EFI_PARTITION is not set +CONFIG_OF_CONTROL=y +CONFIG_DM=y +CONFIG_SPL_DM=y +CONFIG_MTD_NOR_FLASH=y +CONFIG_SPI_FLASH=y +CONFIG_NETDEVICES=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_DM_SPI=y +CONFIG_USB=y +CONFIG_DM_USB=y +CONFIG_USB_XHCI_HCD=y +CONFIG_USB_XHCI_DWC3=y +CONFIG_USB_STORAGE=y +CONFIG_RSA=y +CONFIG_SPL_RSA=y +CONFIG_SPL_CRYPTO_SUPPORT=y +CONFIG_SPL_HASH_SUPPORT=y diff --git a/include/config_fsl_chain_trust.h b/include/config_fsl_chain_trust.h index eb45e98..40d323e 100644 --- a/include/config_fsl_chain_trust.h +++ b/include/config_fsl_chain_trust.h @@ -81,17 +81,18 @@ "setenv bs_size " __stringify(CONFIG_BS_SIZE)";" /* For secure boot flow, default environment used will be used */ -#if defined(CONFIG_SYS_RAMBOOT) -#if defined(CONFIG_RAMBOOT_NAND) +#if defined(CONFIG_SYS_RAMBOOT) || defined(CONFIG_NAND_BOOT) || \ + defined(CONFIG_SD_BOOT) +#if defined(CONFIG_RAMBOOT_NAND) || defined(CONFIG_NAND_BOOT) #define CONFIG_BS_COPY_CMD \ "nand read $bs_hdr_ram $bs_hdr_device $bs_hdr_size ;" \ "nand read $bs_ram $bs_device $bs_size ;" -#endif /* CONFIG_RAMBOOT_NAND */ #elif defined(CONFIG_SD_BOOT) #define CONFIG_BS_COPY_CMD \ "mmc read $bs_hdr_ram $bs_hdr_device $bs_hdr_size ;" \ "mmc read $bs_ram $bs_device $bs_size ;" -#else /* CONFIG_SD_BOOT */ +#endif +#else #define CONFIG_BS_COPY_CMD \ "cp.b $bs_hdr_device $bs_hdr_ram $bs_hdr_size ;" \ "cp.b $bs_device $bs_ram $bs_size ;" diff --git a/include/configs/ls1043a_common.h b/include/configs/ls1043a_common.h index c9ab2bf..82da808 100644 --- a/include/configs/ls1043a_common.h +++ b/include/configs/ls1043a_common.h @@ -105,7 +105,23 @@ #define CONFIG_SPL_BSS_START_ADDR 0x80100000 #define CONFIG_SYS_SPL_MALLOC_SIZE 0x100000 #define CONFIG_SPL_BSS_MAX_SIZE 0x80000 -#define CONFIG_SYS_MONITOR_LEN 0xa0000 + +#ifdef CONFIG_SECURE_BOOT +#define CONFIG_U_BOOT_HDR_SIZE (16 << 10) +#endif /* ifdef CONFIG_SECURE_BOOT */ + +#ifdef CONFIG_U_BOOT_HDR_SIZE +/* + * HDR would be appended at end of image and copied to DDR along + * with U-Boot image. Here u-boot max. size is 512K. So if binary + * size increases then increase this size in case of secure boot as + * it uses raw u-boot image instead of fit image. + */ +#define CONFIG_SYS_MONITOR_LEN (0x100000 + CONFIG_U_BOOT_HDR_SIZE) +#else +#define CONFIG_SYS_MONITOR_LEN 0x100000 +#endif /* ifdef CONFIG_U_BOOT_HDR_SIZE */ + #endif /* IFC */ diff --git a/include/configs/ls1043ardb.h b/include/configs/ls1043ardb.h index e7d1f99..b06cd06 100644 --- a/include/configs/ls1043ardb.h +++ b/include/configs/ls1043ardb.h @@ -149,7 +149,7 @@ #ifdef CONFIG_NAND_BOOT #define CONFIG_SPL_PAD_TO 0x20000 /* block aligned */ #define CONFIG_SYS_NAND_U_BOOT_OFFS CONFIG_SPL_PAD_TO -#define CONFIG_SYS_NAND_U_BOOT_SIZE (640 << 10) +#define CONFIG_SYS_NAND_U_BOOT_SIZE (1024 << 10) #endif /*