From patchwork Tue Jun 14 17:52:40 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sumit Garg X-Patchwork-Id: 635212 X-Patchwork-Delegate: yorksun@freescale.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from theia.denx.de (theia.denx.de [85.214.87.163]) by ozlabs.org (Postfix) with ESMTP id 3rTSpW0j9kz9t1T for ; Tue, 14 Jun 2016 21:58:27 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id D2D6DA751C; Tue, 14 Jun 2016 13:58:23 +0200 (CEST) Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id qT4PzQh5nds0; Tue, 14 Jun 2016 13:58:23 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id F0863A7521; Tue, 14 Jun 2016 13:58:19 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 73F28A7521 for ; Tue, 14 Jun 2016 13:52:45 +0200 (CEST) Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id QLysyDaMNZHR for ; Tue, 14 Jun 2016 13:52:45 +0200 (CEST) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 (only DNSBL check requested) Received: from na01-by2-obe.outbound.protection.outlook.com (mail-by2on0087.outbound.protection.outlook.com [207.46.100.87]) by theia.denx.de (Postfix) with ESMTPS id 7E5C9A7528 for ; Tue, 14 Jun 2016 13:52:11 +0200 (CEST) Received: from BN3PR0301CA0062.namprd03.prod.outlook.com (10.160.152.158) by BL2PR03MB592.namprd03.prod.outlook.com (10.255.109.35) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.517.8; Tue, 14 Jun 2016 11:36:55 +0000 Received: from BN1AFFO11FD008.protection.gbl (2a01:111:f400:7c10::189) by BN3PR0301CA0062.outlook.office365.com (2a01:111:e400:401e::30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.517.8 via Frontend Transport; Tue, 14 Jun 2016 11:36:55 +0000 Authentication-Results: spf=fail (sender IP is 192.88.158.2) smtp.mailfrom=nxp.com; nxp.com; dkim=none (message not signed) header.d=none; nxp.com; dmarc=none action=none header.from=nxp.com; nxp.com; dkim=none (message not signed) header.d=none; Received-SPF: Fail (protection.outlook.com: domain of nxp.com does not designate 192.88.158.2 as permitted sender) receiver=protection.outlook.com; client-ip=192.88.158.2; helo=az84smr01.freescale.net; Received: from az84smr01.freescale.net (192.88.158.2) by BN1AFFO11FD008.mail.protection.outlook.com (10.58.52.68) with Microsoft SMTP Server (TLS) id 15.1.511.7 via Frontend Transport; Tue, 14 Jun 2016 11:36:54 +0000 Received: from localhost.localdomain.ap.freescale.net ([10.232.14.164]) by az84smr01.freescale.net (8.14.3/8.14.0) with ESMTP id u5EBZnIX004141; Tue, 14 Jun 2016 04:36:50 -0700 From: Sumit Garg To: Date: Tue, 14 Jun 2016 13:52:40 -0400 Message-ID: <1465926760-8730-5-git-send-email-sumit.garg@nxp.com> X-Mailer: git-send-email 1.8.1.4 In-Reply-To: <1465926760-8730-1-git-send-email-sumit.garg@nxp.com> References: <1465926760-8730-1-git-send-email-sumit.garg@nxp.com> X-EOPAttributedMessage: 0 X-Matching-Connectors: 131103778148234595; (91ab9b29-cfa4-454e-5278-08d120cd25b8); () X-Forefront-Antispam-Report: CIP:192.88.158.2; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(6009001)(7916002)(2980300002)(1110001)(1109001)(339900001)(189002)(199003)(106466001)(110136002)(48376002)(87936001)(77096005)(92566002)(11100500001)(5008740100001)(50226002)(229853001)(5003940100001)(8936002)(2351001)(81166006)(104016004)(6806005)(8666004)(81156014)(8676002)(189998001)(85426001)(105606002)(50986999)(2906002)(69596002)(2950100001)(19580395003)(86362001)(356003)(50466002)(97736004)(19580405001)(36756003)(33646002)(47776003)(586003)(76176999)(4326007)(68736007)(7059030)(4720700001); DIR:OUT; SFP:1101; SCL:1; SRVR:BL2PR03MB592; H:az84smr01.freescale.net; FPR:; SPF:Fail; PTR:InfoDomainNonexistent; MX:1; A:1; CAT:NONE; LANG:en; CAT:NONE; X-Microsoft-Exchange-Diagnostics: 1; BN1AFFO11FD008; 1:3heYcQYu6UPgHW2C/H5AEV/mMzUCrGTh2K0JQaFQTG/gHqUzMrzBHtXZPCvypAn1evSCJ+rxV49peWN9EweVFm9ei40uB3sUT+YZsB6GShhxtWtKLc5T4aF8wfyImKUvanXObXWDC9PNJBWkP8+JJftNmzfQ7sJLKrUrHcKq/L7EFyPeouMwkV8v8rgyrCAof4HkKyidy/Z+uXjLXz4r05pdaRKcLbUGRMb71dKcdkjc5swjBwzFc6NcKKGfh3ni/yEHo4MT1YbTc3isej8gekf158FkbWyI6uqJrZq9XRe0ewgDS3bE1IM4+bu13EmrtL02xtFzjauOvEYFYWvrLDQwVv0gAr5bxPaZ0AW36DbyNNSXZvnsday+Qof3R6rplsfCjTzxhqFVcQD8z5VFZk1U0rtxtWg8AhOEadriEnwksziiY9vrRdsrXzyCd5+NldeKgWAd7+DFh+xyeR67azwrXCDIgy8qaBWgglVvdmc0ZSu1hu/to8OmngCvc1ivMa0zF+iL+cSPEOr812rSUYEOFoz+dT4/tO6Phn4C2MhIGcuLlzqnIPmA5QHhkOMnSwdNXmeHPvuN/aY8MXPeYrnQKFKgdL+ec6U8vqgTLTgq5hcI5JsAVWye2obhO22Ig8SL7rj1B5Qilw7Ek5y/wehTjy6EUXD3LNeMq2wMssyU7l/Zq84GW4ywV3dsiGkR MIME-Version: 1.0 X-MS-Office365-Filtering-Correlation-Id: 5c7356f4-1dd0-4bd5-5403-08d394482fb1 X-Microsoft-Exchange-Diagnostics: 1; BL2PR03MB592; 2:cMoutCRZk6XwBesASn1k3ozs4IPE9/w4YX7rhl+nxTn/Iv4kXzLj6kAzwGNZw/PztLIcIMqhLozMPBQUNZnqUb3RUhKPTw4w21zvlqZUNEaA5KAMPGhUWs2+GtFVBfjiW4/BKK6drmhvee/jduea8pRABFrZc4qgetxS461IzEN4t/uslZQICZc9NlQfoc9q; 3:N2B/yx9NNgrnCtbe+6RfKjOkcLVriZoS6C1wwfftFSy061U8PmSJkC56t3AX7Y+XSqQjLRpcG0JpJhFlZ+MrH2F9DogrbZKyC5RDoofphcoBYQ8LvPshws+/zQPjC1PYJDIyK1o6zQ6W/ESPKFTiVbilupzj/TS+Ymw8AVg1NGkr5dkOisFBlqMpH9hM5SOdZYRp47Trm0gXFH+rk07Xi8in0H4xIsFgKn8LbNOLLcM= X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:BL2PR03MB592; X-Microsoft-Exchange-Diagnostics: 1; BL2PR03MB592; 25:DwGQBMT3KPDVEloGwotUYLvyuqVfqAnInV9opUQQ+RRX69uxONXCw8KUZrimZXpS3kIg9zUoc/nM4USGUImGlKzDhZD6QV29TKJolhRrqqxgePDzzq3v8hL4rfM/jzq1yxzOGxEU17518Y/ZZ1EjAbZYMYqLLeJ8Txf3ROnzOpgMC6ckcAwjTmfQfphZptEWGRVloH5MQdPEShAUKBW7V0Is8N/jd+7K7buGa0aAS4x5lhEOECA7+YhJs1Rqat421j8kSc8otsC/bOLaCadEnakEAPlgld+sJBMN11ffavEnaa68uEGvktl1M4UDfW8vQwcp7v8c8B1K8dFQ4uCNGyOwE5uNRnMue++OWJwPGhLUYIlhZbnRoZZAYcbHPt9ccQWS5o5kC4Ei9HVZG+dAL9nxnj1UFnuhC3dgY4Ndb04LdL12YBOEmJYDlB2mh8LUpXUl1EBDQc4eikl2iZH8TlOq49/MHtAGkJy0TNJMtC3yaAjUlu/rExZS5FgvI7Hh3xBfP46OEbVLQYtABB56Na9FSU9wuFMIy3tCmSbu5eli6sgFrjlU1yzNqpGJ5J+KELcDJlmP3QskNgFmA50rvNg6N9YBaWrxMJ3hEdM2mM8h1XpDMmBDTW8ZcmGem+hgxH6fb6SWCahSZ3o3/t4TNP8kzyXme15qNCs/GHgp8wOJfzubF55REHHEkce/1lg52vHCy/7a277nhsA04sZJIwBJrm1HQCJEbPnBpC6OLbkF0wnQ6ti8DOCYTATTTLPdB2eCXQK68Psq9S5CNattPxR47QbAIZVs39nmr3Vlrp/RP5ONelanFoOafYqe+h2j X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(185117386973197); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(2401047)(13018025)(13023025)(13017025)(13015025)(13024025)(5005006)(8121501046)(10201501046)(3002001)(6055026); SRVR:BL2PR03MB592; BCL:0; PCL:0; RULEID:(400006); SRVR:BL2PR03MB592; X-Microsoft-Exchange-Diagnostics: 1; BL2PR03MB592; 4:fkTTESOez1qUpwdA6fgzFnnggw6hN5Z6TiEfa82akcQAxRhUV9ynicapkFhdy/mVWHkVEUjQE+2SNvzzoJ1j0knH2NNijVAjr1tEL2SvtnRQQyJ4gFtfmNOeGElfHLOrSRH70LP2wylVGJYr4ku2rwqIEcYERXkUIrn8nJrEExIOyxmnwpL4SDV6Cclk6eiBMP2CC6QXp4juNkX2qmMZh0kCJs3oDzTTjn1ZEQjlCjKZCNUXV7CGjIYpQ3Uc9Up06HmTVM/+jxQN4uHj9xdwpkwGQCEHbC5KXe/cPtU0qTCVV6nUHgfKoZqe8t4qX8SGv4EnQ/7aoE7a1xxPlIR2+BI5DLzyuX4O+SRDlQtj5olkQ3+j6jhkldisEefHx5dL2OcgF817ZxGStfEvMuSBHyR27jZVeOjGOnh2l7jGTI3T5etZLohRzSESv8S/ZjU82lHXF+CpyRwfzXkCwQmjMhxFPca38rl1zumCwZC7zb5Cyb5wf02fz7ABCBKbBbd80crHckRE47MsqQJcZWO3Bw== X-Forefront-PRVS: 09730BD177 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BL2PR03MB592; 23:0fCbUHcaiPYZ+z662krwqspw00dJ7Ry903Q0vE8M2Q?= =?us-ascii?Q?M895tw0O53qtpVFH+fIw+rt07WIBVgPaE1BTTKX1t1YUDLkghFek5dMIzYvw?= =?us-ascii?Q?wl4swBKwg6VyxdnWQob7mrm9WspkD5+/MVub96BSxQ7OIqItBNsfocvalfbc?= =?us-ascii?Q?1YU/ihFM8M5xJLpDUC4ORpVNc0IYgemhlmg8v8sSePfw/rf+AQ1ZhG3q717r?= =?us-ascii?Q?I9ANbbQrldqTKNTP1Xju46QVjB0eCnbk/8BIStGyeV/Snq7OUAJA7tzh/qT7?= =?us-ascii?Q?tsn6mnOUh7JfoB81g9aJC+OTTALado4/ft+patxM58sw65Gr17kaJey0I35B?= =?us-ascii?Q?HCythDDaUr+Hni8j14nJu1OMrEUq2xnunFk/JiHJCWUalHRiKrM5PGELG0w3?= =?us-ascii?Q?ZrsKL820aaE0L9+ivrOahVfO6X/aDZJYvaSy63B9Lk6xzvuBWGypxq9o8gZZ?= =?us-ascii?Q?xpTjb0BnxQyouuoxrQXmLB07wTLWmCJXydyPpTQzfewly9yRrii5QyOVpHOW?= =?us-ascii?Q?tQfQeDu9ZOKHLiKwwgPutgddBmtImoX0hXsFEitFz8GEZADeY+rBwg8kD8Tk?= =?us-ascii?Q?RSRq+jplqykDroTdoNoG5yeCDuwDz4jp0jc/2CQS2qip0GM1bahEGVzLFH3c?= =?us-ascii?Q?3+tV5xwDXTvjQEM6pM3aRtmJ/t7La0T8Q3FlEqttAi4H5VvxenvckfPsABZI?= =?us-ascii?Q?wg/HzPRUmbZESVK1/k3L2Wqn2/R9L2hC9BgzSMVWqE/74irZa1t/MKIrVwBr?= =?us-ascii?Q?kSApLepNisFVs/5LShtIozt/CrznoGAqKekQYM40oBGbACJmTIbOGiknShI3?= =?us-ascii?Q?keIzrZ271GrDKeJnT1N7PAyrzSjYyQXBk6nO5J04RfZi/nk+CljnOu02/ckW?= =?us-ascii?Q?ax8p9HIa9vyK0Jg0TSMSWRvn2GCVL+1VkqRiKT/xXDm64yFxzxWpIBTIKKxf?= =?us-ascii?Q?DKaIWBGrv4l0g2dXqAgGBBy2zpLK8ks4qLUoWgJM4c/AL7g1CFxiAeK5Pfjg?= =?us-ascii?Q?rbTAdP0WWjrl5lZ0wa1USDfZpvzoDwkPYMAczYUxUtsxaU0YDC2reoRdnuSp?= =?us-ascii?Q?MvsVJHOZea5ZjfuoT1QLxj245c988HCSsSK0erDIJp4CZ8+MEzN6cQgaNjFO?= =?us-ascii?Q?jpw9sLNItrpJhJrrV23i0G6aK7yxpOw3kpuCwFxycwWmvBfJw8+SIZ6yWlLR?= =?us-ascii?Q?j/nfnFSDHzjxw1y1rsuuK3ihhRkNv+ytVqpve+DeG7lVMFC2wfjjKZyQ=3D?= =?us-ascii?Q?=3D?= X-Microsoft-Exchange-Diagnostics: 1; BL2PR03MB592; 6:dL0DR4Lo9ZzaUVDQmg/EHxRMKarx1y4FWirT/q8dVhz0a63ro5Lithe/dEkxHCKgoeGNC57hMAuLmkBehlmeq0gnmY+9dlXkV1J9vPN+iVFSiCZLKA0qnEhyZvm3wK274UppZk6cRGM1Agd/uociGNvwsy0ZXpYK2P2yyOSNgYtEVea8+l0w73FdUwDowGI5xWylGn0CibH2SHrP0vo7e+IMjyg8N7n6qtrHkyB0rVJ1xJ/OnerUpyouVJZEZiLSzvOrJP5WbGw+gk0WdeY0vg==; 5:tt4yDehCIKQOUT4T04s/1xoGI3sHRHeVjQy+0XvSZ1qcMD3azuSb6P5MB90KAvR+x8qHGuuShEWXkT/Se7Em0zpf2KFvdIAAbUqepJaP7IlKzF477e7y8OVW0qbt86ZvCMCbskGe7u7S5tW2ujYVbYBA2eLN7ZawNRi55Zb9SDY=; 24:JCZFFBUDrN2NUDgYxYReNiV9BBL37TQftv7nj7ndgCXHDACIGvX+MOQxlLQV2FKhQMg5Kp1TNwI5lhSwh3p5frW66vV6QK26kz6nGN7vcJw=; 7:qyrsohb2NcKfmxXiz1iQ3zJVYkMYm3yNQ+r+CKZgFMAj5CpdxOIfUdggEfxHSPX3y0+M+bi6/MqXy8qaJO0OYYZerXTxRyYsRabtsxFsb3tXnLJz+jOjxDZOinJTZA+d//DDmrcNmJR02qgpIF3IGyoS8lMtuRGlILTLUkyRTUsxZSLo9C7jPTYvWsd+iO7TT9BNDTYDJQSti+9LXt3MkA== SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Jun 2016 11:36:54.5894 (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.158.2]; Helo=[az84smr01.freescale.net] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BL2PR03MB592 Cc: trini@konsulko.com, ruchika.gupta@nxp.com Subject: [U-Boot] [PATCH 4/4] arm: ls1021atwr: Add SD secure boot target X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.15 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 SD secure boot target for ls1021atwr. Implement board specific spl_board_init() to setup CAAM stream ID and corresponding stream ID in SMMU. 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. Reviewed-by: Aneesh Bansal Signed-off-by: Sumit Garg Reviewed-by: Simon Glass --- board/freescale/ls1021atwr/ls1021atwr.c | 7 +++++ .../ls1021atwr_sdcard_ifc_SECURE_BOOT_defconfig | 31 ++++++++++++++++++++++ include/configs/ls1021atwr.h | 22 +++++++++++++++ 3 files changed, 60 insertions(+) create mode 100644 configs/ls1021atwr_sdcard_ifc_SECURE_BOOT_defconfig diff --git a/board/freescale/ls1021atwr/ls1021atwr.c b/board/freescale/ls1021atwr/ls1021atwr.c index c69c9cb..77482a9 100644 --- a/board/freescale/ls1021atwr/ls1021atwr.c +++ b/board/freescale/ls1021atwr/ls1021atwr.c @@ -503,6 +503,13 @@ int board_init(void) return 0; } +#if defined(CONFIG_SPL_BUILD) +void spl_board_init(void) +{ + ls102xa_smmu_stream_id_init(); +} +#endif + #ifdef CONFIG_BOARD_LATE_INIT int board_late_init(void) { diff --git a/configs/ls1021atwr_sdcard_ifc_SECURE_BOOT_defconfig b/configs/ls1021atwr_sdcard_ifc_SECURE_BOOT_defconfig new file mode 100644 index 0000000..c735d6d --- /dev/null +++ b/configs/ls1021atwr_sdcard_ifc_SECURE_BOOT_defconfig @@ -0,0 +1,31 @@ +CONFIG_ARM=y +CONFIG_TARGET_LS1021ATWR=y +CONFIG_SPL=y +CONFIG_OF_BOARD_SETUP=y +CONFIG_OF_STDOUT_VIA_ALIAS=y +CONFIG_SYS_EXTRA_OPTIONS="RAMBOOT_PBL,SPL_FSL_PBL,SD_BOOT,SECURE_BOOT" +CONFIG_BOOTDELAY=0 +CONFIG_HUSH_PARSER=y +CONFIG_CMD_BOOTZ=y +CONFIG_CMD_GREPENV=y +CONFIG_CMD_MEMTEST=y +CONFIG_CMD_MEMINFO=y +CONFIG_CMD_MMC=y +CONFIG_CMD_I2C=y +CONFIG_CMD_USB=y +CONFIG_CMD_DHCP=y +CONFIG_CMD_MII=y +CONFIG_CMD_PING=y +CONFIG_CMD_EXT2=y +CONFIG_CMD_FAT=y +CONFIG_NETDEVICES=y +CONFIG_E1000=y +CONFIG_SYS_NS16550=y +CONFIG_USB=y +CONFIG_USB_XHCI_HCD=y +CONFIG_USB_XHCI_DWC3=y +CONFIG_OF_LIBFDT=y +CONFIG_FIT=y +CONFIG_FIT_VERBOSE=y +CONFIG_RSA=y +CONFIG_DM=y diff --git a/include/configs/ls1021atwr.h b/include/configs/ls1021atwr.h index 0fb28ef..7f14851 100644 --- a/include/configs/ls1021atwr.h +++ b/include/configs/ls1021atwr.h @@ -123,7 +123,18 @@ #define CONFIG_SPL_SERIAL_SUPPORT #define CONFIG_SPL_MMC_SUPPORT #define CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR 0xe8 + +#ifdef CONFIG_SECURE_BOOT +#define CONFIG_U_BOOT_HDR_SIZE (16 << 10) +/* + * HDR would be appended at end of image and copied to DDR along + * with U-Boot image. + */ +#define CONFIG_SYS_U_BOOT_MAX_SIZE_SECTORS (0x400 + \ + (CONFIG_U_BOOT_HDR_SIZE / 512) +#else #define CONFIG_SYS_U_BOOT_MAX_SIZE_SECTORS 0x400 +#endif /* ifdef CONFIG_SECURE_BOOT */ #define CONFIG_SPL_TEXT_BASE 0x10000000 #define CONFIG_SPL_MAX_SIZE 0x1a000 @@ -136,7 +147,18 @@ #define CONFIG_SYS_SPL_MALLOC_SIZE 0x100000 #define CONFIG_SPL_BSS_START_ADDR 0x80100000 #define CONFIG_SPL_BSS_MAX_SIZE 0x80000 + +#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 (0x80000 + CONFIG_U_BOOT_HDR_SIZE) +#else #define CONFIG_SYS_MONITOR_LEN 0x80000 +#endif /* ifdef CONFIG_U_BOOT_HDR_SIZE */ #endif #ifdef CONFIG_QSPI_BOOT