From patchwork Thu Nov 24 07:55:11 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: York Sun X-Patchwork-Id: 698705 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 3tPWyP4nFwz9vFD for ; Thu, 24 Nov 2016 19:07:09 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 98474B3926; Thu, 24 Nov 2016 09:00:53 +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 uBxe00uNZMci; Thu, 24 Nov 2016 09:00:53 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 6BD5AB39DF; Thu, 24 Nov 2016 08:59:32 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 9FF09B3849 for ; Thu, 24 Nov 2016 08:58:36 +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 sHMyldPX9goB for ; Thu, 24 Nov 2016 08:58:36 +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-co1nam03on0041.outbound.protection.outlook.com [104.47.40.41]) by theia.denx.de (Postfix) with ESMTPS id 82E8EB3919 for ; Thu, 24 Nov 2016 08:57:35 +0100 (CET) Received: from CY4PR03CA0014.namprd03.prod.outlook.com (10.168.162.24) by CY4PR03MB2470.namprd03.prod.outlook.com (10.168.163.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:57:31 +0000 Received: from BY2FFO11FD031.protection.gbl (2a01:111:f400:7c0c::122) by CY4PR03CA0014.outlook.office365.com (2603:10b6:903:33::24) 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:57:32 +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 BY2FFO11FD031.mail.protection.outlook.com (10.1.14.196) 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:57:30 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:; UpperCasedChecksum:; SizeAsReceived:1025; 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 uAO7tR4B012503; Thu, 24 Nov 2016 00:57:29 -0700 From: York Sun To: Date: Wed, 23 Nov 2016 23:55:11 -0800 Message-ID: <1479974118-2912-90-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: 131244478514745292; (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)(1110001)(1109001)(339900001)(336004)(189002)(199003)(39410400001)(8936002)(6916009)(86362001)(4326007)(85426001)(110136003)(36756003)(77096005)(69596002)(50226002)(7416002)(76176999)(5003940100001)(38730400001)(2950100002)(50986999)(81166006)(2351001)(39060400001)(92566002)(81156014)(105606002)(33646002)(8676002)(48376002)(97736004)(189998001)(50466002)(626004)(8666005)(305945005)(104016004)(5660300001)(107886002)(7846002)(2906002)(68736007)(47776003)(6666003)(106466001)(39390400001)(356003)(39400400001)(4001430100002)(39380400001)(7059030); DIR:OUT; SFP:1101; SCL:1; SRVR:CY4PR03MB2470; H:az84smr01.freescale.net; FPR:; SPF:Fail; PTR:InfoDomainNonexistent; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BY2FFO11FD031; 1:qtUQpilmsJfR+Ypyk1nkTf9qyMsALt1ERURvDIILThIqUtQN+KVF6eqVTeGQyRugh55E6a801Vjx7lPKeq+2nY1y0Ax569dl46iQvQCr+eNJkqjztFG5xAcY3BI7VybJ+Hhl49OhqNr9XRAAcZ+eLKhzlcDsM2OLdtZPJhxMbf2nZBTK6w8otPzJPlEOdOnCc96x8Fcqeap50xDDlTBoYGDfHmFAUZnNCUNTVwaEcXKBs8K3IdXDZB/X21xVseDTJRWPlSAS8kkxa57nFpseIDceBgHa8iQqyLRQ4upT9a/VZk5PqW6ztnfR36K5i7zZuQb0CKhPjNzqIEaOywyT50dYEdVnI8TMUBF73Kqh25USfVgMba4/lNOX83ByTl0XmOefFMTb/xyd2U7uujtKrOEWyeYvOUF9jtBxSMoGDam8ec4pPviLaOJ1qh8HdxEJ/v/6k0XBhVLI3Ea+PG88VqhVaOA4Ae8+YofGIcaCwO5/pTzsdZWDj9ztDoiBa8dLjTLavzQxagzH7T6jj35+6MXQwgJPNWJF1YbEL2U2f/pd1HPnkDfVeX4FK92uHO7kw8J3b9TDYM+FbgYfSlLesE4TsrzHkEh958gNHzVReAp3j5D0bIwrdOykZP5W1hY3WQuOI4Nrr9ClX23j2vaGsDAJW6P7ZWqjBIGjxXEnUsNcM75ky2vdVRyeNbCIW3E507k7WhJXrsKGkNymHnnUtbkasQhFQnXYN6KHGsbo55Y= MIME-Version: 1.0 X-Microsoft-Exchange-Diagnostics: 1; CY4PR03MB2470; 2:4HPLBeIwXWoYOni+vSMqMoutB43XBRjpD2BDpxsCpt3PP8uR2SQyWVELjVl2f+gf4HEknSTW/cRrq2q8yK1gmRCRkZcO/EhKG6x/M4GQDTH+3muJ5FhwkzdURSRGk5kYKrq6qpu7Tzjye6s5keIUi91nJR9Usbf53SwPRzOVzgU=; 3:gOj2anmISqnH3JCDyY1dKuPaBNFY/XHxmb0VidWr5zR6ihNJfCihR2jxgEj4IptvKxd8VH8/0xsUMIgxXkyDTInFTclNgWzPC4ax9mlazDYKeUQ4XOtRTH4/MqOi0kcMZx5m+hJY/zAFVDTDlrXy1VO5eq3FrdnWeCPfVlY1rrNoLZhDj6un+bp7BV8PKMH53RBqxtNlpkusakJ4heNtYds7/bN/f5DjlkUf1OGqUiO7+zzMU6yHjze4K8wtAS69F3rOxLYqiJGA0c3wZwhiXA==; 25:2uC6eEYooDBoi0GS2AYCRDvsPUI/ktngfR0+L9cxJDuVNcZsMsvSRdYtFH0aHYmbHMs7VJUy1JSVFD8nvlNMpcKfOUxwVjgUkS06ykqAjUu5QCyUQxYmo9uoP/f82EqBlZA6rBIms39Yfd9I7cH2elnsqG+raKsjZuUOR3qQxLv/RHjtHTUTmMyNnSqduDk6hdEU+Repin0cCP6DmBRUcWrUutjY6dvR4pnYQKuvD41zcxORF0oUfHzek1uAutsLee040SYK3HogB05yCuwBLJzhaW3zaP050ObjA3hD7JqujicmDgUbrkW9deU3RSrH5kZyiJkIrvpMjqWwIRhGWpzD04NCLHka8rVxQhnmrGmx8GbO1S1D4LDDqPq89w0XfYyWcMpj2wIORUkr/ne/cF/A/OIysiei9xnBgnCsDFOSrzgS5incPqqCQCe4N61EKuHKPvah/rrWV1cpbQQQlg== X-MS-Office365-Filtering-Correlation-Id: dec876e4-cf99-48b8-ee6b-08d4143f8b0e X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001); SRVR:CY4PR03MB2470; X-Microsoft-Exchange-Diagnostics: 1; CY4PR03MB2470; 31:8DILLDbmkNJorNXAGLx0Zw1CiQB6xt/ywoE73Yq3gKNOPJAQmnEypVs43VPefraEE1UnzPhF/w6oAKLJDEmw0YxANxVp6R1SakFIeFLz9w33oUTkFL/8edqRwlQ7MeH6WmNwtKt1W/kPbnapX8GSfaP+nVXygWCHFjTEk2m1EsTMjo1smiCsgscRY1MG1NsUgtT3RaMSY99gytRgpVG8ryJRN3QhaGAxLmD3pjQYVI/r3P+x4RvPDaOAwSv6EC7VRXe9p+llKH82aepBFkBwHw== 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)(8121501046)(13015025)(13017025)(13023025)(13024025)(5005006)(13018025)(3002001)(10201501046)(6055026)(6096035)(20161123556025)(20161123561025)(20161123565025)(20161123559025)(20161123563025); SRVR:CY4PR03MB2470; BCL:0; PCL:0; RULEID:(400006); SRVR:CY4PR03MB2470; X-Microsoft-Exchange-Diagnostics: 1; CY4PR03MB2470; 4:ZAmE7fc5TWKHvN1xKzKgIThWDSaisLBMqVuGRmt5hjulmkK5izTjSm5TExGP4/9mAwJdR9CfQXvs2KCGktAsUawl7iZdXedv0dA+MFuxVa+kJwZKIJ1PcybOOs0flVD34hZsIsJZmtthoQ355djmPIV4RAkbjNRKYUOdNpBifpaPS2gw5BMna2q3npbZ9mJxzhzTEdwwEkf81+brHTQ2cxNwhhLf/hQfEJJ1z/uDZyMW6hAQlnMiOrI3v7tcC3oXqZE4OfiWptU6ZPs++ddRrBBhIheH6me/89R5LaC58hFzXNlSfCeMBH/6B0bElqUAtDfE58OhoJH9IWlHflUbbqDCjSnBeKMrncpXhjUceJKolFfuUm6h6aqx5ZR4xR82hc3SA5mA84AOSKYWln2qZyCA6sPO9oCCfdPic+3jPK2bGFdGFwuk4rzS4MqjkGobNx11E6Z6K9263/PdlTYj27v/3vCpI/yeukNwc5ZfQxrxBfj5rC0rw0bysYAVPSCBFLNHlxZo9bYcQh+Pzlu2eY593FdzZAV0RDTpJaseb9YDbbUJxGe9ybVcWWDb3vKowyZaaKA546ugnmmeEHLhmB5FPs5d06V4RAGugJ+fWrTBjWBGiGhAKwpUzEBgRRohiqvqODsYna4a+pCuvdYJruNWVL0+5qzrcw1nvB1XkAAETJ0lntoJJlgq/vhCz8SfyKqRGAtfd2dsojq5x1I59ngW3bcphfAQw532raJJooPkgWA6+Y2yUv+G5X3WTRpu X-Forefront-PRVS: 0136C1DDA4 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; CY4PR03MB2470; 23:Aj+y5D1AXkRyIlqDEmz10JTzRD/0moX9rSFqjCsE3?= =?us-ascii?Q?mrLnTr6sfdmAFgUsqFLtAM0nQv8Ko2P+NCTNnsKd4QqusitKBOMLCXFcc8bS?= =?us-ascii?Q?ur/CRvAaSzU4h/K2bOAYL3HhFDvZb5Ed5Jp2zBJQXXrA36yGOTNPbjrX6OXw?= =?us-ascii?Q?Wp4P+w0+31blhZEqOLzgdNs7IJlIJGcgjyygcn/Jz0m76u3AQIWq8GrUuehZ?= =?us-ascii?Q?Gvc9sF1XFjY/Y0iZCJ1pSl5eGFUyufKQKVZAMWP4/D6G2Zz9I5oRykjyC8cE?= =?us-ascii?Q?pUAn/Pj6uIF64va4CCfDyXPO76t1ZuwsUwDiRrquqmZQpZUORiQa1ccQfA2u?= =?us-ascii?Q?PQZ4XdK6DyCB8tQKF4B7gULBGetXiCtM9QxBXuR3Ugq01wdQqIHUESII5/rL?= =?us-ascii?Q?ujlpHVxk6TY2ER8Kv8sKpJsYf3lBlJ/ojvbqSwm5QDxkD6HJRseFJrIwNHKk?= =?us-ascii?Q?Gn19/vOCaiqSOzkbX/1Zb8ltsmKpXdXsbKjIV2/zSlPDpBSkPSY8xcC9N3Md?= =?us-ascii?Q?byJivykjDMO4CgmOdJMKlPyjIwc0wgJUeALoZVkLumnbAIrGl09TXb3aOrBa?= =?us-ascii?Q?KP0vFy+GDuSVV5Ai9ylY9yahasLe7mwJQOu8BeSVNKvViHhW6sEKlaWlLNbS?= =?us-ascii?Q?aukTlhbuRsofwoLTS1vKksgtrP0wfB+YwrnzNIcRtx7yTM7tbdLUMAKEht2s?= =?us-ascii?Q?GcmmeclDDYudXbOfd8Ax5PRl0VYqW6pdKtL/OY2XveAsIhA+KS4URzsh9/A7?= =?us-ascii?Q?vTvk0eAQCwClmrwib74lGpXsCjxnN3NStxRNwpBzI81Vrt9qFodwtzF2LI3l?= =?us-ascii?Q?sdxgzihoN4vd3X/AEH2HvDqwqxx5U5/IsDW9tUeBg9gNUgnxYOKkVgRzb5BU?= =?us-ascii?Q?phx3yYnjf+VQf/RcERWAet8aMcM5ARqInz7EWOMPWaFCs4Qdpyr1n8IMHbaH?= =?us-ascii?Q?nibQb0AV+X8kqd3Zc3tVVrlfuwoI5J/0FXFSpYC0nmbcYtipUXNA3H8jaAxk?= =?us-ascii?Q?8uJ66ICur43NhUzo0p4MjMQiN267fWdRuL1JQKsyE8nu/5Q8Dw/zGb2g8LoA?= =?us-ascii?Q?+ul4UWLKOWAvyMFzgOOZUnt4jhwTtRwSOYYfknNpIo0tRmeIYT483LI/miZr?= =?us-ascii?Q?I05+WynDnqTIFRIQcXoCcnNmHSB53glrKxWmte/HQ0AYovFJ2QIuYkamhzGl?= =?us-ascii?Q?gCNEA3vdUa8pWxQkmxhOTmLG+xgpPswwQoZo0Xg1+peKCM+ccTV4tsruJUNN?= =?us-ascii?Q?hQGIIDLKn4v7iUwKy4aEK/1skEL9bjxHdjAkiCpApq2xQ2o7qFXUMo/kbzAz?= =?us-ascii?Q?EY+QlBchx9QXpxyAOfqJFLad/QJ46GhD1s7uhkNA+a/?= X-Microsoft-Exchange-Diagnostics: 1; CY4PR03MB2470; 6:IMGD4iPAPtDd+IybtuzPe998Xz94ZMFSuob/qIudUJKR9FjruDaLotINnTVlhsLAg+ISPcOyJunUzps/2c2bvLjH4QD7lBqaDDpNKq7dmyRNv/WIZgHDrHT9VVY0EZ5uVbfkGg70+GPM7wXot25efJHSgFQNSjYNgFHiT/H+ig2d6Cgi0SVNta4OickfFpofuMtaistt26QVmP7Uc5WqaGOIf7ZkacylDArvP7GrKOdzas24HYT0UCrFHrbIjAkLWd1l1MRbuhGbIPQMXS9UUj7w627UKxDCAyg4HjV2OABYBYS7DiQWTx9dZCCE8P+6E7VqPCymjpAawUP/k80UZA==; 5:9VtSeD5h8U6mbPeJTbsrnd9ACZT1aNjsXkJttchCkyikjviU1s2mJGC/9TviFomlzz/ZTTaPWFGe+DnssWbCoI5uOnRQGg3cZ38IYYFTMfbDODehGQt1C7FMjgRGJkjiyhp+fIrOS6bRWv4noh+8IL7ZC+eGXDn1e2sbLEeKqwqrk8hOvySxCHJaqrSwc2eH; 24:v6X23Gq30wNn+bA6hWvETpgPxkPQgd9aYlNGTP5RUBXCfaOC4iTxt9rhLoNlJmxdjRPp7GTb0INrWE01BeWxuC2TRSZIzq/kcIKXOF0amvU= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; CY4PR03MB2470; 7:s+sBGqLKSixqI2JE4ZNbTACQGCniB1umsNfQ1hf/beDgAVF6JvBqvOo2VWApQJZqq/m/mmqaLULkMfbjnrM4rc4I7e5Q150mjQaYlpqUk3cX7uN1ljRRJnn8j8K7FcrURMbxGzxqcOSGtzbl0wU9/cvSEPO+slSH6k4ESa7zOjvsjKolAbZTCELhg4r3XbvzPYwhd6m1xgZa9zjkAB1hNJZL4y1KodxGZA8wdYrylrI/lw3EE+r8wUS4ukbW//KMTAJPVhCaKc6lMtW68t3Ch/NudeuX6K5YmUnFawGX1pXJDkZKD2NU3EQnBVTo7cW8rnUij3JfVQokyxg7LK49JEEnX440H8QhGH5QBNtxhmM= X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Nov 2016 07:57:30.6321 (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: CY4PR03MB2470 Cc: Kumar Gala , Aneesh Bansal , Joe Hershberger , Stefan Roese , Andy Fleming , Mingkai Hu Subject: [U-Boot] [PATCH 90/97] powerpc: T4080: Drop configuration for T4080 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" There is no T4080 target. Drop related macros. Signed-off-by: York Sun --- arch/powerpc/cpu/mpc85xx/Makefile | 2 -- arch/powerpc/cpu/mpc85xx/fdt.c | 5 ++--- arch/powerpc/cpu/mpc85xx/speed.c | 3 +-- arch/powerpc/cpu/mpc85xx/t4240_serdes.c | 2 +- arch/powerpc/include/asm/config_mpc85xx.h | 6 +----- arch/powerpc/include/asm/immap_85xx.h | 6 ++---- drivers/net/fm/Makefile | 1 - 7 files changed, 7 insertions(+), 18 deletions(-) diff --git a/arch/powerpc/cpu/mpc85xx/Makefile b/arch/powerpc/cpu/mpc85xx/Makefile index e5b45e1..46ed22c 100644 --- a/arch/powerpc/cpu/mpc85xx/Makefile +++ b/arch/powerpc/cpu/mpc85xx/Makefile @@ -46,7 +46,6 @@ obj-$(CONFIG_ARCH_P5020) += p5020_ids.o obj-$(CONFIG_ARCH_P5040) += p5040_ids.o obj-$(CONFIG_ARCH_T4240) += t4240_ids.o obj-$(CONFIG_ARCH_T4160) += t4240_ids.o -obj-$(CONFIG_PPC_T4080) += t4240_ids.o obj-$(CONFIG_ARCH_B4420) += b4860_ids.o obj-$(CONFIG_ARCH_B4860) += b4860_ids.o obj-$(CONFIG_ARCH_T1040) += t1040_ids.o @@ -88,7 +87,6 @@ obj-$(CONFIG_ARCH_P5020) += p5020_serdes.o obj-$(CONFIG_ARCH_P5040) += p5040_serdes.o obj-$(CONFIG_ARCH_T4240) += t4240_serdes.o obj-$(CONFIG_ARCH_T4160) += t4240_serdes.o -obj-$(CONFIG_PPC_T4080) += t4240_serdes.o obj-$(CONFIG_ARCH_B4420) += b4860_serdes.o obj-$(CONFIG_ARCH_B4860) += b4860_serdes.o obj-$(CONFIG_ARCH_BSC9132) += bsc9132_serdes.o diff --git a/arch/powerpc/cpu/mpc85xx/fdt.c b/arch/powerpc/cpu/mpc85xx/fdt.c index 9d81873..12001f8 100644 --- a/arch/powerpc/cpu/mpc85xx/fdt.c +++ b/arch/powerpc/cpu/mpc85xx/fdt.c @@ -512,7 +512,7 @@ static void fdt_fixup_usb(void *fdt) #endif #if defined(CONFIG_ARCH_T2080) || defined(CONFIG_ARCH_T4240) || \ - defined(CONFIG_ARCH_T4160) || defined(CONFIG_PPC_T4080) + defined(CONFIG_ARCH_T4160) void fdt_fixup_dma3(void *blob) { /* the 3rd DMA is not functional if SRIO2 is chosen */ @@ -529,8 +529,7 @@ void fdt_fixup_dma3(void *blob) case 0x29: case 0x2d: case 0x2e: -#elif defined(CONFIG_ARCH_T4240) || defined(CONFIG_ARCH_T4160) || \ - defined(CONFIG_PPC_T4080) +#elif defined(CONFIG_ARCH_T4240) || defined(CONFIG_ARCH_T4160) u32 srds_prtcl_s4 = in_be32(&gur->rcwsr[4]) & FSL_CORENET2_RCWSR4_SRDS4_PRTCL; srds_prtcl_s4 >>= FSL_CORENET2_RCWSR4_SRDS4_PRTCL_SHIFT; diff --git a/arch/powerpc/cpu/mpc85xx/speed.c b/arch/powerpc/cpu/mpc85xx/speed.c index 7f10ed0..fcf5d92 100644 --- a/arch/powerpc/cpu/mpc85xx/speed.c +++ b/arch/powerpc/cpu/mpc85xx/speed.c @@ -131,8 +131,7 @@ void get_sys_info(sys_info_t *sys_info) * T2080 rev 1.1 and later also use half mem_pll comparing with rev 1.0 */ #if defined(CONFIG_ARCH_T4240) || defined(CONFIG_ARCH_T4160) || \ - defined(CONFIG_PPC_T4080) || defined(CONFIG_ARCH_T2080) || \ - defined(CONFIG_ARCH_T2081) + defined(CONFIG_ARCH_T2080) || defined(CONFIG_ARCH_T2081) svr = get_svr(); switch (SVR_SOC_VER(svr)) { case SVR_T4240: diff --git a/arch/powerpc/cpu/mpc85xx/t4240_serdes.c b/arch/powerpc/cpu/mpc85xx/t4240_serdes.c index 1a5bcb1..3fc527d 100644 --- a/arch/powerpc/cpu/mpc85xx/t4240_serdes.c +++ b/arch/powerpc/cpu/mpc85xx/t4240_serdes.c @@ -263,7 +263,7 @@ static const struct serdes_config serdes4_cfg_tbl[] = { {18, {PCIE3, PCIE3, PCIE3, PCIE3, AURORA, AURORA, AURORA, AURORA}}, {} }; -#elif defined(CONFIG_ARCH_T4160) || defined(CONFIG_PPC_T4080) +#elif defined(CONFIG_ARCH_T4160) static const struct serdes_config serdes1_cfg_tbl[] = { /* SerDes 1 */ {1, {NONE, NONE, NONE, NONE, diff --git a/arch/powerpc/include/asm/config_mpc85xx.h b/arch/powerpc/include/asm/config_mpc85xx.h index 0d8eb46..2619562 100644 --- a/arch/powerpc/include/asm/config_mpc85xx.h +++ b/arch/powerpc/include/asm/config_mpc85xx.h @@ -545,8 +545,7 @@ #define CONFIG_SYS_FSL_A004447_SVR_REV 0x11 #define CONFIG_ESDHC_HC_BLK_ADDR -#elif defined(CONFIG_ARCH_T4240) || defined(CONFIG_ARCH_T4160) || \ - defined(CONFIG_PPC_T4080) +#elif defined(CONFIG_ARCH_T4240) || defined(CONFIG_ARCH_T4160) #define CONFIG_E6500 #define CONFIG_SYS_PPC64 /* 64-bit core */ #define CONFIG_FSL_CORENET /* Freescale CoreNet platform */ @@ -571,9 +570,6 @@ #if defined(CONFIG_ARCH_T4160) #define CONFIG_MAX_CPUS 8 #define CONFIG_SYS_FSL_CLUSTER_CLOCKS { 1, 1 } -#elif defined(CONFIG_PPC_T4080) -#define CONFIG_MAX_CPUS 4 -#define CONFIG_SYS_FSL_CLUSTER_CLOCKS { 1 } #endif #endif #define CONFIG_SYS_FSL_NUM_CC_PLLS 5 diff --git a/arch/powerpc/include/asm/immap_85xx.h b/arch/powerpc/include/asm/immap_85xx.h index 75868fa..786e4f6 100644 --- a/arch/powerpc/include/asm/immap_85xx.h +++ b/arch/powerpc/include/asm/immap_85xx.h @@ -1759,8 +1759,7 @@ typedef struct ccsr_gur { /* use reserved bits 18~23 as scratch space to host DDR PLL ratio */ #define FSL_CORENET_RCWSR0_MEM_PLL_RAT_RESV_SHIFT 8 #define FSL_CORENET_RCWSR0_MEM_PLL_RAT_MASK 0x3f -#if defined(CONFIG_ARCH_T4240) || defined(CONFIG_ARCH_T4160) || \ - defined(CONFIG_PPC_T4080) +#if defined(CONFIG_ARCH_T4240) || defined(CONFIG_ARCH_T4160) #define FSL_CORENET2_RCWSR4_SRDS1_PRTCL 0xfc000000 #define FSL_CORENET2_RCWSR4_SRDS1_PRTCL_SHIFT 26 #define FSL_CORENET2_RCWSR4_SRDS2_PRTCL 0x00fe0000 @@ -1875,8 +1874,7 @@ defined(CONFIG_PPC_T1020) || defined(CONFIG_PPC_T1022) #define FSL_CORENET_RCWSR11_EC2_FM2_DTSEC5_MII 0x00100000 #define FSL_CORENET_RCWSR11_EC2_FM2_DTSEC5_NONE 0x00180000 #endif -#if defined(CONFIG_ARCH_T4240) || defined(CONFIG_ARCH_T4160) || \ - defined(CONFIG_PPC_T4080) +#if defined(CONFIG_ARCH_T4240) || defined(CONFIG_ARCH_T4160) #define FSL_CORENET_RCWSR13_EC1 0x60000000 /* bits 417..418 */ #define FSL_CORENET_RCWSR13_EC1_FM2_DTSEC5_RGMII 0x00000000 #define FSL_CORENET_RCWSR13_EC1_FM2_GPIO 0x40000000 diff --git a/drivers/net/fm/Makefile b/drivers/net/fm/Makefile index 4bfadaa..08b3f27 100644 --- a/drivers/net/fm/Makefile +++ b/drivers/net/fm/Makefile @@ -34,7 +34,6 @@ obj-$(CONFIG_ARCH_T2080) += t2080.o obj-$(CONFIG_ARCH_T2081) += t2080.o obj-$(CONFIG_ARCH_T4240) += t4240.o obj-$(CONFIG_ARCH_T4160) += t4240.o -obj-$(CONFIG_PPC_T4080) += t4240.o obj-$(CONFIG_ARCH_B4420) += b4860.o obj-$(CONFIG_ARCH_B4860) += b4860.o obj-$(CONFIG_LS1043A) += ls1043.o