From patchwork Thu Nov 24 07:55:15 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: York Sun X-Patchwork-Id: 698706 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 3tPWyh46xHz9vFP for ; Thu, 24 Nov 2016 19:07:24 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 2B753B39ED; Thu, 24 Nov 2016 09:00: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 cHg5wsgu8Dbo; Thu, 24 Nov 2016 09:00:59 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 7F711B39F0; Thu, 24 Nov 2016 08:59:34 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id E1318B3888 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 eSuE7sO4Mczj 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-BY2-obe.outbound.protection.outlook.com (mail-by2nam03on0084.outbound.protection.outlook.com [104.47.42.84]) by theia.denx.de (Postfix) with ESMTPS id 066DFB3917 for ; Thu, 24 Nov 2016 08:57:39 +0100 (CET) Received: from BN3PR0301CA0069.namprd03.prod.outlook.com (10.160.152.165) by MWHPR03MB2477.namprd03.prod.outlook.com (10.169.200.147) 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:36 +0000 Received: from BL2FFO11FD010.protection.gbl (2a01:111:f400:7c09::145) by BN3PR0301CA0069.outlook.office365.com (2a01:111:e400:401e::37) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.747.13 via Frontend Transport; Thu, 24 Nov 2016 07:57:36 +0000 Authentication-Results: spf=fail (sender IP is 192.88.158.2) smtp.mailfrom=nxp.com; crashcourse.ca; dkim=none (message not signed) header.d=none; crashcourse.ca; dmarc=fail action=none header.from=nxp.com; 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 BL2FFO11FD010.mail.protection.outlook.com (10.173.161.16) 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:35 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:; UpperCasedChecksum:; SizeAsReceived:1107; 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 uAO7tR4F012503; Thu, 24 Nov 2016 00:57:33 -0700 From: York Sun To: Date: Wed, 23 Nov 2016 23:55:15 -0800 Message-ID: <1479974118-2912-94-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: 131244478559021187; (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)(38730400001)(68736007)(33646002)(4326007)(8936002)(2351001)(7416002)(2906002)(50986999)(76176999)(97736004)(50226002)(104016004)(36756003)(7846002)(39060400001)(105606002)(189998001)(305945005)(106466001)(5003940100001)(81156014)(69596002)(47776003)(8676002)(2950100002)(81166006)(8666005)(48376002)(5660300001)(626004)(92566002)(50466002)(110136003)(6916009)(6666003)(85426001)(77096005)(86362001)(356003)(39390400001)(39400400001)(39380400001)(7059030); DIR:OUT; SFP:1101; SCL:1; SRVR:MWHPR03MB2477; H:az84smr01.freescale.net; FPR:; SPF:Fail; PTR:InfoDomainNonexistent; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BL2FFO11FD010; 1:N33NZrYzrR/w1PGzz4OqdDIc5QovZF6x4d3IjGshy2ipZWHkhDHD6Ng1f8clAgLqru3WK95hoLam7rgfDfTPtYwAh7kEmUkpnMUyD2tTtqcz7IPIgPm2vdbVKF3dfRnabwlT/WMc5UaQfztjeptb0Y6V5AKHwmBUS/GOFTBLmy5X1bGXycedk+yPj2d2bP6ZSb4MsWqL+Px+N4Lh6bm5A2lyMbIG/hzOrWLH+o0wbnQn5h4oIcjHVsB3tMLsluor9t1jbSZl4ZO5klxysPZl/lJW3p5/GAzKz7S+AR17mEG7NwOz6FHJbEnqqkV+Qvluc6jffEMh7VTYV7wAB1DdgR7y/quUs/t5qUKYEvCbiOcvEPIWx7j2qvOxl7CTzbzRmGRY9wPbBfJyRotSWlR/ZO3wmsbQE2WOpDdRRExzc5OkP0O0W2P8GWOWntRKSf5IH9IzbG8KDkTiPiaMWL/YaXUQezY+bNjEEw2EVOvwvHT1tumcNrMM0SfduJCLV1aKXfn9dsBNpFYuIXJfPppLKZhikYvFyxYel9me86Uv1SRXq1YNMqryoqiANku/QO0oFIvuhvskbGILUZvKtKPS3U9ZhmA3lK00EZl926h0/LMdGXAFRU7766Jk/hbowvKt MIME-Version: 1.0 X-Microsoft-Exchange-Diagnostics: 1; MWHPR03MB2477; 2:d7/uVS9gB+rMDdKNPip7Pdali6+5Jc+Jm1yJhhh3St5ZwMhUmSD29zMP/RbL84EFTCViPwhUcZcCUCR3LrLDOZoPhxjmkt3rBy6JMgrhpAdNDNa8rbY+u2Fngv1uzejcEwt4FJJ/OwFt+tuHeB/tuRESQF5PpMkJu7McemjWPxY=; 3:ZBIi8gz0X3X2UNPNlXqqU6s4rg4l3/G8CbUs30JzsXyekBe2akJbHOfy0PmAZqhqZuOb/pF7arOFSTOaZxHY4SmgW7HLk/3uVgVbFcC+e+mQczzeiIlUWL0lzblFFEZqEt2Hpd3ssen2cNWJOWoJm27mTdHEBuPk0ihRb0fF8If56EuFL5kSud6vXgYIhbUzd6bWHRopzrPavNa6KHnO2bWG5VZnMVFDTKpXqzZl1ZCCBE6yzpC4Bc9S1u8gSfnA2ypyxQcRhVKSa/wE4Bcc0g==; 25:SQNcDE9mqCgziBXx4j/rqjo+gENlgGKAVrlC2RkQVp2k0dHpqqmKu8a5sSoSqycFkPPh0EyIlWoTq8XFZfkMYqNTmGjhyx8nTnUTjXiQ1l6oRkzjyfd89zRnZq2oSaTc7ATz7F0psqKkJOpj9LCF/YK3uqCfk0thCE0IIaDgqBo0RTHZxR9fe+v/DLpN/Ef5lZdnqZ9FU5SKz3Zn/K/ha04n59GTZvsS/DqwTu+47RBZhC6ZT3OIbNsPhYbTDOJf0DYTrTuqVsKBz+/SdZNRIKXvPWBxEel/dMdBWFqCB8+MsMpcJoN+TQDHAKK9eV/J7Zzfi+eEEK6rH7Rpqq9r6ZfMC9SeRwCJqz8++YDxdTxJV9K3QZIit5YUBItzab+m3lmL9Vw+MclB7Tt1WNwSqqUnvyNOMGUxw6FkAOu3t3wUxZf+0AurFsvRHgJpYyNFeTg135qQp3p/WIidV5r0xw== X-MS-Office365-Filtering-Correlation-Id: 84350dae-6a58-4609-873f-08d4143f8db2 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001); SRVR:MWHPR03MB2477; X-Microsoft-Exchange-Diagnostics: 1; MWHPR03MB2477; 31:+c4iWa9V+r4rM8XYwVuf00dC+8tL4ikZeJQsDFkm/qt2sf8vcdsYPBiJkI+A1u9ymTq1ZE3GV8WgjqlQjpFEKrMreBaxZfNthuWMc2ZTWqc3hTQC1P6k2ykL1Q4dBc20fMYHJD3+o8lDv5xLg6CeKp13JyApqcGMZUn+nL8N0zMiMzq/zCuu0HCwDesWEbpjEUW5VIAeOVq7SCpCwVOhRvwMK6sjayz8Y7iGFhzk84vW6irChueep2wRVH661wpi3fhbXSdrkI6l7c8BPNc/fA== 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)(5005006)(13023025)(13015025)(13017025)(8121501046)(13018025)(13024025)(10201501046)(3002001)(6055026)(6096035)(20161123556025)(20161123561025)(20161123565025)(20161123559025)(20161123563025); SRVR:MWHPR03MB2477; BCL:0; PCL:0; RULEID:(400006); SRVR:MWHPR03MB2477; X-Microsoft-Exchange-Diagnostics: 1; MWHPR03MB2477; 4:V4PkXgPQ2kxaBx96RTx/N7849FmZWW6w3u5I+oq1M8e9sZZnAzdyUmwX3PRuT6kpYkQog6LsjFyLjIRHDnJfx1paCz0wm54QFnqEK9S2cWdoli4OTozjsDKG4KSltTJ8QK40/wsrAEVE6hsBrQ9kRDFfv2GygVrc6RLPjTlACyIZNOIUIKwvM/LA28ajpyo+O5K4tdli/UzT5jYrtqwi22XUVyXM38SLn3XBL1VkPhlH4ZdIepdPOpf3ChlFsX6lr3RWmdQjoRUXCOKJY6eySoqFsTcaoxBEn5Uggrqs0GtWFQKppMfvUIQZ/2ayJJASlKzmqN+2w9LJVMvLLxvmGCpB1zckB5FE9YeZp2UWbqIF/tWXPiB/yDcorNOF+QTHh011rZk6uty/62tLRRK7ovikiwhUh1g2WMatozKycSm+lEUCUdXGUk221H2Su3n6GQsT2WLzgf1KDVkft1K9+8VwKN0AsOQ0ioPLVsJ21S0TbTT8R9izX2qrG+H093tt62Zxg/IbdyNiyrRztCwUgZFjOquqsRMUejS9XLfzatu4VBOb8MZD4naD9I17OgU6d4H0cGgs4642vdf49R8bkZ9QBChuKWbgHmuidcHbOkuotZcPKsXt7ufaxSiPYZjJ3vD/M4DO48sFs5TmVx+1h27Cp0SM9JEjWA7sCPXivVZVcEKlaBhB21sW8mxc7tRblzItopnRWcpXVxRGPztqgWTmVA+GAH31BhWXn1Vyo9+/bgMkWYBEKggNx4sFPS0k+QA0VvP07LfeFJBvBgMHsw== X-Forefront-PRVS: 0136C1DDA4 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; MWHPR03MB2477; 23:yYsDZbGFqg2tGVQjzK7SCaIXYhZh1nN/asvtF8fqb?= =?us-ascii?Q?McQ0Ik3PDxDHgeESNSfSlJX2vb/rQ0fSd14k2c90/F/hEBuh/cL7HbcUgmO2?= =?us-ascii?Q?p/FpOUKNuWtpNAsMuh7I/ZqX8T4BnKJQhOUHwvWy3wvFJxUTEQQdPA5PttCo?= =?us-ascii?Q?xWgBK4cRfaGcAvwfjfZk0rNTCaiR438BISoK7AoZEqQEZnwGQjJLn1owehgx?= =?us-ascii?Q?gZIKeZOGO29RbCge6lJOdCuRPgZV6moNlELgP5EzxkbvRG7w18aqo2rm4RG7?= =?us-ascii?Q?1HIE51C9ryr88grnCOg95nIzIa4YpVeQoWCP7G48zHRS63hNXAycs082P/k9?= =?us-ascii?Q?kD2Wme8vntcG8r0+7Q3GmArqzSX6yQTMqTw9L8kQmkRvpBxYUMsHsk8wLe3V?= =?us-ascii?Q?4rRH/f9/oIMdmbiXjMovYw/SxZTJn1kAMzK52NpZxQdcXhJdjcx5Gz9j8Ivj?= =?us-ascii?Q?c7Ci04RCkeOCOa1fKC0NS8NZ2qymSr2YTMlU8mDRfZ1k0cjoSvRIyrKRZJBr?= =?us-ascii?Q?Xq7cahpibCprE13mZO7cvFAsJCEEdD2f33lgO227aHoP8CtcjraxZe/lWkPi?= =?us-ascii?Q?P2E66x2LVrsEUXVUk6N/LopIbJiWxESbmaoGVp4OU7imOCfmZ6dEFD8f+wwo?= =?us-ascii?Q?Isj3Cbr6Pb6AfLb00b1PHuci+/y/LdER1MSbTGzapRxK+lSV97LjwgEKYlPR?= =?us-ascii?Q?tCKqeOWQhBNZxVe+GVYJhrryYW7Ffytdi/AoW4KzDO6Kr5t8wnrxOG+woLwC?= =?us-ascii?Q?KJ+c0b8CmHiQQKBwWFyZ+MwfhgV2sS1js5NFAZYqINfyv9/rIHZuzV325bY9?= =?us-ascii?Q?CfMfIsUKslXTCh6936G6SLw9+1G2F8tM9/spMBhdqy9Tkrtm7jkXU+JzBspL?= =?us-ascii?Q?ToddKAyhy/zvGocPHLJD5oCh1ncWXNln8RB2sttOMWNr7BNymjWqieKksafe?= =?us-ascii?Q?fk2sBTkorRQrNY2tiC/oOdOrYoVmtQQ8Ge3Pxb1ehjbQ1kgqJbF754DjRBc/?= =?us-ascii?Q?rc7fErNIWHqKjGRUwQ7kozzWh/7xmx+jNVVbZ/2zVaU0Dcz3tWiuE753Kovw?= =?us-ascii?Q?rBlA/C7BxY382JUeJLvLpUW+NHsL62qZZvIskkPJXVQg+5Ykvs61CnovWvJ3?= =?us-ascii?Q?c0BBpD2BNGvjSFSm97Cq6yAbMmB+RPY59tYtDT3UR6z8NtWYNphAMDO77GY/?= =?us-ascii?Q?xGNtiS9d8Z2AHdvG1Pp7BBoXmXu4+j/D2tyvyZX5LjAUm0lVOg4VgqH5aVz5?= =?us-ascii?Q?He3HyAT0VZzyORwTt+2yF2GR5Ot3t3YuHqLe/Y1RcPUzUu9Y6r8RWHCcwjZY?= =?us-ascii?B?QT09?= X-Microsoft-Exchange-Diagnostics: 1; MWHPR03MB2477; 6:pFt5tPzef3UiAMm0ACSABVQY9OoJn6fLDhU3S7RAWTJnpVcInFZSnTTJGKQcgTD2FtaaD91HOUrBL0KoSqqefplfsdbhBoWMp1ZqeCqXzbn+Q9FA3QjVkuJNimpf4T2cI/21gEvEvF5lY6OlM/B1FekB+d0yCI4QJ2o3n5TTTBYSQeVUlj/9JgS2DFv78eRZTHSrtG6Ll+/hpF9ueo6QrKRwP/JGPOR2FP6D5cqXeQ2SPMo5GLJvIW1VBBxKzCQ3kaCw/r5BIjraF+BCMnljMKvx2XIgvhSL9c80lmkQ9gCuwER+S1Wl/sRLXpdag97oEeIUKl8wYFO05Y4Znhpmuw==; 5:s40MkpFi8NI8K5YeNqByb0822iGXRzg87OK6NC3Jt6d80VUmarqvLT/INZaKDbu5fALEwlvB/EUDcPXfhDlBzaEGzmvSUXzyisYpVhEYNvPB9tsL/eQIGaGIwkKrkZYsKvGwKZV/fXNoMuQlGMPv2MTfdmhkfVzJhf8w6xHzn4dJ8+JDZveyGsJmCUzwJOcU; 24:2ijjSJ+HFxLMRaVoxDeat7SjpI5jmrPG3jr8rGB8LJClb/rHp9mf3gBpnSn+2UEBPeJqc3Oif4JoTL0PDd35xQqR1bid8GKjp/Hbm3vLhiw= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; MWHPR03MB2477; 7:7ktNALwhJhsqOrzSWugTCxkWqHuccQZsUa8nrM7O2BZ0ixx0X/jNyr9qafPWWZ+CUg+LvnA0J1XQacvOL6L9vAgLCuWFIa50aV1wzNKQsKKEM5+MV/265ETT/GNVz55Iwq6KKPjUiCkbkfU0GpzAZThArFuSVWxlQwAsJiyyTFketoQgkybDv6pLkxWrBBNGFnXhnNPQeDeX4qzFYqdlwPgaTf1sZ+nJ5qsRCbKYE5fPy6JMYwdO2NZ4dDbb1JfPHehsnJ/axCZiGh4QnTMnUhAa0i2XA4PcvioSKA8UhO1qRmEA1b303J71SBoTEIBVdFT0DWJsEgjzJDJ53f4Z0ADEMCSVXGuud7KxYJaXXj0= X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Nov 2016 07:57:35.5901 (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: MWHPR03MB2477 Cc: Kumar Gala , Scott Wood , Jagan Teki , Stefan Roese , Peter Tyser , Andy Fleming Subject: [U-Boot] [PATCH 94/97] powerpc: MPC8641: Remove macro CONFIG_MPC8641 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_MPC8641 with ARCH_MPC8641 in Kconfig and clean up existing macros. Signed-off-by: York Sun --- arch/powerpc/cpu/mpc86xx/Kconfig | 6 ++++++ arch/powerpc/cpu/mpc86xx/Makefile | 2 +- arch/powerpc/cpu/mpc86xx/cpu.c | 2 +- arch/powerpc/include/asm/config_mpc86xx.h | 2 +- arch/powerpc/include/asm/fsl_law.h | 4 ++-- include/configs/MPC8641HPCN.h | 1 - include/configs/sbc8641d.h | 1 - include/configs/xpedite517x.h | 1 - scripts/config_whitelist.txt | 1 - 9 files changed, 11 insertions(+), 9 deletions(-) diff --git a/arch/powerpc/cpu/mpc86xx/Kconfig b/arch/powerpc/cpu/mpc86xx/Kconfig index c3b3b07..98fb702 100644 --- a/arch/powerpc/cpu/mpc86xx/Kconfig +++ b/arch/powerpc/cpu/mpc86xx/Kconfig @@ -10,6 +10,7 @@ choice config TARGET_SBC8641D bool "Support sbc8641d" + select ARCH_MPC8641 config TARGET_MPC8610HPCD bool "Support MPC8610HPCD" @@ -17,15 +18,20 @@ config TARGET_MPC8610HPCD config TARGET_MPC8641HPCN bool "Support MPC8641HPCN" + select ARCH_MPC8641 config TARGET_XPEDITE517X bool "Support xpedite517x" + select ARCH_MPC8641 endchoice config ARCH_MPC8610 bool +config ARCH_MPC8641 + bool + source "board/freescale/mpc8610hpcd/Kconfig" source "board/freescale/mpc8641hpcn/Kconfig" source "board/sbc8641d/Kconfig" diff --git a/arch/powerpc/cpu/mpc86xx/Makefile b/arch/powerpc/cpu/mpc86xx/Makefile index 0caf9f1..88c23fc 100644 --- a/arch/powerpc/cpu/mpc86xx/Makefile +++ b/arch/powerpc/cpu/mpc86xx/Makefile @@ -20,5 +20,5 @@ obj-$(CONFIG_OF_LIBFDT) += fdt.o obj-y += interrupts.o obj-$(CONFIG_MP) += mp.o obj-$(CONFIG_ARCH_MPC8610) += mpc8610_serdes.o -obj-$(CONFIG_MPC8641) += mpc8641_serdes.o +obj-$(CONFIG_ARCH_MPC8641) += mpc8641_serdes.o obj-y += speed.o diff --git a/arch/powerpc/cpu/mpc86xx/cpu.c b/arch/powerpc/cpu/mpc86xx/cpu.c index 4dc483b..7a9570c 100644 --- a/arch/powerpc/cpu/mpc86xx/cpu.c +++ b/arch/powerpc/cpu/mpc86xx/cpu.c @@ -92,7 +92,7 @@ checkcpu(void) if (get_l2cr() & 0x80000000) { #if defined(CONFIG_ARCH_MPC8610) puts("256"); -#elif defined(CONFIG_MPC8641) +#elif defined(CONFIG_ARCH_MPC8641) puts("512"); #endif puts(" KiB enabled\n"); diff --git a/arch/powerpc/include/asm/config_mpc86xx.h b/arch/powerpc/include/asm/config_mpc86xx.h index 96340af..e3d94e3 100644 --- a/arch/powerpc/include/asm/config_mpc86xx.h +++ b/arch/powerpc/include/asm/config_mpc86xx.h @@ -15,7 +15,7 @@ #define CONFIG_MAX_CPUS 1 #define CONFIG_SYS_FSL_NUM_LAWS 10 -#elif defined(CONFIG_MPC8641) +#elif defined(CONFIG_ARCH_MPC8641) #define CONFIG_MAX_CPUS 2 #define CONFIG_SYS_FSL_NUM_LAWS 10 diff --git a/arch/powerpc/include/asm/fsl_law.h b/arch/powerpc/include/asm/fsl_law.h index eee78c8..b348cc1 100644 --- a/arch/powerpc/include/asm/fsl_law.h +++ b/arch/powerpc/include/asm/fsl_law.h @@ -79,7 +79,7 @@ enum law_trgt_if { enum law_trgt_if { LAW_TRGT_IF_PCI = 0x00, LAW_TRGT_IF_PCI_2 = 0x01, -#ifndef CONFIG_MPC8641 +#ifndef CONFIG_ARCH_MPC8641 LAW_TRGT_IF_PCIE_1 = 0x02, #endif #if defined(CONFIG_ARCH_BSC9131) || defined(CONFIG_ARCH_BSC9132) @@ -117,7 +117,7 @@ enum law_trgt_if { #define LAW_TRGT_IF_RIO_1 LAW_TRGT_IF_RIO #define LAW_TRGT_IF_IFC LAW_TRGT_IF_LBC -#ifdef CONFIG_MPC8641 +#ifdef CONFIG_ARCH_MPC8641 #define LAW_TRGT_IF_PCIE_1 LAW_TRGT_IF_PCI #endif diff --git a/include/configs/MPC8641HPCN.h b/include/configs/MPC8641HPCN.h index b35bbd4..66f8e96 100644 --- a/include/configs/MPC8641HPCN.h +++ b/include/configs/MPC8641HPCN.h @@ -17,7 +17,6 @@ #define __CONFIG_H /* High Level Configuration Options */ -#define CONFIG_MPC8641 1 /* MPC8641 specific */ #define CONFIG_MPC8641HPCN 1 /* MPC8641HPCN board specific */ #define CONFIG_MP 1 /* support multiple processors */ #define CONFIG_LINUX_RESET_VEC 0x100 /* Reset vector used by Linux */ diff --git a/include/configs/sbc8641d.h b/include/configs/sbc8641d.h index 361c96c..2bd89f4 100644 --- a/include/configs/sbc8641d.h +++ b/include/configs/sbc8641d.h @@ -21,7 +21,6 @@ #define __CONFIG_H /* High Level Configuration Options */ -#define CONFIG_MPC8641 1 /* MPC8641 specific */ #define CONFIG_SBC8641D 1 /* SBC8641D board specific */ #define CONFIG_MP 1 /* support multiple processors */ #define CONFIG_LINUX_RESET_VEC 0x100 /* Reset vector used by Linux */ diff --git a/include/configs/xpedite517x.h b/include/configs/xpedite517x.h index 027440a..6d95789 100644 --- a/include/configs/xpedite517x.h +++ b/include/configs/xpedite517x.h @@ -14,7 +14,6 @@ /* * High Level Configuration Options */ -#define CONFIG_MPC8641 1 /* MPC8641 specific */ #define CONFIG_XPEDITE5140 1 /* MPC8641HPCN board specific */ #define CONFIG_SYS_BOARD_NAME "XPedite5170" #define CONFIG_SYS_FORM_3U_VPX 1 diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 75fe00b..91654cf 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -3147,7 +3147,6 @@ CONFIG_MPC85XX_PCI2 CONFIG_MPC860 CONFIG_MPC860T CONFIG_MPC862 -CONFIG_MPC8641 CONFIG_MPC8641HPCN CONFIG_MPC866 CONFIG_MPC866_FAMILY