From patchwork Mon Oct 24 18:37:18 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sumit Garg X-Patchwork-Id: 685758 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 3t2Xs81TDyz9srZ for ; Mon, 24 Oct 2016 21:41:48 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 50F28A754E; Mon, 24 Oct 2016 12:41: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 Ke-PK57PlMfN; Mon, 24 Oct 2016 12:41:45 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 9B342A7533; Mon, 24 Oct 2016 12:41:44 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id B11ADA7533 for ; Mon, 24 Oct 2016 12:41:39 +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 OkP1fzB_Asih for ; Mon, 24 Oct 2016 12:41:39 +0200 (CEST) X-Greylist: delayed 5519 seconds by postgrey-1.34 at theia; Mon, 24 Oct 2016 12:41:36 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 NAM01-SN1-obe.outbound.protection.outlook.com (mail-sn1nam01on0079.outbound.protection.outlook.com [104.47.32.79]) by theia.denx.de (Postfix) with ESMTPS id 1218AA752D for ; Mon, 24 Oct 2016 12:41:36 +0200 (CEST) Received: from CY1PR03CA0042.namprd03.prod.outlook.com (10.174.128.52) by CY1PR0301MB1626.namprd03.prod.outlook.com (10.162.166.28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.679.12; Mon, 24 Oct 2016 09:09:34 +0000 Received: from BY2FFO11OLC001.protection.gbl (2a01:111:f400:7c0c::199) by CY1PR03CA0042.outlook.office365.com (2603:10b6:600::52) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.679.12 via Frontend Transport; Mon, 24 Oct 2016 09:09:35 +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; 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.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 BY2FFO11OLC001.mail.protection.outlook.com (10.1.15.185) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.1.669.7 via Frontend Transport; Mon, 24 Oct 2016 09:09:35 +0000 Received: from localhost.localdomain.ap.freescale.net ([10.232.14.22]) by tx30smr01.am.freescale.net (8.14.3/8.14.0) with ESMTP id u9O97lJe015131; Mon, 24 Oct 2016 02:09:31 -0700 From: Sumit Garg To: Date: Mon, 24 Oct 2016 14:37:18 -0400 Message-ID: <1477334238-8531-2-git-send-email-sumit.garg@nxp.com> X-Mailer: git-send-email 1.8.1.4 In-Reply-To: <1477334238-8531-1-git-send-email-sumit.garg@nxp.com> References: <1477334238-8531-1-git-send-email-sumit.garg@nxp.com> X-EOPAttributedMessage: 0 X-Matching-Connectors: 131217737751924862; (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)(7916002)(2980300002)(1109001)(1110001)(339900001)(199003)(189002)(229853001)(33646002)(50226002)(110136003)(5660300001)(2950100002)(6916009)(4720700003)(6666003)(50986999)(76176999)(626004)(105606002)(68736007)(8666005)(2351001)(356003)(19580405001)(50466002)(48376002)(19580395003)(106466001)(8936002)(7846002)(575784001)(86362001)(85426001)(305945005)(97736004)(11100500001)(36756003)(92566002)(47776003)(77096005)(104016004)(87936001)(5003940100001)(586003)(189998001)(8676002)(4326007)(2906002)(81166006)(81156014)(7059030)(21314002); DIR:OUT; SFP:1101; SCL:1; SRVR:CY1PR0301MB1626; H:tx30smr01.am.freescale.net; FPR:; SPF:Fail; PTR:InfoDomainNonexistent; A:1; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BY2FFO11OLC001; 1:kkYX6MeP4Ofj6TxL58hByavwgqsDfI7QEeE/Y3LT/cAN1M0u3pXP4JZiXJ0A2vJwlX+0n7S5bvpFywqIAHwXlsbQC4Bikc1vDfrBkfrt5o2hBLQq8nH6pJSfQR6egUFPFORqlRPtIkAWrisaN52gZY7ePFbWVhpqJpHQf8y7fZ7QXLA9602dvte6Xmv8ctt7Rz4COKZ/dbhRy64DCsM0eutU4dP+YRRXSi+nUCxcCP2IfpbTvBY9/U7L2reaUnyhLafipsOuTilRQm8NZVwFynRkU+B8tMJygTMJmKUz7y3qCv4f8ZtivgtEPGmSFnPjAzF7mYBKVyLPmS5j2Q6FvVn5AnM+sektDK7fzGJB+aQy3HMUWe/dsuwSxyVHEKxOv7HIOg28sXtjtJ4x8oQEMYcPkfFXjqPuToS3MsNmX/FfN0O/pZKfnyE9l1s0838VuIh33odrPieb6w0QhPK2WmFhVHEedjlM7D8fIB5z5g7SHXextIbMtIjV1Ks3qK3KeiQpe1nVv5vY15y56cr4mfDLTucQtsAb+yelmbSXiTkyMilIST98G415QYrJ4V84VuvXJ2nwU5ScXPOxkGrUkuXos3ZRr19sSGU99o1imn/SlPSPzh6RluXm6M1SsRBW47l39pWLrHfRZB5YoNoCCFqvHiQgLne450rzFjOGSMRGJ7asBVoOixSkPGOKKxp3Xxa8pZWghCUFV2wYmQN8uSTJIgK7brxmP2YdqaDed8U= MIME-Version: 1.0 X-MS-Office365-Filtering-Correlation-Id: f52cdb0c-bd1e-4edc-107e-08d3fbed7966 X-Microsoft-Exchange-Diagnostics: 1; CY1PR0301MB1626; 2:SbGSlpuY6xOATR2fdNZv87jenfmL0Dg1bMSdMyJomqlPdWC22Yb5JPEjBbp8W6E+C12XTCGXBNBebWAPFH0f0QrNA1E84Zawa2AJGAK0wwVpL0ZbGiuxRVMNwanSynojjoGpGrHHkFoA5IC5TbzdPvpLfzMqEYwaxX7NqRcfB9SwQCPHbXDFLc1sIm+ZOs8Byl7a9Q41akT1YoK54/wdNQ==; 3:RGm1xuBlO/hdZeYL/wafLG04VFObSrq8eFVWLENhC2SRRN20bwzVr/IIOWAT93ZnwNH2ANYaDSiwiWWkPzmQEEvqu5xsgCqZtSIVFvMGXIzT4PONMkMlqB5TWk7ilw7V4rw9ovl/Mdak4iQCL9SbweMNW7Hdu6HzHcIIrzZmCVYhJZH9Pb9hAubM/FeKMTV4zIUVxM/qElTCcBU931LcORMmuuRoUNNoYlFNmnt7g0Sxfct3pOtUgyJJzNrfSykL X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:CY1PR0301MB1626; X-Microsoft-Exchange-Diagnostics: 1; CY1PR0301MB1626; 25:CAxM8lIGIMy73dviomPG6iFYJ0e95HCttO7i8cSGvEKZ6SKNhXLI7E/fJgrRslU09VOWE2DZ8xrg+K4vHMyOoZKxNhx6sI2dA0pOS6VyeXj4U4cOz4hM4bYJRFdKBjvD2/mPyu3m/QyvKHwHg9YBSIlnCogME/Jw4bJavk0lAyByFRAWakOLzz+kdqP+NOoPGpmvSQl+6bR29zkTS+Non2C58je0TrQPIxChGMLdou/1qEVy69X0Zv3e28f/B6aj0x+NMGF759CGoQHaEj6M+Lk9CXunTqlrOV0GvyThBJY1EMqswx15Jwt7koA2VNsUKhYCTVHB7PF9/IMaRsZAmkJN0eRJwMv8gIvA6N+zY67snxuG8ysfjxnBL/5CzHyEoA9651ki2aB8YvlCtokIqNOls6KDtfncur3ORUxKIzh/TCIeZe9KFF3QNiB8Q2lXDE8wvAhRVsZzf/UW9h3w8lBtGuiE6wmkkm6Cd/LM5uHrSBhNVJo/rc4fKOljtQatSd6faazO15R+jau5QT3dKcklb+w90v6jRqfWuO5pyY2fUn2MkTJG4b/TneKklqZYe5bGBtg4cIcu3n90zuThnw6VKqvYteEEDhu2KP02izKItIUV/E3QcXyDuNwPm19GgIdiWa3k3CGx6y4QuL3FD7LC0URDYAfU20px0Zg/R+SwUChfeCMS72t1j6cEAdw5PCgvfSgCgitJ1W1HT1QWDuvpOjn0Gg0++a+DhL9SjoGn4tKi2YNxisu5QOrXS/pMOfDO/5bj8bA+ZX3w9sNpz+opBhxUCjJN0bDZUVNZ7H72IdDMZsT+tw3QpC4VB50KqL95wZWPeYUtmeEnoIIASYTqPOueTVCB4L2u67AkxrY= X-Microsoft-Exchange-Diagnostics: 1; CY1PR0301MB1626; 31:Nbm1NSb1NL2YNNx9CThwxN6ua3CksjT9nWu+EQI8aDz9I4YIS0vybIU/CYisEhznubupXe1UIxvBnmGlXq8UG4Z5m9CCt8L8XFp9UxkTp657ppgiRMineapjPOq3SShzBHP7SNJ4/ZtgTpXqWFtqjNjnK3DLniKeCJljXxz9XcYG8KqPiNWNPpOmhteU5YLUOVPLuiXFIHfsxu6ZDtRziK0qCYqfRq2rhqJMM+NsxL2NhCYWH0bxKPwbdXNQC25/Zu2PekADuqCJqeF0uT7LcA==; 4:gvtO0Lt4YV/o8ogHfEV7J5bD676S0vZreQUiuN/HjX6HusuiMMFdk2vGUeD8qfhJbsgqmgxdJV8fmMTDQoMyV5eKLRtcSQWSk2QvSqoe81cS9jbQDF59Jm5qHo6eWonCATOd6wn0UodW71skuOODWPDPNAVaimr4I8Mjg907egPpneAajtbJoTLHooc+fVapf/+YIsaUBEnoe4wq1fpxM7VUWbJNQ5yGiuaCh2eQOQceUMhzLypCLvBG3WxkUldT97vTk+KXP3/NsqapYC8k0dzs827oE9KduLdIye65lu22pIMaEvw3+qYyLu2ayfJyWP6PtkmBhAkUNRJdE/ZtK00oruWW1Wt5JrEAOk5FIAbqfZJeIxu1iA828EJSmqiYoST5i/uzmyus7dpHMyZI0DqZVRcRFtbD+jJbY33gKG32IwpJ9rf12p9AiBK95GerLRz85Zm7WKjzfL5owN9bkauFrxCGrb2BjVj5uww0pg4iLj2ooNOf1+wDZZeTZaOifVu13eBdEuhBNHKRvuE9ZpvgICqr5UIW8aboxqjzFFM9V1oktFi6MqZ5IyFhcEoY X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(185117386973197); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040176)(601004)(2401047)(13023025)(13018025)(13024025)(13015025)(13017025)(8121501046)(5005006)(10201501046)(3002001)(6055026); SRVR:CY1PR0301MB1626; BCL:0; PCL:0; RULEID:(400006); SRVR:CY1PR0301MB1626; X-Forefront-PRVS: 0105DAA385 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; CY1PR0301MB1626; 23:MBK3i4td58H6NL77D5UYzjjOfIAWIz3w+H70fvo?= =?us-ascii?Q?ZLef0B1mCa28v+Q2ftn9rpG3F+1rDa21VS9zKzUSaJ9bLgjSLtc6+i+psnZT?= =?us-ascii?Q?ks1EX6diHI0hsGR0O9hSw1HItmKSj0KKSqTY0i08ctkmFToyaivFuxOfOrfH?= =?us-ascii?Q?8tp3vlzga8oy7MMOzboWEkrlBgNgyU7iV3zoh7gO7iMJLheOPqnSeNJzX7rD?= =?us-ascii?Q?phUN9NfSBptGdpi2R2CXG+RZktxeD2sAZ/F1pfgX5uobAMY6muA3uSZtQAZZ?= =?us-ascii?Q?DbmmDqS0DDidPFSlPTIb0+Nd0+VIECBpvSH5CDMZY/FCkY7VQftk5bHPaE3V?= =?us-ascii?Q?0JFV10qtnvs+i7DdGFdINjtJ06H4kah3T4kxcA8yV15TrGPjgnO0K6TUbaqo?= =?us-ascii?Q?CL3fopcpyiv43HFBOzD1c/P+m3XcZUaJmsxy8K0rw3Ehz28eAhBZVDTOOEWH?= =?us-ascii?Q?Qrq9nCqy8W3zPwglrWaOI2hKxK9CyVupBvSM3bdRUcawBkVzB11Zhehj7jDe?= =?us-ascii?Q?SPpJq++unWW0BxfJA3T0PMEjkhQzACm9kugwTLoUfZkMcycNZoyZtmVVLRRr?= =?us-ascii?Q?XdyIiIOD+ea6srvGah/fyLBF6uGdCbEI7WEOAXw9MlijH7+ubXdsKbw+wXll?= =?us-ascii?Q?rN7qAbv97jaoIDZYin+GadwbIdSB4KXnFpK75vSjumhKaMsTzhX2V6EaNfDW?= =?us-ascii?Q?lzp3eN1xAKxlKPjFIGpttp/8Qt2Cqz6b1+XoZfUDwwFdQ70lDNHFLgmyADq2?= =?us-ascii?Q?RGR85OjZ4vZEb160bAByJNvAeB2A0dcu8nwL8P+BQS+fXzVonynuBcvZrlKP?= =?us-ascii?Q?QTfVQt5d4gSSXW+uOCWd/4WAiShdKJTpWFewDMHZxsITKrjhW0ybJDqD1HF7?= =?us-ascii?Q?gFdWYQ3QoGr3bmOpoG3NUZk5bziQkVSJEaGyelWxA4EzwgcIJ1k3lb7fb7UJ?= =?us-ascii?Q?8IKYD7avBGDLiNdtpvdST27PDKZ36ChYgj9DWr4THmF86tM+Pn1K6hGF5s5C?= =?us-ascii?Q?UDRkZ+2aesO/wziNdNUx+IQBcV2Qa8tw7LGgay086ppV76CaDJQ8KDbLA8cA?= =?us-ascii?Q?4/s5rMDI5p19KSTQe71g5GVAO57v70oseQTGU3s7z4gKqaDmAAgorwEiJdeo?= =?us-ascii?Q?kp2defF6YofK+lTIZG3SKYSvT5bge3CAWQ9Lvs4CU49fOOiaOk0CfyajJd83?= =?us-ascii?Q?bIU/Xt2O4InSVmw4lG8CZ27ioieuv9D5WNm7kUkofrBR6SA1rIuSqrQ5VyhM?= =?us-ascii?Q?H5AL9iW5k2jJgAu1lXUnmCjHWwutRq1ps46L1mS+R4DLj9SdgLfXOoYlBks/?= =?us-ascii?Q?nBA=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1; CY1PR0301MB1626; 6:9iD8f7Jw28eziYLruqigu+kWzJ9cGGR+MmZTHHArON8Lvoh6C6gDkd9okDbmBcDD4AZEKcJdmItnTWi2pR6sSZ2ToU5WZqS3i02l//pywYRFTp1yjjEcyRbzc2y3S9ymObB/gzkQ4iJSA58ouxwxB32nNA7vBbBMsLKza+gomjUAocHq5Dv3yp5DpAUuR5BwUBAqmO3hnpt27gIPzBkE/1lf6c85U4DUIlmoRq0muwv6V90OCxtYYWHDiatQ4A8z+5jGR33hX32AfTFzkTOnIn4PHtcEHH3TNZhfHwwBMnMC1xdoSMAoW+q7up6pTmDi; 5:dmIOMWEmO1AhD1+5e7qRsEmGvRUve6kRJRbplu/Jmbf6asn+keTgLVnRB8fHkqdg9ZVSGhvyKXn+57dNg6xH0NObE79QUHlYyCNbSxOGk1h/1CkY8PG4lhtGvo0aBoTMe4NZGCkQ6gEbYuNZiJR/3DRYbG0oDla6beOVyBT9hXn+JUn5ydJ8DJ11XLNjS85h; 24:J755Vmi+mJ9uIXU4sZkOvroiDBSWGbHfbv5oj9R++AlkFfW+RTabHFXNEiiZp2LFD+6kM6k3FL58hOlxSPS9yLn7Oqbl+He0rznXlxfDu7E= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; CY1PR0301MB1626; 7:zmrPhkzNQ9iOhIT4dQP7YNWWMEPHSvJJ6Xthqssd1oH9scrl/BgPXzGZTtThRYwVf+4evrmJDyXzr4Ld1WOmXRVdoAT4nvamdsNOct0MMzg0a04cm6adHgTNIwsRXFQdqKc2jOnYhYYq8yBCWjWSuiFZyNqBZ7x4cTSgSckW+5/OAUlC1JNtTRqvTVQhEhRY73riLDlqgDOmcAbiJJALMnTr+bmkCkNRtSwDRkczJ9XcaubtjJQ0zuX5LBnW9+r4ATPrjMqPttIQesMOQm74qeEQ7PypDk4PffQBDPFFWOVuO5pfUaSJsp2ISAFJGs6RJx4hXajJ7ToZ2RfmQv9bEfOF/kHCWIipuMMR/+vV7g8= X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Oct 2016 09:09:35.0052 (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: CY1PR0301MB1626 Cc: ruchika.gupta@nxp.com, vinitha.pillai@nxp.com Subject: [U-Boot] [PATCH 2/2] LS1046ARDB : Add QSPI 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 QSPI Secure Boot target to enable chain of trust and enable sec init. Also define bootscript and its header addresses for QSPI target. Signed-off-by: Vinitha Pillai Signed-off-by: Sumit Garg --- arch/arm/include/asm/arch-fsl-layerscape/config.h | 2 +- arch/arm/include/asm/fsl_secure_boot.h | 37 ++++++++++++++++------- board/freescale/ls1046ardb/MAINTAINERS | 4 +++ board/freescale/ls1046ardb/ls1046ardb.c | 19 ++++++++++++ configs/ls1046ardb_qspi_SECURE_BOOT_defconfig | 27 +++++++++++++++++ include/configs/ls1046ardb.h | 2 ++ 6 files changed, 79 insertions(+), 12 deletions(-) create mode 100644 configs/ls1046ardb_qspi_SECURE_BOOT_defconfig diff --git a/arch/arm/include/asm/arch-fsl-layerscape/config.h b/arch/arm/include/asm/arch-fsl-layerscape/config.h index 4201e0f..11a62e8 100644 --- a/arch/arm/include/asm/arch-fsl-layerscape/config.h +++ b/arch/arm/include/asm/arch-fsl-layerscape/config.h @@ -196,7 +196,7 @@ #define CONFIG_SYS_FSL_IFC_BE #define CONFIG_SYS_FSL_SFP_VER_3_2 -#define CONFIG_SYS_FSL_SNVS_LE +#define CONFIG_SYS_FSL_SEC_MON_BE #define CONFIG_SYS_FSL_SFP_BE #define CONFIG_SYS_FSL_SRK_LE #define CONFIG_KEY_REVOCATION diff --git a/arch/arm/include/asm/fsl_secure_boot.h b/arch/arm/include/asm/fsl_secure_boot.h index 4525287..933e09c 100644 --- a/arch/arm/include/asm/fsl_secure_boot.h +++ b/arch/arm/include/asm/fsl_secure_boot.h @@ -45,7 +45,8 @@ #define CONFIG_CMD_HASH #define CONFIG_KEY_REVOCATION #ifndef CONFIG_SYS_RAMBOOT -/* The key used for verification of next level images +/* + * The key used for verification of next level images * is picked up from an Extension Table which has * been verified by the ISBC (Internal Secure boot Code) * in boot ROM of the SoC. @@ -59,9 +60,10 @@ #endif -#if defined(CONFIG_LS1043A) || defined(CONFIG_LS2080A) -/* For LS1043 (ARMv8), ESBC image Address in Header is 64 bit - * Similiarly for LS2080 +#if defined(CONFIG_FSL_LAYERSCAPE) +/* + * For fsl layerscape based platforms, ESBC image Address in Header + * is 64 bit. */ #define CONFIG_ESBC_ADDR_64BIT #endif @@ -78,13 +80,16 @@ "setenv hwconfig \'fsl_ddr:ctlr_intlv=null,bank_intlv=null\';" #endif -/* Copying Bootscript and Header to DDR from NOR for LS2 and for rest, from - * Non-XIP Memory (Nand/SD)*/ +/* + * 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_LS2080A) || \ defined(CONFIG_SD_BOOT) #define CONFIG_BOOTSCRIPT_COPY_RAM #endif -/* The address needs to be modified according to NOR, NAND, SD and +/* + * The address needs to be modified according to NOR, NAND, SD and * DDR memory map */ #ifdef CONFIG_LS2080A @@ -96,19 +101,26 @@ #define CONFIG_BS_SIZE 0x00001000 #else #ifdef CONFIG_SD_BOOT -/* For SD boot address and size are assigned in terms of sector +/* + * For SD boot address and size are assigned in terms of sector * offset and no. of sectors respectively. */ #define CONFIG_BS_HDR_ADDR_DEVICE 0x00000800 #define CONFIG_BS_ADDR_DEVICE 0x00000840 #define CONFIG_BS_HDR_SIZE 0x00000010 #define CONFIG_BS_SIZE 0x00000008 -#else +/* ifdef CONFIG_SD_BOOT */ +#elif defined(CONFIG_QSPI_BOOT) +#define CONFIG_BS_HDR_ADDR_DEVICE 0x40780000 +#define CONFIG_BS_ADDR_DEVICE 0x40800000 +#define CONFIG_BS_HDR_SIZE 0x00002000 +#define CONFIG_BS_SIZE 0x00001000 +#else /* elif defined(CONFIG_QSPI_BOOT) */ #define CONFIG_BS_HDR_ADDR_DEVICE 0x600a0000 #define CONFIG_BS_ADDR_DEVICE 0x60060000 #define CONFIG_BS_HDR_SIZE 0x00002000 #define CONFIG_BS_SIZE 0x00001000 -#endif /* #ifdef CONFIG_SD_BOOT */ +#endif /* Default NOR Boot */ #define CONFIG_BS_HDR_ADDR_RAM 0x81000000 #define CONFIG_BS_ADDR_RAM 0x81020000 #endif @@ -125,12 +137,15 @@ #ifdef CONFIG_SYS_LS_PPA_FW_IN_XIP #ifdef CONFIG_LS1043A #define CONFIG_SYS_LS_PPA_ESBC_ADDR 0x600c0000 +#elif defined(CONFIG_LS1046A) +#define CONFIG_SYS_LS_PPA_ESBC_ADDR 0x40740000 #endif #else #error "No CONFIG_SYS_LS_PPA_FW_IN_xxx defined" #endif /* ifdef CONFIG_SYS_LS_PPA_FW_IN_XIP */ -/* Define the key hash here if SRK used for signing PPA image is +/* + * Define the key hash here if SRK used for signing PPA image is * different from SRK hash put in SFP used for U-Boot. * Example * #define CONFIG_PPA_KEY_HASH \ diff --git a/board/freescale/ls1046ardb/MAINTAINERS b/board/freescale/ls1046ardb/MAINTAINERS index ff42bef..758ff9d 100644 --- a/board/freescale/ls1046ardb/MAINTAINERS +++ b/board/freescale/ls1046ardb/MAINTAINERS @@ -7,3 +7,7 @@ F: include/configs/ls1046ardb.h F: configs/ls1046ardb_qspi_defconfig F: configs/ls1046ardb_sdcard_defconfig F: configs/ls1046ardb_emmc_defconfig + +M: Sumit Garg +S: Maintained +F: configs/ls1046ardb_qspi_SECURE_BOOT_defconfig diff --git a/board/freescale/ls1046ardb/ls1046ardb.c b/board/freescale/ls1046ardb/ls1046ardb.c index 585c807..6fadea1 100644 --- a/board/freescale/ls1046ardb/ls1046ardb.c +++ b/board/freescale/ls1046ardb/ls1046ardb.c @@ -20,6 +20,7 @@ #include #include #include "cpld.h" +#include DECLARE_GLOBAL_DATA_PTR; @@ -77,6 +78,24 @@ int board_init(void) enable_layerscape_ns_access(); #endif +#ifdef CONFIG_SECURE_BOOT + /* + * In case of Secure Boot, the IBR configures the SMMU + * to allow only Secure transactions. + * SMMU must be reset in bypass mode. + * Set the ClientPD bit and Clear the USFCFG Bit + */ + u32 val; + val = (in_le32(SMMU_SCR0) | SCR0_CLIENTPD_MASK) & ~(SCR0_USFCFG_MASK); + out_le32(SMMU_SCR0, val); + val = (in_le32(SMMU_NSCR0) | SCR0_CLIENTPD_MASK) & ~(SCR0_USFCFG_MASK); + out_le32(SMMU_NSCR0, val); +#endif + +#ifdef CONFIG_FSL_CAAM + sec_init(); +#endif + #ifdef CONFIG_FSL_LS_PPA ppa_init(); #endif diff --git a/configs/ls1046ardb_qspi_SECURE_BOOT_defconfig b/configs/ls1046ardb_qspi_SECURE_BOOT_defconfig new file mode 100644 index 0000000..c79c875 --- /dev/null +++ b/configs/ls1046ardb_qspi_SECURE_BOOT_defconfig @@ -0,0 +1,27 @@ +CONFIG_ARM=y +CONFIG_TARGET_LS1046ARDB=y +CONFIG_DM_SPI=y +CONFIG_DEFAULT_DEVICE_TREE="fsl-ls1046a-rdb" +CONFIG_FIT=y +CONFIG_FIT_VERBOSE=y +CONFIG_OF_BOARD_SETUP=y +CONFIG_SYS_EXTRA_OPTIONS="SYS_FSL_DDR4,SECURE_BOOT" +CONFIG_QSPI_BOOT=y +CONFIG_BOOTDELAY=10 +CONFIG_HUSH_PARSER=y +# CONFIG_CMD_IMLS is not set +CONFIG_CMD_MMC=y +CONFIG_CMD_SF=y +CONFIG_CMD_I2C=y +CONFIG_CMD_DHCP=y +CONFIG_CMD_MII=y +CONFIG_CMD_PING=y +CONFIG_CMD_CACHE=y +CONFIG_CMD_EXT2=y +CONFIG_CMD_FAT=y +CONFIG_OF_CONTROL=y +CONFIG_DM=y +CONFIG_SPI_FLASH=y +CONFIG_SYS_NS16550=y +CONFIG_FSL_QSPI=y +CONFIG_RSA=y diff --git a/include/configs/ls1046ardb.h b/include/configs/ls1046ardb.h index 2fe8fc1..afa580e 100644 --- a/include/configs/ls1046ardb.h +++ b/include/configs/ls1046ardb.h @@ -234,4 +234,6 @@ "7e800000.flash:16m(nand_uboot)," \ "48m(nand_kernel),448m(nand_free)" +#include + #endif /* __LS1046ARDB_H__ */