From patchwork Mon Apr 17 12:37:18 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ruchika Gupta X-Patchwork-Id: 751264 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 3w60PL1hH8z9s03 for ; Mon, 17 Apr 2017 17:33:42 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id E48EBC21BE6; Mon, 17 Apr 2017 07:33:08 +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_H3, RCVD_IN_MSPIKE_WL, 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 46115C21C95; Mon, 17 Apr 2017 07:32:55 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id D65CAC21CB8; Mon, 17 Apr 2017 07:32:47 +0000 (UTC) Received: from NAM01-BN3-obe.outbound.protection.outlook.com (mail-bn3nam01on0053.outbound.protection.outlook.com [104.47.33.53]) by lists.denx.de (Postfix) with ESMTPS id 2CFC6C21C92 for ; Mon, 17 Apr 2017 07:32:41 +0000 (UTC) Received: from BN6PR03CA0094.namprd03.prod.outlook.com (10.164.122.160) by CO2PR03MB2279.namprd03.prod.outlook.com (10.166.92.148) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1034.10; Mon, 17 Apr 2017 07:32:39 +0000 Received: from BN1AFFO11FD026.protection.gbl (2a01:111:f400:7c10::114) by BN6PR03CA0094.outlook.office365.com (2603:10b6:405:6f::32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1034.10 via Frontend Transport; Mon, 17 Apr 2017 07:32:38 +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 BN1AFFO11FD026.mail.protection.outlook.com (10.58.52.86) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.1.1019.14 via Frontend Transport; Mon, 17 Apr 2017 07:32:38 +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 v3H7WT2o031802; Mon, 17 Apr 2017 00:32:35 -0700 From: Ruchika Gupta To: , Date: Mon, 17 Apr 2017 18:07:18 +0530 Message-ID: <1492432639-32589-2-git-send-email-ruchika.gupta@nxp.com> X-Mailer: git-send-email 1.8.1.4 In-Reply-To: <1492432639-32589-1-git-send-email-ruchika.gupta@nxp.com> References: <1492432639-32589-1-git-send-email-ruchika.gupta@nxp.com> X-EOPAttributedMessage: 0 X-Matching-Connectors: 131368879584240431; (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)(39840400002)(39450400003)(39380400002)(39850400002)(39860400002)(39400400002)(39410400002)(2980300002)(1110001)(1109001)(339900001)(189002)(199003)(9170700003)(189998001)(106466001)(53936002)(2906002)(50466002)(6306002)(105606002)(48376002)(38730400002)(6636002)(5003940100001)(4720700003)(2950100002)(85426001)(6666003)(356003)(305945005)(33646002)(81166006)(76176999)(50986999)(8936002)(8656002)(50226002)(54906002)(5660300001)(104016004)(36756003)(77096006)(8676002)(86362001)(47776003)(4326008); DIR:OUT; SFP:1101; SCL:1; SRVR:CO2PR03MB2279; H:tx30smr01.am.freescale.net; FPR:; SPF:Fail; MLV:ovrnspm; MX:1; A:1; PTR:InfoDomainNonexistent; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BN1AFFO11FD026; 1:RjUYzlN0PB73Z8e+95u2qLgSjn1hXK7FYu0p3bevxMr/vf4nPz9kr30ymcHbFuocErq/efjMI8yddL/vV2cmkjzI+nZAnaJkpUCU4GIVAfQ75H5ss1M0WmSFWTR9ZDizto8diV84XTnZfUd6nN8ZCF1moEhGAcHlVhOT/CkxaFo0/SqR5WwKLwhfWcJvdXua3mANX/GtqnqZqI6CAHX6ex+FX1fsp7gmAU8ZbXwCZL6jZTubHj77FRChRsVMKAYiLzJAl9CbSQV07rHhm1r+EVLZJqQ8LwpjC6JU15qYEzF+ijLXGDWoq6JOW2pIj0JWXGVJUg24QUnCCtlBzxgTx+Jgb1OaWpGL0azTZVLSH2OKk5QwRHsO6ZZ0Jx4KqSpbbek8YE4F4QFaV2jkR4hAMLSq5ugoRgeWYxKSYKUvVhPiC3WF77RapDmjEEkyoPLVJsgorV4y/dbDXcYKLhD1xhgvUXUSP+2ILqIoj/XQ7Q9/TUznXMBdI4341jov75OPV9F0w5wp6ntW5nw9Mx1G4HrihHZAW2NZdAtPWLQffgPPq4AV5e0Lz11CPSsH7GzgkI1rTntm8G20VFL8oWAZJhH+xxdde3Eb8hrwNNSFlXnPQ3md1R/JAqx4119yyYv6L+GF/zTSN/Fg3/m5yEy5YMAVEv1hZKWymuF96oI6bVYW4g78iiZu5SQz0rjtmVOHRCjeqGHZA7K/DDAedhlxaNCHq5g9jhgJPaEztZdjhW4= MIME-Version: 1.0 X-MS-Office365-Filtering-Correlation-Id: 5e5f2e35-afe1-470b-3988-08d48563ec8f X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(201703131430075)(201703131517081); SRVR:CO2PR03MB2279; X-Microsoft-Exchange-Diagnostics: 1; CO2PR03MB2279; 3:lx3/fI5FHFP9mOenPrXjCFIw3h2PM9FdLzXGcRQiJdRK1NsPpL56dM3vzThdirj27M/rvH1w+ImrcgAtqYQOLZrgQgTKeJWicWfTv7SgMWIjNrToqnG7Y5P6gGDmi7rqhUnp/E8QuYhOulVI32kH7RyTaaq2NfUFieoYwkjleNJEk2uxNWz0rgT8e8UwAl0sxc3nWpYuu83w3tpixRE7XAH2DEKxYi9U/CfPWhVVHZWPvgcNssKHSOY9jWsQS4d3Bqb/JKysnvFu0R6dLcvvzugUvaWpWJP8tbQuroj2bVuhR6BLvebu/kyThEyBY0FC0XFH+mWx5JS8Omq3lrsjxE92M5xHlpuwYbZkA5HapJTidkcJ/em9s6TPIKj3aXRpoBh/lpRxweKRqMuEcovWUM5X3W32KWEiwyCPgo65oy4Gj4Fp4fnoQFplXJeCpB7t; 25:mC3/nqSW/vcQgb5w1y+XrIBNztSllR1TzcUKua7uuFoNauTE7VJ1ne4Bw/2MsThYKPp2H+MDdfp0oylNmDo05IOvYkB2LSep1VXqMzui6/ngxxZII21Zn1K9VGGkDz212fHL2glOw04Gh717I0naafMrZxXYKLib29lXBMHHmwh7o3rDxG66iAua6bniSn9B0vcbkW8YPoQj6+hhhfTQN6zTbzl+SVHfK0d1UZlUgPzW6zc/BL30krnKB1TWnkZNSeo0iFCvJmRnmp+Rmu9LOrxwez5jtJ+TowGU12eqqvHUwaF81dANTiPfbbRnKNFsCqe7CM2YT0jpAhAHtv8Pg52u3qqZtkiVaRPnpaqs5QoMCKYe82r4sCymANhx4jLrNgtuQVFE8GwmNTl9V3b4Jj8Yj9J4BJm4a1YM7fo2r13BxagsxIHNSfcg8HwHt4ClLTPj4LH43ia11lLjLb0p9A== X-Microsoft-Exchange-Diagnostics: 1; CO2PR03MB2279; 31:Ym9Ygd12753cpi4XmvPcE6yexegxncx/Et5ffHIBmUoPAFHOUAFnnqGvQyUC7YXOSKamUTClkkeoWaCR1DPa4aoE8U/u9XsJ86g1VQxiZffa/eKcNDYcNWnOoVn2/hc5kL52ojox2ox3WxuPdYO94oUgvPBFe6Wyqo3PEUAbL1R4xN3HdGshQmUbGLT5f3NN8pqyUrKr0xAU5a5ObRmnECbCISOFqx5mmKioSEmRoq4uoJ59E4cu1IrHqR6mesVqfORM1GieKFQT8cCJOSY4cg== 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)(13024025)(13023025)(13018025)(13015025)(13017025)(8121501046)(5005006)(10201501046)(3002001)(93006095)(93001095)(6055026)(6096035)(201703131430075)(201703131433075)(201703131448075)(201703161259150)(20161123563025)(20161123556025)(20161123565025)(20161123561025); SRVR:CO2PR03MB2279; BCL:0; PCL:0; RULEID:(400006); SRVR:CO2PR03MB2279; X-Microsoft-Exchange-Diagnostics: 1; CO2PR03MB2279; 4:j0AMxU6PfpPvPcvZpzCKp6AGeUuYkVkIUazaSSz/8kXwYt2FT3jlnNSRBHjkUd7byH8iJZVvCO5SkYX3rSY8OPLVEtFtttlKq5f3JZe6T6qrjMN/8N5hVimc0hTTnZS/oykE08H1QCL1tbMwFoK9NTvXCxeWhbbqNge52NVvkQOu7TdTquQsS3HYNwB8+U6sDvLDIzN1TRecLJFZfFCQwT95zSPQ5d4tuoxnS+Agy3Q9JrHlsXt99aO7AmOyfzhgD1dcdykHr0sXs0ct4Mjo27/FO8EjDbDTfGc75LLmycD6bkD+4K+T3DyJG8HTUpSbI4rvbioQQ07dYXbAalTvkUipjewvlrLEjUBPtvb7zudhusu2fp8RAwIfiVdrJVyURNVpEKvLqvASgQUJu7ls5ba6jjN32uoz4ICY5z7HzsHWI4EaWIKP5HHR4Yq4dmVNgs4+awZh0I4kjc2Ep8gWYfzBQVDFRT/tCEmhlfmm8waRKBCw6TTrUjtOWvLhyTtXEOqI2T0LOWmetx7ie5XRzmFC9hNFhr8CcSyVBSq76nT8W73eDrBATUU23TlXb6/TSnQ1xGKgqT34WQzizLfEHJo79RjTnSRZhlt/MCqf48Ndm4+yoXHO7gRL6bRtKAdB0ZNeDSBsaQWbdqOSkyeSTOU2vm4zR+yMqBofEgYn68HDU0GFoV27kRnatGaEBN5VJYt+fhDg9NRr3j64zhCTsqcxFfdtKJcowTHlVybO62XUiDmSviVHCBfJ7DTm3JbWXgD7AcmMI9owMpU7QUySeP1RcR1eIwIWJJDgL3DZjjks0/Uciv9HPolPe7/t9sDp4D5BMLCs1dARse42VQ5K9JHCtsryDHbd5d0aCFYR1pgM7QYMfrd0KGJEJ7FJYGzuW/x1JrrNU3qcialMS7tE6Q== X-Forefront-PRVS: 02801ACE41 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; CO2PR03MB2279; 23:8Mxu8HIBt4KOapbggXQa98Bnz7VnZPguVeScJcu72?= =?us-ascii?Q?70EEqvUxr10dvLe4zEmOEqmle+qC7z88Pe8Vp4Ce7TM4JWtMflC33jLHPmMt?= =?us-ascii?Q?CVa+tAPUrw7Sg/Bw6HsSTiyIikpnotmDwlO+mWVzbvMO76C7uDFRgmPY0T4W?= =?us-ascii?Q?f2PrTDcIr7fvdICiJfeWXcZAPRKkKwxwuRZtqdPGq7fg7Ak9VnlYJI0S7mpU?= =?us-ascii?Q?C+94jOh8Q6CiU6WrvfFI+mY6le3lMDb2NTALny5NZ+B48WKL4edKKTGWhQtt?= =?us-ascii?Q?yQC6hGt2nWooMWJXozqAmqdeKXjKx6Hk5QWhvOOcXIlihTlRoMKalnnH8JDs?= =?us-ascii?Q?k1R69SHLX1rwS7xCB/ZrwGh8mDboM9b1LCz7p/zz59J4XdBZOYC6ebzhxQUc?= =?us-ascii?Q?DeYwU0CzjugWp3sX8v64tsUWywgaSEInIbbQoi16pN2cssRxDxmJJPs26EQh?= =?us-ascii?Q?yvw/1u8Fislj5OqhDMjMVdE4QtVasf0ie3wo3lVi5r6KR6HH6zcFUIGbB77p?= =?us-ascii?Q?RauM5N6S1EeakHYMLoOw/kVV9CSlJ727SvDvub5CaDg4S4dC4U5EXiMQM9Yo?= =?us-ascii?Q?l2dvmGT7AXzp8P+GZNKCU6ArVJJ9oF3yqDjYQTglipbtSHmi1GVryFQNZfZk?= =?us-ascii?Q?jJG6QPbKqdw32Z5A6OSh0B0rUZJK55D3lbd7C+7ltV19rYC9pyiHXzAlLChn?= =?us-ascii?Q?IDnA7VnnMHsXqyavKqhcAOwZc3R1j8vF6pHzo1CSyNalYH2+SSRYDklHBjrw?= =?us-ascii?Q?1nzVUgSPZ4ZID1JlbxpjiIFblO4BoAk4oalD15prlg+L00tkuuT0pk2KpFwY?= =?us-ascii?Q?hoVL/xKq138A1Zd+7ULtb7FFyl6mMfMl2vipK0Y9GYQtN421W34U0ZdT3fiT?= =?us-ascii?Q?LrMZb3XgXywx+cjQhdphS2Rv9cF/w8RM0bSsRw/6FCIX8OrgPFVgxqEetByn?= =?us-ascii?Q?mJD+zsNthFrfYs6FsRIR2KPnHb0YbQ+wV79TjRgz0HUiS1scZrqCTmTj8MBb?= =?us-ascii?Q?0NeqjXHxPbqeteDP40RXI0QkYVmb10etSmTnbIdJDaDYA6/LllbAmNCp99eb?= =?us-ascii?Q?cMARrlllzgb1xjt1nqWLJULb1gCTB6EJ5VKbvDW4bmOYZd97qinQkdVHEnBP?= =?us-ascii?Q?+6KFzfbzDpufjd1ZhrnTBpkda07wviAfVLhQW0Yf9Pme702zQ4SZSg9QlhD5?= =?us-ascii?Q?zv2ZUpiZ3mXjo/u838v1zhGE9jekVy5ZcoIXj+5fOvAxjnVlo5Z89KTag=3D?= =?us-ascii?Q?=3D?= X-Microsoft-Exchange-Diagnostics: 1; CO2PR03MB2279; 6:Y/OLUUoQufs4yX+c+7a5e1kxmjSMk2I8NsaQ9m9YCqbdfflY82DKTRyZmDPJ/pWe6jkGsxzLHzj6wuQJxGm58HG0zIGd3L7ZCIMjzDFw6YSBTG023bcZUbIa3OuV2SEBbRnohqM8oE5QzXvlPKYRtyFT7w2yVpJ+mov1QpTow1rf4CUKrhEKxsaq9MoQowlDjlSml4YEoxVKvCv3lm8StxQUveDB4m3MmKytWZGPmaAyFYSzMhEc64AmjKK2gUI90oUB6AnY+z9V3UoweR+INPJPsk0z+u94ZwdwlGV+SXmB6u+TBdXQ1dnnR2UTnmqMAlgTGNVmhjhWTnDTRjwul3NwWSVigqY1z571d6MEOoH255TP5EDLe7C2CuR1F/o3AYe+L6WZD8WzDDHffb9d3IoGWgY6fF9CN4LvwzGRxpTm2zVyr/DVvz5RQjw8tOt8lXMh26uyXKyZeUGNN3QosHBJyHuehJRGPBflSq9MIuHsmni0iaVE59ZojkwdDgIQ; 5:XS8bgD6U+qmEjdZjlfXsx7nZIJAVsQGL5yO1yB+qFmaUatwbWZIsff2WrYgDoiYN0P4E4mSR0n7Hi5adnfoM8Qw8r4AFwq/mcgZi4CLEVyvSo/BBKc0BQsshzwSDF/9wsNHPK1CGc/v+akxAEZLAPkR9qo2UnBRm/kmGaL11xIx3y1QwRu/MHVwoi0v4ukYF; 24:eVW9N02wBJI3XYeP8GGSA90I0caI7lt4o8SseH8+8bZgSqVrWZD2y2gpX8LnEAkh0CcaaxtheOTe6m21h0WMKJqjlrFznvp6WxtD1r1kH+0= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; CO2PR03MB2279; 7:QovZ37Os1TccZOv/2lpKZEcIY/MsTlu5R7Q9fVzm1XABdqR0B+a2F7LqQVtIbxkxvWBVbFezxM7hyfowLtw7UaMDlXGThcYAVi21D/hacqttuGoD8gnMLICKzhjWQ0Bt4hoVz8LCY9hK+7hAnM9O3Ng54JL9GgqW2hxNBxjOU0EX1GCMSKYeL12Z6t7mBp4DN0xamI+DQvp9B9zYvjx5b7QwTIFZI7w3E1IlHYJS890a80vsTZ/RHGrHaTNFt0kkIH3uvjTj65ipVg7QUr9T7o3zK8d06aXsFO8iyryeC0fISd2pP+UFIOa0LyiDxEqMD6u2FkYiUvVPRixRmCx9mw== X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Apr 2017 07:32:38.1432 (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: CO2PR03MB2279 Cc: Ruchika Gupta , Vinitha Pillai Subject: [U-Boot] [PATCH 2/3][v4] 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" 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 in v4: Updated Maintainers file Changes in v3: Removed changes to ls1043ardb.c Changes in v2: - 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/MAINTAINERS | 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 56a6ba0..9ca7abe 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/MAINTAINERS b/board/freescale/ls1043ardb/MAINTAINERS index 8b69892..87aa006 100644 --- a/board/freescale/ls1043ardb/MAINTAINERS +++ b/board/freescale/ls1043ardb/MAINTAINERS @@ -13,3 +13,4 @@ M: Ruchika Gupta S: Maintained F: configs/ls1043ardb_SECURE_BOOT_defconfig F: configs/ls1043ardb_sdcard_SECURE_BOOT_defconfig +F: configs/ls1043ardb_nand_SECURE_BOOT_defconfig 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 b71456e..202372d 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 7ef5c25..6455393 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 /*