From patchwork Mon Jan 16 09:31:49 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Z.Q. Hou" X-Patchwork-Id: 715635 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 3v27dv02bXz9snk for ; Mon, 16 Jan 2017 20:45:55 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 99091A75E4; Mon, 16 Jan 2017 10:45:51 +0100 (CET) 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 fKbWOxHPZ5j7; Mon, 16 Jan 2017 10:45:51 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 7DECAA75F3; Mon, 16 Jan 2017 10:45:43 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 20962A75D5 for ; Mon, 16 Jan 2017 10:45:26 +0100 (CET) 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 mQn92Zn9LjFu for ; Mon, 16 Jan 2017 10:45:25 +0100 (CET) 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 NAM02-CY1-obe.outbound.protection.outlook.com (mail-cys01nam02on0043.outbound.protection.outlook.com [104.47.37.43]) by theia.denx.de (Postfix) with ESMTPS id 28F53A75B7 for ; Mon, 16 Jan 2017 10:45:21 +0100 (CET) Received: from BY2PR03CA074.namprd03.prod.outlook.com (10.141.249.47) by BN1PR0301MB0739.namprd03.prod.outlook.com (10.160.78.146) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.845.12; Mon, 16 Jan 2017 09:45:17 +0000 Received: from BN1AFFO11FD009.protection.gbl (2a01:111:f400:7c10::118) by BY2PR03CA074.outlook.office365.com (2a01:111:e400:2c5d::47) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.845.12 via Frontend Transport; Mon, 16 Jan 2017 09:45:16 +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 BN1AFFO11FD009.mail.protection.outlook.com (10.58.52.69) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.1.803.8 via Frontend Transport; Mon, 16 Jan 2017 09:45:15 +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 v0G9iu2a026967; Mon, 16 Jan 2017 02:45:10 -0700 From: Zhiqiang Hou To: , , , , , , , , , , , , , , , , , Date: Mon, 16 Jan 2017 17:31:49 +0800 Message-ID: <1484559110-32221-3-git-send-email-Zhiqiang.Hou@nxp.com> X-Mailer: git-send-email 2.1.0.27.g96db324 In-Reply-To: <1484559110-32221-1-git-send-email-Zhiqiang.Hou@nxp.com> References: <1484559110-32221-1-git-send-email-Zhiqiang.Hou@nxp.com> X-EOPAttributedMessage: 0 X-Matching-Connectors: 131290335156432309; (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)(336005)(39450400003)(39850400002)(39380400002)(39400400002)(39410400002)(39840400002)(39860400002)(2980300002)(1110001)(1109001)(339900001)(189002)(199003)(105606002)(47776003)(38730400001)(2906002)(104016004)(2201001)(86362001)(77096006)(39060400001)(92566002)(189998001)(97736004)(5001770100001)(8656002)(106466001)(85426001)(7416002)(6636002)(68736007)(2950100002)(6666003)(81156014)(81166006)(8676002)(48376002)(27001)(356003)(50466002)(50226002)(8936002)(305945005)(626004)(4326007)(36756003)(76176999)(50986999)(5003940100001)(5660300001)(921003)(1121003); DIR:OUT; SFP:1101; SCL:1; SRVR:BN1PR0301MB0739; H:tx30smr01.am.freescale.net; FPR:; SPF:Fail; PTR:InfoDomainNonexistent; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BN1AFFO11FD009; 1:/KkmlEVGHSaXXPC/1jIcZ7dpGQKKhuQOccFo/s4qDbZDENnxvY/lAoATQSRz3lL8Fu8R7IHAM9SwnFXtjH+vLKTEYrPTsSjBsIFEXjDlM3QgsZMMXIje0luCfSZgSANJTAYR++AMl/N6OFMfMe3qbc5eRInyUbc8g+25xclTahPogV+hptTlsZAFFTvv+1hIdkqEB8VZiHQculcjmDmODZL4KuuNlWuoQgLVU1/Ab3NuSjNyVpZg8GY6MJwE/kadVm7NBKCfSt4ms/3d+gIifhr1L7jRmbEF68pe1h/WCRrdUgN6wwpniACKyZ6wMOpFIOnuUYqM4TCQKZcXIvX0y/GHOBCzGXTk3alnJtDcRZbw4AwkNUg24RN4XaqMyWjgsIqgofH7isFobodmabNkSx4TFJ9gib1e3gz+WQKc9ORfC2uKMchPm3famCtQ25WCiKXii1PeSzaGWhqUU/E3z9wnhm0O/qIRcIrN1cCL7Pcm1CA9n5YcAaRgdqethiRWbI78BS6Okj7ZIluhDahJzLgFnLrGX0/AVd+NOWRCNja+u/3zr138F5WRt+HeijUVT8ZJxHxFcwQVPSVjSxv3959QZel7BfIbezhGrV4jgjPHZiopW7GvUgQfcKSpN76IYRg2E3jK8l1l6Qk9bDr617pAFo74pbaihAmeul0Hlu4hlJBj/tNaLchHIkd1gdJGE3TG2Ze9LECo0BxTuNu2yQ== MIME-Version: 1.0 X-MS-Office365-Filtering-Correlation-Id: ca620a19-d6aa-46fc-8c58-08d43df45fe5 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001); SRVR:BN1PR0301MB0739; X-Microsoft-Exchange-Diagnostics: 1; BN1PR0301MB0739; 3:jersf6+24ep0HHlj+QMvgQST/bttVnMyIUviglacRXhluMnY7epCLaJx1NR8oJnG5Wt/UJS6eNzXe2hKA5FsI7l2/VmwjtVb+si/qUOJZcETXOJ0E3RB+et+Gnun1do9cG4BQE3qpdyU6VkQxM71NbTiPfARPHjxql8jmQbp8McEluuoAD2rd1gKb3tc6z6Rf/8v0d2JGtu/OKF9BmsW8lRmIe4ORE1uEtQrE2GZychfbhrZfHlPR0QPnubsWFWgMkFOojQw9SNAzPEJVj/RWs1J2jK/B0+lPaW+vM7Y5Xka8CuyqEEn1+RX/mxHa1Zs88iHQoGKiuQGuu/wgi2bSE1zZH+FNR5r9AkXywf93ByjeAaLmiBeCZM74TzNe5O3 X-Microsoft-Exchange-Diagnostics: 1; BN1PR0301MB0739; 25:HBpWxfpv3G+2uOYsatcme0R+1729BkhCOq+hd3r1grYU3PTj9kaA21TwrI3uF/+lbTTN/6JxDsIpU6ioeIRf0TcF0khGPEVuFVzW7sf5CPH02uesF5fwVfNM6lMQmaEC+JQXPdxRwCevbQdFDME65WbZqjYggo6YNYaUxPBIpEYbpayGrsoh/w5HUdgOR/YbBrfFg04jiuVytQHpephZA/XLI9bhs/aWdsxSEdJoy+YnZJ7SgC4Gt2m+Wz/OU58popjj1/+L6+9MPoQtPt49z7O3yY1HCfwtZERRa3zWtC2s3NR5/JLX4Q4f7Q0988QsmMk8qJbch8/KIVbodex3k+VL5dxCZpACoMNdSyUVgXAci0iuDEpXD979wkYchl53Ssby0kRl0Z2mAGq7hrxhlyYNeM6FT6CK2Ng72D+bXHkjmOckNR6KuITC+wQRv0HNJdD3lN533R7ICsVQbMIiZa0zcN392IgacYKqU65uJegwTQukfQrxknkpdDbuubtX7KouxVxY+UAb7PGubG00+aKBy5+33Tt8YC8IKu3JoD+pVwKERnhbpiCPBdRQ5HEBJAblwgvPDCynFhXxn/6DzJJDOhOfvc8Rcs+Duejq/FHHr28ZMl3HNsmihWQapHFEE3ati97dQ5lLBTuQUwnfD72gz1usaTvV5AErlc2HNBJY+n7J/c5DzdHXl0D/lRA4wKjE4+7WU7Bb+psfuwLbWlEZJBUMVcYD5aUzWUMxsNjBsX/kVNtsxQDRmHtFMMI6JXREKTSYOAzzgVrYyaTxTjSMjGQxvg3Dd4BxsXWSu1o= X-Microsoft-Exchange-Diagnostics: 1; BN1PR0301MB0739; 31:JAKvDD3tQya3OsEVu3eSeV5Tz7ORvNvkCwM2fjXxi6cmp1/yyvz7ffeYx3T7DRBp9S1ULKb0flnIs+y7hacfC1PWH2PfANsVIcfxdSFMvkvgvBsejbH7V+LbHu9xKPiFU4xx7Z6Gsj4MFMSAeQSZe0h/RyxhUaCLdwfmbL6+UPTjDWswQ4oKRWHV4yJvsmIOCfBAG5F47xT+Ge4ZSAEmVAFbPI0NJfV5YDp0/sRFdO0ruvjAfV6KO9i7Xh3AXA7h4ou/SLsT5/OKgq8/t26rVgzjVn+/brHxDhfDhDVqwqQ= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(185117386973197); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6095060)(601004)(2401047)(13023025)(13017025)(13015025)(13024025)(13018025)(5005006)(8121501046)(3002001)(10201501046)(6055026)(6096035)(20161123561025)(20161123559025)(20161123556025)(20161123563025)(20161123565025); SRVR:BN1PR0301MB0739; BCL:0; PCL:0; RULEID:(400006); SRVR:BN1PR0301MB0739; X-Microsoft-Exchange-Diagnostics: 1; BN1PR0301MB0739; 4:KkHlin2jTkKt+YeCI3g6aCjo1jrPU1lHPYJI+VjLPO8Dys8npg4EFE1QBCf+mNc1TUNZKCIaYTr+ofncFTZK093sw+nadSAsanwwAbc6slWW3Kc3Gl2kqB9zr+okZECMNLlOS4qjHXLO+0xf9gyyyFuIzC+rlGm2uVlMba3vjPaFAitiiN8nNZPMOD705uLhD/4L4IcqUA3adZt158dLDthTN04uCcZQzTvFKThSXbBu2JLz8AZg7PSRwiaXQdOzDOGfcNyeLKCj4yxgu8WHFvwZSZiZnYkSZ1IgvIQ1y+1gfISKD36bIKiz6aC0sdpu+qrnLM27JFzwiTqeHZ56UQvk2hE4EyAfy+4BkCgLuFj/9dHdeB7XY7q73h/BnMvJUOMSPTV8XWY0UQ3HA5ssIlRBhvq7lSe9nFl35B4s+VmMBctAsJ6VoVZAd0dhSqZxn/Vw39FTJ3lSbQqnNVh91aiQyDhcPpn8ucAtzCaZ5ZhziDFrfVUALNf6PKFs5Fk9PtiVRgh1WXNRPg4e6oaDVhp+KHiWDx2i2nWMLjWb/t4gJswjfP1KiSvSQ2iAGMyzF2cb6+PLagaiQYcduZ2Rx8wbMm7TB0Wqv0NNejz7aC3MAl+DuaGU6d1tR57phcbQeyIdYCcS1DFCvwkBIVdRsWSpaDZDeArNI77U5JnTGnKYKPa4sbKqyfrfWJkn38Br7DJHGajAxiYhwJucd/2PCCqxNlFA+cb0PlpFMzHtbYo0IsoKw4W2pl34dKp6aRIy X-Forefront-PRVS: 01894AD3B8 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BN1PR0301MB0739; 23:VERonodhc1MKvsMiL1g3OzvbD/YgQRVaNS9SG9r?= =?us-ascii?Q?23Zxu0rJdiiUz2Sb7lV7jgZgVfud+q1XJXXCZYLlk2adCTZ3diaWvTNcxsj6?= =?us-ascii?Q?zJaguaK5CWGCZ5ubUQXcwrq+oVO1/rLX2EFcQiaZJSHFd2PFdq7Z4dk2V9O1?= =?us-ascii?Q?ID88ZamJRPEWMEuVg8Ux/owPXgQrH5lsjPVvl+PSLmvPGbt/frecBDNj6RoX?= =?us-ascii?Q?+uuBstQMZzh4l8CFOPJF7XYHTFeb2YjEvwlpcx+/3AufPwXci5i26DFT84gY?= =?us-ascii?Q?f5bq0G2svPXICMbMAzzbvTFYrpZHgSBYVnfZof7sZBbTuP3MiZZYh+8rHb+x?= =?us-ascii?Q?Tx7f/PYmSOdxc4uDSdauW+49VlqLQXFAmRudW2GSL230oTvYIMR+eY6KdVaD?= =?us-ascii?Q?lTh6Gd4kgTLqp4mGkR5dtSqu4FgnNGnVWPcglkSzAsTJmS5llHVlRc6w/eBG?= =?us-ascii?Q?qCVCVZfEpkJ4SH5Z9MhPGlQuRLQYmDJwexBr/2mW3/yBa3IiSFa4qMy6oKus?= =?us-ascii?Q?HB8KM3xcFMLBDT7d5CWbV1wgDee4eapOCjIu6ktVINWv4QKMXOjussXErYk0?= =?us-ascii?Q?gD3w0i1Z8O/zsjxwOgR/YaRKvi28jmJzMPT2GoaIBEzJQ5ADhG90hU88z67c?= =?us-ascii?Q?yKyVF4qqmm2t38RIQMA95O/C3CdZxY+4vyL5tMe52Vxs1/BZqU1BZ9vIFMuM?= =?us-ascii?Q?zcP9W5PgUjgiRWgPGIdoRLerl9uOZ7U8Vq2ls0rbGAaGfwLj++1p3728/MQK?= =?us-ascii?Q?yXJ2VFM2cOH2CbUEufmxoqpEipNBxfHQglCyy1N5oOM+/J0UlXiYy2a4uJ5F?= =?us-ascii?Q?4sNmuqYX5fNUI93q1yeTciGB96cO/aXkZ2pGRh7uqYROUZtyr40HsmjqjqFZ?= =?us-ascii?Q?olSqavfOOdXGFO17De+0s2Y7VLMoJVKikoXjdIATklO7l/bKwGBYHoD8Ymrb?= =?us-ascii?Q?TWDbk+kIKhPq84xqDBic9SRmerP5UFvTnvnhkMAZZi2MomOtPbY8V/Kp9vDD?= =?us-ascii?Q?TKjfwOOsMx6V6R0Eb9uO5NWW1LU+Z1hy6eqYZ0cTZK834psZLEWOmENxmqhN?= =?us-ascii?Q?zdPGUhVfcEpadfiV3XGTmveYI3IjlXz+oVK3TK6HbGwQwoAXJJ/Mr/86NT/s?= =?us-ascii?Q?HMvxPPya9ty6HSU1nVvVMY6j44c6je7Ue1iKQQO/rQPkLimoGttp+dsNSaBH?= =?us-ascii?Q?4EJo96Cq12+9iqlz8u8A9d7dy9KsBVUPH1EVyrvVmI60Tu2bzrMA2nfO3L0m?= =?us-ascii?Q?WWpNfjSxyOB0poRGMiB7kUx62m0F8PsfKc/AFy8aen2hMTrYs1sub6KcXtab?= =?us-ascii?Q?tZbWJ3rmYTU3RSpQ3P2Qd4wU5tDVtZMgKWY4AZXi58VquK1YPFvadUUA2HJc?= =?us-ascii?Q?+SgQq9A=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1; BN1PR0301MB0739; 6:ktZqqtfES5dO9WV9yY8Fz38PZ3R4HTbhNQZDOf4tSZi3jwUxIeI62mlTN2WTYMfaBFf0T/oq9RpnvPepVdEBfYnK5bzFvdqxIE7fsFUnJpZ7891Nnia+DaRU1Ot6dABoJCbMmqomBBCGIXEJaWz/axxEpVpZYzs9WGx1PNXE21n1MlsNigvIC58u3tiLlCboCsu6vIeomfZI+TRn1xbedpccVkYhn6GOBlcfKNeHIT5zGvD9bWYKg1fPUsrmDq7yaoKaCtISFD6BoD7yvaUrnMqHdGj4VNYhsS/X33vnqQ0RPUy3d/jolMO1c+0PMaklOGqfQ+VT39X6fDGxTOlwyqt/7T/+rG6oFnujQ2FCuWgF6G0RH6GaF2e4Vo4PTc2FtGPsK1kaiLqPjR7BjZ1O53+H0+sCo9V85Ch3ONVSHh2rDSrzjkJ3xokXuVqrkf5B; 5:imgbBTgnNTPlguOkrYJRKQ2A//gdjpv2uiW9A2F9nptKoB7RLL4Zx5S50v8yIfyR162SXm8nZAjzlvqVZTbnIJV7PYdiBsbjzfyEjw4QhRRh2grdekOUO1qYmbJAeJryFmOLJ1L2Agfy1CgIouDwlhrvvMw3c0AxJFXL65Y4X9OWziVBL/5w6ieysRBuGaUk; 24:J1A73N5Jg/TX3rcXOWWbiR74aoLrCw7OlhZjalOl4VBRX1UPucPUAxYUlOmFIIYC1ZL52u4+LslNJNPQjSpgXlfGjYbkjYBWUlBrOv9J46k= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; BN1PR0301MB0739; 7:NyL7XZGMTIrG1XR0x5GJP+fy4oB24DeQ1znHQhZxGu5zsQcMexP5Prlzs5RQShFePlhOOBgstOFJXhCRbxttBI9bITJqkgKoD8ufCeVLZz6MUV05xfo5SeNR9Qvx4mkTazBFPP1frBGgAQjUbXIvPdmOZBzhOAASYEeafIgaxjUH1OHZ1WKGNdcoFlj4erNZf1SpUO85NbJvLbyU1zgiIQEvyj5u3/EI2l3joPziDXvFl++aO3Oc2j4nCYX7BeabaaHsC9GIaCXPuioBTEyWME3FFdKI/CQAizQGPcOEOUF6y8qTSw7pcFlq+QFPiia7lOusDPsFl2OUScan2jtV22Hn470kUcE+AtsIsE6AQP8TJSvb9tqE6PrHfHbROJuEl26Po5oaeQzppMIpWk7xr1iHa/TBIueL3yK1WL86ztfXn4i6eH5pdJfCA2IMvZR/ZxNYVgODSFzzB9w2byLllA== X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Jan 2017 09:45:15.4560 (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: BN1PR0301MB0739 Cc: Hou Zhiqiang Subject: [U-Boot] [PATCHv2 3/4] 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 --- V2: - Select ARMV8_SEC_FIRMWARE_ERET_ADDR_REVERT only for LSCH2 platforms. - Remove the dependence on LS1043A and LS1046A. - Generate the patch base on the latest code. arch/arm/cpu/armv8/fsl-layerscape/Kconfig | 27 ++++++++++++++++++++++++++- arch/arm/cpu/armv8/fsl-layerscape/Makefile | 2 +- include/configs/ls1043ardb.h | 7 ------- include/configs/ls1046ardb.h | 7 ------- 4 files changed, 27 insertions(+), 16 deletions(-) diff --git a/arch/arm/cpu/armv8/fsl-layerscape/Kconfig b/arch/arm/cpu/armv8/fsl-layerscape/Kconfig index 9098296..7ed9fd5 100644 --- a/arch/arm/cpu/armv8/fsl-layerscape/Kconfig +++ b/arch/arm/cpu/armv8/fsl-layerscape/Kconfig @@ -48,13 +48,38 @@ menu "Layerscape PPA" config FSL_LS_PPA bool "FSL Layerscape PPA firmware support" depends on !ARMV8_PSCI - depends on ARCH_LS1043A || ARCH_LS1046A + select ARMV8_SEC_FIRMWARE_SUPPORT select SEC_FIRMWARE_ARMV8_PSCI + select ARMV8_SEC_FIRMWARE_ERET_ADDR_REVERT if FSL_LSCH2 help The FSL Primary Protected Application (PPA) is a software component which is loaded during boot stage, and then remains resident in RAM and runs in the TrustZone after boot. Say y to enable it. + +choice + prompt "FSL Layerscape PPA firmware loading-media select" + depends on FSL_LS_PPA + default SYS_LS_PPA_FW_IN_XIP + +config SYS_LS_PPA_FW_IN_XIP + bool "XIP" + help + Say Y here if the PPA firmware locate at XIP flash, such + as NOR or QSPI flash. + +endchoice + +config SYS_LS_PPA_FW_ADDR + hex "Address of PPA firmware loading from" + depends on FSL_LS_PPA + default 0x40500000 if SYS_LS_PPA_FW_IN_XIP && QSPI_BOOT + default 0x60500000 if SYS_LS_PPA_FW_IN_XIP + help + If the PPA firmware locate at XIP flash, such as NOR or + QSPI flash, this address is a directly memory-mapped. + If it is in a serial accessed flash, such as NAND and SD + card, it is a byte offset. endmenu config SYS_FSL_MMDC diff --git a/arch/arm/cpu/armv8/fsl-layerscape/Makefile b/arch/arm/cpu/armv8/fsl-layerscape/Makefile index 423b4b3..c9ab93e 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 cc9371a..49fa556 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 - #if defined(CONFIG_NAND_BOOT) || defined(CONFIG_SD_BOOT) #define CONFIG_SYS_TEXT_BASE 0x82000000 #else diff --git a/include/configs/ls1046ardb.h b/include/configs/ls1046ardb.h index 8ede24c..559e9ed 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 - #ifdef CONFIG_SD_BOOT #define CONFIG_SYS_TEXT_BASE 0x82000000 #else