From patchwork Wed Oct 12 09:26:12 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Z.Q. Hou" X-Patchwork-Id: 681097 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 3sv8Lz6v6xz9s9c for ; Wed, 12 Oct 2016 20:53:31 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id EF228A75B7; Wed, 12 Oct 2016 11:53:28 +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 MwvUvALdhDm8; Wed, 12 Oct 2016 11:53:28 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 420B4A7548; Wed, 12 Oct 2016 11:53:28 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id EBA43A7548 for ; Wed, 12 Oct 2016 11:53: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 ygvvuKLNtY28 for ; Wed, 12 Oct 2016 11:53:23 +0200 (CEST) X-Greylist: delayed 873 seconds by postgrey-1.34 at theia; Wed, 12 Oct 2016 11:53:20 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-sn1nam01on0082.outbound.protection.outlook.com [104.47.32.82]) by theia.denx.de (Postfix) with ESMTPS id 3B8A2A7537 for ; Wed, 12 Oct 2016 11:53:19 +0200 (CEST) Received: from BLUPR0301CA0028.namprd03.prod.outlook.com (10.162.113.166) by BY1PR03MB1420.namprd03.prod.outlook.com (10.162.127.150) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.669.12; Wed, 12 Oct 2016 09:39:00 +0000 Received: from BY2FFO11FD057.protection.gbl (2a01:111:f400:7c0c::166) by BLUPR0301CA0028.outlook.office365.com (2a01:111:e400:5259::38) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.659.11 via Frontend Transport; Wed, 12 Oct 2016 09:39:00 +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 BY2FFO11FD057.mail.protection.outlook.com (10.1.15.235) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.1.629.5 via Frontend Transport; Wed, 12 Oct 2016 09:38:59 +0000 Received: from titan.ap.freescale.net ([10.192.208.233]) by tx30smr01.am.freescale.net (8.14.3/8.14.0) with ESMTP id u9C9cYKu030977; Wed, 12 Oct 2016 02:38:53 -0700 From: Zhiqiang Hou To: , , , , , , , , , , , , , , , , Date: Wed, 12 Oct 2016 17:26:12 +0800 Message-ID: <1476264373-2966-4-git-send-email-Zhiqiang.Hou@nxp.com> X-Mailer: git-send-email 2.1.0.27.g96db324 In-Reply-To: <1476264373-2966-1-git-send-email-Zhiqiang.Hou@nxp.com> References: <1476264373-2966-1-git-send-email-Zhiqiang.Hou@nxp.com> X-EOPAttributedMessage: 0 X-Matching-Connectors: 131207387399644092; (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)(8936002)(50226002)(8676002)(81156014)(47776003)(5003940100001)(229853001)(7416002)(48376002)(4326007)(50466002)(104016004)(19580405001)(87936001)(92566002)(8666005)(356003)(85426001)(81166006)(2906002)(19580395003)(586003)(305945005)(7846002)(36756003)(97736004)(5001770100001)(189998001)(86362001)(76176999)(50986999)(6666003)(11100500001)(6636002)(2950100002)(2201001)(68736007)(106466001)(105606002)(626004)(5660300001)(77096005)(7059030)(921003)(1121003); DIR:OUT; SFP:1101; SCL:1; SRVR:BY1PR03MB1420; H:tx30smr01.am.freescale.net; FPR:; SPF:Fail; PTR:InfoDomainNonexistent; A:1; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BY2FFO11FD057; 1:08bpGAcx600NktXPisN+eGMEkjarvebUJCGa2ibTVb7CNAslsPo2mxhDFV2ZBDLzfuzTkLwEEhiYq0j5tSxgsatEWASjyaKXR4IoO2tOjcogn0TfxEkUCU+Pdz6aQM0oNbZjiRMCqczex3MLo8xYdnaN6prUPFv99jnuzjUKj6zr2hWn014T+yUGiSufg7pgfWl3VJy+synPi4q8HSMlM8uQA5uyxDjumODHdXqJlfy/bTLraUN6WDg7twccnBvis4tmiARrr4Nsmi/As8QffNwuS6SeZi2KqeLQG29OkQyzPlfXkQTgO/LnXzVn+C0qKj674m7LKf/xZFiTa7znCgCDF/LvTHocAv3tt08m8c1iy4cs0WxRHTLGdJ1pV2+6zmBWPigSnsbHelimOt7iL0RCwNcZ5dKr7qmSF9ZXX6zlQAf0fjByy+8He93I2Usf+ZtvLBP8NoA/o7K4VOgdkQapWV5aHO+ouktvm2GZYnQYbsDFrVT9E+sfOo0WHIiFSTi2ZCZ8GN5UUmVue7deqqteQopme+TvBy/Frajn5PxLIyfzKVzy4TfD4rOw9nT45ndsN4HXvqeC6boE/nR+tLWm2s3Cm7JvhA4uYlkqF+zd456G9Kn/asrXfUGJVZfLRbQOAHsOnENq5scwdPmK0vWakvIZS7oYdcvo8QeQVt/ni+o1bTxKGi9AA7z/+53iJ1Ma/NBwRuodIGh34QuwJ7GRE2NHxxHnIm6HQoGlkZ8= MIME-Version: 1.0 X-MS-Office365-Filtering-Correlation-Id: 120f9780-03d6-4c0e-7753-08d3f283983e X-Microsoft-Exchange-Diagnostics: 1; BY1PR03MB1420; 2:YgBzICpek3Tri37rhgcVo2sCzMVDXC/BzhT6MbZOpCB5ojHg3V7r84W8X3m9e2zxNyyme5fMRWESQdbansOcVypTm+vyTstGfSue1Htifw34KclwXH9Bc/mQ79o+lWBQ8lxo/ALuABOjzVmgsVK9hIIfXjSV2S3yKNZ8VKg8nTCW1sxOr2NF1LYd4cF6JBSV5gIVaDtWyspDaoL7XimMHg==; 3:WuPklkr160NzY/mTOIJlzQdku68TeJw6KGfq48TxPkQhzYx7fupdAriY1etsHZhvXyFbb8WVdxp/R5LgEPBfDjGLsI5PsVczB7q32n5qWkq8UJW6F4iG4sJ5mqFtrZQRhWn1aVQkt3lsR5r5rgKZ29T+Uz1bQXqRE2bpNXJ0QEZKHkuJta5wr/S6MvJxoh9jWLQPERrhMJr4RtkHAdIsvmpJYgarSWTwUIBt2oTZ6SSbKLO2lzhZVIF3I89a21wp; 25:bnQKWDeeoCW6jVDR6npYzRNFnYFyheUqA7e/S7AyxVVBdVVWv4IM5QiCtebhJHfUUtGPCq6ZjYmG50ElpsRis7ggIp7hhkHI08gvTqcQzt4m3hTBlMfctglyP1a7GAHPWZZBkqgE5FZlAcRR7IdEkaT4nIDu6C4o4SXilpYMmBlwBRG45JN4P3RbARSUibsZ2c94okscCmqN69QFxcLvVz06ihhY6nJ1+XgjHlpQk7JKbWWMFB4SHn51ur0G5Y8sJ6mYCSXGectqHl85y2vXDPfMwaG0oBCgu5n+dnPFknTzt7Q7EJ8QIpcD72jKMatoK6ndrijFRSSBH33hasumV3DoTf/zD2Yd0L01IMktVKexAb3OmMKKuHNYFyDGaCCfYB3NFWu34Wa5zKy1y91xc2yw5SC76FH4qO2GK6Smiv7dIqFg3LdjYOvOTmCp5ycPR+vkULg8Lt2CkYamX5t WPw== X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:BY1PR03MB1420; X-Microsoft-Exchange-Diagnostics: 1; BY1PR03MB1420; 31:NMEsxyqsZf0FhYpy9x3IEvUUimv7MjD9s3sfcQeXIcLqKMUDEMuBZRlX18YcIS45OZd7YlZINc19wu4TYkPGF/6xEaSN+2m79k7XjFE5aR3LBwDvTs34Gyj7ly3SZKUOpJ/W+qSUR5vFFqr3HYjrBsLoAsrZKqM0dThbpBcPIg1C8tN9QWSxxM9edITmBaJZpD7+Be5IlyZn6eDp3Bvey0O0pYS/7iwlRY3nNNZfyF2NA0oh+zVJAdzooFogCWxeLNoSJMflPC9B0T8CUbTyGA==; 4:s0nNtE67/J2OzGeUKJlt0bA26r9Map4tWPX6lCHPbwMoE/MO/YoFtZldbdz40ApcktKyx5GDpqQXRWRRrb9iqXdeoBRV0y+CVan3dmssoY94NXmSTocEUid+57cWgzJ4GXNY1Z2rfZaE48abg6YPQ9c3ZhPfxYfx3CkPhlKtLXFrD/KBXqfmiYXsXyd60En0vFjzF5v+EVpuKM68V7ScI+WlRYDE5o3enI4K6juL9nsRrK0kv6VXZ3d72VW8eUXrR1biA5lwAqjQsR0GsGriSjItjJILgdx6bdEXYIoUBnOoV9zEKsBVu7I5sZuWVh8kpSJEmocxJtWJpQTXNXGZvOhr2Y8cfxXKZOAHKs4YnrP7N8KpJKkxo+0PbMp9tVI7j5XLuO0LkfwOthukR+rgTN+G7spmRX5aae5Hv3NoVm7BFZXOBt+pFSAkThV/bRLtUTRIVXrBN8t6xlWynWUx8rtt9U3E+vMRjm3io1UnXD321RdbJs92P21BzSAf/zNqMR8vrCLWsSJrKGIuhIOjm+Rw1psyLohxWRZZCVxNikAe/h137pk4ocsgrIB9/1ir 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)(13018025)(13015025)(13024025)(13017025)(13023025)(8121501046)(5005006)(10201501046)(3002001)(6055026); SRVR:BY1PR03MB1420; BCL:0; PCL:0; RULEID:(400006); SRVR:BY1PR03MB1420; X-Forefront-PRVS: 0093C80C01 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BY1PR03MB1420; 23:0/J9Ev8wsA/yB2uzdLrAEK4MYNJ1LLu6z8z5+wB3q?= =?us-ascii?Q?l4rlje7dlymb2eeCPoiaUc+zPtboOyMzeAgzTtuNlftYyq5YOUL+FwkeT9uZ?= =?us-ascii?Q?WReOEI+r5MWPXAlMTKUGtFM3fIWLMladZhOXixYLYYd9d9wmUXdUidK28dOU?= =?us-ascii?Q?MNjTmV+8FGGc/bY0DT8gfmiSGkADpfAfZrqUHzstQl2vYv4LRKSCKmGc3Ia+?= =?us-ascii?Q?92hZ472zJTIRjNoUT+PtStlz2bz/IcNVPkUsQ0NE746bSLCKMTYQXgS2e5JZ?= =?us-ascii?Q?Io4+/AG/GRAa9jlGay+GaABH+a4VaLdCdkpr9+vbUyOSZU7JLXDquMR3hUVk?= =?us-ascii?Q?nWpI57usMg8RK8cpNAVBZP4EZ4jGsYXUzDYDUsqZ2CeG8s9Q8nkL/YTMyy7m?= =?us-ascii?Q?j64XXnFrwYfUoJJsm2aj9S9wOFurBPgyZkOfp3wk5wqBNt5SnEIoUgFIk5EP?= =?us-ascii?Q?eONfW9WGqG6D1O0vkeQnNPbEsKkLJJOZ14A6hkscS5LnBM5HcMIxU3t3IeHl?= =?us-ascii?Q?v8vQ/aUgF9pFwhmvUDe8eMMoyHuzEfpgahDPxyFTlPwCvzt//yiwZB7XWubW?= =?us-ascii?Q?zenTfNMbClBBc8Dn6EqjfR9oGExG8qGk1J5qzFSgbrtcRfeAXCnb6VfRsCPm?= =?us-ascii?Q?ALvlWPOSYgJ0eCy8GTE4DyOwhLQb7mHqAZ8x2I7N8gIfCASq2cbxElpKYspZ?= =?us-ascii?Q?NvRgI5g4WYzQll6oRCu/kXirA4PJlM11EP9qSrWkPLrV+7CPX+JeT4aBtvcW?= =?us-ascii?Q?6zw0W2rJhI9sr4nRAtkBn2dGBdieqZE5Cc0a6iHWHpr7mSjuiHFdq55khF6P?= =?us-ascii?Q?kJagbN1DbLCYpcGXdQ0iJMisHCk9RdtANKXOYdFuNu2IyIgpJK5mgacDJ5+R?= =?us-ascii?Q?IN1EH0nQPMZEi4+8eGzsoNb024/3T9TD61VV/ETNc+nluC97ZR1R1bACx4Z3?= =?us-ascii?Q?xztfBRmolEjRgi50eCjfEMuPSogPc73RX79B9kdY/xYpUiKqv9328Mh3Bj8v?= =?us-ascii?Q?P7PJkg847tCO9CTmg8iHCpl+GP46EnzZ1Z+Jr6Lg9enpbkwKI4otT0U6lhxD?= =?us-ascii?Q?8x/W6HydUd9e451l0ITy7GEibEyv8zpnzKI8FqmJ9QiovZmm0f0bc4prCNUF?= =?us-ascii?Q?zl5l8wdEFd6bRAuP0oL+Z/pZEo0X/KZRd8pE40L0IwPCBuEmB7dqKIfDlHJG?= =?us-ascii?Q?PKTXlMC39UScOTyKmGTQyfuXxUzGTls0vhUarfARKnEykcBY0eOQi9apU8Vv?= =?us-ascii?Q?W7e7JvAaN3HdmAXPv0=3D?= X-Microsoft-Exchange-Diagnostics: 1; BY1PR03MB1420; 6:XhJo1xDWan6PmpWFoslJQZFpalAt+lCmAOxzeIjgyBAlsFtlKtc4FUfdgihacbbWKMt87bsaTdDzoxHx25elVcsZ20fMPLTAEQEBeGPM4F0KyuCf39LFsUOQJOSWXy61NsmU9XqB6VotOYODbRsgCHMy4dWZWepW+1efLs6NBh3m+jGMOT5Tg283waSyej8IiFqgp+TIWcs79yF+lVYsOugs3ss8LkswDV74NJ7aC/OelFy9sZJAPw7chaxCwAh00W4zsts0bFBbjoSST6knQSwak9/23EffshMg1mgBb0a4O+VAt7f9tmkjdQewf9Hg; 5:T9P9Ghg9wjCmLkVNMxOjJQVWPT2HbD10cQNWU8GkrpBvcucZ5o1/bWXNBeY9guwhuPUBsfWWcELg0cjhCPEjQcNWLetl88Rju7x1mQHqd4W5U1iBbfii7qANnhWBY64VahrFf0s4mid3wUPZYjKTIfvnGryGyv5GABqlZxTw0Lb+hd2Y+OmNGNrvN8vzTQLx; 24:ZE0CSiXv8jHPH5gZ/OBJRtcdtriqxxliTllwspynb+leIHIE/u2ohfWHoq9d/IV0KMa6OaqSb+bWHGI2TEzqyn/ohxe/Ay9ALJpSM5pDVX0= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; BY1PR03MB1420; 7:FvxOpOpUEy8+AmKCi9HoB4pb3wG2x4kk3Jvo9uhipGfVFB3bF8c3ZcPW8cru2jEtoDYDdvzEiUu9tK17LflVSEaebxKxhlpIUVSd4leU3JNQzx6ZbkXYCwPSN7eML+S5ZW3inoshQdMhUFnO/x4BCSRslJEQRYGfQ2StSEx266lr1DgTVsC0lxCh2OUcVulsKAfK/z8G1bPzB72ke3uZlpO1ROgr9dMCYadxztPZgA6P8IB10FZyMCjB1kUlscvngw0pHvylCbpRJ6Ze8rpPjcpwTF5FUmpORqrGGbsKqQjRydldBFuYQDBy8K6S5WtSnXdPmFSKna9YCX8/42O61I+pGr3DqYy2dUqPNXfj1CA= X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Oct 2016 09:38:59.5744 (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: BY1PR03MB1420 Cc: Hou Zhiqiang Subject: [U-Boot] [PATCH 4/5] kconfig: fsl PPA: move CONFIG_* to Kconfig 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" From: Hou Zhiqiang Signed-off-by: Hou Zhiqiang --- arch/arm/cpu/armv8/fsl-layerscape/Kconfig | 29 +++++++++++++++++++++++++++++ arch/arm/cpu/armv8/fsl-layerscape/Makefile | 2 +- include/configs/ls1043ardb.h | 7 ------- include/configs/ls1046ardb.h | 7 ------- 4 files changed, 30 insertions(+), 15 deletions(-) diff --git a/arch/arm/cpu/armv8/fsl-layerscape/Kconfig b/arch/arm/cpu/armv8/fsl-layerscape/Kconfig index 94ec8d5..952db19 100644 --- a/arch/arm/cpu/armv8/fsl-layerscape/Kconfig +++ b/arch/arm/cpu/armv8/fsl-layerscape/Kconfig @@ -44,6 +44,35 @@ config FSL_LSCH3 menu "Layerscape architecture" depends on FSL_LSCH2 || FSL_LSCH3 +menu "Layerscape PPA" +config FSL_LS_PPA + bool "FSL Layerscape PPA firmware support" + depends on ARCH_LS1043A || ARCH_LS1046A + select ARMV8_PSCI + select ARMV8_SEC_FIRMWARE_SUPPORT + select ARMV8_SEC_FIRMWARE_ERET_ADDR_REVERT + help + The FSL Primary Protected Application (PPA) is a software component + loaded during boot which runs in TrustZone and remains resident + after boot. +choice + prompt "FSL Layerscape PPA firmware storage select" + depends on FSL_LS_PPA + default SYS_LS_PPA_FW_IN_XIP + +config SYS_LS_PPA_FW_IN_XIP + bool "XIP" + +endchoice + +config SYS_LS_PPA_FW_ADDR + hex "Address of PPA firmware" + depends on FSL_LS_PPA + default 0x60500000 if SYS_LS_PPA_FW_IN_XIP && NOR_BOOT + default 0x40500000 if SYS_LS_PPA_FW_IN_XIP && QSPI_BOOT + +endmenu + config SYS_FSL_MMDC bool diff --git a/arch/arm/cpu/armv8/fsl-layerscape/Makefile b/arch/arm/cpu/armv8/fsl-layerscape/Makefile index 51c1cee..150eb7a 100644 --- a/arch/arm/cpu/armv8/fsl-layerscape/Makefile +++ b/arch/arm/cpu/armv8/fsl-layerscape/Makefile @@ -10,7 +10,7 @@ obj-y += soc.o obj-$(CONFIG_MP) += mp.o obj-$(CONFIG_OF_LIBFDT) += fdt.o obj-$(CONFIG_SPL) += spl.o -obj-$(CONFIG_FSL_LS_PPA) += ppa.o +obj-$(CONFIG_$(SPL_)FSL_LS_PPA) += ppa.o ifneq ($(CONFIG_FSL_LSCH3),) obj-y += fsl_lsch3_speed.o diff --git a/include/configs/ls1043ardb.h b/include/configs/ls1043ardb.h index 4b4d090..3023c48 100644 --- a/include/configs/ls1043ardb.h +++ b/include/configs/ls1043ardb.h @@ -9,13 +9,6 @@ #include "ls1043a_common.h" -#if defined(CONFIG_FSL_LS_PPA) -#define CONFIG_SYS_LS_PPA_FW_IN_XIP -#ifdef CONFIG_SYS_LS_PPA_FW_IN_XIP -#define CONFIG_SYS_LS_PPA_FW_ADDR 0x60500000 -#endif -#endif - #define CONFIG_DISPLAY_CPUINFO #define CONFIG_DISPLAY_BOARDINFO diff --git a/include/configs/ls1046ardb.h b/include/configs/ls1046ardb.h index 85a58b0..3ea02f0 100644 --- a/include/configs/ls1046ardb.h +++ b/include/configs/ls1046ardb.h @@ -9,13 +9,6 @@ #include "ls1046a_common.h" -#if defined(CONFIG_FSL_LS_PPA) -#define CONFIG_SYS_LS_PPA_FW_IN_XIP -#ifdef CONFIG_SYS_LS_PPA_FW_IN_XIP -#define CONFIG_SYS_LS_PPA_FW_ADDR 0x40500000 -#endif -#endif - #define CONFIG_DISPLAY_CPUINFO #define CONFIG_DISPLAY_BOARDINFO