From patchwork Thu Nov 24 07:54:09 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: York Sun X-Patchwork-Id: 698674 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 3tPWnN4ws5z9t0w for ; Thu, 24 Nov 2016 18:59:20 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 8A549A7599; Thu, 24 Nov 2016 08:57:31 +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 NhkyoiNB17rQ; Thu, 24 Nov 2016 08:57:31 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id A57A7B386F; Thu, 24 Nov 2016 08:56:54 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 2FC98B3878 for ; Thu, 24 Nov 2016 08:56:42 +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 Xg-O1KU_4rcQ for ; Thu, 24 Nov 2016 08:56:42 +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 BE85DB3881 for ; Thu, 24 Nov 2016 08:56:11 +0100 (CET) Received: from DM2PR03CA0025.namprd03.prod.outlook.com (10.141.96.24) 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:09 +0000 Received: from BL2FFO11FD042.protection.gbl (2a01:111:f400:7c09::181) by DM2PR03CA0025.outlook.office365.com (2a01:111:e400:2428::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.721.10 via Frontend Transport; Thu, 24 Nov 2016 07:56:10 +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:56:09 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:; UpperCasedChecksum:; SizeAsReceived:1116; 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 uAO7tR39012503; Thu, 24 Nov 2016 00:56:07 -0700 From: York Sun To: Date: Wed, 23 Nov 2016 23:54:09 -0800 Message-ID: <1479974118-2912-28-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: 131244477698145373; (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; BL2FFO11FD042; 1:0AVZ8ggTMo92ZVd4vYsLF6VSSyjvx94UtAkA7s9t7CrgJctWry5eSTbWYDvBc8WRZj4cI42d7b9VE+TDSLTayN36shiZhuThLAsbBwt9sl/VeNPVGbp2ok+TIFDKcnLOlkGkRpuRN/hasPh6B/xcTbknViCqZULhekHM6/V3sA7j53VwVEsXJNq8Cm2XL+LVhEOYjb2LARb9FyryIuX+1Am7TpDIUmPs5MBDZ8UGl61T3ZJ+t05ymG+1nDzqP7ByLo78GNh/p7n2Jq61QHY0qSCWnX1PwQJjPjPt6UajlAzFetvoKsavZJ+tliORfOXsFxq6ASlgBY0PBS/0qUClfnWpYexUf0FW6gQ0hfeEd30J0unXllOU9jN3g2UmyIEtdSGIVqpvaE6pWfULsM5DRYOTsACyMxviarMGGOzgEUoFmqUCXrHotNj+m2mxHxMrQMDRPSCw6EVLavqvQu9DUZUYpfUa/W0X9KjEC2mrw54i4OguNPXeYjmkCm/VSMCp8tHv8pozjRv9FfZ9gE+NaODMXuewdXLpC7EJgx1QTV1IkIwbalhF8iiFRrZ8EW0T0Nn01YDQwlwb+Ps+crKWKtEbl7UzlI3qMIyrjgpnUJUgAxTM4xNy81G6nXu7PZRXimE6zQjA4VMLcd8zCFB6PNgKrNiud3yoWzIgFwplmAkN+iX7z1p+AUcbYx+x02M4DnEzbgRWuSKaRWZzDNOYNH5McI/2+LRNknZmt+YWPno= MIME-Version: 1.0 X-Microsoft-Exchange-Diagnostics: 1; DM5PR03MB2475; 2:1hQ7MgmG9CFQZ7PJ6DW7k3hlKm3BCnlGYbvgpZKDJO3hCRi3JAv+0oneTv0lm03wouDB6FPdRYsdzEBAYqZ1RVLP9eTirqoj5AIAmmF5HJALoHYbpQkIzJvJZnW+nQABKqZp7PLYQIkSk7Ov3jyrX//wjecpHIHJkTAo/RsiS5Y=; 3:XOugSBrGb5+HpXjJvDFRmwKrxF9BnKOUTxuH7xqim50ndpTT0780N5JMkhygURvZWW+LH7UPSDI8iq1VIk1gVXMcq0Rm7DiP1zvp3v887VlZPf0tEKN8FH9kcROmIOK7Y1uQwzSJSSazK8yMQUkIVr80ux3Rl5dgYB3/bxqvRZf5UQkM57qd52/C7R9IH2nShlW/gxft22eGiST6ppEOsXLNMp+s2QIVsRZAtt+YUPnL9tlnEd68LoIhQ0p3PXRTmj4zsQPS0ICn0bRBKDU8zQ==; 25:cSlzR08OnKwrQmGZOl3qtHE3iitVg3QGCLorMm2hJmgE8BxuUJJuzH3vID4kU94Y6go2ttfHl0cYu2ihyY5VptF3k/bHN8FpYahm61s7nv8kTV3dhMemTNOZhvpQxENHjBrn6CtVFSYAH6XtHhaSQm9w4HN1bguV5Fiu0LIAiNNKZ0UsRGzPcggWtRWvhyf4emnBjJEHYMOfoUnToBe1wK4CxSKVwHTSUgoEQ31YW7W35TPT82s4a5Caa9xW0eOiGLUFvOqm7Lc9NODLouKglObSJECDAloc4Rfxct6L24/TCYJA1O2cPoei5Dcb12DHANOkl6qcENDxrTttGpBUvbW7qZMehjwSPdSbmvXdWI+7hvja6Dp7VpYmsf3RFn1GaNwL14GFfgp1SlDo4X3aOPYcbVwIeK3RCbyjigxyL44ri+mUgrKz5m4WvKns/YBGzhq4aeNBb1StQwg7OrdmsA== X-MS-Office365-Filtering-Correlation-Id: b5735059-349f-40e2-fc5d-08d4143f5a64 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001); SRVR:DM5PR03MB2475; X-Microsoft-Exchange-Diagnostics: 1; DM5PR03MB2475; 31:3BZ0AMdN1tsK12BERJfAmn9gs4kg+DWvHDNgq/Cg3z1oH6aTy7EIJPO36Qet7ym0YK80LEnLZEj4Wup15Xqqkq5UfJjNAx9449056LSLpK+9IUbv76mhauP17p2ChbZjOJMfvdVC88gqorced5tn7C2esgrjAKPg1JWrL4UNFR5zOS9wEjTSsjsu1Id1Yn/QZNjse4m3RUdVE96CiVcEWgT1mHLiDmGyAUvbFbG4FsY9+An/melbY+ajH29GOUcyg5hd05wlu5FlnpUUdSy93w== 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:63L4i2p1PHI3Sn8DuZfpiqtCezkYjZrDl2QBBuIiHo3K4EGcIPrx+5xDUOWpwjkRHVDddsb7uSFidl4zv1tQOOKkYcGOq6bQLwf4z0FWD2G/ICMwAPksVQW7P50rn6k4Cb/vH9zSgkFEyXAWY8EYfqWHx1qeaTZsJBex6x9nALD4096qmIebprJAETNQwAp9qSTrd5PwUVIvD7pfF3hAJSj+tOHvVUbL4usOeQOja1whQHI1Mhvdx2Vz/dYTx4CkMRFo7DBdg6fe/vQxql9g+tASMgAzoLszcfzIoxsACJnpQ08y8TneY4OlLJXQKn3STAfAi1l56mxjAC/mEjDGPXQgPb/gCIVPd4zc/UoWT1hD8lbteCEPrnbcHtrWLgWeMonp45d0ZrSzQhOpdx0fp+9DEsXO+GaUefQ6AfepCplCkSxoJCxkVe+JC97JtTukpNKalkptZDULapgVdMEiPUASdfyNNGoa5OStjhA+sinMVaoL7Q81uYVcYxJMSZh4aByS8VILOv36yoQpCsQv/LUuTX/kRyCGmttaH/wlk6G5bs4yZGyUjIfdsRya59pWa5P+i9v7iKd6S0NRg4AVTKHvAIY/ooxYB6L0WhES1MAPwDrxQtnarCVivc+mNI1vc1gDQmpYc18tOXG3bByDtvVw0gjN+R+Dlybg+99+sv7/mL4P3xxCrZk0jDwC+0Xm7BDGvgJBuGC/i0/m8q1Re1v0396JRA+UjO8SYi0kBLEVQnTARhFuJ1VXOcKC0+5AsWmNtnRmZLPMn6xQhk49eg== X-Forefront-PRVS: 0136C1DDA4 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; DM5PR03MB2475; 23:Ljy9UHo9Jm3z1XhQ0Ubc6fmGi45vn/TXP/oMX7z3+?= =?us-ascii?Q?Bo7JwQMvhYTsin90I2pt9XKaFupuHgQKFeGxhJSdjz8tOsXrA1yczWYkphYL?= =?us-ascii?Q?yMtHL3ShFgdkxGHz3lGpaXAtVB3vYBiOinVo3byEjTZo4OOGwl63LCzGNME0?= =?us-ascii?Q?eTRlcm45PCrnTMyLzgy1S+4KL2bsRHSICJrE//9ljpwfdiVUdAl7yCKYrBNW?= =?us-ascii?Q?Hp03rivk5Ba/k7H/jU1OTEYm3iH6JqFh0mzJsAlR7uthR+8jmIIVm8157fDE?= =?us-ascii?Q?WeH80teDoE2uWgI/ZwaShP4LbPjf++96TfM0vsmNgD0XhwSrgLXZ0//9xr5U?= =?us-ascii?Q?1NmO8Lo5/cuLQ+ZJSUkJFYcRDy6K7kAIRphUDYtjH9f2lEokwA0FV/g2M9Zq?= =?us-ascii?Q?ua8CLSDLgAU3W4XOOu7znA1C3eKw4ggqX6bfALPmzltFgC/O/kvqWod1T+2d?= =?us-ascii?Q?gYwCgQ2TjP2W55EFcRR0V9yyvM9J5JArRA3xX8szEslObUsXqTT1WJXtATOD?= =?us-ascii?Q?CI34wVfmX0u1GjNrPoFGVzOUEgVZzqm9CPsTsjbtuxQkPDAjaL8I+5Let9kl?= =?us-ascii?Q?DWgQUqxMmoSxsMgaJat5Yn05mcZFUuWwyKG8xQl1GR5v7ejC30HMuoo/+9Se?= =?us-ascii?Q?TWk6IXRpKq2ZbRUDd9s5mzbF4/AwRxldAgZ4oAmi/hQr5GfTG7slxToeBh6t?= =?us-ascii?Q?8RObQ6NTCQ/FMWKIs48tQN1IwDNNM9NOEKwT1JU3bs6yhsH+tj2NOSqjlAXi?= =?us-ascii?Q?XnzvIKR80F5qd1/YMv7h0IEaBBXQ2EpwB2+iA43VBYyPLGGmWHidMU1xJMhT?= =?us-ascii?Q?YFz908N9jIErpNdWCenda+JqRy6shJT46a3WiE6PQVYkO6UDTlrOOAYkn0V8?= =?us-ascii?Q?/Zu7WxWV8fIQ7JkRlIIHWj4duEos9NxpIVSBwbwnEkcdfcN+sLhRw1vOw2bR?= =?us-ascii?Q?ee/N0P5gpZi2kPaT4pa/B9K58MhSFQKplInc1mNTHTagbD7HmOfhRiWxc0XY?= =?us-ascii?Q?nfJ9PhlPMlkKsulXX6iFHmm+u4EWPG9qWIJshuln35kRsleql00xz2loOWDa?= =?us-ascii?Q?mAaytwF/i7Olrm+xESMwtB3YYM48TTGe73QxxfIAG8bfy5R6zW4o4WZZeLfp?= =?us-ascii?Q?K9Ty0AHnWAixFpkiJXpHEkGjWAzEx5udxtXjTcr3boaJHEnrnSGplPD/Xohu?= =?us-ascii?Q?RkznAY7jaXAQ67iCQUvjzah9L7j+6zP0Bt9yR+LZWgAs2f/9d+ZcxWnDkpNe?= =?us-ascii?Q?q9B/43AuNTQQDzB2aToq1mg2+gxwC76WaJoOHwqafDG+khBi6TrO0mMnqNRc?= =?us-ascii?Q?VGQm8Z5302Eic+mow+P9dD/a0cvTDdpo/W8C2bhPTeR?= X-Microsoft-Exchange-Diagnostics: 1; DM5PR03MB2475; 6:iZAMW+zDy4NDK1iI/8SuJyQRoKK3Aq1nhe99lcb+5apvRTLgRi/dmxvLrda69GakVuGHTiZw7kV/L+jx1tLdmI+00++lFj5AMbwC7gf28vJYK4zb2AmeWiCtKHTtjI9Gc+kJ/nf7Jw5aHmyEVw492W6wGqIo4jUT0wWRO8Hn1B+2QRWZdAgCW+syjYRl/kk30zCX818E1neJrMKvnqxXLGyk5lOLWgIBFloux2UlJLHJC1i8O9jnS5YOSTrnzbTnfe/ejR2rTjiRVv1pAB6ASujfjOHp0STGkVbs1n9HnQoYYCT9pRYDh8TyDcPMnt8U+MtsZgfGRmdNRkiKNtdmzw==; 5:AUoX8DoBDsTTFpsWBgPUnWgpvn0xyDdH28W1cfj0Q3fWa0f1s17z4N+JlNGH/7fWT7b79nE2EXt4Yk9N5lYpmevJzv0wx43zGfGuGdENhgSPCWiAuISFTbw4WowZL+uk/OxVMiGh9qrsurZAUfU8h8cGdYDPsaZCdcTnO1JG0whBBupaeD2xF7CDtnKjui3n; 24:eYbuDghkW7lq52SOCIRMGXx43L9KM02WTaS9zYYed9NaglpX52sGsG3jIVwyFHKsAC4Ca2T24BKg3nQxcnHVCLCQ+D5LB3Jk3MBP3JMemLU= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; DM5PR03MB2475; 7:N5Fnub7fbi65hrPArUvnkAs2TcClMQY6inGiGjJNEmm4DFTUa6mxMpEdlptJutFrDZNYS0bRNiF/QFPNstjQFGV0LDZkLGUXjFGiE4bB/qL0V1+/oP+upQaP9MNhZgGB/A3zUWbzAWhL+2oLzcIkgR1COxTjV+wOEOC6Hbx5w9iP6zdguORVItXFnc0suVeb9kVMVCyWhzkKuqBQ0dRef14momAps73p1TRbpCivWAQUMifV7y8OZfraKGf7Iw19PdTOLAMVwrEUfCNPMdVlqQAk2+B30oL2fgJMaA7J9Q/O/ER5x1h3mA+nCVYaFNdvo8RfQ1OQPYCOwdm6V9ZOmglhlGv/0sqmLzWvQ25wCpU= X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Nov 2016 07:56:09.5337 (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: Stefan Roese , Kumar Gala , Aneesh Bansal , Jagan Teki , Chris Packham , Andy Fleming Subject: [U-Boot] [PATCH 28/97] powerpc: P1010: Remove macro CONFIG_P1010 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_P1010 with ARCH_P1010 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/include/asm/config_mpc85xx.h | 2 +- arch/powerpc/include/asm/immap_85xx.h | 8 ++++---- include/configs/P1010RDB.h | 1 - scripts/config_whitelist.txt | 1 - 7 files changed, 11 insertions(+), 9 deletions(-) diff --git a/arch/powerpc/cpu/mpc85xx/Kconfig b/arch/powerpc/cpu/mpc85xx/Kconfig index f4d9f9d..9b6dd34 100644 --- a/arch/powerpc/cpu/mpc85xx/Kconfig +++ b/arch/powerpc/cpu/mpc85xx/Kconfig @@ -96,6 +96,7 @@ config TARGET_MPC8572DS config TARGET_P1010RDB bool "Support P1010RDB" + select ARCH_P1010 select SUPPORT_SPL select SUPPORT_TPL @@ -228,6 +229,9 @@ config ARCH_MPC8569 config ARCH_MPC8572 bool +config ARCH_P1010 + 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 e3f7dc8..de42b65 100644 --- a/arch/powerpc/cpu/mpc85xx/Makefile +++ b/arch/powerpc/cpu/mpc85xx/Makefile @@ -72,7 +72,7 @@ obj-$(CONFIG_ARCH_MPC8548) += mpc8548_serdes.o obj-$(CONFIG_ARCH_MPC8568) += mpc8568_serdes.o obj-$(CONFIG_ARCH_MPC8569) += mpc8569_serdes.o obj-$(CONFIG_ARCH_MPC8572) += mpc8572_serdes.o -obj-$(CONFIG_P1010) += p1010_serdes.o +obj-$(CONFIG_ARCH_P1010) += p1010_serdes.o obj-$(CONFIG_P1011) += p1021_serdes.o obj-$(CONFIG_P1012) += p1021_serdes.o obj-$(CONFIG_P1013) += p1022_serdes.o diff --git a/arch/powerpc/cpu/mpc85xx/speed.c b/arch/powerpc/cpu/mpc85xx/speed.c index 3ac3580..c20bc9d 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_ARCH_MPC8569) || defined(CONFIG_P1010) ||\ +#if defined(CONFIG_ARCH_MPC8569) || defined(CONFIG_ARCH_P1010) ||\ defined(CONFIG_P1014) gd->arch.sdhc_clk = gd->bus_clk; #else diff --git a/arch/powerpc/include/asm/config_mpc85xx.h b/arch/powerpc/include/asm/config_mpc85xx.h index 7d81dfc..adad3d3 100644 --- a/arch/powerpc/include/asm/config_mpc85xx.h +++ b/arch/powerpc/include/asm/config_mpc85xx.h @@ -140,7 +140,7 @@ #define CONFIG_SYS_FSL_ERRATUM_A004508 #define CONFIG_SYS_FSL_ERRATUM_A005125 -#elif defined(CONFIG_P1010) +#elif defined(CONFIG_ARCH_P1010) #define CONFIG_MAX_CPUS 1 #define CONFIG_FSL_SDHC_V2_3 #define CONFIG_SYS_FSL_NUM_LAWS 12 diff --git a/arch/powerpc/include/asm/immap_85xx.h b/arch/powerpc/include/asm/immap_85xx.h index 4aeccbf..0cd90d1 100644 --- a/arch/powerpc/include/asm/immap_85xx.h +++ b/arch/powerpc/include/asm/immap_85xx.h @@ -2169,7 +2169,7 @@ typedef struct ccsr_gur { #define MPC85xx_PORDEVSR_IO_SEL 0x00600000 #define MPC85xx_PORDEVSR_IO_SEL_SHIFT 21 #else -#if defined(CONFIG_P1010) +#if defined(CONFIG_ARCH_P1010) #define MPC85xx_PORDEVSR_IO_SEL 0x00600000 #define MPC85xx_PORDEVSR_IO_SEL_SHIFT 21 #elif defined(CONFIG_ARCH_BSC9132) @@ -2181,7 +2181,7 @@ typedef struct ccsr_gur { #else #define MPC85xx_PORDEVSR_IO_SEL 0x00780000 #define MPC85xx_PORDEVSR_IO_SEL_SHIFT 19 -#endif /* if defined(CONFIG_P1010) */ +#endif /* if defined(CONFIG_ARCH_P1010) */ #endif #define MPC85xx_PORDEVSR_PCI2_ARB 0x00040000 #define MPC85xx_PORDEVSR_PCI1_ARB 0x00020000 @@ -2222,7 +2222,7 @@ typedef struct ccsr_gur { u32 gpindr; /* General-purpose input data */ u8 res5[12]; u32 pmuxcr; /* Alt. function signal multiplex control */ -#if defined(CONFIG_P1010) || defined(CONFIG_P1014) +#if defined(CONFIG_ARCH_P1010) || defined(CONFIG_P1014) #define MPC85xx_PMUXCR_TSEC1_0_1588 0x40000000 #define MPC85xx_PMUXCR_TSEC1_0_RES 0xC0000000 #define MPC85xx_PMUXCR_TSEC1_1_1588_TRIG 0x10000000 @@ -2350,7 +2350,7 @@ typedef struct ccsr_gur { #define MPC85xx_PMUXCR_SPI_GPIO 0x00000100 #endif u32 pmuxcr2; /* Alt. function signal multiplex control 2 */ -#if defined(CONFIG_P1010) || defined(CONFIG_P1014) +#if defined(CONFIG_ARCH_P1010) || defined(CONFIG_P1014) #define MPC85xx_PMUXCR2_UART_GPIO 0x40000000 #define MPC85xx_PMUXCR2_UART_TDM 0x80000000 #define MPC85xx_PMUXCR2_UART_RES 0xC0000000 diff --git a/include/configs/P1010RDB.h b/include/configs/P1010RDB.h index c45b091..e17de90 100644 --- a/include/configs/P1010RDB.h +++ b/include/configs/P1010RDB.h @@ -11,7 +11,6 @@ #ifndef __CONFIG_H #define __CONFIG_H -#define CONFIG_P1010 #define CONFIG_E500 /* BOOKE e500 family */ #include #define CONFIG_NAND_FSL_IFC diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 0dd5a7b..c1c012e 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -3383,7 +3383,6 @@ CONFIG_OS2_ENV_ADDR CONFIG_OS_ENV_ADDR CONFIG_OTHBOOTARGS CONFIG_OVERWRITE_ETHADDR_ONCE -CONFIG_P1010 CONFIG_P1010RDB_PA CONFIG_P1010RDB_PB CONFIG_P1020