From patchwork Thu Nov 24 07:54:38 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: York Sun X-Patchwork-Id: 698688 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 3tPWsy5Rzfz9t2T for ; Thu, 24 Nov 2016 19:03:18 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 099B2B389A; Thu, 24 Nov 2016 08:59:11 +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 xPbp271G20ZF; Thu, 24 Nov 2016 08:59:10 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 54914B3911; Thu, 24 Nov 2016 08:58:08 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id BF5D8B3917 for ; Thu, 24 Nov 2016 08:57:37 +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 xiTZZjF9AnZ5 for ; Thu, 24 Nov 2016 08:57:37 +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-by2nam01on0049.outbound.protection.outlook.com [104.47.34.49]) by theia.denx.de (Postfix) with ESMTPS id 3D67AB38C4 for ; Thu, 24 Nov 2016 08:56:51 +0100 (CET) Received: from DM2PR03CA0001.namprd03.prod.outlook.com (10.141.96.11) by CY1PR0301MB0746.namprd03.prod.outlook.com (10.160.159.152) 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:49 +0000 Received: from BN1AFFO11FD027.protection.gbl (2a01:111:f400:7c10::192) by DM2PR03CA0001.outlook.office365.com (2a01:111:e400:2428::11) 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:56:48 +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 BN1AFFO11FD027.mail.protection.outlook.com (10.58.52.87) 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:48 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:; UpperCasedChecksum:; SizeAsReceived:1248; 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 uAO7tR3c012503; Thu, 24 Nov 2016 00:56:45 -0700 From: York Sun To: Date: Wed, 23 Nov 2016 23:54:38 -0800 Message-ID: <1479974118-2912-57-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: 131244478085210837; (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)(189002)(199003)(47776003)(2950100002)(6666003)(6916009)(68736007)(5660300001)(50226002)(81166006)(8936002)(81156014)(7416002)(189998001)(110136003)(76176999)(2351001)(69596002)(48376002)(106466001)(92566002)(50986999)(104016004)(105606002)(575784001)(97736004)(50466002)(5003940100001)(626004)(85426001)(8666005)(4326007)(8676002)(86362001)(39060400001)(305945005)(356003)(2906002)(38730400001)(7846002)(33646002)(36756003)(77096005)(7059030)(15760500001); DIR:OUT; SFP:1101; SCL:1; SRVR:CY1PR0301MB0746; H:az84smr01.freescale.net; FPR:; SPF:Fail; PTR:InfoDomainNonexistent; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BN1AFFO11FD027; 1:RLEWI3do1HbwDAP96ExEUA1ts2ICKJz+pJWWCeuen8SJIJMfrWtccL7fkkZv1+aAg9k+dDxvb7Pu2rovaGyrmDSHmV8GsN6CAPGRGb2EumEt51bej3j6PFlq3eOnf9pxK+gJm8wwY8PlhALa3imdQwh9JmE6u8yVgLO8isDb02NW0301+kAzWVKXum+HYnKRdYHNM+qI54JIW8ZCY3AWnItRmvvgJQkBOy54hs5V8AdT/XfEwes3yLeDFSUijgmuIPTAD3I8glDwecZpYrj6C6OiJWclBYUPa0rY+P2l5dPZK82UpFRBJF2zmGR3DHWSfMLjYXEz75ZcTSTMOlc3ARgeps1ELqj96nbqaQlnL/bxrPNqN43mGyHZgmw9ZG9OLiW3jEmVpfs4ZhHYEibo6tnRZtwXq6qIIj069iYUKgQHFWwvi4rjd4m9vidYVNu+3LVt9AcK/QnnxlFd8o0SeMmLdU4VQg7A0BAzno4O57uSkimtLLFjdtXw7JWslNF70NaEZVfDK157QYE5oy7R8Ztp9iNNZCxo2u3EGCWjxqIWU8ZlQtiPBtX4Z0H55m9zi2Dc4w11CzSUxnv4nZJ8TBfeBD/MmB7xHPhCvc6BTXNpV07pMFBCMNPLYUrh/jzVorf/pzolGhWxlUgMq7bOSctzGdywiN5Zzr090/P5aEqu8MwLSApIbVQllNut2YH62dvXJ+pPRSFZLkLPxOkUJ2nCmDxdlWBvKwuGim0I3TI= MIME-Version: 1.0 X-Microsoft-Exchange-Diagnostics: 1; CY1PR0301MB0746; 2:OxHgfUM7Faz0xavtqLOn5KA53QpPnycuc3Jn4Kh4TurCTfoZ4Kpf9HIRlXl9wlfq0Qs7LrAnlEObAjqYi2lMHOFFjAxpoK33zc/2IhV/pgg8ZSnFcTz3dnPuOwqq1hHREKEbSja73XLx0tjUNxBQeRzwF3PXdyBbCI5LptgG2AI=; 3:/43EUWzTSdDkniTffNNJAH3rWEHy4/PfA/mWh7s0s+CTT/gYbVrWhgnUWjsZLn/onGnEdjQAyH7AkBFw6C45Wq2KbWk1vtK0U7Qb6Nf7j3JwTpSwA9XkHAzhKKMHIHC1hewaJGYrRURltMJIphquO9svxnl/dnKBm4RRygDbkfWY5Q9Q2QkmHXwfJ3hK1y7E0O1d5sDVWzH5E1qtUzoQMj1s1rwdfcNCqSDhRyfzN9hS1+Sh2/jkvCBZ/oZWzbDJOhNsTWu9dQIl5Op5GFztsw== X-MS-Office365-Filtering-Correlation-Id: 74fd2162-efdf-46e4-17cd-08d4143f7164 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001); SRVR:CY1PR0301MB0746; X-Microsoft-Exchange-Diagnostics: 1; CY1PR0301MB0746; 25:18dk72LJX6ciBe6MISM5Iv7BSr7uEitjrwCRsIBbuBc+DPe3GJyNmEiUc6q1yhGgFu01JN3OBMhLLdmd2e2u7tR+9OzZxdeqYrfSWbXjVjwy0IWdhqTHzcZCTuX3CMCX7egUcQJRuJtvwbV1OzgAbatMvFyzE//lZlbkOYb6EUOGJY7ew+XIcZe8y/t0R4rcXabXsXdFL7VYbYRbO1K97CTApgR/PHyuc0TFvxGeJgsCaljx1aJtO2qmz/L1rRTSEDkru3smmg7u730pssqSZYCO/uVTRDi/Kb9J30PRP2zyJ0CmAaYlD2S8lYD8u+IA75sh6JV8YY3uHtAID3zXZRBxrF/0VxrS5RT0psjvPnZ0AOVndb1ya8adI7j1mwf8UBC1mY7yEtM5RouT9EdQqgcaenguBMzvtx9h6L6a8gVYdPG0BxhC8Nq++i3zvXj45aWSw08h24jZoPXDr4UcBpqWTGQXSDH9GuaDVxzd95DYVxTimMkHNXO8hSl6I092UNYImwRv0s8BN4p9z7+FYVHHcDWw697/T3JfZ75O0bLJTms4U9kntvH+VZN+kMLimRkIlM4QhGqonfJw2h99MUpNtq1fEUe/xmNTDUXrBId5uMNPavf7AG/nBdG241r7u/SoXQNUeUNa1ruB2CCTGm1eTrCSMDFS+w9HLNRsIOznrGqxNyLpv0DAyXcgauISux0pO0wOn1ehppQSxpnWs0l3aBkI/RrnECBhXRGRO+T9l5+FVRsJSQ2uy8oEWOZmUp6x0zzSgZ8zqISFIkXDUrHSMb10iZAFRn5hRaz84F8= X-Microsoft-Exchange-Diagnostics: 1; CY1PR0301MB0746; 31:l2C/PR9OSlovUuOQZdajaKQAxEr6zU2wyudJCyS6O8ChJraMfMBSK3gLIq53f+g4A8O9+u4OJih7XOkKHWAvGCdzQ+Tsy9+piqpGH1BKbKxhRGCbAJrTFA0N1OrDAw8GNf9Y6uqIcKHUb86eRnD0TyjyWhYte/6w1ro/8bcGksKGPuSh+Xq4zq/g/L/AAAWoSKcgqsQ/STwnlOtVurmr4Ny5MR4KD2PvZvSHJs7ui7rhgSVT9SVoTToa8rH+vFTXxoqASP9N6Qy6XtsKrNZavQ== 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:CY1PR0301MB0746; BCL:0; PCL:0; RULEID:(400006); SRVR:CY1PR0301MB0746; X-Microsoft-Exchange-Diagnostics: 1; CY1PR0301MB0746; 4:1L9I6jdKBt2slfRpEBQplKKkPjJKhzpl3t3K1q3z7OAHFNIB3VAyC2vpjgRwjky5GacSmS61w72TmGt+TSTgZY3AwT907C8PDTkmeDJ5kvNWIJxoq+GFMSqTKH+F1I/WaMreFQ5YuwBoU6GGxnV3EwTF6OcYdrPKZne+n1UsfEMMNPQ+/dxBSNBB1u2X6f0KOZWQHJbbcuZCl+0ufFoe3h3VflnG+/Y3evzBXtixUyDKnAcax9XEAY+WaTtcuGC4iC3edk1Bj+0RDMARXar44+s9NQyL/U8rp+bHNopw2I1cBLQUKgbcySLqksV0dNDqednQbZZPeBzOMri1mAsX5/Towmg/ETB7E5F7sm7ijbCGRzEnFPtbAchf9pS9kwjfc1CFQon8DwNBSNyaiLWO261SdLfiVu7PfQll6GxmLS23qyaGeeiypK+BIgQEeAAdS8RS3cm3KAGAtRBS7PpfPspYZM1AYrF7JlLAUy6t6dQnNY/Bfo8gze4JRsGRCkHBJrf3/ADEZ4BOAYVI1kmsmeN7GZcG2jX4puaj1EMQpiYU0i57lyl9JCuoRl8qWq358hC/nWhJgn8mpdAleLvmHRsxBZ8JGAjYwu8gTVn0VPBluHN/g6WJtJUbNsxmHNiK1hP1q6u3+KRYGB6jA3RsvFmDnnjxmQb60Vl+07ghnCEAw+o9RHlcf4n8vgVbvPVfQclze4Wpb8ddcI0+OwJF4cdwVz0Qa5Uk0Nr7gnM0N8hBvF5rUy+g5jw3KIoSzTaDFoljZpuIkzJi/Etyj2+HeA== X-Forefront-PRVS: 0136C1DDA4 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; CY1PR0301MB0746; 23:23mqac/ljchncRz7M3++nZdu6w6NQvFq4WdGKyV?= =?us-ascii?Q?rikxYPzf7qNw7jwaX3drJ/8VtThTdODDgtvM2k6ZQpHinQGdijCsqYpV6gwF?= =?us-ascii?Q?P6zphB2+b0yXNuybaeLR/FJgG4yXcYxKwXWRxO7MW8pevjMOO6bnWFZOAGaN?= =?us-ascii?Q?6XLNJwrry79jtgfRTD6aNNG5jsOptrs6azmoTCaHAyMhqK+743FObt8GatTZ?= =?us-ascii?Q?xb69OuU3MamXKy0cSD6NSA1L7QSDA+E+nSWpvWs+BRpspvwiN2yYODRbgvEf?= =?us-ascii?Q?K2oSvvgbep1uBlkKuJtiF0LtWRMFZrFMTRxYY4QV8cmD/iVo1Vi0n68pfHoU?= =?us-ascii?Q?2XL6eJKTvac23vXtFkeRggZcuM+bsr7Le2xZjqBQRHnjAYL9UMMQs51Ka0WW?= =?us-ascii?Q?OGTPe+/YaW6hW1+aq7DBDHqJucyxU+Eo6WHM+Sj8vp1LYqRhYTK1cGnNjz5y?= =?us-ascii?Q?Qrll2cb1Hwks7VOpx2n2bFDg8PsilESnKV6n8W8z3YjI7OnrL+DGL3hCou+T?= =?us-ascii?Q?psFDTZ1cF9ef4OBd4ZzI1G2I/ugSHXWYEeLs9XoSp/V6CSZhPIIEN7M8tKAD?= =?us-ascii?Q?nLyq3BFBjak7MfXfxxbu6bXuBTaHulRk0lGOtUDKsiRdJCwurPRDoRxjBB3P?= =?us-ascii?Q?tDpr/YaoCLo2epUBXuYCCWfr9sPX6omh6wwtlrwI+gAgpSuRynfHa+qEkYtM?= =?us-ascii?Q?T2xsy2WBDKHLDXluzku31NjNZVjleW3ILEerZe5lZ3Mi4w6gYUcMgouOcqBB?= =?us-ascii?Q?i2vuLefdcPDHvHPXDmiFRGJCHQvxJBvD7VC0Hj2kcQxOKPbYAd459S1JuEIb?= =?us-ascii?Q?HRFQ5wqZsj97hCGrVBQl9hNt8yn24wg+tb+DpHEldi4/vhdWTEdIjMR5nhnZ?= =?us-ascii?Q?LEB9OZ/4dkjKs1z4XE4U3SCMqMQeMVs0dBoYNXPJEIShz2X3dgIU6bangDii?= =?us-ascii?Q?GZ4O5sfH6lwUyN44rv2ITI1LFZ6D0h+xDY5/EIM9AV1uCyBV/5fZOnRC+YXJ?= =?us-ascii?Q?GzaZgh00Txmnsqm5ci7ORz3aCys8ktx6pusNyGwjUh4lgsCxOIaF2Mlzwu67?= =?us-ascii?Q?kJfIMGtj27M/8WUeYRrZxF55D/c4/NoCqaNNleBqM8yobQJ0szyBvrDtU6Kv?= =?us-ascii?Q?jzg+CYnJEIl5kPihqJoFywfQfP9B1E1zs1yD9lwbqw8nYWhwWKNP5lRBAD5T?= =?us-ascii?Q?IbQO7lOYfm2KVhy/LdoguVNqQXx3IpT4AfYp+0jd9eWgU1Y95jtU7W7bImA?= =?us-ascii?Q?=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1; CY1PR0301MB0746; 6:jIjR3sKU4mBlRwlaIQHifX1Jxn682EmpuqoRu7jp1O48t/49QDDOSFGq+61DIPjXIQdHF+VCnlLxJ6SbTB7WchiyMoDiVLinxeC0xIIrKFJNwiWV4Y4Std0Eeed3qpTZZUfbmvy22X3woy6OfyrpahcdHz5iHgf/K2egsFfPOgoQKj18kDz10LyaN8iOyWinoWoPb6uDrCiDf7C70B8PB7IsQ6qnto9AZqICKW+xwrQvJe9Y5GOM0zEp6zMliCX5HqoQkS6OOoRXWLDRDvnKL8y7nDmpqanfGW4fT+g6vX3oEar/KXjMI8TvGPC2m+tcAaEVkWPbLuVruFcIZNCdyA==; 5:xH6QNBvvZh83DsIropBChmquBNNy+YX6sIJQr31wI1hz582MB4wDYOd8dzCax4ryJ3FG0pYWbkhI3BZmxnw2ALT1O7TKciltW4snZGicAmhxNd4pvcNeX2nn+Rel/EuBxfFvktMktFtqCe2RgHKAomRZ1qZxKqsICOO1cQwkBpG3nqeUrWALvqXwjvQVGavY; 24:5aqhYbgluio1SnnYJuLB8KyWcQ0XGQ/FKLzY0oZxK/mkNExxLPlIAa/FAexIztdSIA+VRPjtrwPWCnztNBsijbqI1LCRthfPfzf4dLkB0GA= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; CY1PR0301MB0746; 7:xbY9/c+2aTjs1NSaBhEhyNYUJIic32heKL7W+VClN6mesm/0WuWDQS092ifKnt9FlAvI7+QownkoP/WMADnEkxBd+zFrNTkqKJXpxNEsXW5W/uPF8vKkSILKOcSI1ENt9uJYicf32LkyCbPFkrz1O06NDP8PZKP6EMfRoctC8B4T86jxIQD31V/N2X8WIvVvj3utUWuRG3I70LOv93gWB15QX0FMlaM9Zk49b16r5ot2xfBL6tzvcMkBOJR4TGwSP3DnzLIgtE4APuIEmlHU4/C1u/JwGZTDPQbF4p4MWcouBOqJlXDXKLRK+XUU6EiIsPSLVKg+mDI+UPXecyk8iSv7O/Z0AhOHBtI7oXYgVX8= X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Nov 2016 07:56:48.0374 (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: CY1PR0301MB0746 Cc: Joe Hershberger , Kumar Gala , Aneesh Bansal , Mingkai Hu , Jagan Teki , Stefan Roese , Andy Fleming , Ruchika Gupta Subject: [U-Boot] [PATCH 57/97] powerpc: P4080: Remove macro CONFIG_PPC_P4080 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_P4080 with ARCH_P4080 in Kconfig and clean up existing macros. Signed-off-by: York Sun --- arch/powerpc/cpu/mpc85xx/Kconfig | 4 ++++ arch/powerpc/cpu/mpc85xx/Makefile | 4 ++-- arch/powerpc/cpu/mpc85xx/cmd_errata.c | 4 ++-- arch/powerpc/cpu/mpc85xx/fdt.c | 2 +- arch/powerpc/cpu/mpc85xx/fsl_corenet_serdes.c | 2 +- arch/powerpc/include/asm/config_mpc85xx.h | 2 +- arch/powerpc/include/asm/fsl_secure_boot.h | 2 +- arch/powerpc/include/asm/immap_85xx.h | 2 +- drivers/net/fm/Makefile | 2 +- include/configs/P4080DS.h | 1 - scripts/config_whitelist.txt | 1 - 11 files changed, 14 insertions(+), 12 deletions(-) diff --git a/arch/powerpc/cpu/mpc85xx/Kconfig b/arch/powerpc/cpu/mpc85xx/Kconfig index d8bc1d0..a68a651 100644 --- a/arch/powerpc/cpu/mpc85xx/Kconfig +++ b/arch/powerpc/cpu/mpc85xx/Kconfig @@ -46,6 +46,7 @@ config TARGET_P3041DS config TARGET_P4080DS bool "Support P4080DS" select PHYS_64BIT + select ARCH_P4080 config TARGET_P5020DS bool "Support P5020DS" @@ -320,6 +321,9 @@ config ARCH_P2041 config ARCH_P3041 bool +config ARCH_P4080 + 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 df777f1..0ea5547 100644 --- a/arch/powerpc/cpu/mpc85xx/Makefile +++ b/arch/powerpc/cpu/mpc85xx/Makefile @@ -41,7 +41,7 @@ obj-$(CONFIG_SYS_DPAA_QBMAN) += portals.o # various SoC specific assignments obj-$(CONFIG_ARCH_P2041) += p2041_ids.o obj-$(CONFIG_ARCH_P3041) += p3041_ids.o -obj-$(CONFIG_PPC_P4080) += p4080_ids.o +obj-$(CONFIG_ARCH_P4080) += p4080_ids.o obj-$(CONFIG_PPC_P5020) += p5020_ids.o obj-$(CONFIG_PPC_P5040) += p5040_ids.o obj-$(CONFIG_PPC_T4240) += t4240_ids.o @@ -83,7 +83,7 @@ obj-$(CONFIG_ARCH_P1025) += p1021_serdes.o obj-$(CONFIG_ARCH_P2020) += p2020_serdes.o obj-$(CONFIG_ARCH_P2041) += p2041_serdes.o obj-$(CONFIG_ARCH_P3041) += p3041_serdes.o -obj-$(CONFIG_PPC_P4080) += p4080_serdes.o +obj-$(CONFIG_ARCH_P4080) += p4080_serdes.o obj-$(CONFIG_PPC_P5020) += p5020_serdes.o obj-$(CONFIG_PPC_P5040) += p5040_serdes.o obj-$(CONFIG_PPC_T4240) += t4240_serdes.o diff --git a/arch/powerpc/cpu/mpc85xx/cmd_errata.c b/arch/powerpc/cpu/mpc85xx/cmd_errata.c index 01710b5..d311934 100644 --- a/arch/powerpc/cpu/mpc85xx/cmd_errata.c +++ b/arch/powerpc/cpu/mpc85xx/cmd_errata.c @@ -31,7 +31,7 @@ static void check_erratum_a4849(uint32_t svr) 0x50, 0x54, 0x58, 0x90, 0x94, 0x98 }; #endif -#ifdef CONFIG_PPC_P4080 +#ifdef CONFIG_ARCH_P4080 static const uint8_t offsets[] = { 0x60, 0x64, 0x68, 0x6c, 0xa0, 0xa4, 0xa8, 0xac }; @@ -49,7 +49,7 @@ static void check_erratum_a4849(uint32_t svr) x108 = 0x12; #endif -#ifdef CONFIG_PPC_P4080 +#ifdef CONFIG_ARCH_P4080 /* * For P4080, the erratum document says that the value at offset 0x108 * should be 0x12 on rev2, or 0x1c on rev3. diff --git a/arch/powerpc/cpu/mpc85xx/fdt.c b/arch/powerpc/cpu/mpc85xx/fdt.c index 047c972..eeee92c 100644 --- a/arch/powerpc/cpu/mpc85xx/fdt.c +++ b/arch/powerpc/cpu/mpc85xx/fdt.c @@ -490,7 +490,7 @@ static void ft_fixup_qe_snum(void *blob) } #endif -#if defined(CONFIG_PPC_P4080) +#if defined(CONFIG_ARCH_P4080) static void fdt_fixup_usb(void *fdt) { ccsr_gur_t *gur = (void *)(CONFIG_SYS_MPC85xx_GUTS_ADDR); diff --git a/arch/powerpc/cpu/mpc85xx/fsl_corenet_serdes.c b/arch/powerpc/cpu/mpc85xx/fsl_corenet_serdes.c index 72d5e30..20d039f 100644 --- a/arch/powerpc/cpu/mpc85xx/fsl_corenet_serdes.c +++ b/arch/powerpc/cpu/mpc85xx/fsl_corenet_serdes.c @@ -76,7 +76,7 @@ static const struct { { 17, 163, FSL_SRDS_BANK_2 }, { 18, 164, FSL_SRDS_BANK_2 }, { 19, 165, FSL_SRDS_BANK_2 }, -#ifdef CONFIG_PPC_P4080 +#ifdef CONFIG_ARCH_P4080 { 20, 170, FSL_SRDS_BANK_3 }, { 21, 171, FSL_SRDS_BANK_3 }, { 22, 172, FSL_SRDS_BANK_3 }, diff --git a/arch/powerpc/include/asm/config_mpc85xx.h b/arch/powerpc/include/asm/config_mpc85xx.h index 8f0a250..011aec6 100644 --- a/arch/powerpc/include/asm/config_mpc85xx.h +++ b/arch/powerpc/include/asm/config_mpc85xx.h @@ -378,7 +378,7 @@ #define CONFIG_SYS_FSL_ERRATUM_A006261 #define CONFIG_SYS_FSL_A004447_SVR_REV 0x20 -#elif defined(CONFIG_PPC_P4080) /* also supports P4040 */ +#elif defined(CONFIG_ARCH_P4080) /* also supports P4040 */ #define CONFIG_SYS_FSL_QORIQ_CHASSIS1 #define CONFIG_FSL_CORENET /* Freescale CoreNet platform */ #define CONFIG_MAX_CPUS 8 diff --git a/arch/powerpc/include/asm/fsl_secure_boot.h b/arch/powerpc/include/asm/fsl_secure_boot.h index b75ae11..38b666c 100644 --- a/arch/powerpc/include/asm/fsl_secure_boot.h +++ b/arch/powerpc/include/asm/fsl_secure_boot.h @@ -59,7 +59,7 @@ #endif #if defined(CONFIG_ARCH_P3041) || \ - defined(CONFIG_PPC_P4080) || \ + defined(CONFIG_ARCH_P4080) || \ defined(CONFIG_PPC_P5020) || \ defined(CONFIG_PPC_P5040) || \ defined(CONFIG_ARCH_P2041) diff --git a/arch/powerpc/include/asm/immap_85xx.h b/arch/powerpc/include/asm/immap_85xx.h index cdfdb88..83f8b8f 100644 --- a/arch/powerpc/include/asm/immap_85xx.h +++ b/arch/powerpc/include/asm/immap_85xx.h @@ -1848,7 +1848,7 @@ defined(CONFIG_PPC_T1020) || defined(CONFIG_PPC_T1022) #define FSL_CORENET_RCWSR8_HOST_AGT_B1 0x00e00000 #define FSL_CORENET_RCWSR8_HOST_AGT_B2 0x00100000 #define FSL_CORENET_RCWSR11_EC1 0x00c00000 /* bits 360..361 */ -#ifdef CONFIG_PPC_P4080 +#ifdef CONFIG_ARCH_P4080 #define FSL_CORENET_RCWSR11_EC1_FM1_DTSEC1 0x00000000 #define FSL_CORENET_RCWSR11_EC1_FM1_USB1 0x00800000 #define FSL_CORENET_RCWSR11_EC2 0x001c0000 /* bits 363..365 */ diff --git a/drivers/net/fm/Makefile b/drivers/net/fm/Makefile index b435ecd..46dc6df 100644 --- a/drivers/net/fm/Makefile +++ b/drivers/net/fm/Makefile @@ -21,7 +21,7 @@ obj-$(CONFIG_ARCH_P1023) += p1023.o # The P204x, P304x, and P5020 are the same obj-$(CONFIG_ARCH_P2041) += p5020.o obj-$(CONFIG_ARCH_P3041) += p5020.o -obj-$(CONFIG_PPC_P4080) += p4080.o +obj-$(CONFIG_ARCH_P4080) += p4080.o obj-$(CONFIG_PPC_P5020) += p5020.o obj-$(CONFIG_PPC_P5040) += p5040.o obj-$(CONFIG_PPC_T1040) += t1040.o diff --git a/include/configs/P4080DS.h b/include/configs/P4080DS.h index 0d44c00..020144e 100644 --- a/include/configs/P4080DS.h +++ b/include/configs/P4080DS.h @@ -9,7 +9,6 @@ * Also supports P4040 DS */ #define CONFIG_P4080DS -#define CONFIG_PPC_P4080 #define CONFIG_FSL_NGPIXIS /* use common ngPIXIS code */ diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 10dedf6..3830f10 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -3645,7 +3645,6 @@ CONFIG_PPC64BRIDGE CONFIG_PPC_B4420 CONFIG_PPC_B4860 CONFIG_PPC_CLUSTER_START -CONFIG_PPC_P4080 CONFIG_PPC_P5020 CONFIG_PPC_P5040 CONFIG_PPC_SPINTABLE_COMPATIBLE