From patchwork Thu Nov 24 07:54:17 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: York Sun X-Patchwork-Id: 698723 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 3tPX5z6HJgz9t1d for ; Thu, 24 Nov 2016 19:13:43 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id F33D2B391C; Thu, 24 Nov 2016 09:12:23 +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 7by6Q1Idw9AN; Thu, 24 Nov 2016 09:12:23 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 9DE96B392A; Thu, 24 Nov 2016 09:12:03 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id E79A0B38F0 for ; Thu, 24 Nov 2016 09:11:43 +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 vORNiELnxh8M for ; Thu, 24 Nov 2016 09:11:43 +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-DM3-obe.outbound.protection.outlook.com (mail-dm3nam03on0053.outbound.protection.outlook.com [104.47.41.53]) by theia.denx.de (Postfix) with ESMTPS id 48252B389A for ; Thu, 24 Nov 2016 09:11:28 +0100 (CET) Received: from BN6PR03CA0008.namprd03.prod.outlook.com (10.168.230.146) by BN6PR03MB2465.namprd03.prod.outlook.com (10.168.223.19) 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:19 +0000 Received: from BN1BFFO11OLC003.protection.gbl (2a01:111:f400:7c10::1:150) by BN6PR03CA0008.outlook.office365.com (2603:10b6:404:23::18) 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:20 +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 BN1BFFO11OLC003.mail.protection.outlook.com (10.58.145.14) 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:19 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:; UpperCasedChecksum:; SizeAsReceived:844; 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 uAO7tR3H012503; Thu, 24 Nov 2016 00:56:18 -0700 From: York Sun To: Date: Wed, 23 Nov 2016 23:54:17 -0800 Message-ID: <1479974118-2912-36-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: 131244477798554877; (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)(199003)(189002)(39410400001)(189998001)(47776003)(356003)(7846002)(50986999)(76176999)(8666005)(305945005)(106466001)(5003940100001)(2351001)(68736007)(36756003)(107886002)(69596002)(50226002)(105606002)(8676002)(81156014)(97736004)(8936002)(81166006)(6916009)(39060400001)(86362001)(33646002)(48376002)(2950100002)(110136003)(92566002)(85426001)(626004)(104016004)(38730400001)(4001430100002)(50466002)(5660300001)(2906002)(77096005)(39390400001)(39400400001)(4326007)(39380400001)(7059030); DIR:OUT; SFP:1101; SCL:1; SRVR:BN6PR03MB2465; H:az84smr01.freescale.net; FPR:; SPF:Fail; PTR:InfoDomainNonexistent; A:1; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BN1BFFO11OLC003; 1:mhxMqF7Nb8C/9B6rcVOb6Dr3vzIdDGfhKvUXYpOrDTI0zJqWmpcAIm5ciCQnCcc/MPDgv2mn5UD4oGyuMxmnKRO+HpFPilbhCz/olDip4pea8P9YPTgEhQWAV3FXLWqkKkt1qb4kCxwc7qlEe/SWI0kmJRg4YivefhSi8o9gQIYYQDwEhO5C23rIP/U53qfprFsE8SoUWpVoVS35uIxmxIrX98CWjas2vbP5CsXj4Nn4JHJWCHiQRIOzGk3h23GmRL4KnBHukTvVt2O703zxhNR27dcMR5HQ7HX/vJ1Rr6/x4EsB3sZCnc+Qv8nO+Hx1rsVq9uqxuoJmhM6Il4WXltWY3F7kLAXIIbNWqRAaZuryv50Nrj0E9jBX8qcgg9sfGx3EZkvIsBlAsb0g/HC3j10I0idGGNfqtm7PFG16KlUD+3Zyvf6ZpRFXTpR+BLOkrHXTV+Yxt96NPnXjDbvm1d4FaSv4ikxNbm2+wgVCokgEPyBd/D3oRzQ0ahXdBvDbhTKRQJdk6HrpWuBoaog1O8U7Aywlv1yXURIlQL7CrtEVoIjh4QBcXzh7kr+lJnbpYxGtgU9S04mwg4DNZbTWGiyO2NNTBcqeHrsb4b4WnY+Xor+cJRqdCtBO7cs0bPGAdcLZ9YQT1d248ITTU3ICgbJZ1wJGjAD7Y1cxCK5DDRogrWBBIBmQYaqrIt5v8kJa54lbK7Nd6g+1sQEvGefRhn+3chYB1F1mXy4qVu+mWIA= MIME-Version: 1.0 X-Microsoft-Exchange-Diagnostics: 1; BN6PR03MB2465; 2:yMG1XuBLhdW46qbpicDB6+ruf5hjmXPfhq/lVLdbBYHM6QtG7YFhaR8r+iIU0dHy9eN1tub9C8DZKFWtKyw+y8rNiU7ODwJklidNBRak07yYY9Dq0RfR0A8E0xSvV8q8e4sS5Wg7FflxW/stQz6EnhEVP7gseUqb2d8Ho/ulEZk=; 3:PmiYsib15DawzrJsEoCDqjD6IQ5Q0u2Q5QKNeiejel8w6pqgg4i1t4xDShHgS9rNwazknCBWdUU4OecDTwtkAUDirLTOyDp5ZKRxzcloslc7iqjNN2s3J+KAVNuISoDxcvdoMXHaoDIuDgQLbA4eTR60+POYUiNURgkNbeFO6/Vq9nkr+HwB0VVE/ESkTTwC5oYbrtD9wodim0Yv8kNZzIHN50rb10WZqazIicOyLTYJE+wzvU90fJz0KV3hphIf+qbj9+wyPiuAohvVg1eO0g== X-MS-Office365-Filtering-Correlation-Id: 11e344ae-5f9f-4aec-1cfd-08d4143f6061 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001); SRVR:BN6PR03MB2465; X-Microsoft-Exchange-Diagnostics: 1; BN6PR03MB2465; 25:yDpEvstKdaJxUtOCTDU+VSao/1lO8cUKxXC5e3YToSWrthSZPTErSaShQIoXps8kGXgDV+0C0Mu6/m2ZAPptqZ0dlbUE/l/jNF7HtPMa2YXotANRBxxIncwVDFFg2WJ4ZrEO0bQ/zs18VY/rVUZOG6LasFhFlJ9TjFxD1pPHHfKaATHcNj9aIT0GKGCOojG3gfwva39CwnU40c7/ngbJfIcgFrZDaalzZ9PXLk06+o6BlMGrqw7CXGW89/BgSyZ7S2m6ONphQyaom3cq7/HkNCbLsFPvBETMJ1RhZe9IcfLrtfK+2O9aYdjerVlvdeuJw8VBJB7LpvISFa1fFeywJer/5VCocisIFTPIzmB60QcLaWvPZTSAzTM+eGDNE0m/D6UEJoNT7lr7FhN+9bpYYPLGuEMUGIjDz4vOpYstLDaRiPrhoXQ3bDJ3+ddX6VbcfHqRHM00A1d/2Wz7qTgeIH1laEG57UhodXflh9IH2Wu2gsqVNwCg4aFdTZwp9xZN/QFXoBZuZl6VEGzGnibPSfAYnlCg9mK8I0Ytdg1vXVtWEKBnY5atcr5Xne3uh3AAU0A0QV8tAJuVhrokcr998ixuXJ57raz7QQV/GRaCe1/CsFvPXbq3DTOB3iA9jeSaz3q9KU3We1eU9++Ly55KAxsgN8pMollHFAvpWd9h041BOGmJtpcsibekU3AsLnZcBCjxMDmvmeDL6bhMctpaEPxJHjp3J//1ZJ+V7KJ1xq2zr5GiY7oVyn8foi8Wf23p50q32BFpBKRHbZ096PsJKGgrMLH2osjj3Bo/VKTZzls= X-Microsoft-Exchange-Diagnostics: 1; BN6PR03MB2465; 31:NaSNboduolDng3mMY2/N1sV3bdWV0qWqvpTqjodUr4cS6NNq9nQEkvucL6jEh8Bj7+wEUMfus9l9ahn3Y/u+sq69GmhFma+5Bka+Oyd1NIBBiVmNPRhj3xO7/tWhlgNoplJw4gktNjc5qwMzH7Les5cL+Wv4eXs5kYJHkGqjQmzgZQ4YxeKsKBh76IQPRit9TXXgOiS1hbE0ZXb5fI36d2ooBhlcuQUDrvRWjeztkHAcMKm8gfBGzIPvNvyJz3SAW5kxlRp8Wry0zbsOYceNkFWFsUmH1R8WP8+LT2WDE0k= 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)(13015025)(8121501046)(13017025)(13018025)(5005006)(13024025)(13023025)(10201501046)(3002001)(6055026)(6096035)(20161123556025)(20161123561025)(20161123565025)(20161123559025)(20161123563025); SRVR:BN6PR03MB2465; BCL:0; PCL:0; RULEID:(400006); SRVR:BN6PR03MB2465; X-Microsoft-Exchange-Diagnostics: 1; BN6PR03MB2465; 4:PyyijPXfGBqqGY9qUGEfu02rJpeAIrSudcFvqr57sFgn73M/EpUX70HUDry1cst4UaONqMiP0x1QNb/i2NY8j3LgClpm1iG0DmWJjMDTMVzImgQnZPSpsV7Trrcd9at56c770V01UXuUXSI1TVAAZMxnVTUFW2aqwnTBDayWyP4YkMpoIlMoPK8tsGFDD85NVkdriF53NaqvYNh1AqRHzRr3DlkDNzjzDB5NHk9AKPUtaFi+uEcssniVUZCHVAW7BIYwdOeC+5AQ2+y95Ig4lGmgLXPEHv0zNudcEYqRByOaw723divs3TjXR9C74Q4ukriunnWgZvZS9kgKjYlvsaiu2Mf4tB7hHcUuSCf6ry8OopIZQk7rnx05cKgXFidTPRPg++c0pE0U+PQGds5wwQROkVVNjiaoaBpViJqHPjU0tMkDTrSfO5L54g+hkOJLRQV6wI2rIuWqHYbMht9Tu4xcRxncubIGOGtV57lwxndQ4CjtrYAWKu+pWs4eKL16ZVqH6Z9f8XcmmB79W0zv3660PxVdVaqRnce+O6qDQyGSLcme7C5qj2uHOuxIzckv3btG5IMeW/L/AATo86SIR6tJ5VcRoBijfW1iHmiubwTsaxPvoXkX87NaD0NrSmP8qFp/Z9wHhaD8xYOYdL71zaFsTP8NTdfzgvv+f5A+AXrylEzg+sI81EbV0oP7R9iE9nvJ5Ts/wjvpn/XPtdwfsbmcXl5wUBYcv9OBqCbHY4H02JjO5FJtqFTmHxva/I2P X-Forefront-PRVS: 0136C1DDA4 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BN6PR03MB2465; 23:FNz4boIQBu8ePCUJqCammtpqRLtLIQjqDzKNH9Mwe?= =?us-ascii?Q?DUHaOwMJprDGTFjTbp/6SfrMw22PEQA0LMwCgl6F62d0LfIlcYFif0Zh/SwL?= =?us-ascii?Q?9xFZz4cgMExqnvOLlsh8c3S9F1uW2AWom9pO/3hGwg7xYdJ4HKUwEER/dgg2?= =?us-ascii?Q?INAXrMvFp2VViVPoFN1cY4eohfFs6+T0CgREGO+ETthLBt8Jg2quTU6CO9SF?= =?us-ascii?Q?4D0AssRPZOIDUvKox18v/ahsK/fiPZBhyQpk6Lll2aQaD4XWbD6scCQJwP+I?= =?us-ascii?Q?2geF5eLD40LZmMuSZ4PbLC0vhzXZefznxr2uvXMvz2JCq5xdgfWQFSIEFgEJ?= =?us-ascii?Q?2u+YULwBROUBW2zrvsoDvYOn1RTIDLqTWh2hJ1eZUJhed6CdnMNW5sponWNG?= =?us-ascii?Q?bQsW074frCsmA7VtQdu6Qhk/gK3NKhe1eg4E7FeWNVFBbEtxYPQlleg5HWyr?= =?us-ascii?Q?eQRcOOIaQ8fEwOarCfFbqCMU2FfL+fZfPOkHHxNgh8gsElzh/u3icealSPQH?= =?us-ascii?Q?YMdsZWFJcjCFD5t3DuVHbLDp/ArTTXKYjloVvkvKWYSru9Q9MsapWwc0hHUY?= =?us-ascii?Q?6aisR7OdkG3pk6OEAqPkeLpKrf+MlZOa7oo0wFZsi2k0O42eCVOcOPWSWHSs?= =?us-ascii?Q?6FQRaS5I74jDC3iy1ANqS5Bd+LUnXcVN1bT4On9UiXzpJv9twVm7qI3QE1Sy?= =?us-ascii?Q?3obvnLaxLmOixc2EwvjUVLuA5no/GjDp4jwre44yB8RNyj1BiV+YOpNv/mWL?= =?us-ascii?Q?oL/yOcmuHEvY5kqWI8fxrlkMyyRNNV8MoPJFv/eoLTEG5jfmWp0IdhDs0+Bj?= =?us-ascii?Q?/akKP8dymav4CLw7jZvnpYyjoSu/ZN+yzAXiGtRbsPOSDhjhjJArNxumu0mP?= =?us-ascii?Q?OYZiLlyAtG65faqHHv1O3GiVcryXVH9WHjrfoLpndgJC6aeKmJNImxA90kRW?= =?us-ascii?Q?+9kuMjC49roT6ZCIL8xqhp57t36yNXvRAJb5B0BwqnoqNQnpBifo6DaZf3hY?= =?us-ascii?Q?z3IyALGnIyL4Q1/8yznnvfCR8iYwmCZvz5BFieRfxIT7RJebWCZ7+r4zaYtW?= =?us-ascii?Q?wI2RTisKgZVCjE52WqraGdjLQrwythrRv6gcaIgE2Yw8NumIuw7r3P7t+86g?= =?us-ascii?Q?2FRhAIAwjH9eKQif8f5pJtsWuLEbCXFB+6X4CIydeMec657hKP/IYEYbsvkR?= =?us-ascii?Q?mmvt0FC2Vqehp0OXM3HsDBfk7p36JQA/PJKH/meLow3+Zcpl2Bl6g9IBw9oR?= =?us-ascii?Q?B6wgWav2OaTNMkuMjrDfisDErDA3gYe56j1jOlTKz0bOqbWAVFcCuwXDbGUF?= =?us-ascii?Q?mBZQdvZYoLw0eL/rPOSPB4=3D?= X-Microsoft-Exchange-Diagnostics: 1; BN6PR03MB2465; 6:Zx/UOTGY9W8QCFa6gmwfhL8F5r4eXixOXRp6HUxt8sOxrv5n+KqMGcUKTzVzoRDWPjPcV7/7btAseiN4Y8eJ1VUMf97lKrX32r4IK8tVvfV+2ndr2pGZ91xeg2DViRS5nS9KMAAuaxvqaz7YQxEHZneSoItSr4hOXP+VN5dhtnuy0w0lFkKUKwSpfNUeEtoEOKn97uwrbgRHaVf+nf575KayJG2wFXcmo28sF/v9stSIJC28qEqTK7mtYTn3FeL0fa181Z/mFFDXoZHhg+46V+aGQWUo14b0+v/ncS0BYVBfQNS2pP7HoKPzTTP4jk2KceoAGFSX7c0NPZ24+yCmUQ==; 5:09pyCHs4X5gkBTrOa/yyvnR1a5dgY+cTYjUtwoU90O5uXzp4Yb9DlujPEE7Fx+RiIjgutctOZ53aZyxTNVHMctjsX4JrYz8dfdFvXNziZSraJjGEj+1pXXHjfSg8tPLbtzMkjFCKWpPnBdSvxomRfyVlOWitDLYQNW6Dh5Utd3Vcy0De/ttEMZjUwSJlGmaU; 24:bBRb/Yue1ae/sd/H4SHrWDDKRzvU+0HvyWZTHHgWAjBYU7kBGDH/Oivl7OBrnASS0tq8RKqU2SlopuqCRLSkVSgQ5B5HQtEQElntlhlBk+c= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; BN6PR03MB2465; 7:PK+GBkdNLVLorPUDKM/A8vE9G2f+nJE9NpWjejtCF3ECbwHrPYDIv7+n5HFSdTBJGBHcw2/NHv/vNiXog3d2x/Z8ZFxjVgPyfD5BihvMF2ZMHiTORxtpsmJ116EgRcSRETfhuyMFOsYaTUOVwbwJ1RtTwYtninedtmAwn3QM5tLHCUeySrNX3aqhZhFyibolRi4J1suq7TIbuZQ5/E76u7ANZGjpsSUzhsyD7Nx7JGOjxDIL6LPecq/jJ/4XkhTaDfG1mXUxVlcROv6WQv9KC/n6iQ3iF1Pu53R9yvMmzvMynBfjb/yw1uEbsONPYRC76ywAznGXmgCd3bgB1OgAjs8mI40agPTHKo4CD+5ZrIg= X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Nov 2016 07:56:19.6214 (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: BN6PR03MB2465 Cc: Kumar Gala , Aneesh Bansal , Stefan Roese , Andy Fleming Subject: [U-Boot] [PATCH 36/97] powerpc: P1014: Drop configuration for P1014 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" P1014 is a variant of P1010. There is no P1014 target configured. Drop related macros. P1014 SoC is still supported. Signed-off-by: York Sun --- arch/powerpc/cpu/mpc85xx/Makefile | 1 - arch/powerpc/cpu/mpc85xx/speed.c | 3 +-- arch/powerpc/include/asm/config_mpc85xx.h | 17 ----------------- arch/powerpc/include/asm/immap_85xx.h | 4 ++-- doc/README.mpc85xx-sd-spi-boot | 1 - 5 files changed, 3 insertions(+), 23 deletions(-) diff --git a/arch/powerpc/cpu/mpc85xx/Makefile b/arch/powerpc/cpu/mpc85xx/Makefile index 707d784..b52cf79 100644 --- a/arch/powerpc/cpu/mpc85xx/Makefile +++ b/arch/powerpc/cpu/mpc85xx/Makefile @@ -74,7 +74,6 @@ obj-$(CONFIG_ARCH_MPC8569) += mpc8569_serdes.o obj-$(CONFIG_ARCH_MPC8572) += mpc8572_serdes.o obj-$(CONFIG_ARCH_P1010) += p1010_serdes.o obj-$(CONFIG_ARCH_P1011) += p1021_serdes.o -obj-$(CONFIG_P1014) += p1010_serdes.o obj-$(CONFIG_P1017) += p1023_serdes.o obj-$(CONFIG_P1020) += p1021_serdes.o obj-$(CONFIG_P1021) += p1021_serdes.o diff --git a/arch/powerpc/cpu/mpc85xx/speed.c b/arch/powerpc/cpu/mpc85xx/speed.c index 83fa04c..4e63859 100644 --- a/arch/powerpc/cpu/mpc85xx/speed.c +++ b/arch/powerpc/cpu/mpc85xx/speed.c @@ -707,8 +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_ARCH_P1010) ||\ - defined(CONFIG_P1014) +#if defined(CONFIG_ARCH_MPC8569) || defined(CONFIG_ARCH_P1010) gd->arch.sdhc_clk = gd->bus_clk; #else gd->arch.sdhc_clk = gd->bus_clk / 2; diff --git a/arch/powerpc/include/asm/config_mpc85xx.h b/arch/powerpc/include/asm/config_mpc85xx.h index 5b6c872..31723ea 100644 --- a/arch/powerpc/include/asm/config_mpc85xx.h +++ b/arch/powerpc/include/asm/config_mpc85xx.h @@ -183,23 +183,6 @@ #define CONFIG_SYS_FSL_ERRATUM_A004508 #define CONFIG_SYS_FSL_ERRATUM_A005125 -#elif defined(CONFIG_P1014) -#define CONFIG_MAX_CPUS 1 -#define CONFIG_FSL_SDHC_V2_3 -#define CONFIG_SYS_FSL_NUM_LAWS 12 -#define CONFIG_SYS_PPC_E500_DEBUG_TLB 3 -#define CONFIG_TSECV2 -#define CONFIG_SYS_FSL_SEC_COMPAT 4 -#define CONFIG_SYS_FSL_ERRATUM_ESDHC111 -#define CONFIG_NUM_DDR_CONTROLLERS 1 -#define CONFIG_USB_MAX_CONTROLLER_COUNT 1 -#define CONFIG_SYS_CCSRBAR_DEFAULT 0xff700000 -#define CONFIG_SYS_FSL_USB_INTERNAL_UTMI_PHY -#define CONFIG_SYS_FSL_ERRATUM_IFC_A002769 -#define CONFIG_SYS_FSL_ERRATUM_P1010_A003549 -#define CONFIG_SYS_FSL_ERRATUM_IFC_A003399 -#define CONFIG_SYS_FSL_ERRATUM_A004508 - /* P1017 is single core version of P1023 */ #elif defined(CONFIG_P1017) #define CONFIG_MAX_CPUS 1 diff --git a/arch/powerpc/include/asm/immap_85xx.h b/arch/powerpc/include/asm/immap_85xx.h index c82daab..222bb4c 100644 --- a/arch/powerpc/include/asm/immap_85xx.h +++ b/arch/powerpc/include/asm/immap_85xx.h @@ -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_ARCH_P1010) || defined(CONFIG_P1014) +#if defined(CONFIG_ARCH_P1010) #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_ARCH_P1010) || defined(CONFIG_P1014) +#if defined(CONFIG_ARCH_P1010) #define MPC85xx_PMUXCR2_UART_GPIO 0x40000000 #define MPC85xx_PMUXCR2_UART_TDM 0x80000000 #define MPC85xx_PMUXCR2_UART_RES 0xC0000000 diff --git a/doc/README.mpc85xx-sd-spi-boot b/doc/README.mpc85xx-sd-spi-boot index a08db92..b7d57be 100644 --- a/doc/README.mpc85xx-sd-spi-boot +++ b/doc/README.mpc85xx-sd-spi-boot @@ -67,7 +67,6 @@ P2010RDB config_ddr3_1gb_64bit_p2020rdb_pc.dat P1020RDB config_ddr3_1gb_p1_p2_rdb_pc_800M.dat P1011RDB config_ddr3_1gb_p1_p2_rdb_pc_800M.dat P1010RDB config_ddr3_1gb_p1010rdb_800M.dat -P1014RDB config_ddr3_1gb_p1014rdb_800M.dat P1021RDB config_ddr3_1gb_p1_p2_rdb_pc_800M.dat P1022DS config_ddr3_2gb_p1022ds.dat P1024RDB config_ddr3_1gb_p1_p2_rdb_pc_667M.dat