From patchwork Wed Oct 12 09:26:11 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: 681094 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 3sv82V4YHyz9s9Y for ; Wed, 12 Oct 2016 20:39:13 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 90D63A75B7; Wed, 12 Oct 2016 11:39:08 +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 sTAfxFGMCWmS; Wed, 12 Oct 2016 11:39:08 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 0F2ADA7548; Wed, 12 Oct 2016 11:39:08 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 046B0A7548 for ; Wed, 12 Oct 2016 11:39:02 +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 pwpDcXKt3qMF for ; Wed, 12 Oct 2016 11:39:01 +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 NAM01-BY2-obe.outbound.protection.outlook.com (mail-by2nam01on0071.outbound.protection.outlook.com [104.47.34.71]) by theia.denx.de (Postfix) with ESMTPS id 2D881A7537 for ; Wed, 12 Oct 2016 11:38:57 +0200 (CEST) Received: from BY2PR03CA073.namprd03.prod.outlook.com (10.141.249.46) by CY1PR03MB1424.namprd03.prod.outlook.com (10.163.17.146) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.659.11; Wed, 12 Oct 2016 09:38:54 +0000 Received: from BL2FFO11FD056.protection.gbl (2a01:111:f400:7c09::115) by BY2PR03CA073.outlook.office365.com (2a01:111:e400:2c5d::46) 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:38:54 +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 BL2FFO11FD056.mail.protection.outlook.com (10.173.161.184) 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:54 +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 u9C9cYKt030977; Wed, 12 Oct 2016 02:38:48 -0700 From: Zhiqiang Hou To: , , , , , , , , , , , , , , , , Date: Wed, 12 Oct 2016 17:26:11 +0800 Message-ID: <1476264373-2966-3-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: 131207387342972764; (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)(189002)(199003)(7416002)(7846002)(106466001)(76176999)(626004)(105606002)(36756003)(305945005)(5003940100001)(68736007)(8936002)(8666005)(356003)(5660300001)(6636002)(50226002)(11100500001)(2950100002)(6666003)(104016004)(229853001)(50986999)(92566002)(2906002)(50466002)(48376002)(4326007)(85426001)(47776003)(575784001)(19580405001)(19580395003)(86362001)(2201001)(87936001)(586003)(8676002)(81156014)(81166006)(189998001)(77096005)(5001770100001)(97736004)(7059030)(921003)(1121003); DIR:OUT; SFP:1101; SCL:1; SRVR:CY1PR03MB1424; H:tx30smr01.am.freescale.net; FPR:; SPF:Fail; PTR:InfoDomainNonexistent; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BL2FFO11FD056; 1:dezESmKNQdcp1kifq51mH7p9xQ0x6P55Qk3fr0Up4DJi45gq0kq1rVU0HLc3PPtPfKQaxRQeDppD0UZgxIF/74zCqLhzNXPhbkKYZZSgcY1OL4fXrKSojjgAkicz1gDrYSsPRAZlSd/qAfEpRqY1VXyMF4yLYVC5GD2BiSJzkBrJb0ZpSCRakwhPe3hpywuxyGKNRk4tcslmyeku80xcPXjZqT8sXd5V/SHPrFi1raha0ODRXJeCEv+a1eY7Qb7nCRAECauyEWiJUt8R6B7mWl69uuIOwimU40HAZ5f4a5r81GOZrVYlNuGRM1eGUwXERNuMQSCTjk8f1oNSH3zoBlr4hq7/sNOV7weCYAWiroKa7iV+oDB/I/XENiNIA72dxu+j0ov0qpgtKryWOUAjyBq2MKApgzhlTfx1/4uw8OtS3yRxJKne4DcwoooMIPvXeHU07Ep3ag65LwsCd+4x+61tE93EQ7qd2Yxvnj2Iwx5PODdp/ZzF6jWb9C/aEoqPCnNHKMBD4CCFOrdAzE88oH4+wy2c/Tx5t18mveorRqyvkIPUoyxvJOVmTVTc4Fy01r7jCRmmp4gz0doKvcedjVWo0MRkRM67ccGDz91SlThFW+n+CJklFSny/TU6BjvKwc2OZWsKXIFDxTj+n2wNwz6nEDA2tjcdu7QWf8YvYn/4eU/x4H8kPNlLRLjzJcl19KPlTHdPpMegrSf62xF7J6L+tnqofWCXqVSbN+A0EMA= MIME-Version: 1.0 X-MS-Office365-Filtering-Correlation-Id: a258169e-0d5e-4476-c5ff-08d3f28394f0 X-Microsoft-Exchange-Diagnostics: 1; CY1PR03MB1424; 2:0jTsZFf2Qeb6RQHlDrpIKyh2X4r9nkQgxPBZCipIfkL+155QggxScmNyfT7QetQUxzEMZYApfgi4mUjAEsg/CwIfZH00eRIp7KmbWATZ4YHbOKbuNI0/4kQfWOWYbh7BKmf67isf7xsencbhle0Hb0UxIJWB/pqUuX4CKNRyreq3VGI5ibKtjkujwpCz0krKV9PZ+q7HyfCwjnSooMTQgg==; 3:2fXV5n1VQbuMKhPh6+aI2lRhI2UG0NBeo1O58gADaXSUTZw1Ly1+n8XsFw47MQMkYB3iw9kQIvnDLngn8gptoiLUUFWskoDBMWJshu+YH46tCMYIhgnDqRxtco6x+ZK5vXvnTUppehepgDyRN3TG3QjmIOk3SsUEQYDs+broUANfKFvMEhB90eir6oWwFGQvWA4Ikuo/fnVg//tfyzO3k6TzIBHdoRi4skNnTee6L0KDWnp4bfPkaTv4L9q4wf7W X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:CY1PR03MB1424; X-Microsoft-Exchange-Diagnostics: 1; CY1PR03MB1424; 25:MahH/NLx/mT4SBcaZALRijkwXxC8g29NyL+UZmRGZXHtVZO9Iu0A/VDeWM1vx7RVDiKWznMsNcilUHwC0Eq5cqnh6HHiIjt/JXT0O75fwJdQj2ytNzR9s9auGBbc7ueEALA6K0pP3uxr8nmw5X7mDOxfjAZDN2i0CakfSzDbI7waNjh595mMGcgkDHFehRiN9lTKtSwY1d9kfqnJcHTgb4Qri+xgWB5SYK7QKmKOPuA/Epd4OVacgQQ+QOHEOvhMRbQ+elKGkDaGUHF1YOVEPnyzg+/THRLGxTcwtZzejQVErI6w0FohjkKkZHLe/L4E1qrI3l40gIwVFymM99xeejWQ09xKdd32G+ndKaZ8YPjLlDDVCZCHNKV+hZAWV7AEVXsJnOQQ5Vwu5BlMspFQBYp6TngK5lZatT7uaHdTWhw6lop8d89wvQjA9PTofqfy3kG9BAbJt53Z7MNQHXpm1fZUu55BhbwKM+OuPnFO++Q8Ivx99mjJRISooeL/ghhACC3eQQrcwg7DtyTKL2hye2r1uLkMTBhaKnPvlhyvtocHnEAd1Zo/8swKdyCOYGL82NqUEt3sXnIhCpOfpNWxqTXX0Zy5np80ps5t8qHXkaxpBhUd0tKVTnQ09UCP6Qd6gEgolv9IDQdq4opqxVYa1HM8IfhjV4bYDTTwb/OWbfUXm0OszseWq2a9ihANpc2yhLiEn3cJz5ajrgITZM+v5aZ1tH76Etbt4vze21L6VFKP6g/y9IsK3cxolWrs1sMcs8J/DZGVPM7EB8nDiXbSN5CCENJZc2hvDiK6mmxVN5ZzsJlq8YH7bvNqx/5qy9Q5IxOkSFtF9wcvmazbmtSjSQ== X-Microsoft-Exchange-Diagnostics: 1; CY1PR03MB1424; 31:d308DtkOTKLA7tBkpp0CUVryCDUiBIWi7/5Z09Qo9VUePktrEi0VK0nCXslxItt0XK69dDjG+Z9X2riboTR0blmz98rFx26Lm9J6n7wWbW8MdfHHBQ+oPjv4nw4lQC7fnz2nrCycZB7aP122yn9FvydutU/Lq2O27vTXlkvZXQt8hcImXAqpRY3g2gr9+X2qbdgz5d+oFx9tDGdOhtVTTPLiPKRKo7GOzyKb8g4SbuuBPI5I9kEZIMgJfzTkpRmds292aBDMge7B1iRj7iyncQ==; 4:ieYJ6S8pCsvWnSYQjm/9n5pIfm5OBPp7giq4qSVITWtp5I7b0h4XoMucuG506GUKk8IsksHWnWEoARVFiVgljfz/7iXN0vWoUKQFcWg2GyWX1pXNrB449/nCZeL1mhM37+7e1RY3qgKUIH0fEMUzd3kZLB89iO/eDn8fTxDK2uuvKxtfyFMTB5YZ0QQUtFM8WHbDmywFqsm3ZIFW7mYI8NUu8iwuGheIoerBLYPb2xdolYn8L63KwHBMh0UvD7yELWoYNh2yesYuoCkURSAGhplDx9ftB4eix6LFBDPx7pTMvViII+sUaip4Vbhvy8n+kWl34ewjjSsuLmAPzAUp/iFyJIu4uWsnasq1+Kmjp/T3trqK9HOl9nxbL4zXO9EZ48+9sBDPia0bWQdJg+c69NqECwEQgI9SvmGC85ITO0JTYOvfiqFtjMFyAOfszenWTKFvwXJnajYFWJ7gk9X7Jxj/mzeqpzJ7G629zOMvoA37sesjVOmij142mZV2H/5VgKCjNoeIeyGU3tJJoHoRMzo9ybxx7cJ6AX7ZchYU2a8r5Eslg0+6JGly68haZAAu 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)(13024025)(13017025)(13015025)(13018025)(8121501046)(5005006)(3002001)(10201501046)(6055026); SRVR:CY1PR03MB1424; BCL:0; PCL:0; RULEID:(400006); SRVR:CY1PR03MB1424; X-Forefront-PRVS: 0093C80C01 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; CY1PR03MB1424; 23:FZtzXHnX/LMTNKNeVTOkgwlsgj8lcMpmJmkjlKCnE?= =?us-ascii?Q?f1JVBEoZt9l2z22Ecw4Q0GYFYQM9JB9qG03XW/gFHjWTH9iyezc6LL1qHaU1?= =?us-ascii?Q?lvPouMSK9sWs4WJXZTeqGuSSMsD0K6HesJhfW51E2B9IR2vTWgEvlTWNVX0L?= =?us-ascii?Q?d6XP4RiJXrJ0xMHqqv6aHkOKsxq/2LOfwbBTUqE5PnhyCrNP9M5lbs+Kp9SH?= =?us-ascii?Q?lk7r/oGlfv8OmAw3E/g4dU/wxnurGHE4TK3QYtm0idY2z/ZY5aRb6kjHAPzy?= =?us-ascii?Q?gwb2Hot5BIMJtpkbTkOWP94JdpiB6yLXihO6cjN1BxYMttdZMzGi4OyjTvmc?= =?us-ascii?Q?vTyK8Q6W7AQE3BjwzRKpXS1b87tPiblsLsFdVHs0KxEVintokmLkN10DMXBC?= =?us-ascii?Q?+A1DWFd7uYKSflq7UP6XM7PhQZSINaqRwcJfifm2lsKl9aFVFkybWer8wQth?= =?us-ascii?Q?xRxVkhyuJnH65OU5cuXTKhPQ5Gweb9ZzpLu7knuYvTUW6/nx2HV1kUeLDjTs?= =?us-ascii?Q?KUT6VT0GBKqId4rm4QIvPZNSosL5NIoESq1dLjE4Yvuu4Z6YWi1nKAnooejv?= =?us-ascii?Q?qj0HjOlEsU03ltkc0yFCSWSxdpqmvEYpY0mXKEKsYqME6Bov5Oz4zg9KV8r/?= =?us-ascii?Q?KBxf1pPgUOyQbxTWEpyHxOIjxwVNgqt4mgq4Y1SBeXVwe3nyvcabWuAyhGTZ?= =?us-ascii?Q?cvazup8nTN7z7Iue67/llHlr6BwbSTN7OSjOSczNZUgY6BzOR17g5TWpbIqy?= =?us-ascii?Q?ks1nGthobQ8Cwip87ynOTjO4T+xjaSK0v4qC5VOPoBF0zjBb8WWkN0+qM9Cx?= =?us-ascii?Q?qnZ4mQ7ywqqYhuoohRp94GlLoyIeL8h5++ipRBUCioDbWf04FZt5uGAiw521?= =?us-ascii?Q?lxvsbRxTaDAO0EEW7Qrl2AXhNF+ZwhHZwkkrgUIIGjBOYzxzeEx558PaR/mE?= =?us-ascii?Q?qtcLtdZR5+D5xC7St1AN6tRtvAc+iorXYwm11162L4Ddv4ZUy0x0dzJbPVRM?= =?us-ascii?Q?tOGaE5XcAG87saBBHEt/R2yQI5f3mc3q+uCnf4vBSiIB8/6i/6oH57BRDu2w?= =?us-ascii?Q?mNS9wTZ6zgodmaS5mTTPatoSlA3npqWaavz51ZxfxfwqNEBTv28KiDYP9Kcm?= =?us-ascii?Q?51F9BVN17HUcLmVCyLc0E3/0uKu5QqK5nN6YCeiFzud/qMVRQZkz1SYLE1P+?= =?us-ascii?Q?qLnwhhILRVzd4zQEVBUhJWpChVknfcufiAm7LHjabZmAdG7tWPFCFOx3VSyB?= =?us-ascii?Q?49SigcI5vn4msmLFRjVLjSM0UXczdM5BDhHlpuI?= X-Microsoft-Exchange-Diagnostics: 1; CY1PR03MB1424; 6:/hT7yFNDoy78CbHkQfbQqxWm89vQN+A39prn02OqMo1R3ACE0wTR4Dbj3yqCiK8e3V2rDaA6esNex7E9yDBd3evl6wTAfrjmhN/dKp51bl8Ap8lZkl2Z0LUqnxIRcg95V+DUtqeto92tXRkM9X5jSjHuGMJ0uPeEBCWvxEr2WIDjkmS0BWBCr8th34TftRVCa270IylIaytp+3Vz2KjMwUnKx24VHa9tc1peeCvNZnLYNFYnk7uSAmfe/W4vjgRHUFhUiN4jxD+qOZfRiUC/A555d4HsN8mkECfKbJ7BuXldmmkRFY/hVwp5R0Cr7mXi; 5:Ifs2p6VqhGwRuNhPCDWfOjIgr3iX1hYooNLuahKuaVAJav/GkdVYwmhVDhgHoQxgmEMHMpegVfzOQlOvP+fd0Q8Fho13JDrYvg/nsDDm7wPWW5Mjbg2JNsx971IvyaXrdD6+K7HCpxWid4PY8OcVgbZ3Tj0sNw1AnoiapWbkNeFmoNTTQCbOQfSzSSH50Qyh; 24:fgDHry+LgzMmLz3VYZ1Hp1aCemPGKPYKt4bwICHwXOsndKOt4Ec7eknXuqJVNv+ZU4yu/0aRLoHbeTtF7DJzjX9GdbZ+1bMHFmfLPFv2wFg= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; CY1PR03MB1424; 7:hSBFvWhpIInfO7h3ke4gkX154m7nneCRPyhtr/5SDfWXBEnaqyBUjlljXPrbpNWeeyNfENFO+DI/xOG1jPmpwbJUljKQ9rj0VGjR0RJtJJa94/1DN8CvJS36wrKvGpLuQIA7oBDnHfRud8y1Y/R86eLIXBuyVOitpz3nwqaZjb5Wr0NpJ36/jZKDd/40C+dFJyzgeyGJeOh0Jab0crFtGG2XgexYKkytMb1yG/AN+34rsPPSTxcHVL5ZHnxDHjkZCEB7glb0tCvIWHD5IZr4jix2IqJhi+cXdH4lMkhfboM2X2GWp9GHnI7+fwb0XvUPZXNN2xYXwODFE7xMxIyqGlhkHZ2LVZJZ6C9gHoF7Qk4= X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Oct 2016 09:38:54.0632 (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: CY1PR03MB1424 Cc: Hou Zhiqiang Subject: [U-Boot] [PATCH 3/5] kconfig: armv8: move armv8 sec_firmware 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/Kconfig | 36 +++++++++++++++++++++++++++++++++++ arch/arm/cpu/armv8/Makefile | 2 +- arch/arm/cpu/armv8/sec_firmware_asm.S | 4 ++-- include/configs/ls1043ardb.h | 4 ---- include/configs/ls1046ardb.h | 4 ---- 5 files changed, 39 insertions(+), 11 deletions(-) diff --git a/arch/arm/cpu/armv8/Kconfig b/arch/arm/cpu/armv8/Kconfig index 7e1fc4c..cb5a970 100644 --- a/arch/arm/cpu/armv8/Kconfig +++ b/arch/arm/cpu/armv8/Kconfig @@ -21,4 +21,40 @@ config ARMV8_SPIN_TABLE - Reserve the code for the spin-table and the release address via a /memreserve/ region in the Device Tree. +menu "ARMv8 secure monitor firmware" +config ARMV8_SEC_FIRMWARE_SUPPORT + bool "Enable ARMv8 secure monitor firmware framework support" + select OF_LIBFDT + select FIT + help + This framework is aimed at making secure monitor firmware load + process brief. + Note: Only FIT format image is supported. + You should prepare and provide the below information: + - Address of secure firmware. + - Address to hold the return address from secure firmware. + - Secure firmware FIT image related information. + Such as: SEC_FIRMWARE_FIT_IMAGE and SEC_FIRMEWARE_FIT_CNF_NAME + - The target exception level that secure monitor firmware will + return to. + +config SPL_ARMV8_SEC_FIRMWARE_SUPPORT + bool "Enable ARMv8 secure monitor firmware framework support for SPL" + select SPL_OF_LIBFDT + select SPL_FIT + help + Say Y here to support this framework in SPL phase. + +config ARMV8_SEC_FIRMWARE_ERET_ADDR_REVERT + bool "ARMv8 secure monitor firmware ERET address byteorder swap" + depends on ARMV8_SEC_FIRMWARE_SUPPORT || SPL_ARMV8_SEC_FIRMWARE_SUPPORT + help + Say Y here when the endianness of the register or memory holding the + Secure firmware exception return address is different with core's. + +endmenu + +config ARMV8_PSCI + bool "ARMv8 PSCI support" + endif diff --git a/arch/arm/cpu/armv8/Makefile b/arch/arm/cpu/armv8/Makefile index dea1465..9f65927 100644 --- a/arch/arm/cpu/armv8/Makefile +++ b/arch/arm/cpu/armv8/Makefile @@ -19,7 +19,7 @@ obj-y += cpu-dt.o ifndef CONFIG_SPL_BUILD obj-$(CONFIG_ARMV8_SPIN_TABLE) += spin_table.o spin_table_v8.o endif -obj-$(CONFIG_ARMV8_SEC_FIRMWARE_SUPPORT) += sec_firmware.o sec_firmware_asm.o +obj-$(CONFIG_$(SPL_)ARMV8_SEC_FIRMWARE_SUPPORT) += sec_firmware.o sec_firmware_asm.o obj-$(CONFIG_FSL_LAYERSCAPE) += fsl-layerscape/ obj-$(CONFIG_S32V234) += s32v234/ diff --git a/arch/arm/cpu/armv8/sec_firmware_asm.S b/arch/arm/cpu/armv8/sec_firmware_asm.S index 0c6a462..15fbe0b 100644 --- a/arch/arm/cpu/armv8/sec_firmware_asm.S +++ b/arch/arm/cpu/armv8/sec_firmware_asm.S @@ -23,12 +23,12 @@ WEAK(_sec_firmware_entry) /* Set exception return address hold pointer */ adr x4, 1f mov x3, x4 -#ifdef SEC_FIRMWARE_ERET_ADDR_REVERT +#ifdef CONFIG_ARMV8_SEC_FIRMWARE_ERET_ADDR_REVERT rev w3, w3 #endif str w3, [x1] lsr x3, x4, #32 -#ifdef SEC_FIRMWARE_ERET_ADDR_REVERT +#ifdef CONFIG_ARMV8_SEC_FIRMWARE_ERET_ADDR_REVERT rev w3, w3 #endif str w3, [x2] diff --git a/include/configs/ls1043ardb.h b/include/configs/ls1043ardb.h index 70ee046..4b4d090 100644 --- a/include/configs/ls1043ardb.h +++ b/include/configs/ls1043ardb.h @@ -10,10 +10,6 @@ #include "ls1043a_common.h" #if defined(CONFIG_FSL_LS_PPA) -#define CONFIG_ARMV8_SEC_FIRMWARE_SUPPORT -#define SEC_FIRMWARE_ERET_ADDR_REVERT -#define CONFIG_ARMV8_PSCI - #define CONFIG_SYS_LS_PPA_FW_IN_XIP #ifdef CONFIG_SYS_LS_PPA_FW_IN_XIP #define CONFIG_SYS_LS_PPA_FW_ADDR 0x60500000 diff --git a/include/configs/ls1046ardb.h b/include/configs/ls1046ardb.h index 693cc8d..85a58b0 100644 --- a/include/configs/ls1046ardb.h +++ b/include/configs/ls1046ardb.h @@ -10,10 +10,6 @@ #include "ls1046a_common.h" #if defined(CONFIG_FSL_LS_PPA) -#define CONFIG_ARMV8_PSCI -#define CONFIG_ARMV8_SEC_FIRMWARE_SUPPORT -#define CONFIG_SYS_LS_PPA_DRAM_BLOCK_MIN_SIZE (1UL * 1024 * 1024) - #define CONFIG_SYS_LS_PPA_FW_IN_XIP #ifdef CONFIG_SYS_LS_PPA_FW_IN_XIP #define CONFIG_SYS_LS_PPA_FW_ADDR 0x40500000