From patchwork Thu Nov 24 07:53:58 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: York Sun X-Patchwork-Id: 698670 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 3tPWm41X8vz9t0w for ; Thu, 24 Nov 2016 18:58:12 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 5E3C8B38C8; Thu, 24 Nov 2016 08:56:59 +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 kMV3PF7_0ZNu; Thu, 24 Nov 2016 08:56:59 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id B88E0B3871; Thu, 24 Nov 2016 08:56:42 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 97CDEB3878 for ; Thu, 24 Nov 2016 08:56: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 nE4uA_r1EAfo for ; Thu, 24 Nov 2016 08:56: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 NAM03-CO1-obe.outbound.protection.outlook.com (mail-co1nam03on0086.outbound.protection.outlook.com [104.47.40.86]) by theia.denx.de (Postfix) with ESMTPS id 3AF14B3870 for ; Thu, 24 Nov 2016 08:56:05 +0100 (CET) Received: from BN3PR0301CA0001.namprd03.prod.outlook.com (10.160.180.139) by CY4PR03MB2471.namprd03.prod.outlook.com (10.168.165.7) 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:03 +0000 Received: from BY2FFO11FD021.protection.gbl (2a01:111:f400:7c0c::179) by BN3PR0301CA0001.outlook.office365.com (2a01:111:e400:4000::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:02 +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 BY2FFO11FD021.mail.protection.outlook.com (10.1.15.210) 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:55 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:; UpperCasedChecksum:; SizeAsReceived:1242; 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 uAO7tR2w012503; Thu, 24 Nov 2016 00:55:53 -0700 From: York Sun To: Date: Wed, 23 Nov 2016 23:53:58 -0800 Message-ID: <1479974118-2912-17-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: 131244477619863542; (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)(336004)(339900001)(199003)(189002)(7416002)(50986999)(50226002)(8666005)(4001430100002)(5660300001)(50466002)(626004)(97736004)(356003)(39390400001)(39380400001)(39400400001)(7846002)(305945005)(107886002)(33646002)(104016004)(189998001)(68736007)(76176999)(38730400001)(5003940100001)(2950100002)(8676002)(81166006)(81156014)(6916009)(48376002)(39410400001)(4326007)(39060400001)(36756003)(69596002)(86362001)(85426001)(2906002)(47776003)(110136003)(105606002)(77096005)(92566002)(8936002)(106466001)(2351001)(7059030); DIR:OUT; SFP:1101; SCL:1; SRVR:CY4PR03MB2471; H:az84smr01.freescale.net; FPR:; SPF:Fail; PTR:InfoDomainNonexistent; A:1; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BY2FFO11FD021; 1:3tUG0ly3SzK8emC4KszM4sIYelcn1sLpktJ4VM854sEq76UkvA9Jkf97jVpWhMEr2t/UmvbnTjFus4oAUXGgtjrAa+tRw+oUkkzLtqi+ZKHhQIj+Hpz81w6B+M0SJBh1YFkgS8cgG5kp3wQ0xkOnDRahA5LJAGg7trmOPGXgC7VOrexKkFZMc893ESUquZA0UppOybaE7OyfiSVEdGDjQtTak0g/q+PsyIOKuVoe4cYEIRthQaJ0Y90hpBpEHlUJhJ/4ky7psZFLapbhqucJHUP7sjkuTMU8Cch4R1zv5ne3uIWYTQ8FFz/1vfmp2BSP36X+UoEgJObZiwF/01uTqfn/w/CBlinhaVHvuTrrI4rbXCxbT8hAnoY6804df3fs+3GGj+Jm//Z5rQ9PbM0LoJBYmyLyK4m8ME763gX0+jfRmYeTXtdMMRY3dROpXv7FKHrSks+xvR/SZk7OP2ZhCzdmpgz188vBpgt0XX+e6veruXB2WTVTIWL9FOe6SVJnFQ6kR5Gj0IPwJkW7S9UwtiCjZMuFy7SO/lIKhUCbNQTSMjD7U4TW+hvHKzXg5YoQGLtTGXHzZcM7OWx79A5dFB8/8CKS5UrRojOzS6o85/rTnma0aXhc8bz3jQpiGcrx7Eu7abptE6EiZ3fxD1l5o6WlMhSnsMz4W905yYENkZGQNWoYotwWFlz0KczkDuMwFb3XioztUdMMmKvRTKKdL4gF9AmcJpjdoiXWeVFGk5o= MIME-Version: 1.0 X-Microsoft-Exchange-Diagnostics: 1; CY4PR03MB2471; 2:b5z0NjdfuE0gcxW9ZwTs+EG9H5LhPFVa78dUw3OlMZIbgIbFPL7Lq4UfaaIYurB04NsprErXJYLm06zWbXlmtoe8a8Cx6UVCNcpV64FrSqZS6aF1ym17QLL4OkEierTrf0Ps/SvfRGfdO8UWNzwST2XqUK+6CCwXdVZ02hj3rUc=; 3:yg0cS2KB3IS0jKk1YjrdtsxFnixI5yuDC0Nl/7JTLH6/jvmKuY4Rn9EkaFggJWyz8o3upidEzvSSFXMayOYW4TWa5MVTFVvz6aogrv83G42AwtHM0w2vTYpAYDgam+dhupbhdnNVnsUVu5jURvOz9ktlsVzKUHl5vzc0LCmFSQAFR+RbPiEujBAc/d8arG2UO36+6OLO55+YbnLyp1fBkXKmf7m8i/D44NVX/rXRLNm8bvLjPOzhMGLZvhSkp5iIhV4GbxxoNOraC1vRVJDTAQ== X-MS-Office365-Filtering-Correlation-Id: aaf85685-1b8d-4f6a-1e96-08d4143f55b8 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001); SRVR:CY4PR03MB2471; X-Microsoft-Exchange-Diagnostics: 1; CY4PR03MB2471; 25:uxQjAmrf94v6r8RkHcMuoolMaNKxqb1idqEoMuT7N1COyAoE6Lsr537JqmrQQPXWpG/biqMZoJGnGqXiWdxFnfrlwwYP8OkozFNC9ssMnl8BCWOvw/elY/D3UpwexXA4myTOci4CgFZI4pq/2Z/IQkqVwkAmMraTY2cZXs4dozpqIWbEHTj0CozeBQEIyxYb0qdwdZQnUYOLTxWhxJszwoZuXQjbp6sY1hres40d1wC/1MhcOn2+/TwmzOuCx0O+fyli9DSn4UywAHRJMAbZuwZpAgNOfXNMSlUEiSs4WrXJUBpeahxMF2yhW+4XJsEjVqVghMi4y+quyIas3zr+B/fI6pf9C69y3yx4xCX4Y65GBa3lg/zrvnHKrvPtPXjR3ah+uKYwhw1Qzxo9CUUlVbGMgE6Rynn4N3t1aoCf/vUBV5HAM35316F3G3A7W3vLGRS9yAc0h1TOfINE/CO6uwnpcaqMgZjeiEz40b6ilCW6TPmM9F0+2+NfXQcfSv1pu8ZShqUVr/G40VcY6MYty2B27Jh+kWnhPiyPR4b5VYZV9zsBylon2T0J8a567fAtcQ0nE6KF3d1ZWQ8RaCf4cOsYTu6NUXJxYQ+NOb6kTTFMtWehE/Q4g7ekrpBcf9A8ga0fFyDD5jazlVgj8WDQe71PukbfHGNF89ry8rGidfMGDDVz7mB3j7HQcOIvBooXA9WggFhVS0tCVPBN2HvisPe3qEqhn16/pnTlGe/0OIPsGY6zrhLkzoWxluG9vZCV X-Microsoft-Exchange-Diagnostics: 1; CY4PR03MB2471; 31:hnz390jm1VDV0be/qNVa9BFx0DUGKPMOj8+JvU4maNzZWjAipwY5beDC+/rEdMBZP2UkITPyAGttC/FtzemkWlcDG4RX60VIZasDOuRfJ0DvIB6TOsbwNHe4/z/pBGdnx0LlRUkiyWMF+pwLdjy3FG78nuwEfMXQX/Mo+oWlnInW7iFTjhQY/yTOe4Ggd9RyFwWBxqo17DFEHlNy/v7SA4jHTfGrVA03rEm01Ly2p6+m/kOQRETrWHsQaclclJQk/TQWo32IhEcDFERv5NvyIEBIpoQCX3f91KTS+OP8xp4= 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)(13017025)(13015025)(13023025)(8121501046)(5005006)(13024025)(13018025)(10201501046)(3002001)(6055026)(6096035)(20161123556025)(20161123561025)(20161123565025)(20161123559025)(20161123563025); SRVR:CY4PR03MB2471; BCL:0; PCL:0; RULEID:(400006); SRVR:CY4PR03MB2471; X-Microsoft-Exchange-Diagnostics: 1; CY4PR03MB2471; 4:PYRlWqGejCXng7H9hTgmaIHvTKFFWkhCiDGLImia85vcw4cH+E5f0D+UX67LjpuPtXdr0T5aMzNBBw/jwvAdJEvjycyLbQfOFrmsZgHC4y3HlRPuyJZdkMA8BiqPXNc4C6c4gyr/wGTszgK5Ke0a5Fefc6+OSb1c/zxk8ewrSJ+cvY9dxn3jmRq8/2BR6vNLn3HvE03XXBM21nOfhlk3PHrsP4fy9GTWJzD9UrB2sNLiEly1g+JWKKtF13LvYKXAyBCVVdsaZ0CQRic776NMU5L60ZP4ap1tC0f6cMzqR7OQuTEqceF+O7ItOe/zY9ok5aIpPrgDNHldVLi98GyE40UXx9q5lmEg9MbEMMZdRkMzqxDU90gt1muwPwWJbM0quvy5FujKIX4h1uo2rUZgwM+2Oyv7b279ploO6wn+zxJpfV6S4eHOqSN0Z5wklQng3uEslfGqkimb4O20olFuN+0+Divx+2KJbgivKW5eeJZx7ssSdItguslfaNOU9qq8MMhyE+0NE6Z1KutncMZWg0xr+Kv/dedKLhPLBoKH8YDVqPd/vXn6E/cBlQubOiXWLG23kKaQrCVuGqv5tmFyHuNcBinPONTwa7ndpmxLno55+ViDRO6TPETfBkGqL9Oq7fhOb6LbMAX9qZd9liivN0JPnFP3naMLs9IzaCzLZGUwE0myy/ekd/R6dQF1DpM7EqH9uMDh752YPkZEHuEExT9ZA+z8h0tAf+QHwZxgQpDa5sVCLNEX31tv7mNP35ijURASA+dh5JP+WuDYxuqYyQ== X-Forefront-PRVS: 0136C1DDA4 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; CY4PR03MB2471; 23:l+KVAfqRtWXKdVFWKD7HCNbLn0rQKQ/ES1fROs7gc?= =?us-ascii?Q?A6bgZQxXxRQi1vyKoQH0VmcYISzNXwyNeZfQ576nSDfncXST4WfLGoFKYWZo?= =?us-ascii?Q?UDiz4Lz1oIHsf2n+eqq76VNtdc9orYo75Ea2NAIj2ukiOdzEVC1BaIKmJz/Q?= =?us-ascii?Q?/TkA+ESEVSY16V+KSpYc9/cjh+3O2eQnLOJZQijS2PAN7HCFUyN0wPYGbPRJ?= =?us-ascii?Q?Bcv/ZOVUq0N9xuonY81FhSoTK0VCHt4Y7KfNHxZvDxlJO5I5zPmVCZ7LcobN?= =?us-ascii?Q?izdQ3rPLqNFMel2kNa18zY4xViXis9GyNpXkVOd45xdTGleQbFaLT6K9XeKi?= =?us-ascii?Q?yI0LnoTefdTJVtvVu0eMXezGvTmSUFB5Xteg6U1KaWu8MiNfuqpmBitIRmK7?= =?us-ascii?Q?hzIRkZKBpHWaRFO+kikmZaDR33Vt7NqeKFz0bFNmXN/bNiSQ1tKYZHE7Jw14?= =?us-ascii?Q?/bccflwey59wUcZcdDhVCVrcJBl/q9ji9EVO8N2Ybv3X3KP7LB4Mg6lYeDHO?= =?us-ascii?Q?1GNR7x+CwUNCOcYsSII9BaslWOEP/9f6s8iZ5bqEzee40hjf7gJWpPLkmSDy?= =?us-ascii?Q?8mXaJbfdKXwC05WHtqi4XEUPoUsSFCy/00rOuCyMKvG4XH95kC2qQoWce6fO?= =?us-ascii?Q?jeFdYohO8Y834dXSZzLI7XqHEQEeKAphvhroSBZs7P2o9cmJWo1XI+QEvSsr?= =?us-ascii?Q?/7JekW0wS3QvLdtKbFxDJKw8lEAxvxBH4bu4mOgf/OtJBFav2wjkUgAAKgwD?= =?us-ascii?Q?kJFRIKvhRFOUKpg1zJDSSL0sqDyFAU5B10GCJBaiNfiAmmSi8b0pWLW8vSvl?= =?us-ascii?Q?K3lmzSpgz6j48h90iW9DPBr6K0hYEVjRIJ2Rt0vZ5KRN39I66kZHeXElopMx?= =?us-ascii?Q?Dj5aRa0NBun8zGKPLQG92uylHMALtPKxGBaRZMaOE5WUguVw1dMjCvckK6BV?= =?us-ascii?Q?885jC67GQmriXwLTZB0SoB7OCEltwSq63fPME6zzPbwzjKKlrnrICxCZ/fbU?= =?us-ascii?Q?T3TOMKp5QYqBm5nsiPbPOptZVnZwDFjpjoxKZQdYTnVjy16xIsM2dA1KCFkt?= =?us-ascii?Q?4XdDfy9LLld0ulaKyRYeaRORHoqGbLHP41xdOrRoo22nvZ2naLzdVCk4a6Oj?= =?us-ascii?Q?ZC1pqet6gDejDhbK71Ut/bQEVNn+/xpXqCtTPrhbtpy3D21iHi6ng2QbHm/j?= =?us-ascii?Q?A00u/QHf+gbpIx4TJVZQ17r2BZCgm4csGfq6Ixutw78hMpYQrdKACL0ylvKq?= =?us-ascii?Q?2R5uqFY2jaZGrNZK2EVDuNB52FuRZ4+F6/E+KhVWMGmwGtvDH0lHnawoatZo?= =?us-ascii?Q?xXPWD8c73Y8aBUth3QyBn7mszmFHPBMMKH3hjfLjzST?= X-Microsoft-Exchange-Diagnostics: 1; CY4PR03MB2471; 6:tP0l/QhMwkEcGU3Fe29iv8LImsSzUFrEM8kyfenWpkZt2U72dd1kiOfbGRWX87upd30qeNpm/F1ylI28emy8umh0tGE9v9GbTlf2mDxQsZKhJy71SzWVomL6U/AdUBtmRSOWQEvXI6MWZgBiyCs19jvPgsehsEnM7tpyxr5yJEXN+x3Y47wU7gRaOF2BbqANhppeOqslQAVIuAr+Py4Z/TrU88HvL+nGyc5bSglVPllFlTvFM3oXtca2Y0jn7+fAuh8myOadVwrBUG1LKbk5QVGPZSAy/goXkOEyQxMoOjLp6Vbnww871ZELlyuAGSoeMYRwdXw8YXMYVRN2PHjdoA==; 5:B5d03AFLAEeb8JTqqC5lyCD5tP3LCM4iibJ5RaYKz1PUV8zXNzGRlKtPIFECAv9iRDxOKbeeO2Et4G8xsf8JJz2NrvaDMO8OuGuEIz03dQ4gMx71neKghByvtIjaNfvjU0YHaKaq9+pqqqToe2dnDfxcnFDResO1nAEF9AeXKRHXQhit6FpMz3BnYUogWFgZ; 24:VOpS/WI/VfLCtwgVvfGyM9d2uC1z+P5pRdqGVqpSDJLAkozyFOZykqyCI5kyyfEC6qA5NPqCISUPRUiNP+ZsqQXIDYn/cNAIsAEfPI7Bre0= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; CY4PR03MB2471; 7:W6c4SBY6iXCkqNg5fRqx2m1VH2nuohTF9A710Mb/KRBqbFYLeOrM67huejN9EA/8qnjgmwswnuT7FJkzr841gGQ5zx66qhMe9IgctOng/QEVo9RTqjOJjKBYKPn8ROZ5VE2ZtJMNTG1na3ErQwPG7BAg3g/L0mFKPJa+7abOQVb7QLIkC4nwg+lJ7sOE+xhT5v56gF6lSfJn3I7gqX8AmxCPSMPEEODT5zrK2+k7vuyvQ+tXAVhAZt/mIBnfMPG9kz27nSTugJ9c3UH9ksnrF6oLein0BbDZNpNh9OLnUhYfEDQWwdyM2hg1ye9cjAenKoQnbCCnS9GBjCBrMeVFlu9311atJHkKzKDta9x8o7E= X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Nov 2016 07:55:55.7775 (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: CY4PR03MB2471 Cc: Viresh Kumar , Kumar Gala , Aneesh Bansal , Stefan Roese , Jagan Teki , Andy Fleming Subject: [U-Boot] [PATCH 17/97] powerpc: MPC8555: Remove macro CONFIG_MPC8555 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_MPC8555 with ARCH_MPC8555 in Kconfig and clean up existing macros. Signed-off-by: York Sun --- arch/powerpc/cpu/mpc85xx/Kconfig | 4 ++++ arch/powerpc/cpu/mpc85xx/cpu.c | 2 +- arch/powerpc/cpu/mpc85xx/speed.c | 4 ++-- arch/powerpc/include/asm/config_mpc85xx.h | 2 +- arch/powerpc/include/asm/cpm_85xx.h | 2 +- arch/powerpc/include/asm/fsl_lbc.h | 2 +- arch/powerpc/include/asm/immap_85xx.h | 2 +- drivers/ddr/fsl/ctrl_regs.c | 2 +- drivers/ddr/fsl/mpc85xx_ddr_gen1.c | 2 +- drivers/input/keyboard.c | 2 +- include/configs/MPC8555CDS.h | 1 - include/keyboard.h | 2 +- scripts/config_whitelist.txt | 1 - 13 files changed, 15 insertions(+), 13 deletions(-) diff --git a/arch/powerpc/cpu/mpc85xx/Kconfig b/arch/powerpc/cpu/mpc85xx/Kconfig index 8b08ee2..c58f76f 100644 --- a/arch/powerpc/cpu/mpc85xx/Kconfig +++ b/arch/powerpc/cpu/mpc85xx/Kconfig @@ -76,6 +76,7 @@ config TARGET_MPC8548CDS config TARGET_MPC8555CDS bool "Support MPC8555CDS" + select ARCH_MPC8555 config TARGET_MPC8560ADS bool "Support MPC8560ADS" @@ -207,6 +208,9 @@ config ARCH_MPC8544 config ARCH_MPC8548 bool +config ARCH_MPC8555 + bool + source "board/freescale/b4860qds/Kconfig" source "board/freescale/bsc9131rdb/Kconfig" source "board/freescale/bsc9132qds/Kconfig" diff --git a/arch/powerpc/cpu/mpc85xx/cpu.c b/arch/powerpc/cpu/mpc85xx/cpu.c index c563744..3e6f8f3 100644 --- a/arch/powerpc/cpu/mpc85xx/cpu.c +++ b/arch/powerpc/cpu/mpc85xx/cpu.c @@ -294,7 +294,7 @@ int do_reset (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) { /* Everything after the first generation of PQ3 parts has RSTCR */ #if defined(CONFIG_ARCH_MPC8540) || defined(CONFIG_ARCH_MPC8541) || \ - defined(CONFIG_MPC8555) || defined(CONFIG_MPC8560) + defined(CONFIG_ARCH_MPC8555) || defined(CONFIG_MPC8560) unsigned long val, msr; /* diff --git a/arch/powerpc/cpu/mpc85xx/speed.c b/arch/powerpc/cpu/mpc85xx/speed.c index bd810d7..93c7193 100644 --- a/arch/powerpc/cpu/mpc85xx/speed.c +++ b/arch/powerpc/cpu/mpc85xx/speed.c @@ -626,7 +626,7 @@ void get_sys_info(sys_info_t *sys_info) */ lcrr_div *= 4; #elif !defined(CONFIG_ARCH_MPC8540) && !defined(CONFIG_ARCH_MPC8541) && \ - !defined(CONFIG_MPC8555) && !defined(CONFIG_MPC8560) + !defined(CONFIG_ARCH_MPC8555) && !defined(CONFIG_MPC8560) /* * Yes, the entire PQ38 family use the same * bit-representation for twice the clock divider values. @@ -682,7 +682,7 @@ int get_clocks (void) * AN2919. */ #if defined(CONFIG_ARCH_MPC8540) || defined(CONFIG_ARCH_MPC8541) || \ - defined(CONFIG_MPC8560) || defined(CONFIG_MPC8555) || \ + defined(CONFIG_MPC8560) || defined(CONFIG_ARCH_MPC8555) || \ defined(CONFIG_P1022) gd->arch.i2c1_clk = sys_info.freq_systembus; #elif defined(CONFIG_ARCH_MPC8544) diff --git a/arch/powerpc/include/asm/config_mpc85xx.h b/arch/powerpc/include/asm/config_mpc85xx.h index f16e32e..4e38d23 100644 --- a/arch/powerpc/include/asm/config_mpc85xx.h +++ b/arch/powerpc/include/asm/config_mpc85xx.h @@ -85,7 +85,7 @@ #define CONFIG_SYS_FSL_ERRATUM_I2C_A004447 #define CONFIG_SYS_FSL_A004447_SVR_REV 0x00 -#elif defined(CONFIG_MPC8555) +#elif defined(CONFIG_ARCH_MPC8555) #define CONFIG_MAX_CPUS 1 #define CONFIG_SYS_FSL_NUM_LAWS 8 #define CONFIG_SYS_FSL_DDRC_GEN1 diff --git a/arch/powerpc/include/asm/cpm_85xx.h b/arch/powerpc/include/asm/cpm_85xx.h index e89e2f0..b46e20e 100644 --- a/arch/powerpc/include/asm/cpm_85xx.h +++ b/arch/powerpc/include/asm/cpm_85xx.h @@ -77,7 +77,7 @@ */ #define CPM_DATAONLY_BASE ((uint)128) #define CPM_DP_NOSPACE ((uint)0x7FFFFFFF) -#if defined(CONFIG_ARCH_MPC8541) || defined(CONFIG_MPC8555) +#if defined(CONFIG_ARCH_MPC8541) || defined(CONFIG_ARCH_MPC8555) #define CPM_FCC_SPECIAL_BASE ((uint)0x00009000) #define CPM_DATAONLY_SIZE ((uint)(8 * 1024) - CPM_DATAONLY_BASE) #else /* MPC8540, MPC8560 */ diff --git a/arch/powerpc/include/asm/fsl_lbc.h b/arch/powerpc/include/asm/fsl_lbc.h index c7805e9..ff9b2d9 100644 --- a/arch/powerpc/include/asm/fsl_lbc.h +++ b/arch/powerpc/include/asm/fsl_lbc.h @@ -326,7 +326,7 @@ void lbc_sdram_init(void); #define LCRR_CLKDIV 0x0000001F #define LCRR_CLKDIV_SHIFT 0 #if defined(CONFIG_MPC83xx) || defined(CONFIG_ARCH_MPC8540) || \ - defined(CONFIG_ARCH_MPC8541) || defined(CONFIG_MPC8555) || \ + defined(CONFIG_ARCH_MPC8541) || defined(CONFIG_ARCH_MPC8555) || \ defined(CONFIG_MPC8560) #define LCRR_CLKDIV_2 0x00000002 #define LCRR_CLKDIV_4 0x00000004 diff --git a/arch/powerpc/include/asm/immap_85xx.h b/arch/powerpc/include/asm/immap_85xx.h index 4754aa8..d6e7f62 100644 --- a/arch/powerpc/include/asm/immap_85xx.h +++ b/arch/powerpc/include/asm/immap_85xx.h @@ -127,7 +127,7 @@ typedef struct ccsr_i2c { #if defined(CONFIG_ARCH_MPC8540) || \ defined(CONFIG_ARCH_MPC8541) || \ defined(CONFIG_ARCH_MPC8548) || \ - defined(CONFIG_MPC8555) + defined(CONFIG_ARCH_MPC8555) /* DUART Registers */ typedef struct ccsr_duart { u8 res1[1280]; diff --git a/drivers/ddr/fsl/ctrl_regs.c b/drivers/ddr/fsl/ctrl_regs.c index b2e92a0..32b0967 100644 --- a/drivers/ddr/fsl/ctrl_regs.c +++ b/drivers/ddr/fsl/ctrl_regs.c @@ -1831,7 +1831,7 @@ static void set_ddr_sdram_clk_cntl(fsl_ddr_cfg_regs_t *ddr, unsigned int clk_adjust; /* Clock adjust */ unsigned int ss_en = 0; /* Source synchronous enable */ -#if defined(CONFIG_ARCH_MPC8541) || defined(CONFIG_MPC8555) +#if defined(CONFIG_ARCH_MPC8541) || defined(CONFIG_ARCH_MPC8555) /* Per FSL Application Note: AN2805 */ ss_en = 1; #endif diff --git a/drivers/ddr/fsl/mpc85xx_ddr_gen1.c b/drivers/ddr/fsl/mpc85xx_ddr_gen1.c index 67a9ad8..c005f52 100644 --- a/drivers/ddr/fsl/mpc85xx_ddr_gen1.c +++ b/drivers/ddr/fsl/mpc85xx_ddr_gen1.c @@ -47,7 +47,7 @@ void fsl_ddr_set_memctl_regs(const fsl_ddr_cfg_regs_t *regs, out_be32(&ddr->timing_cfg_2, regs->timing_cfg_2); out_be32(&ddr->sdram_mode, regs->ddr_sdram_mode); out_be32(&ddr->sdram_interval, regs->ddr_sdram_interval); -#if defined(CONFIG_MPC8555) || defined(CONFIG_ARCH_MPC8541) +#if defined(CONFIG_ARCH_MPC8555) || defined(CONFIG_ARCH_MPC8541) out_be32(&ddr->sdram_clk_cntl, regs->ddr_sdram_clk_cntl); #endif diff --git a/drivers/input/keyboard.c b/drivers/input/keyboard.c index f53a07a..7af5868 100644 --- a/drivers/input/keyboard.c +++ b/drivers/input/keyboard.c @@ -21,7 +21,7 @@ static struct input_config config; static int kbd_read_keys(struct input_config *config) { #if defined(CONFIG_MPC5xxx) || defined(CONFIG_ARCH_MPC8540) || \ - defined(CONFIG_ARCH_MPC8541) || defined(CONFIG_MPC8555) + defined(CONFIG_ARCH_MPC8541) || defined(CONFIG_ARCH_MPC8555) /* no ISR is used, so received chars must be polled */ ps2ser_check(); #endif diff --git a/include/configs/MPC8555CDS.h b/include/configs/MPC8555CDS.h index 908b7ed..d0498c6 100644 --- a/include/configs/MPC8555CDS.h +++ b/include/configs/MPC8555CDS.h @@ -17,7 +17,6 @@ #define CONFIG_BOOKE 1 /* BOOKE */ #define CONFIG_E500 1 /* BOOKE e500 family */ #define CONFIG_CPM2 1 /* has CPM2 */ -#define CONFIG_MPC8555 1 /* MPC8555 specific */ #define CONFIG_MPC8555CDS 1 /* MPC8555CDS board specific */ #define CONFIG_SYS_TEXT_BASE 0xfff80000 diff --git a/include/keyboard.h b/include/keyboard.h index a911ac8..5cbd9f8 100644 --- a/include/keyboard.h +++ b/include/keyboard.h @@ -99,7 +99,7 @@ extern void pckbd_leds(unsigned char leds); #endif /* !CONFIG_DM_KEYBOARD */ #if defined(CONFIG_MPC5xxx) || defined(CONFIG_ARCH_MPC8540) || \ - defined(CONFIG_ARCH_MPC8541) || defined(CONFIG_MPC8555) + defined(CONFIG_ARCH_MPC8541) || defined(CONFIG_ARCH_MPC8555) int ps2ser_check(void); #endif diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 1284101..aa7dcc8 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_MPC8555 CONFIG_MPC8555CDS CONFIG_MPC8560 CONFIG_MPC8560ADS