From patchwork Thu Nov 24 07:54:04 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: York Sun X-Patchwork-Id: 698671 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 3tPWmR0HbJz9t0w for ; Thu, 24 Nov 2016 18:58:31 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 588E3B38D7; Thu, 24 Nov 2016 08:57:08 +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 YWDpQhWLzvzt; Thu, 24 Nov 2016 08:57:08 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 175DCB384D; Thu, 24 Nov 2016 08:56:45 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 3A91CB386F for ; Thu, 24 Nov 2016 08:56:41 +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 NJVCIp9XS4Cj for ; Thu, 24 Nov 2016 08:56:41 +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 NAM03-CO1-obe.outbound.protection.outlook.com (mail-co1nam03on0047.outbound.protection.outlook.com [104.47.40.47]) by theia.denx.de (Postfix) with ESMTPS id D0081B3871 for ; Thu, 24 Nov 2016 08:56:07 +0100 (CET) Received: from BN6PR03CA0043.namprd03.prod.outlook.com (10.175.124.29) by DM5PR03MB2475.namprd03.prod.outlook.com (10.168.233.21) 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:56:04 +0000 Received: from BN1AFFO11FD046.protection.gbl (2a01:111:f400:7c10::138) by BN6PR03CA0043.outlook.office365.com (2603:10b6:404:10c::29) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.747.10 via Frontend Transport; Thu, 24 Nov 2016 07:56:03 +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 BN1AFFO11FD046.mail.protection.outlook.com (10.58.53.61) 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:56:03 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:; UpperCasedChecksum:; SizeAsReceived:1139; 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 uAO7tR34012503; Thu, 24 Nov 2016 00:56:01 -0700 From: York Sun To: Date: Wed, 23 Nov 2016 23:54:04 -0800 Message-ID: <1479974118-2912-23-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: 131244477641284560; (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)(336004)(339900001)(199003)(189002)(7846002)(39410400001)(2351001)(76176999)(77096005)(8666005)(189998001)(97736004)(47776003)(50986999)(106466001)(305945005)(107886002)(69596002)(92566002)(50466002)(105606002)(36756003)(48376002)(33646002)(6916009)(2950100002)(5660300001)(8676002)(356003)(110136003)(4326007)(7416002)(626004)(2906002)(86362001)(4001430100002)(104016004)(5003940100001)(8936002)(39060400001)(68736007)(38730400001)(85426001)(81166006)(50226002)(81156014)(39390400001)(39400400001)(39380400001)(7059030); DIR:OUT; SFP:1101; SCL:1; SRVR:DM5PR03MB2475; H:az84smr01.freescale.net; FPR:; SPF:Fail; PTR:InfoDomainNonexistent; A:1; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BN1AFFO11FD046; 1:kPqgA8SbknsAa2/O30YiZaLz+6dhSSuchLDriZ6dyQSjigNiiXj+URnSJKdFpGP6DKv4PmcY9sYWl/hXRvRsuqu56ckLn3qOae8D1luX7O89Cjji6uLTQfbAELN87BSKTF+/kqKgRQE6IE0zrXfN1I8qCHjZDZPZViaucwaWUE+NyMV7cvzXT2gnTgaRTFd4fbHbfL/7obHhfUbcRjUEmzq0yVhwjtT6dG/T6eDZkGkufEyytKCJ7zmH8nR+3nsr7nOuX8NhPE+SSKpGxvjQ+5J2DwIX9WLTw1c9dmaLug40/a3lBTYNKb7rvfEaOfAh9HKNQEAb5KfoqzDMibFLYHQVnjQXt9YpNKfkCKvsCAm0xpgTjEYiWdJ+8opjpMiT7cpX3QVBaWuZH6fjAdCZPxiwQn1l5HgwN/N56jA1sK4Jwn8HY48QySgW8bNgKExCU331wyfn+fDzRP6nY49DBFHZXSnwRAAIx1N3Lm/zdOCJ8HKNBYIHPvkyfjB72Rn+t3XaaZLb6gYNTzXchKuvMAf9A55s3cL968lV92sB9WVaUq1f8qp6wiVV8jM42x/XK+RUsjKVcOq5fhO9izrpLfO4I319WZD7z/kt9wzRBpkGzXOUQUH1OhPKcU3eOpp/wEELTmgKHqiGHIe8QsJoIgOMg+v3CTeXj6aFerXS8EOvc12aQ14OHYK3vDTryPp4ehPf8qCle7931F5C/KirkgXxUQ+6wcQXHMeQ+BFBLBQ= MIME-Version: 1.0 X-Microsoft-Exchange-Diagnostics: 1; DM5PR03MB2475; 2:/+iv/QQroACmFM/sbAA4yOqesKjUTbFvIXOTpMaUk1xgx2xhzRel4runSoQeTtuKeMSlBitwevZt7FodaWvrRtHpuH+/TjZOWjwZS9RQ0SCXChkMspHg1s3dTiW84oGnjgADYQ0iPJojbT80X5OsXveSYmF9bmg+p1dlqkckQow=; 3:sFz3U2ju8wc3re3C6C93qNGmxFh+bX2HarB/90z2e94MUxfv+KuVERqNke08t3Z6qny7T6vIYAc4sc1AvPiMpZKksbX4we6kRAH7vvU/sOnnewybUQX2hxdlphKgCOb/iaTMI/htY+H6UxQEsSWm6hSewNN/Ro46WxW3AB6FWlWUekL6Xfne64BErTl92iciuqWuR1uaIIsMgfbV4b5uz2hThLIperLBciWv2HIM0Bcfcuj0rnJVL/HyiJh2NPFAN2YP8ofJvoqx5U25uB33/Q== X-MS-Office365-Filtering-Correlation-Id: e146692a-9f3c-4a73-fa72-08d4143f56fe X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001); SRVR:DM5PR03MB2475; X-Microsoft-Exchange-Diagnostics: 1; DM5PR03MB2475; 25:AaFvB2O/t8D5H9DjkHrQKNYVLE0k+hiVw1JhPGGf3vZ+HREQpB02e876rKTPexp/3kfd78NIjsiwzsJasxKIn6W4NIwt4N39eReux+DKZUoWJ7g0b9IR8Q5GJH3rZ4l+DEv81GjbAn2ubh+4BbnPfdDyTKogrAaHjgmBqig0hGHq8FAcGhjl0S+HhZIbQo0ZDECtAJR6MAsYN1c6pZlem982jdQYdKPjvqDvYRQ9ZGe+qB2y8CUTOZodnusJ/v4qxCpiKnmGCkucg3qcsHJ30ucquabFd+ryhqVl4V703HppP9SAA6W7rKNoJ3cYP4EqIWOBrxRdQxJKvXTbLppLzL8ZhJzdCjHx/mkbuAbcaqyNllVUX8LmRnxhwi0hXFT5FWoAizCr/fx6Wwp+7CFVKrcodWe9ufUPJBNjJ8tc25AW8HtlC3SHbh+wBklxUpbCgNkgVQjI5syMOxhc8IIG0K2pzHFaxFHmTyB1i560qCgOK/s0ZB504moRFuwRooATfru6uBPCAY59FhZSxmwN/rfZa+etjEFBmdrGFEBU2sDJ2JkQMf061H4x4yoy9TCzq/rzFP/H7C8a9oajRTZzx35OdyFYRgQ6aC3o+2hMv3SuoV2hCSnpi1nHPkeixWYvTx+4K+Bk975j6EpHhPo1Ts+fW3Ywsdmjwg/STifT7aUz9lSMMXAtqAD/x9Qtk978XpXV2U68TMTSIOryNaaeGTd5ZKKMpLl1FDzUF+ibG7tTYOtOQ72+HHzbv+P895+bz8/riJlPZyQSPyOjHc7/uQ== X-Microsoft-Exchange-Diagnostics: 1; DM5PR03MB2475; 31:0L5gXQ4eSNWvPMAONvGgO5Qd0i/aTXti3MtyzCCEpj9g+77aAKJTzljmzZxcLo82ZK78H9nHRygEDMhxH1GAt7UBJb11XAvYclECDbGUPsnrZi+Q7vqcB7PItZkUN7WR7TBPs7o5cXdk2MOAgasBYNBA1qLoAqmV3DAPuj1FHPEApRtJdxJfVKWDzo1p+2GUt1J16KPq8BXdNOBDa48hggG5oszZwhCjrSqFL65VO9pqekBAbUYcWo9Ym+KispkUxZogc+VZK0YZeq4PPjDWwqkGMTmhX4XS1N553eFjA/w= 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)(13024025)(13017025)(5005006)(13023025)(13018025)(13015025)(10201501046)(3002001)(6055026)(6096035)(20161123556025)(20161123561025)(20161123565025)(20161123559025)(20161123563025); SRVR:DM5PR03MB2475; BCL:0; PCL:0; RULEID:(400006); SRVR:DM5PR03MB2475; X-Microsoft-Exchange-Diagnostics: 1; DM5PR03MB2475; 4:qjfTnmC1TgbQWbjHUo4b+OtpQ9S/SO3C3qlF1pF6NnSAz88BWjFyGCzCQQsOwmKi2WaMC8LikmxVDBFElo1oVSpGmRScFo7/bxqtfBdjsx8RJ43OrOErekHTwAvfGzfEFD+OPhH3maFV0cznlXmeqym2hAdBbe7vEHLlDiholxz7LAeVugSD5liHBi66ZfsBVm0DxjZIhsiQIiZMpv5Zqhb8S1EILCkCVDARLFp4MXYNdQZft7mFzVBzeXWQ+2bcbQfr5+eg4qvknjIyMWXLJpSHZaIXgDQVeNL/gJcZrAsNh6rqyZEei77w/j+XIRJEKFzAPYXGzvYEkSEymIxSf/Pjug+40Cx7eUD6R61Vy0UPaC1rOcF3wY2/oU+WBx7OHfCuX0B4oxrKXLK3BRnhnUcIkygijpJTWlr4SvJyRLbaa0O04cVgRCQhixgHmYEnM6v5CBqXYnOWKsMuPdHX1kojDN3Km7mgWztC0yqnQ2hhyvqBk07kIK4lZedHFFUdccnXWPbKP4ciCgUvOiIpBAUGaBU58TBV97lwuzb2eaDLYTnauonCvdKA3Z9cwzHPsgKqmL18QDPaS1ZlYNyl7uTcC+QITzKD2by09ZZDICsrtHNwrCdSWMEoo87edfh0Vsfza8zffOooeZbNsNU2P9u+SQVXmnj8orJAWT3MlzRNMBnwSokuncO3ExtTl0O+pu+o2wTyR0Tj5gSiJk7KjSd14mqR4h+jTiK2pnhLWBlbEfMMpH55Fqp9LrfflNe4zwuc2IgSsfiDVpyu6d/39A== X-Forefront-PRVS: 0136C1DDA4 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; DM5PR03MB2475; 23:GvxDFTzp9GHFi1a24MWqgnpmZYvr2Fv9vRupLuDBR?= =?us-ascii?Q?9kT40Kl6AMRwteavnhUhGf+BuSGL8UF6FIPt0b4k6KHAzufTHscDQmm7Ay12?= =?us-ascii?Q?TbKOQjcnF7tPhWl9ov7Ad3WIz/X4s9GGmF1CH+UgT6L87xdRV3OtVII90HKk?= =?us-ascii?Q?JNIbZ275sWjTKFrTADZvTChV0QMih3TEh9BAkAr2MG0h7l/Xup1AM9M6lA9O?= =?us-ascii?Q?mBD2R00YGa1T0JKq8jfOMmXXTH5ScYBkyqHFeIvwrk2JYc0YOlYy39cFuSHn?= =?us-ascii?Q?ZD4aaUSfczWqhmLbNYkuiXp5ijeo6t5Hv5LH9yrAgB+MKE/I021WjY6ScdiR?= =?us-ascii?Q?pvcNXwKjqa8yI1HqKFiO38nmau3sNlX4NYhTqFLH/QMZrPZMqamvsHBRy/rm?= =?us-ascii?Q?SFvG2tCdhaoYj4fTtgg6GOcHc0WuOlAlWUjDpsgx1CPM0lBR5CTw/I+UJen1?= =?us-ascii?Q?vayYy9BNVE5SfMW1g7o/ZEhE4xdOOsuKN/DT6VdBK9zQ40ibP/Eb2xSDzgEe?= =?us-ascii?Q?oPiin1VL5/V92AbKGybg3gH6VJxK6Eu2UsUST2atMvJKHv6ngowpoK8cklsq?= =?us-ascii?Q?2Iz8TG6PUPK7yOUcQUl2Rv68rVVt9S/qBEvPs1xe+JxLBJTcjCu2kJ6yGGMI?= =?us-ascii?Q?4IswWKYN3Sxl3aaLJtuVZpBJYJuNydadf6ldRGtu4NUN8lNuP6LzYrEig7Ib?= =?us-ascii?Q?Qi0mSN1Q+XbLmplDJMmWF5nIqJeTNaRt6zkNGPYVvYd0QayF95zs3An4V3aD?= =?us-ascii?Q?ZFHqDBbY8Uv9E4BPMJEn/ZrNWVA7Rqy0KcaNLQriQFepQ5whPJ3RqqDXefXI?= =?us-ascii?Q?KBP+TiovUcwBRLhmJ02LAauAYdXInAIUzY8LD21ajeTksP7dHQF7QEgn+Ayp?= =?us-ascii?Q?UwvBZEcLSAaoQDTcKdsAyqpOWPW8H2TDLj7xYQzujZUgqlex63cOrP8HdQC9?= =?us-ascii?Q?ZJP+S9rQXKr6Vhm/WTxEW7ubP1Qpgj6C8R9Jwl2J/YuGn2090S38a2x94pQG?= =?us-ascii?Q?ZL3kkd06IIdukwiFe7m51Zs3ciqDm0AuaTCUbsPeNylRY1Lizp95ClLoBZiV?= =?us-ascii?Q?LxByl2vaOdzeFYmH9JmXu+8mZBk5Eq2x4UCyQgA07vlAKGUteQEcatieU5Ct?= =?us-ascii?Q?rPr0qTxs5sVS+56NmojZnB569uH91YlegwIlwb7hwbSwuKCxo/HKnhSwPPvM?= =?us-ascii?Q?8p8vYgG5xbbwpulOso2IsYIfNmjsW1iUIbzvUljJyd7OzrWuMdf5x+U/BNWY?= =?us-ascii?Q?xCDIQeeR829pO/VwgJOU/ULzSNVb/MOJ4w42hvY+YPV+i/nQgaHL3fKW0dLx?= =?us-ascii?Q?Ylfd3ntqp1Bu5JMPMsatI2RBJD3BWqi4ZxKSkSP4dy1?= X-Microsoft-Exchange-Diagnostics: 1; DM5PR03MB2475; 6:a+tZoh3SOB7XgjCJF1PHyhYk6XNLMIjIiYHR74CXQ+S4DathLPIcyOtD1TpvXNoI1qEOAwDWsF4lnYx02TJQmCf3L/Es1e2Lq4pxLnDCi4KQG1izS/nUpeclSkDjO06vEdwh4A0MslN7+dZw89TjGYf0IGFAYuWy/g8SMQkhj3g/tElEz6DurRxhYlZ8R21KeYYDnFRC0yZsoLVTL7wjvsTVbl15KS2NN1Ht7BHHtWke/CYOYcO82cca2qthOqjAb59dyfHoFlIMVPEb9TxCp9J76WZymmPbfmg0PIxERqPvLc0Q+BxqQwI1ux4JBzAidnKEERnfk/1drzey7jxmww==; 5:7F140bAy2LnhzXbv/QgA7m7/rCXxC6p+pHgLg9P2XxBvVRaM8g5J1ny4lJ7iQ280TyzeEog8STxi0B6T3yGG1wnYTWVWNy5yPTr6e3X1Wah0/uaSYY0j6V56qLtTAQ+Ntc7sktdMFbyNALQT1fKBruLvHxG2Ir1usDZ0kSU6vB0sjqG4v6KiFHt/mLC2booR; 24:ZTxl6DzEkqPLFUaCMe10C2cMsSDgGhufw4+AMCCoCXQWW8EHm2zYoJ+lZpufIp6wqVIWdbjcB0rA9arB04KBWGGbdZ9aFdEMaek4gsJmSCg= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; DM5PR03MB2475; 7:wL8Ha4MH6DIu28r3q8yk1y0jKFSIk6NIJfa7TT9xSAu6UqRXe7msaKX2xNs2CFFhVbmYUQcE7ovyEHUt3YkaYywN/8Vr+x9qqzDseshT9XHg8mZQHnIX20QrtNg12D7r+W8GUf1XjoyrWe07j4SpcmefgGkG35CqQtmR4JEWZ0lBKQOt5wc9H+Q2f5MwvYnbqGRSr8xKH3zH4Tpmx7rFs+QUjjGJHN5pubDzsrMXgGk6M24Y1lVNX8dn9dZCtrqy58OsMnu+QcCnmbZ8IES1yOCmNc/AZV1W3Ct2IfTDg6GL63Ry6Ek4W1oq7oocWNkILm+aySrpspH6s6LxHQ3ktwhcB869ISBvdk/q8VjE+l0= X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Nov 2016 07:56:03.7696 (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: DM5PR03MB2475 Cc: Viresh Kumar , Kumar Gala , Aneesh Bansal , Stefan Roese , Jagan Teki , Andy Fleming Subject: [U-Boot] [PATCH 23/97] powerpc: MPC8569: Remove macro CONFIG_MPC8569 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_MPC8569 with ARCH_MPC8569 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/speed.c | 2 +- arch/powerpc/cpu/mpc85xx/start.S | 4 ++-- arch/powerpc/include/asm/config_mpc85xx.h | 2 +- arch/powerpc/include/asm/immap_85xx.h | 4 ++-- include/configs/MPC8569MDS.h | 1 - scripts/config_whitelist.txt | 1 - 8 files changed, 11 insertions(+), 9 deletions(-) diff --git a/arch/powerpc/cpu/mpc85xx/Kconfig b/arch/powerpc/cpu/mpc85xx/Kconfig index 9545793..b58ccee 100644 --- a/arch/powerpc/cpu/mpc85xx/Kconfig +++ b/arch/powerpc/cpu/mpc85xx/Kconfig @@ -88,6 +88,7 @@ config TARGET_MPC8568MDS config TARGET_MPC8569MDS bool "Support MPC8569MDS" + select ARCH_MPC8569 config TARGET_MPC8572DS bool "Support MPC8572DS" @@ -219,6 +220,9 @@ config ARCH_MPC8560 config ARCH_MPC8568 bool +config ARCH_MPC8569 + bool + source "board/freescale/b4860qds/Kconfig" source "board/freescale/bsc9131rdb/Kconfig" source "board/freescale/bsc9132qds/Kconfig" diff --git a/arch/powerpc/cpu/mpc85xx/Makefile b/arch/powerpc/cpu/mpc85xx/Makefile index 390eede..9df1434 100644 --- a/arch/powerpc/cpu/mpc85xx/Makefile +++ b/arch/powerpc/cpu/mpc85xx/Makefile @@ -70,7 +70,7 @@ obj-$(CONFIG_ARCH_MPC8536) += mpc8536_serdes.o obj-$(CONFIG_ARCH_MPC8544) += mpc8544_serdes.o obj-$(CONFIG_ARCH_MPC8548) += mpc8548_serdes.o obj-$(CONFIG_ARCH_MPC8568) += mpc8568_serdes.o -obj-$(CONFIG_MPC8569) += mpc8569_serdes.o +obj-$(CONFIG_ARCH_MPC8569) += mpc8569_serdes.o obj-$(CONFIG_MPC8572) += mpc8572_serdes.o obj-$(CONFIG_P1010) += p1010_serdes.o obj-$(CONFIG_P1011) += p1021_serdes.o diff --git a/arch/powerpc/cpu/mpc85xx/speed.c b/arch/powerpc/cpu/mpc85xx/speed.c index a7f43b6..3ac3580 100644 --- a/arch/powerpc/cpu/mpc85xx/speed.c +++ b/arch/powerpc/cpu/mpc85xx/speed.c @@ -707,7 +707,7 @@ int get_clocks (void) #ifdef CONFIG_FSL_ESDHC_USE_PERIPHERAL_CLK gd->arch.sdhc_clk = sys_info.freq_sdhc / 2; #else -#if defined(CONFIG_MPC8569) || defined(CONFIG_P1010) ||\ +#if defined(CONFIG_ARCH_MPC8569) || defined(CONFIG_P1010) ||\ defined(CONFIG_P1014) gd->arch.sdhc_clk = gd->bus_clk; #else diff --git a/arch/powerpc/cpu/mpc85xx/start.S b/arch/powerpc/cpu/mpc85xx/start.S index c3e1234..5f8881d 100644 --- a/arch/powerpc/cpu/mpc85xx/start.S +++ b/arch/powerpc/cpu/mpc85xx/start.S @@ -345,7 +345,7 @@ l2_disabled: mtspr DBCR0,r0 #endif -#ifdef CONFIG_MPC8569 +#ifdef CONFIG_ARCH_MPC8569 #define CONFIG_SYS_LBC_ADDR (CONFIG_SYS_CCSRBAR_DEFAULT + 0x5000) #define CONFIG_SYS_LBCR_ADDR (CONFIG_SYS_LBC_ADDR + 0xd0) @@ -376,7 +376,7 @@ l2_disabled: tlbivax 0,r4 isync -#endif /* CONFIG_MPC8569 */ +#endif /* CONFIG_ARCH_MPC8569 */ /* * Search for the TLB that covers the code we're executing, and shrink it diff --git a/arch/powerpc/include/asm/config_mpc85xx.h b/arch/powerpc/include/asm/config_mpc85xx.h index c38d983..c162c9d 100644 --- a/arch/powerpc/include/asm/config_mpc85xx.h +++ b/arch/powerpc/include/asm/config_mpc85xx.h @@ -113,7 +113,7 @@ #define CONFIG_SYS_FSL_RMU #define CONFIG_SYS_FSL_SRIO_MSG_UNIT_NUM 2 -#elif defined(CONFIG_MPC8569) +#elif defined(CONFIG_ARCH_MPC8569) #define CONFIG_MAX_CPUS 1 #define CONFIG_SYS_FSL_NUM_LAWS 10 #define CONFIG_SYS_FSL_SEC_COMPAT 2 diff --git a/arch/powerpc/include/asm/immap_85xx.h b/arch/powerpc/include/asm/immap_85xx.h index ec4c837..123dcad 100644 --- a/arch/powerpc/include/asm/immap_85xx.h +++ b/arch/powerpc/include/asm/immap_85xx.h @@ -2210,7 +2210,7 @@ typedef struct ccsr_gur { u32 gpiocr; /* GPIO control */ #endif u8 res3[12]; -#if defined(CONFIG_MPC8569) +#if defined(CONFIG_ARCH_MPC8569) u32 plppar1; /* Platform port pin assignment 1 */ u32 plppar2; /* Platform port pin assignment 2 */ u32 plpdir1; /* Platform port pin direction 1 */ @@ -2484,7 +2484,7 @@ typedef struct ccsr_gur { u32 svr; /* System version */ u8 res10[8]; u32 rstcr; /* Reset control */ -#if defined(CONFIG_ARCH_MPC8568) || defined(CONFIG_MPC8569) +#if defined(CONFIG_ARCH_MPC8568) || defined(CONFIG_ARCH_MPC8569) u8 res11a[76]; par_io_t qe_par_io[7]; u8 res11b[1600]; diff --git a/include/configs/MPC8569MDS.h b/include/configs/MPC8569MDS.h index a2ec52b..2da630c 100644 --- a/include/configs/MPC8569MDS.h +++ b/include/configs/MPC8569MDS.h @@ -13,7 +13,6 @@ /* High Level Configuration Options */ #define CONFIG_BOOKE 1 /* BOOKE */ #define CONFIG_E500 1 /* BOOKE e500 family */ -#define CONFIG_MPC8569 1 /* MPC8569 specific */ #define CONFIG_MPC8569MDS 1 /* MPC8569MDS board specific */ #define CONFIG_FSL_ELBC 1 /* Has Enhance localbus controller */ diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 020bbcc..fdd9ce2 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -3141,7 +3141,6 @@ CONFIG_MPC83XX_GPIO_1_INIT_VALUE CONFIG_MPC83XX_PCI2 CONFIG_MPC850 CONFIG_MPC855 -CONFIG_MPC8569 CONFIG_MPC8569MDS CONFIG_MPC857 CONFIG_MPC8572