From patchwork Thu Nov 24 07:54:46 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: York Sun X-Patchwork-Id: 698737 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 3tPX9p6p1Nz9t1C for ; Thu, 24 Nov 2016 19:17:02 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 4ABA0B3915; Thu, 24 Nov 2016 09:14:20 +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 4_44P2-orX-3; Thu, 24 Nov 2016 09:14:19 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 5436CA75C5; Thu, 24 Nov 2016 09:13:29 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id CB9DAB38B8 for ; Thu, 24 Nov 2016 09:12:44 +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 KjZrUOM_O7y7 for ; Thu, 24 Nov 2016 09:12:44 +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-by2nam03on0077.outbound.protection.outlook.com [104.47.42.77]) by theia.denx.de (Postfix) with ESMTPS id 9E955B3900 for ; Thu, 24 Nov 2016 09:12:06 +0100 (CET) Received: from CY1PR03CA0028.namprd03.prod.outlook.com (10.174.128.38) by DM2PR0301MB0751.namprd03.prod.outlook.com (10.160.97.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:01 +0000 Received: from BN1BFFO11FD008.protection.gbl (2a01:111:f400:7c10::1:107) by CY1PR03CA0028.outlook.office365.com (2603:10b6:600::38) 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:57:00 +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 BN1BFFO11FD008.mail.protection.outlook.com (10.58.144.71) 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:59 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:; UpperCasedChecksum:; SizeAsReceived:1190; 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 uAO7tR3k012503; Thu, 24 Nov 2016 00:56:57 -0700 From: York Sun To: Date: Wed, 23 Nov 2016 23:54:46 -0800 Message-ID: <1479974118-2912-65-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: 131244478202096294; (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)(8936002)(39410400001)(33646002)(2906002)(6666003)(50226002)(48376002)(7846002)(69596002)(189998001)(68736007)(5660300001)(50986999)(305945005)(8676002)(76176999)(97736004)(50466002)(110136003)(356003)(39060400001)(38730400001)(5003940100001)(7416002)(85426001)(4326007)(81156014)(105606002)(106466001)(104016004)(6916009)(81166006)(36756003)(2950100002)(626004)(86362001)(92566002)(77096005)(575784001)(8666005)(2351001)(47776003)(39390400001)(39400400001)(39380400001)(7059030); DIR:OUT; SFP:1101; SCL:1; SRVR:DM2PR0301MB0751; H:az84smr01.freescale.net; FPR:; SPF:Fail; PTR:InfoDomainNonexistent; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BN1BFFO11FD008; 1:ZaAOVClMOaBOVenN+yFJp/kWBS7fHphDGrkstr4yqhPs9VuTk1yU1m7rGBtH5YFwWKdjxE4q6Rl+6GA7Pcr6zym3ox249GtnNqNIA29pTzga1q28CN8TuybZJDVqYzoHpdpwTl23CxoVPj/p8eog0KJ9N2Uex7qFjpp7k3gptAPoKPFpldEyp/WYE4y564HicL87v4yFFDo2HwhXJ6CNJ3I3d1KIAGdoImB0n2vuuiV7itjaKitKo00Kf/krWLPi+X7asModpeAbYtMkN6aYLpri8W7Z6FYE+iGFMzJQOYl2AHQIm7HXNCTJhVfIZeZtwCNBKNGmFs/+2tcF7v5UZ3MgLZtCFa3WHRvESZEZL1qyzuVnTwtAdXGmkoGYLswKSc0hluVOvxOTOSkB9sUQJIZA/DFZINL15lRiJyapcl6CBPUy95zj687i98rsN136yIODnT3JhBA5PIF65GeLdbf+/d3/gLM7INiqsmtilt9Hc334+3xFsBHE/fRuZfCZi+MG5pkSGmxh35ISGrAtH32lFhlqfaYvHloJlPskcDRhIYVLhgYd6BlgN6t+Gmuoprr9UMHSW0VeAHUwFR7lj3QsvaoRN0LMpQBJS1gBrRdXQVffQbKZsTGG4EIaXZyy MIME-Version: 1.0 X-Microsoft-Exchange-Diagnostics: 1; DM2PR0301MB0751; 2:Ql2S3Zs0xHeGZ/152Kcl3OEV1BZyZE3cMsUW8Mplmk9OwnTfAibsjNsZZYiVEk9WRMPZGJUuB+Pozqo5cw4VmG/SWqIeUGRG/Gii4ArzTuCPLmLCzYVNpfbJr/PJVaRKVU+ZdhToRv2hOrOjiSbBoYf4OR1zHvo7SotMs+G7mPg=; 3:BWs+jGxPT/ijOxgpl3zB4wA6755jnoPPlKhjO9YUx7rHIO3pzzFBaGqT7wf4gOxobRlND8n5cqE2ajrVzQ8UZCyKfohsuTkc8cKYFDCvYtidWVPw/RB00OohnGAJPoMHQfyD+be/C6supaIIU6FjoEhlBahGJsDRk/c9WY4uKgpyOFONys7WL2v41qAn8a6LXmM/H513BBfuDwqp46HBJahCnlJFDHCjOf86eF4rebuoO5kZAtahTLaFaYSuGTfzeR67jDfd2BmIs9v86NY0TA== X-MS-Office365-Filtering-Correlation-Id: 30d0a635-6ff3-460f-4947-08d4143f786c X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001); SRVR:DM2PR0301MB0751; X-Microsoft-Exchange-Diagnostics: 1; DM2PR0301MB0751; 25:gVEBv23L3m9vd9ed41eq7kYpwcFpSUoUFwdA9PxmRyfglLsBEUeFU3QqfsBp5SkiQJoYQbU0fCyk3hVpVy6Q47i2n5wJIKY4Qwacsf5cQUlA6MG4+6/K4ObqFcVIpEj6tGvoEyTcvjHJjpcPuaSaXZPcxqcIIin3/39J9ukebxTL9wSrvbh0AsKCSwgWaNnW22CuM3HIu/dLu4JAmrt7CfZQft4TSyqopZIX7QAoVYtc+F2MY/HRNVI8yAAzP3rdWDB6x/gfTxXNle2eKtJsUknN1RVg5SozYPXEw/35yQcdclkWDpgPZ1peDW1HmcWWrPJHHVyt0Wxx9072vSoJmyBr8ZRr242kW+a4viHqM4XORc0BIC6JzYAJWTC/35uNXko0qVqt3eVOZ/II7NunhgRVDWmmGRk0Q+zCWUObLQ4CCDs+FCEs/RTxVPJK30GQY3dpzTTF4ibh7H2lUqWbWdak2TQtcKMVdvmt6vXltYWMY/qVQULEVqKo4mCp7BpkT1kzogfh/ViShXjHS2yN6nNXhMteFt2QBjWMVfSs0NkSB9GnkRKKTbwzm1QzCYJa1kRgM+/VizpjCH781jfZ9R9q+ol6dJXLVFHd84E3lAXdQTGqdI5Ict8iKaqGvP6mE/hb1oSPv34OCPLbh1chb5DOxUFIDML92gWjCqEvXBYJXnYY6IYoLmHWJ11rr5iuQdefsgSyT8iFw9IIYUnOmozBj9p4XnPQKu/736mwQNtGNPVwmzYwnSQm0F66WgDWiiNL1upDUrjlDHtTYn+jjA8cQtto8CzLMa9LvNmMuc8= X-Microsoft-Exchange-Diagnostics: 1; DM2PR0301MB0751; 31:ZQboD6SQgAFOc5+jT52889JTz9q72g+AgYMcC0XGtQfjwTJzargLxNYvWaLrSMyj30u0ARghvq48eTh9bpfvjwUPdSRDVBQpVQiz8ldL5+dlXV9EFd6FrmcJ2w8KauOsHLncKqQVF44QpTMXnQ7ckEVY/wIHu49J7N7CP7wnSDoSjv3poK+31x8G4GI26F/1204AVWMeTPmiZ++3Vt7UC5MGy90yKAbj1hn3b5mvc9X6hpuEcd7in+kv3zanpFNVQL72qr/4YF/iHBt2ZxKCgJieqj7hGaVk4mwWHR0AIn4= 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)(13017025)(8121501046)(13015025)(13024025)(13018025)(5005006)(13023025)(10201501046)(3002001)(6055026)(6096035)(20161123559025)(20161123561025)(20161123563025)(20161123556025)(20161123565025); SRVR:DM2PR0301MB0751; BCL:0; PCL:0; RULEID:(400006); SRVR:DM2PR0301MB0751; X-Microsoft-Exchange-Diagnostics: 1; DM2PR0301MB0751; 4:Ns1JV/1pTKFIHw13gOBDvbczYiWklA+Y8F/W55Im5n8OATxIOAB0QndjQJcXX2H5D64M7kNKrPmlmyl0UaaLDwpcYH6N+Qhc0d1gsXUWRPLIT2E8wSL7LYUwFqWzEl5iAelJa+t/GU4THHng+K05UquKoEidaeul0Z5hCxiUNKDBApEvfPfo3kXkp4SMI7PwUpFpHuYZmMxvs1mKzo3FHN0mko8etxFna5JzN4T4vJVZxLIvWGKx294onhNbK2l9FxeY/myFWvkoCzlkZIcAJENt/cd91P+KVBb6novkvBiAFc1l8g+HqDHzcd8XvlVtdEqDu7lD1rkQN0V63espOWaF35xwVJB7RR4q6eHmXDYYWheslk4ugcWiJEJOey15I49F7FlzxZKj3Op7j5ldwNuIFC4vzIDaAOuykCi9DMCukM9m/GHkeeaLgvjtIhilCIwWUt+VnW8O9W827TzY7KudLYdYNwKcPvIIHuMpMVOWQyL1+jtDo0UnBqmegX1HKzChYGifrnbBMG2euIU6atphSgVy+YEz3IjYshf/HLPtwf7f0ommKCsnaBCikQMWjIQ1jiF9UR+aESsOupMAx/pvjeSr5tA/s+s24pgeCdyvUbbdNZebgtO1jDC6lNOeMzpVZiwtNSpNatdJs6Ul4zd5oMpViNiZzqfH4aE1GdbCGjUXIJrwYaygc19g7hMyiZ/NNjA1uyvTQMuno7+CBOlLxNqeLOYpjxkakl2kPpTvhH5j2a51+Xj6nkNsfSSS X-Forefront-PRVS: 0136C1DDA4 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; DM2PR0301MB0751; 23:BU31gVR79QwneMDatnptlLf7Gxj2/aA+ETvh+ya?= =?us-ascii?Q?NmBHmqO3LQPOHTv3AKYrZWOVfo+Vg106pL3lYk6Xv09GBKVo0jA+0hmthspZ?= =?us-ascii?Q?7v0VC6atlifcOCmJ65rbN8j/nQHA2qUAXkzNgKlJw94Xlr7n5Wwt6vjaEBt/?= =?us-ascii?Q?rEC3uw5j4uF6/tKWoNlp8kyrMROSTdFxfDblKlhpkQzh9EoWETjHi+nudr7q?= =?us-ascii?Q?XoCUfJ8mlcbZ+07y6nvaEaQLBlYVPSQiNCqZGSs7wtTLKmudOqTqegiaYE8S?= =?us-ascii?Q?PhStv9+8by46frf48k/l0PL7Gmr+b4F4YeUnQ/a4OwzqFDE1P+wR5GFPD3kM?= =?us-ascii?Q?Qr4Pey0Bcykf5hDaVyzgu+gRWEuGT2PXmoBL1q4EWy0lz1KYvecwlu9R71SD?= =?us-ascii?Q?GGuMMU0YdHwL8USAnFekd96eWeHGPi6DbeuL4Q4YHNjE96886AJUV4JJSCmd?= =?us-ascii?Q?7Uw0Ct3b4pvxOtXwXOZVzauNlYVpgUrM/YCVrHQzmqXQ4kTvOItdFpNxZQtA?= =?us-ascii?Q?AL3q4xea4w5h5CAF+BeFtj69AZPc/ZlVpz/8d9w44xChaWfOSq/+NSV42uoY?= =?us-ascii?Q?wsEL9TM/OI9QUTcN+fFFpie0lac2atiitC0wng/Pm1BVhTzrCAZg1nfY5oE/?= =?us-ascii?Q?hGNwBGdGaTwGEhHIoEJC4ZcurYic3Ox175UPJ8Dr8bZbx5mfRY1P6JcLa3UM?= =?us-ascii?Q?juGpF7/PRFgZhLoEZisrF+hivEQmPSQDtuw6A8HD88M4oKXGN/C0GprMdDN8?= =?us-ascii?Q?bYX8yT5kM4KkRo7WDltsgTHClRV5Lhgk8qZgfrfeNsrD9l0ssoOwZ8SEqE+s?= =?us-ascii?Q?wUAMmlD0Idbg67dmd7bcbL5QRXVzU0A7jyTTg+iWWNq7FGheqpoR29jqdkoa?= =?us-ascii?Q?p3iJpno5vA8x75YqzLZSntVxEgxOyRc6ePv+wa6E0fuY66Rp7xGkzTWSsNcC?= =?us-ascii?Q?KnWGlH2MqVYx2jyoQrXOopTOSA2pCPOwScCko4J0+ATJ6GfnNBfsJr9aGvOI?= =?us-ascii?Q?t4eXGXcIZFy8WVP1n0WiWyEROvLB3P+0cYQz8ymDuXTYGKocgeEWhIycWmur?= =?us-ascii?Q?ViabryZjPcN/QdJU6uynw7AHrV9MQRfbbF8dSRc2eZYY2UNH1e/ciAf2cAiN?= =?us-ascii?Q?g786Wz1zZo/m3SY7gf6fZ4qJCyO4yS8BdR0RY+Dogp/IWvQgkFmgD2Es/IY0?= =?us-ascii?Q?rPlMK83mOmwytjWZXC3RcZTVa4kLNMGmBpx03zdYEfaT35EJDZz3CLX5S03V?= =?us-ascii?Q?FmyjNsKGqM17MyBYIHhjJA9fcf1oZ4oRxXQn9SZfnr6DNSFpnqlbZnNGBnts?= =?us-ascii?Q?g4VGl7iOTkBo8jVIoY0EwtD4=3D?= X-Microsoft-Exchange-Diagnostics: 1; DM2PR0301MB0751; 6:ivrPkjqHbdOvv5YieOn14FB38KSFTZ+lhHMhruYji3KzQoyQARTxtP9oaZ2kS2wx1rA8tFiCctWhW7ZjLGqs2TdrCCfvyh4glm+1MxSU3A9fFWIBnMK9L31Sb20iwcybHlRNfSZtVzr0Mw9wrwmG9zjQhwjYBRFo6PH7phCokZfca0XIQfT6tu9sr4tnIxN5qPtGxjWQrm6qT7q3zsKTdhjbtvf6lh6+MJvqGB+7aqblmswY4vu9usfR+Ohk01bgZNhNr+5J5nMdnhph7ka1nXs+le9XHtyIEOkYrypvFkfe2Gwu2Zzp9siVAIAtQO/HcaAEGXkZd2qDNuJ/snDWiQ==; 5:DPyHjGNE/QBjF1WbYpUkAKtFEUEygsvxa77ll2hh7zxcw9WqwQl5bLJWmcqL86l20qgr85TF5VYzBciyQrRsxAtO0ezRzUYHB2HbXE5qgsaiegcEBU1yTdFIJ+qI2kEthXKKxrpj+kHWahZkiNWxulpC0BA8Kej3sI1+7v7PbYp+O/z2QOkV3afbGKq9UEGk; 24:YOvYjap/d4bYFxs7UQwp014IlUePdy+o8GfncMHKHzbVrzNAX2NdeQVuWwAGBWTmKTb5fE1pU3iI1cN7sA8UtGwqqSNfEEKoWwbzkTSNzNo= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; DM2PR0301MB0751; 7:eb74aPHgfF+cnOdMeKieFmMIsiRxHUVd15lO26NkddOG4BsTTtZES8hXrl67Dmc6ZO6m7peKAe0N4bdTO5kCKoSry2JyYpeRKAxVlHnN2fFheSQ00rXT8NPpl+yabNQJHm2+DUwAs/xQnOdsszORPymobV5w7L9Ln0DoQWcstXciZEiqxDZm7g4jhBKJxh274XjLY38X0AEWa68oj0FGinxhezI0ofsTxSkB1kNcPGUFxkddHIl6gyRwR9R2ddw5pRFhEpfFUt1qAOE/hz5tAofz8kf+DOtWPdx6w7tyKJRwS4UsTVrHcb9oUFXkZgGYbaVihGx67f2J5xrgLtXxdlHjnSGq4DbaCSxnQz6+0JU= X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Nov 2016 07:56:59.8352 (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: DM2PR0301MB0751 Cc: Stefan Roese , Joe Hershberger , Kumar Gala , Aneesh Bansal , Scott Wood , Jagan Teki , Andy Fleming , Ruchika Gupta Subject: [U-Boot] [PATCH 65/97] powerpc: B4860QDS: Remove macro CONFIG_B4860QDS 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" Use CONFIG_TARGET_B4860QDS instead. Signed-off-by: York Sun --- arch/powerpc/cpu/mpc85xx/cmd_errata.c | 3 ++- arch/powerpc/include/asm/fsl_secure_boot.h | 5 +++-- board/freescale/b4860qds/Makefile | 3 ++- drivers/net/fm/b4860.c | 7 ++++--- include/configs/B4860QDS.h | 2 -- scripts/config_whitelist.txt | 1 - 6 files changed, 11 insertions(+), 10 deletions(-) diff --git a/arch/powerpc/cpu/mpc85xx/cmd_errata.c b/arch/powerpc/cpu/mpc85xx/cmd_errata.c index d311934..402a1ff 100644 --- a/arch/powerpc/cpu/mpc85xx/cmd_errata.c +++ b/arch/powerpc/cpu/mpc85xx/cmd_errata.c @@ -323,7 +323,8 @@ static int do_errata(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) if (IS_SVR_REV(svr, 1, 0)) puts("Work-around for Erratum A-008044 enabled\n"); #endif -#if defined(CONFIG_SYS_FSL_B4860QDS_XFI_ERR) && defined(CONFIG_B4860QDS) +#if defined(CONFIG_SYS_FSL_B4860QDS_XFI_ERR) && \ + (defined(CONFIG_TARGET_B4860QDS) || defined(CONFIG_TARGET_B4420QDS)) puts("Work-around for Erratum XFI on B4860QDS enabled\n"); #endif #ifdef CONFIG_SYS_FSL_ERRATUM_A009663 diff --git a/arch/powerpc/include/asm/fsl_secure_boot.h b/arch/powerpc/include/asm/fsl_secure_boot.h index 7de554a..d0fef32 100644 --- a/arch/powerpc/include/asm/fsl_secure_boot.h +++ b/arch/powerpc/include/asm/fsl_secure_boot.h @@ -25,7 +25,8 @@ #endif #define CONFIG_SYS_PBI_FLASH_WINDOW 0xcff80000 -#if defined(CONFIG_B4860QDS) || \ +#if defined(CONFIG_TARGET_B4860QDS) || \ + defined(CONFIG_TARGET_B4420QDS) || \ defined(CONFIG_T4240QDS) || \ defined(CONFIG_T2080QDS) || \ defined(CONFIG_T2080RDB) || \ @@ -134,7 +135,7 @@ /* The bootscript header address is different for B4860 because the NOR * mapping is different on B4 due to reduced NOR size. */ -#if defined(CONFIG_B4860QDS) +#if defined(CONFIG_TARGET_B4860QDS) || defined(CONFIG_TARGET_B4420QDS) #define CONFIG_BOOTSCRIPT_HDR_ADDR 0xecc00000 #elif defined(CONFIG_FSL_CORENET) #define CONFIG_BOOTSCRIPT_HDR_ADDR 0xe8e00000 diff --git a/board/freescale/b4860qds/Makefile b/board/freescale/b4860qds/Makefile index 673d2ea..c032242 100644 --- a/board/freescale/b4860qds/Makefile +++ b/board/freescale/b4860qds/Makefile @@ -8,7 +8,8 @@ ifdef CONFIG_SPL_BUILD obj-y += spl.o else obj-y += b4860qds.o -obj-$(CONFIG_B4860QDS) += eth_b4860qds.o +obj-$(CONFIG_TARGET_B4860QDS) += eth_b4860qds.o +obj-$(CONFIG_TARGET_B4420QDS) += eth_b4860qds.o obj-$(CONFIG_PCI) += pci.o endif diff --git a/drivers/net/fm/b4860.c b/drivers/net/fm/b4860.c index eb058c9..5aeeb87 100644 --- a/drivers/net/fm/b4860.c +++ b/drivers/net/fm/b4860.c @@ -47,7 +47,7 @@ void fman_enable_port(enum fm_port port) phy_interface_t fman_port_enet_if(enum fm_port port) { -#if defined(CONFIG_B4860QDS) +#if defined(CONFIG_TARGET_B4860QDS) || defined(CONFIG_TARGET_B4420QDS) u32 serdes2_prtcl; char buffer[HWCONFIG_BUFFER_SIZE]; char *buf = NULL; @@ -60,7 +60,8 @@ phy_interface_t fman_port_enet_if(enum fm_port port) /*B4860 has two 10Gig Mac*/ if ((port == FM1_10GEC1 || port == FM1_10GEC2) && ((is_serdes_configured(XAUI_FM1_MAC9)) || - #if !defined(CONFIG_B4860QDS) + #if (!defined(CONFIG_TARGET_B4860QDS) && \ + !defined(CONFIG_TARGET_B4R420QDS)) (is_serdes_configured(XFI_FM1_MAC9)) || (is_serdes_configured(XFI_FM1_MAC10)) || #endif @@ -68,7 +69,7 @@ phy_interface_t fman_port_enet_if(enum fm_port port) )) return PHY_INTERFACE_MODE_XGMII; -#if defined(CONFIG_B4860QDS) +#if defined(CONFIG_TARGET_B4860QDS) || defined(CONFIG_TARGET_B4420QDS) serdes2_prtcl = in_be32(&gur->rcwsr[4]) & FSL_CORENET2_RCWSR4_SRDS2_PRTCL; diff --git a/include/configs/B4860QDS.h b/include/configs/B4860QDS.h index 66000d2..a1468b8 100644 --- a/include/configs/B4860QDS.h +++ b/include/configs/B4860QDS.h @@ -10,8 +10,6 @@ /* * B4860 QDS board configuration file */ -#define CONFIG_B4860QDS - #ifdef CONFIG_RAMBOOT_PBL #define CONFIG_SYS_FSL_PBL_PBI $(SRCTREE)/board/freescale/b4860qds/b4_pbi.cfg #define CONFIG_SYS_FSL_PBL_RCW $(SRCTREE)/board/freescale/b4860qds/b4_rcw.cfg diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index b3ab977..4e77f70 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -291,7 +291,6 @@ CONFIG_AUTOCALIB CONFIG_AUTONEG_TIMEOUT CONFIG_AUTO_COMPLETE CONFIG_AUTO_ZRELADDR -CONFIG_B4860QDS CONFIG_BACKSIDE_L2_CACHE CONFIG_BAMBOO CONFIG_BAMBOO_NAND