From patchwork Thu Nov 24 07:53:50 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: York Sun X-Patchwork-Id: 698666 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 3tPWkZ4qcdz9sD6 for ; Thu, 24 Nov 2016 18:56:54 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id B8EC0B385F; Thu, 24 Nov 2016 08:56:23 +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 isqSRLzsSWpV; Thu, 24 Nov 2016 08:56:23 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 3CB8CB3842; Thu, 24 Nov 2016 08:56:04 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 85B3CA75F6 for ; Thu, 24 Nov 2016 08:55:56 +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 G52YdeWZ_g78 for ; Thu, 24 Nov 2016 08:55:56 +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 NAM01-BY2-obe.outbound.protection.outlook.com (mail-by2nam01on0074.outbound.protection.outlook.com [104.47.34.74]) by theia.denx.de (Postfix) with ESMTPS id 17AF4A7550 for ; Thu, 24 Nov 2016 08:55:49 +0100 (CET) Received: from DM2PR03CA0002.namprd03.prod.outlook.com (10.141.96.12) by DM2PR0301MB0752.namprd03.prod.outlook.com (10.160.97.148) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.734.8; Thu, 24 Nov 2016 07:55:45 +0000 Received: from BL2FFO11FD042.protection.gbl (2a01:111:f400:7c09::172) by DM2PR03CA0002.outlook.office365.com (2a01:111:e400:2428::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.734.8 via Frontend Transport; Thu, 24 Nov 2016 07:55:45 +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=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.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 BL2FFO11FD042.mail.protection.outlook.com (10.173.161.138) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.1.734.4 via Frontend Transport; Thu, 24 Nov 2016 07:55:44 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:; UpperCasedChecksum:; SizeAsReceived:1190; Count:10 Received: from oslab-l16.am.freescale.net ([10.213.168.82]) by az84smr01.freescale.net (8.14.3/8.14.0) with ESMTP id uAO7tR2o012503; Thu, 24 Nov 2016 00:55:42 -0700 From: York Sun To: Date: Wed, 23 Nov 2016 23:53:50 -0800 Message-ID: <1479974118-2912-9-git-send-email-york.sun@nxp.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1479974118-2912-2-git-send-email-york.sun@nxp.com> References: <1479974118-2912-2-git-send-email-york.sun@nxp.com> X-IncomingHeaderCount: 10 X-EOPAttributedMessage: 0 X-Matching-Connectors: 131244477447607767; (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)(1109001)(1110001)(339900001)(336004)(199003)(189002)(39410400001)(104016004)(626004)(47776003)(77096005)(36756003)(2950100002)(68736007)(107886002)(86362001)(105606002)(5003940100001)(4001430100002)(76176999)(2351001)(50986999)(6916009)(97736004)(5660300001)(110136003)(189998001)(38730400001)(106466001)(92566002)(69596002)(305945005)(81156014)(6666003)(50226002)(81166006)(8936002)(2906002)(356003)(4326007)(85426001)(7416002)(7846002)(33646002)(8676002)(8666005)(39060400001)(48376002)(50466002)(39390400001)(39400400001)(39380400001)(7059030); DIR:OUT; SFP:1101; SCL:1; SRVR:DM2PR0301MB0752; H:az84smr01.freescale.net; FPR:; SPF:Fail; PTR:InfoDomainNonexistent; A:1; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BL2FFO11FD042; 1:APfdZXQj+nNr6X8l24LRLhokCJF/iGTN6HAwEdimjOCReyzd6kr+9M/eIuzKIu+NpHI3qciknyv6Mf1mbPMh3Zm39EmKmaciCSiMeV1PpHKvyIjcOt5yaYyps9p5PStVrhahiB6wo6tiD8afLMYHV9hAvhNsCA+jmpLfCCcHq6+M81CoRfWWbAapi6G2dH62q9R2n04Ua/oSIsodzoFdhj1Ts122FnDBHhyKW0GMo1Lrm1wO8dQ3djtzeBorcV2sns9L+Yel0tkWnIIgkPAXCJ9DNi+LX7zMQHPDeUw9yFPqN7x2v+hhfxF7ZVCY0yqydraZrNivOU8+zdBOQbRdmsCBny0eWSHhf9DtjI7CQsIkI5K292B8hN1aeFJ0T1L/h3QlwV+HsPseTV3mrcNilmbBcT9G9m/ZOs4475opWRULo6jH76xP5olkX/wQNhx69rnvT40SZTxaWvbDjHWDYmSWhbzSaEgGmFsOkE45+y9sjt1Rtoaex5X2Jbcf5QM46wfBSFIhvxXw3IjSUL/ZHAECX6HtOnTfdnaiFqsb19K775y+c2+ezyXPOYUusNcZ5DdyKwKveo70ur2CWLlIEeZcEZJuTkmdWSiKEvcayd12BMnBu7LRlWe1iDRgfnmfeeFKIKFQokX+yeSS2Pc1460wZjClpIwqqS/fTm5AmPas6JTioZyH0Paw0s5MGkmdy+EOFSzUAWk3BunoHbWiK4jS0Qhox7eHl9ps+InNDW8= MIME-Version: 1.0 X-Microsoft-Exchange-Diagnostics: 1; DM2PR0301MB0752; 2:mxV+eUUsK6zmm/K6p6vamY7dzPnG1Yhq4IAvWIgTEyR7KkWq2LySRjq6lyU6PHxUui80iMvfstYWSt5/usdfQVCJTCn3rWZLzhegvy5Xx+pa0v5TJgNJYsvfefsaVJz3aXcAdOT1IK0Uid8+L6lb7XmaGc4k/PNasLx/VnqWRig=; 3:EOANHPfs9TUQPAPleAMpVDlHhDUbGBbxZb3SQ3Ume/u5Sum7d4m7D+tXpG+DX0zDuB2vahuFOZpI/Im+ArlfcsR5t486NJEkhXPF2rRvdtaskeRzygL4kOntMVJM1VC1dQxrB4g3oDPSYL07/t2o8UPHEDP1oAF7vTkPIBaLS790c9HQ82YTIIEaAsDOKevWaPbL7spNotaVAGSGx0gSMEsAog5vWtDbOXPYfxpKX5Neek1HkbhYe9waTupyCoDuzUT57qpmEelkdw4H0XThoQ== X-MS-Office365-Filtering-Correlation-Id: 9e0c2ca5-d11a-4578-b476-08d4143f4b73 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001); SRVR:DM2PR0301MB0752; X-Microsoft-Exchange-Diagnostics: 1; DM2PR0301MB0752; 25:pYnFuAqDDoP16Jo00IeL3Im5CSMcJib3klt9VLii3vK2nCmPbuRStc77xWmePboNXrdJX0wR+J9GNzBJU5OJVy/e+igp5XhAUoLMpL1ypqWnQG8Fei8seXV/V9THYuptm0E6Y7jGPnO+K35KpbxBSQ5nvqunan59/GXRATUlV+RxI/H19awB+/tiYdhtqRNVQw0RZ8NkrWp2aAgLIisf1XQDscL7ZlKmPsPwJh+QGRKiyxlmZ5+6Lhr3bwm8uGij57ZrKgNsgSI6dLa2ooMxUBabluWYJ6341TF1jc+RTcX9M+paqtfQn0emOyYBlC7tG5DUM6Qy0hMahc1IaFJpqFEvjsCKxHydRbfmkkCDlnXe2NG6o+ZD2MY4u/AaxsS1MZQhSF5d5d2GiQ++UUIc18dhvuVFA5OWf+b/Q+XEsA/ulAaUgaBOLRoRk4IqUBDBzaZA58ROWfeW9vUWvRoWGy/h4tusRZukIHrTiCVr6RYphsfq0roK2CO3X2G7+8dqyZzfsZEkZvAJMrdhqQwO3h1ZJVdozevl3NubRfAsbLQvkqNrrbn3e2T1BRx014hPk/Jc9unbCMFC13TTPhnbce1RKm46WT0RKLvr3cxBB0dgWqYtZzWP8y3bw9ReHyLOVn6aGObDxaN654pLIm26HBCQU+U8olQxefE+r1Ms5vBrY6m4mGG9Y7elTKL9IevA7hm8Bl3fTvQtY1XjUqBKPfBB/SInzCGUpFrYO3OgbcpkGm+3Le2XKh2v3oX31c6n29FoduSYziJshWkhEJ3AMA== X-Microsoft-Exchange-Diagnostics: 1; DM2PR0301MB0752; 31:T+VygX3o/5GOJ8U0L1Fbt0CkcdWIGZgsc5//STdcPeuqGGI6pHp4b485Bm6IIaftaOZmAqOIIMeCKrp3tPrzLqtv+d9t6kZbeQbKU8de2M0G/xDeLsKGsrwXKCrCSeT/fS8C/JhvFEdBfbdCPo4UKf8hwvj7xTz7cexnPnpu2NGepa3i8cht225MpzCinACR6DGuqOB/QQEZDPevQolx2TWI1XYQ53/rN9OhQOm85gF96skJpiIVfAWD/cg/AnYqWBICxDVif072d3uLA7uphdo7atZWG0RoFkKQHd9WoJA= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(185117386973197)(788757137089); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6095060)(601004)(2401047)(8121501046)(13017025)(13018025)(13023025)(5005006)(13024025)(13015025)(3002001)(10201501046)(6055026)(6096035)(20161123556025)(20161123561025)(20161123565025)(20161123559025)(20161123563025); SRVR:DM2PR0301MB0752; BCL:0; PCL:0; RULEID:(400006); SRVR:DM2PR0301MB0752; X-Microsoft-Exchange-Diagnostics: 1; DM2PR0301MB0752; 4:QLWXFUo01c1I5Q+yIXAab6GVOVeSnAmgMNWLgGAk7qsVJDohSG5ERhGpMSHMJ8IjlCLVzr995bqlsjJzRiIZACz6XLtdUGvhSYDkyg7O0F5zjaoPUvjtdpnHAIlLfh6XlG3Ru7VZ3GZNZ6DxMGF2bFmUx12nXhws3YgRJpRUNL2jGI4/YjhoxlOszEZVDOx5BJ2fFdXMLRA5/ne6aQ16rfrOL/Zr3mcwSKpyJuNqaQgb2P1oYREsSv5xbMBSeD5F2yZtUl0//fpuRWp5XSQGnmeDwPovNNVKQ0cWfrG7Llm0XBzaoFWa54NU4400Ztt6vgAFPt8T0OS1L0OcSfbLoMu7fGuSjo3UXtYft61nV4kIWeYnCCDDCF/HBHwNasAyyiVWuG6do/pNr5w+xikwRcRab5YYs/kv7ZlEr0Him/Gn6C16KsdHio4+i0EZeFSGL2Pio7frBMKGTbKEOb2IPExeC4izH7qEVVkgL5tURpaclgze3m7h/4W0VsoHMLDykCLC8kBpDxJwFyC6le/S6OAB2Tl6RxOi3ex54X6iGJ9PylnuzUEaw7b8ZzJsZ8kZ613xzoOeEQFE5pu5Nps816BnZDBqisft7qs9bRMI2TxT4IQ6cZ3Xg29YXEky+XYc+ZAY4gIBQAurmU+dWfAbt0bYtqafjH3wPXuK6B7k6MTE0DijkTPDEMsvqh6lXGT/BJ5qocQ4TrPFdaXG7C9l2jQmvbn7kgFKSWZz49SLyACsufGURl1T9dv3WTqDXjMuqm1nnk7DTGIlWKeGbOMDNA== X-Forefront-PRVS: 0136C1DDA4 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; DM2PR0301MB0752; 23:QaEpDig9Ixxbnm1h6rN2UobzpLU5koPrL3iUD6y?= =?us-ascii?Q?sRLhUJEVBTJbjdQanCq13u//uuhvbKdhfG4+sIUzj+b1txIRJvsvLlI/AIeh?= =?us-ascii?Q?6YzXo9Sl/R7Jp6P5uVkyhkUHIxL2+B6N9bXUcm04o+mdHA9e+MomQ9ZNl+8s?= =?us-ascii?Q?iK9M/YgWHMhxiv0nmTEJqeTjOoNdVFiIt6OwGEKtm70Lb0ifjheGyo0b695K?= =?us-ascii?Q?3sNQkebk/jBSWOTf998AJzm9XPrWpwgwq/XhuutYLzCbnXChzANqWhbDDYuA?= =?us-ascii?Q?D0g7ZQQpJpLitftYmM7A62EohQ8TNgn7oaR16QJ9hDzmKJRPyF9Z2h4ZQkbD?= =?us-ascii?Q?rfvQsqEYLIEQITzUL5HPoYHmndvBA++VxMU0W4xf1HPnJYXD/5+FQulv+5VN?= =?us-ascii?Q?CPTiQXmL/zZL+mWI9o+Ed6v5M+6cLva3JupAuaHnt3WskbZZ4bvaIGI1ZlTW?= =?us-ascii?Q?jh7a7IHiCfeMH3Wt0eKpbNeU0jFJJzr6odqK2nPgCJ8N1sudBf6kN2d2Y4lG?= =?us-ascii?Q?WAgPaNWZuWpxs1Gs3kW8srYSXGo5KT0bXvB5deCJk/p6OFRWBV00cQMxEDnY?= =?us-ascii?Q?7hEbEkQ/dwWIVoFbOYrZRxyBR+FZV/x2ZV5EhjQrdAM0iHLL6r5BBeczh63o?= =?us-ascii?Q?gylh/knrRvyIxorOVim+l7UC3OaCmI8hKpILuttLUCcoKXRTlT4zg4PrglPH?= =?us-ascii?Q?WaGUfSxdj1/WdluytDU0IGTdOaHbbMCqIGcBF0AQOkxy22GgJIegrPrnGcki?= =?us-ascii?Q?L6XpflAv6gqMeQ7p+nj3pKXtxwS91o+bMRfCPgRIRI+1doUISr0tYaONOOWI?= =?us-ascii?Q?r7oGT202KoqTXwZVBpGYpdh8RPJ1iaGfG0de8sgrKuWJTurmH/doyfP9vx3i?= =?us-ascii?Q?rHHRgE3EbsH+YVe6rI/VgLOh8YHBelIJsCh4kVIeJkbxx/CN/bNvTIfYUO78?= =?us-ascii?Q?sUEFUCXczDnp3t3FImk+uGrcarCw3VeIN0UvUkLuuRyRH1Kboe/1yK3BWnH+?= =?us-ascii?Q?83q8E7SPgA+eDmNFPwoJiURSrQ5mm6wDxMHtgtn6RP/+zN8VhgTQdcIfS0zI?= =?us-ascii?Q?guliDiYHm+Kf7xjN8BJCOimAfmEWgwZuVg6HD4K2E/Ikzm12YKW8IdyQ087a?= =?us-ascii?Q?wkcVoLwxsNCcgxNHAm4guMyk1VS7zm22TQgkzLeH7C+nitQyJU77zniUNtZ2?= =?us-ascii?Q?NU/zcph1rvhRMCw4o4B/mmi4p/bvbYhTd33qCvk1NvmQWSS+R0SwsZ9vTQtP?= =?us-ascii?Q?eUBr6X9ox0cywdkdU3tnkvGqgw7Xa4gjkdfroOAKyZDfPAYKDr/BrBdgL8he?= =?us-ascii?Q?kWcAjEJjMfz8s4vy65WbPzoVfNKJhFMEG9uI5wOOYJjWm?= X-Microsoft-Exchange-Diagnostics: 1; DM2PR0301MB0752; 6:YlEDe1pHnrTckqiYlezMDcU/5f5Urf6vmUWY9jKNKakLZXBxwt0bdG/9kTEJBo1SaKBf01OId6Q5+WSKzqhgwfPYkqJBxtnFkxvkR0/sKKMqcFvXLhUMpKYZWqbdjtijX08aDhtBakjx7UxsQPscBlzkmzN6SsMka4BdCR6OCYKkC4dknemhhEii+v5m4w+7nSw+Sw6xVr1N+kaH4YztYGEKjl9CNINjoLD2brBPzD63q2DTqvxmMnoGDVp+3upaBfW53o8d36ZTiV/sZjYQySDqgqrozaweapjLbvSPfewh/Jw+GBQYyj40kMRbUKtBE/4vsZFnwGjALprreOhylw==; 5:d0Cbx2caCjzhD4LqDN6YI+jZ7PNH4AfZoIoKmytfkFHFU7mREHvR+150IorXsah8rdOjJET00qYn1jG5pbR6xnTVnUXmuGesyzjOVf1HvyELe5LWoAmxQsHGxum/6VjqnH1IkEXMJa2CCL+76D1zGsTzSE1HB3vM7FaD4hjJrGwQPVcqZY8sMRpAKHiUlRjJ; 24:BHqiUkjRPCOFoVg3TmTq+ZHqyiCJCPe7DSRAp6FvTZThWRa0Qmhdc0+Rie03+2ifmuCBWjfe3Z5L3sbPdsPoRVtS2m0FCFq4ZWU1/9BAnUY= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; DM2PR0301MB0752; 7:IsHowZpzGb97628puxf46y4cdsCxWzjHKjTvwprzS3cBGorz4qe8pr9NXPDeRHl1Mykt6TSeHURBQLYTpyGzqR4gg2egq0UmVD0ps7MBx94gQ4f4Y+YJ0NruQy23mj/kDGS9ZqUaT2EFZTSB0OInhtZWIhvR4o4G/w7nah6towYkJV+YrBwIinx+enCVE4eXo9SktQ5X5RFTuYQklchWyioadcAhhZYl1eub5EPY6Y7mb6jmZmMsfNVsDUh3S+PZ8CcAaDELaN5jPMYjDybeGq8+x4w1s/STQG8Ow16NYI6cSJluCBHXAwz7Ci2z7oNyKi/QQjQR+ydCaMyEUArXqddQBQvOY514ElXONu2KrRw= X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Nov 2016 07:55:44.4019 (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: DM2PR0301MB0752 Cc: Stefan Roese , Ulises Cardenas , Kumar Gala , Aneesh Bansal , Jagan Teki , Saksham Jain , Andy Fleming , Ruchika Gupta Subject: [U-Boot] [PATCH 09/97] powerpc: C29X: Move CONFIG_PPC_C29X to Kconfig option 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" Replace CONFIG_PPC_C29X with ARCH_C29X in Kconfig and clean up existing macros. Signed-off-by: York Sun --- arch/powerpc/cpu/mpc85xx/Kconfig | 4 ++++ arch/powerpc/cpu/mpc85xx/Makefile | 2 +- arch/powerpc/cpu/mpc85xx/cpu_init.c | 2 +- arch/powerpc/include/asm/config_mpc85xx.h | 4 ++-- arch/powerpc/include/asm/immap_85xx.h | 10 +++++----- drivers/crypto/fsl/jr.c | 2 +- include/configs/C29XPCIE.h | 4 ---- include/fsl_sec.h | 2 +- scripts/config_whitelist.txt | 1 - 9 files changed, 15 insertions(+), 16 deletions(-) diff --git a/arch/powerpc/cpu/mpc85xx/Kconfig b/arch/powerpc/cpu/mpc85xx/Kconfig index 4fd2ea6..640c846 100644 --- a/arch/powerpc/cpu/mpc85xx/Kconfig +++ b/arch/powerpc/cpu/mpc85xx/Kconfig @@ -33,6 +33,7 @@ config TARGET_BSC9132QDS config TARGET_C29XPCIE bool "Support C29XPCIE" + select ARCH_C29X select SUPPORT_SPL select SUPPORT_TPL select PHYS_64BIT @@ -185,6 +186,9 @@ config ARCH_BSC9131 config ARCH_BSC9132 bool +config ARCH_C29X + bool + config ARCH_MPC8544 bool diff --git a/arch/powerpc/cpu/mpc85xx/Makefile b/arch/powerpc/cpu/mpc85xx/Makefile index e545112..bfff58e 100644 --- a/arch/powerpc/cpu/mpc85xx/Makefile +++ b/arch/powerpc/cpu/mpc85xx/Makefile @@ -65,7 +65,7 @@ obj-$(CONFIG_SYS_FSL_QORIQ_CHASSIS1) += fsl_corenet_serdes.o obj-$(CONFIG_SYS_FSL_QORIQ_CHASSIS2) += fsl_corenet2_serdes.o # SoC specific SERDES support -obj-$(CONFIG_PPC_C29X) += c29x_serdes.o +obj-$(CONFIG_ARCH_C29X) += c29x_serdes.o obj-$(CONFIG_MPC8536) += mpc8536_serdes.o obj-$(CONFIG_ARCH_MPC8544) += mpc8544_serdes.o obj-$(CONFIG_ARCH_MPC8548) += mpc8548_serdes.o diff --git a/arch/powerpc/cpu/mpc85xx/cpu_init.c b/arch/powerpc/cpu/mpc85xx/cpu_init.c index dfea750..c2402a8 100644 --- a/arch/powerpc/cpu/mpc85xx/cpu_init.c +++ b/arch/powerpc/cpu/mpc85xx/cpu_init.c @@ -959,7 +959,7 @@ int cpu_init_r(void) #ifdef CONFIG_FSL_CAAM sec_init(); -#if defined(CONFIG_PPC_C29X) +#if defined(CONFIG_ARCH_C29X) if ((SVR_SOC_VER(svr) == SVR_C292) || (SVR_SOC_VER(svr) == SVR_C293)) sec_init_idx(1); diff --git a/arch/powerpc/include/asm/config_mpc85xx.h b/arch/powerpc/include/asm/config_mpc85xx.h index 80b3b74..77e3f83 100644 --- a/arch/powerpc/include/asm/config_mpc85xx.h +++ b/arch/powerpc/include/asm/config_mpc85xx.h @@ -914,7 +914,7 @@ defined(CONFIG_PPC_T1014) || defined(CONFIG_PPC_T1013) #define CONFIG_SYS_FSL_SFP_VER_3_0 -#elif defined(CONFIG_PPC_C29X) +#elif defined(CONFIG_ARCH_C29X) #define CONFIG_MAX_CPUS 1 #define CONFIG_FSL_SDHC_V2_3 #define CONFIG_SYS_FSL_NUM_LAWS 12 @@ -955,7 +955,7 @@ defined(CONFIG_PPC_T1014) || defined(CONFIG_PPC_T1013) #define CONFIG_SYS_FSL_DDRC_GEN3 #endif -#if !defined(CONFIG_PPC_C29X) +#if !defined(CONFIG_ARCH_C29X) #define CONFIG_SYS_FSL_MAX_NUM_OF_SEC 1 #endif diff --git a/arch/powerpc/include/asm/immap_85xx.h b/arch/powerpc/include/asm/immap_85xx.h index 74c2959..cef9da0 100644 --- a/arch/powerpc/include/asm/immap_85xx.h +++ b/arch/powerpc/include/asm/immap_85xx.h @@ -2123,7 +2123,7 @@ typedef struct ccsr_gur { #ifdef CONFIG_MPC8536 #define MPC85xx_PORPLLSR_DDR_RATIO 0x3e000000 #define MPC85xx_PORPLLSR_DDR_RATIO_SHIFT 25 -#elif defined(CONFIG_PPC_C29X) +#elif defined(CONFIG_ARCH_C29X) #define MPC85xx_PORPLLSR_DDR_RATIO 0x00003f00 #define MPC85xx_PORPLLSR_DDR_RATIO_SHIFT (9 - ((gur->pordevsr2 \ & MPC85xx_PORDEVSR2_DDR_SPD_0) \ @@ -2175,7 +2175,7 @@ typedef struct ccsr_gur { #elif defined(CONFIG_ARCH_BSC9132) #define MPC85xx_PORDEVSR_IO_SEL 0x00FE0000 #define MPC85xx_PORDEVSR_IO_SEL_SHIFT 17 -#elif defined(CONFIG_PPC_C29X) +#elif defined(CONFIG_ARCH_C29X) #define MPC85xx_PORDEVSR_IO_SEL 0x00e00000 #define MPC85xx_PORDEVSR_IO_SEL_SHIFT 21 #else @@ -2193,7 +2193,7 @@ typedef struct ccsr_gur { #define MPC85xx_PORDEVSR_RIO_DEV_ID 0x00000007 u32 pordbgmsr; /* POR debug mode status */ u32 pordevsr2; /* POR I/O device status 2 */ -#if defined(CONFIG_PPC_C29X) +#if defined(CONFIG_ARCH_C29X) #define MPC85xx_PORDEVSR2_DDR_SPD_0 0x00000008 #define MPC85xx_PORDEVSR2_DDR_SPD_0_SHIFT 3 #endif @@ -2344,7 +2344,7 @@ typedef struct ccsr_gur { #define MPC85xx_PMUXCR0_SIM_SEL_MASK 0x0003b000 #define MPC85xx_PMUXCR0_SIM_SEL 0x00014000 #endif -#if defined(CONFIG_PPC_C29X) +#if defined(CONFIG_ARCH_C29X) #define MPC85xx_PMUXCR_SPI_MASK 0x00000300 #define MPC85xx_PMUXCR_SPI 0x00000000 #define MPC85xx_PMUXCR_SPI_GPIO 0x00000100 @@ -2964,7 +2964,7 @@ struct ccsr_pman { #endif #define CONFIG_SYS_MDIO1_OFFSET 0x24000 #define CONFIG_SYS_MPC85xx_ESDHC_OFFSET 0x2e000 -#if defined(CONFIG_PPC_C29X) +#if defined(CONFIG_ARCH_C29X) #define CONFIG_SYS_FSL_SEC_OFFSET 0x80000 #define CONFIG_SYS_FSL_JR0_OFFSET 0x81000 #else diff --git a/drivers/crypto/fsl/jr.c b/drivers/crypto/fsl/jr.c index 4a8cc32..1b88229 100644 --- a/drivers/crypto/fsl/jr.c +++ b/drivers/crypto/fsl/jr.c @@ -21,7 +21,7 @@ uint32_t sec_offset[CONFIG_SYS_FSL_MAX_NUM_OF_SEC] = { 0, -#if defined(CONFIG_PPC_C29X) +#if defined(CONFIG_ARCH_C29X) CONFIG_SYS_FSL_SEC_IDX_OFFSET, 2 * CONFIG_SYS_FSL_SEC_IDX_OFFSET #endif diff --git a/include/configs/C29XPCIE.h b/include/configs/C29XPCIE.h index 41dde82..39eefb4 100644 --- a/include/configs/C29XPCIE.h +++ b/include/configs/C29XPCIE.h @@ -11,10 +11,6 @@ #ifndef __CONFIG_H #define __CONFIG_H -#ifdef CONFIG_C29XPCIE -#define CONFIG_PPC_C29X -#endif - #ifdef CONFIG_SPIFLASH #define CONFIG_RAMBOOT_SPIFLASH #define CONFIG_SYS_TEXT_BASE 0x11000000 diff --git a/include/fsl_sec.h b/include/fsl_sec.h index bffabc8..e6080d4 100644 --- a/include/fsl_sec.h +++ b/include/fsl_sec.h @@ -303,7 +303,7 @@ struct sg_entry { */ int blob_dek(const u8 *src, u8 *dst, u8 len); -#if defined(CONFIG_PPC_C29X) +#if defined(CONFIG_ARCH_C29X) int sec_init_idx(uint8_t); #endif int sec_init(void); diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 1276b45..ad34de4 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -3682,7 +3682,6 @@ CONFIG_PPC4xx_EMAC CONFIG_PPC64BRIDGE CONFIG_PPC_B4420 CONFIG_PPC_B4860 -CONFIG_PPC_C29X CONFIG_PPC_CLUSTER_START CONFIG_PPC_P2041 CONFIG_PPC_P3041