From patchwork Thu Nov 24 07:55:04 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: York Sun X-Patchwork-Id: 698748 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 3tPXDg1nJJz9rvt for ; Thu, 24 Nov 2016 19:19:31 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 9AD4AB3A63; Thu, 24 Nov 2016 09:15:50 +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 2-UeEpbwrdsj; Thu, 24 Nov 2016 09:15:50 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 54782A762F; Thu, 24 Nov 2016 09:14:24 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id DE906B39CC for ; Thu, 24 Nov 2016 09:14:04 +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 ax9h0igzUxnz for ; Thu, 24 Nov 2016 09:14:04 +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-dm3nam03on0055.outbound.protection.outlook.com [104.47.41.55]) by theia.denx.de (Postfix) with ESMTPS id B0A83B3964 for ; Thu, 24 Nov 2016 09:12:33 +0100 (CET) Received: from BN6PR03CA0024.namprd03.prod.outlook.com (10.168.230.162) by BN1PR0301MB0737.namprd03.prod.outlook.com (10.160.78.144) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.747.10; Thu, 24 Nov 2016 07:57:23 +0000 Received: from BN1AFFO11FD047.protection.gbl (2a01:111:f400:7c10::146) by BN6PR03CA0024.outlook.office365.com (2603:10b6:404:23::34) 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:23 +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 BN1AFFO11FD047.mail.protection.outlook.com (10.58.53.62) 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:23 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:; UpperCasedChecksum:; SizeAsReceived:1219; 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 uAO7tR44012503; Thu, 24 Nov 2016 00:57:21 -0700 From: York Sun To: Date: Wed, 23 Nov 2016 23:55:04 -0800 Message-ID: <1479974118-2912-83-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: 131244478437291741; (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)(189002)(199003)(39410400001)(104016004)(7416002)(47776003)(356003)(8666005)(97736004)(7846002)(305945005)(6916009)(189998001)(39060400001)(2950100002)(85426001)(69596002)(626004)(5660300001)(68736007)(2906002)(86362001)(77096005)(575784001)(6666003)(106466001)(2351001)(81166006)(76176999)(5003940100001)(8936002)(8676002)(110136003)(81156014)(50466002)(50986999)(36756003)(4326007)(48376002)(92566002)(105606002)(38730400001)(50226002)(39390400001)(33646002)(39380400001)(39400400001)(15760500001)(7059030)(19627235001); DIR:OUT; SFP:1101; SCL:1; SRVR:BN1PR0301MB0737; H:az84smr01.freescale.net; FPR:; SPF:Fail; PTR:InfoDomainNonexistent; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BN1AFFO11FD047; 1:FGEJroXrp26iWEYgb7cRs4zAxYwKLys/KduQ97uJPdT6dwu4ztRpanXWZFOoiPguXZxu8rjAr5CXEYEZTg0Co6xVEAA4CgGXmyfuS0YHytjgMOFYG2r7c55qYlzXlwoRRG09qRZy7CFsTSJbTnJnTzP7L6KvlsuxLz3M137l7kNjBlanYuaiQOUhSMW3qXr5zSoG+UAKHgxSaOFV3lGgWbxsKJ58ZH4om6gSE2LsmOnK9zcrAunlWD/NEOExmudkvhUlwfjRKu3w2RZI4uOvA8t4U6BwncxIfU/HvssRXkMZdUehlbw5M5q31A2Ldw2C6mbKVqA9VYVmpLYlr5d73uIyS3NMgikBUZG3af+4x2iOY3eXFtNyHzq3L3+GySMO4XJApKheFGqUGOJXCeLOMxdIse+icp2KjilVtYAqx09vj/0LhgZMBK+GTBgaB1cv7ROHZ6UH8oB/J2XY9koR+RbrJh4OgvJQwn3m6a701abzR11IXkeYaywBPeIkb33QHivMCnONY5EYX6CaV1OhoDtuaDaj8+HYGc0467kjK4BqtYLQIf8QXjSh+otIlOj+R0xA/ByVctLCvFZttBK7km8QjN9wfioVs019WSptjMLzuJbLw88d+bDcRm779Tt+uGs2NmPQppbnY9G4sCEN2On0juqsRtYp2SBQOfBQ7QwinBnGwUmnrbhq+B4Wjeel/XMoD9K7XtVv1mbLtd9kvLIqpmJgkCPj5GKW3bMp5O0= MIME-Version: 1.0 X-MS-Office365-Filtering-Correlation-Id: 93b59eb6-d139-4a1d-157e-08d4143f8671 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001); SRVR:BN1PR0301MB0737; X-Microsoft-Exchange-Diagnostics: 1; BN1PR0301MB0737; 3:NQN8apJa5aNe/0mKPb/ZlcjfpTc1o8HpfGSCgZCjHomVrxMdFD5NsITx+bo8qapUp9zFEzMsD9CZ/FwBYkIgBTE5lHpxkco66MyJHLojOtLG8qdKaYS7EMYXo0UPvUTZG9liapCHTHDrjjKT7aqsY8uovvnqWsjs+swFIM+hk0h1ewDhb3PL59g9W75uOirwIOiLG5dVZDMeur3q7LXIeNGdauvaSLa6GZ72lvMf3Gxggv8NG6MywyRHlzOyHkg/awvK34TEjtU3hce4GEm4BEshL/qKlHlLejbOtKRSIgBOG1oBu0Is36XBKRSHLzdzBQq3joHIApf7l+RBxc+HRLsr9Zzis3AP3WPCdcJr2G0=; 25:mYCaAKkuPFCWcH+vFEIED+SrEZ9i7ZpJzWei80CFBwUzRxvt+BP5MzwHi4ZojM/IWRXPqEClmt09rYR+ZoKMBhJR/BUt6IcWK0Ze3ikdnRemZj2FS4X2bEBaZcNEFbFym3rmxsjmgs9ncD0m80RwDbqE1maVbyj/oytO99CiC9LbATGs+SHfAdjM3d2DyVhUUGloOEYGpGRHNdQyqQRBfFlpK/id/77kE3FHq2lXsoQXFFM6bUKp5JOuLwpS6XfEM/iAwFpfAO+rJUyYhD+TkL6SfgGzjEVEJZvcb7FxkDm16OXnG94GN+HazKFjyC7gq8w+K4fWnXGzmjFjAhyGZyOP18SoNnv+mb+lgZ6VMsPHY05rFBvgYWTheqCDaAIdX316C0vhs1d0liHHg0Z4nFeRc5M9oy/nIW+ZpYKqp3flj4z0fPaIyay1j8tWv3kHtucWPOIxcAZIih8h016HFg== X-Microsoft-Exchange-Diagnostics: 1; BN1PR0301MB0737; 31:DEEPGgXhDJIhVSYpHtY9Fce6bPnntFMiMOOKLYEUt4IJLrgKv81UY7pus5FXrGCwYj9sFCrIC3omE/bbkCMBe9uIA6pLGMkiszSiC5Zt/axwE/+3E/jN4JU3cG2TtnQ23sfvncIJayvnPoXXTw6w7snu52voQyh2fqayhxMsbY7fY5sYo34e/HOKplV31EVmZh2oRMrg4d8BO+7Cg1Es83u3B7JEgSzJV7BbrMnDUs3A+r53YOzW+FHh5T+bNMopmvmv8eg/G59nsCCT6kkqRe/MILjmczRHHvyIoNIlE+EtkGcg2X1b7eUVjzaje3AH 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)(13024025)(13017025)(13018025)(8121501046)(5005006)(13023025)(10201501046)(3002001)(6055026)(6096035)(20161123556025)(20161123561025)(20161123565025)(20161123559025)(20161123563025); SRVR:BN1PR0301MB0737; BCL:0; PCL:0; RULEID:(400006); SRVR:BN1PR0301MB0737; X-Microsoft-Exchange-Diagnostics: 1; BN1PR0301MB0737; 4:aw+TBbVR8gySy4OJ7QS3pBLmL20ipUHqTBFU6pKJwFI1nzn7hhk7fNY21rRyJO5ALkccpWUc3gNR9dVlN4b45WW9s9wWFuXnBRHVk6xJBvyWroHRyXi0zHr399j7EbmNkKIKhfm9Pa97zHtn6MmRURGwIiu8MExrsbsNit+N5i8Ay0y7f+O4i1kqhemFrI+kitro/BG8QQ2tNfH1JAWgjRPMaSWm5/pU7HnMnNdypETCixKS2rzcdHLQEAHa+y8HQDq6NouH216hx97o+XMHSeTuWykm5Vp8wIjZpEu5yuAuxDBHO5Ir9mbcwUVevoCJui+uLdCiBPRSdRfGXVPHU/JIwugxFzaLtrJZWJqV7iB5Al3VeEJ2rfuVv9gObwBQSWG0eKuaYnoKuO38QCZXtfwgVrONwsikhwXyKSIlOIgIPh67dDurImk2jZrxF+FHkoUwNBva580dPXhu2qSWkof+yPTDlAEFFEeecbw7eX9SW0n8nC3tkhwZ6L8wiShnsPgzVcMDVERZEepdSX/NTrYvxru3Cy0gZSXt05xvNYZ9XdRInMapk7VJOCQDrNIUrFKx1Z8hL46HGQqyVE4hWzARXdHlHtgNx8tL0ygeuB6RU2C/goZGJhPc6seJHFZYkx8IuI85v/tzfgDrsM2b7jtwSd97Y2mNzHxAJpz4rBSzpNeVoGauWVfx84xvsNDfT8Ehpti+67ZOcthB/QKp2PfThXXOutUealU4qrY0p3pqLuIK4oQQzGizu9tNSdEx X-Forefront-PRVS: 0136C1DDA4 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BN1PR0301MB0737; 23:J6mHjjM0i9HurViMX61fi8HqUV8ks56dtymsjDz?= =?us-ascii?Q?nXagDZ81aDQp+EHaI5hDW4IRRnh6vcjhmo5q1GC3PlXZBwwMmM3zvFAN/XHp?= =?us-ascii?Q?fHj0GYT72K8nLxpX3gD4m97rGH94nnCCX/BVzMLqHghbp28jo/visgHgnb07?= =?us-ascii?Q?+9SQGc7xlk79xB4ImuTkUdGz+VhRxf3SSu3nXeY/3KtbBPr8AGcIHOhtRm7Z?= =?us-ascii?Q?jbPTSUqxNV8VFyZe41rFY7yhiV+k2g7ySLg6NJwtmAN5oVkXARYA+mbgN0bD?= =?us-ascii?Q?zlCjLZozeILxo7BtkaTwyXP2Dav7sRV+UDsBk5u30bN1zjTrWNsQe9vo+f2e?= =?us-ascii?Q?f9cO/BR0/mjqz0SjEu0PSbwz7wzTd/K/jTLLQniJxQ4HTEIEaNk6/O7yvEkl?= =?us-ascii?Q?akblA/o4BuHt1u+l62eTOgOh3kictdGSGLx1NDg83XVXn7dp14o4CFTFYEun?= =?us-ascii?Q?VYaTLVd+2WhVWczwtM2d7FmJFmVHeNi18OBHiH0IOkigQ4yAlTC9/tZI/nnk?= =?us-ascii?Q?G/TXjX546O/sGy8oqltz7WyBvTXmCLKxOUIGJgnE2MBdT58eSvxvVuZksw5E?= =?us-ascii?Q?QovOnrEx7rKiFQ6kEDYyKLxD8QydxAmtZxw2WDZ3eUk38mLeMxIJXp5JxixA?= =?us-ascii?Q?z1ttif3UUnj0yOXHfu3/x2WiKQ/PQ3Huh8Ps8HAf5buWkJ4ejobZrps5B7A6?= =?us-ascii?Q?9EvqkjFAfZ24ZDEze6vZEblLERlpE84TbeozbC28TXpSDt2AWphmvmD9UKsh?= =?us-ascii?Q?66mdBfb0Dm5TT9Of75WxkTul3RkBZwXbqflFVBcjotoLLDEzGaDRQoiL26jg?= =?us-ascii?Q?niUqW3dS21ltGS7YjbwIIOpOnVmU0P8RNYObubUoUfbFnAviQ4m98DZ6IFAX?= =?us-ascii?Q?2v1beX9wiP7vkl1XVhQfDelpm92yVH94jkfPN3mjk4VOSuMVnivmw1YL6iu2?= =?us-ascii?Q?7vN2OJjGwgxVq5VboFvTZmcwsat9xwIIEwlaHNHheKiFmHTPOE3wXIYY+E0T?= =?us-ascii?Q?YZECovCDGhiz518i0l+t175UdsDnTWiiBvBc8fwrqr8NYL9dS8iIst6piMPW?= =?us-ascii?Q?NOktXjBSXTNcNevJ4zB7h9nnaayemwdF8O1P1WFQUoqxJ3sH3N5TB7UqI/E3?= =?us-ascii?Q?XNsQh+9/Jv7mvVzjctW0Pr0of//91Tx+0SDOY6OQx01QXlgFeD3mpjozGBQJ?= =?us-ascii?Q?t4ssyjos84PV/WHiEG246inw5ytMai13VXLcZhI+usZaOaYqVIBl1Kb+4Zln?= =?us-ascii?Q?GkEJg1LDWBNjeO7XShCavvc178rZf5NcCzzJLONxQaJ6pN4YKflowChfn8W7?= =?us-ascii?Q?CxtC21zOmjGvX0VFM6joeJtjWa8USdGiE9tvqbfnqK7IRAWYU96Oiagd9TgY?= =?us-ascii?Q?JPjTnF96u7ixC44BkkPmtjCKQjfo=3D?= X-Microsoft-Exchange-Diagnostics: 1; BN1PR0301MB0737; 6:5E0T/9yjKcn6BCsY1Tc06J453iE1kd8hMHsHNSjyX0lhtE//pJSAtOSEFE70stb5gF9UMFrv4KFAeSPxeNI/Q2z5p+5EJirV2boGgVvrYts0r3NlHIQwS9AznDiI4uCbYyZ2PqvAoj8UeXl+0y4gxHTWMPxu8bmxZf0SjxVXs1y3bbJcxKy09DobJ6enoXgfRNFA42yInQHqq+TMfS2euwRDUOFKDdFvw9MZGDbOG/zy64H9yxszidVH5w0KTxV2+dSe8fFsh2NGQEQ8pK8MTIa0wku3s05AYlEIfCX8uBqkWTwu2eXbEBhY+7eEK07sdD+hnllPoiy/E6csCgQP/fErTcMAP6YTG0yiJGzc1Be15KJgn1k1kqflN9muiHlxuEYO4MKfzARUDHiYCXy2DV8EH3Q3ysBMlLhMOHE2PGPn0t6dUe/4BQ5xDzWW9BJ9; 5:zdod1vu6p1GZfsKyGkOSx87yDz7fP1LS1C18sVjyCeBe7JaaK1X8F6wrZUUncJlbOy9mgaJTbXaon0BFvSLUU9OwfT9/me+Ff9s5XbT5fH+AwHSdLUlTIYpZeInk+k1ERcyBVNdzz55/NPk4Km5QB6lkStr3a9WVTLbYSKAKNigtTYwBOz8EGmy8lVrFbnUG; 24:DEiW3qZGoTW/xSTRHhbZAQs5Fcql0EBlTxyviGHVhkVD6iPhh6IcYDGMvw1T/7LU47OxRMfmNJiCgpfnSzVZZz6/Iil6Kk1FuzW2YnlXODg= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; BN1PR0301MB0737; 7:nWtaDkBemcHxuF1PMRYo+i/Wtsy5oNCEsLKhMh8RBGvRk/oyDhgbc63L855iYZZgzwFjEQWFlTxPSabmuM6OFQ/mxVmdaH+qXadyDcV+AFViJbmHGS9YBzV8m0Fm10tjW7SYQJf9FByL6hIkdWZW00R51r6o/BVIBttyqODPmTjt6PSfqby+kg9MLm/cy07ursmvltq5DariG5WXjSmU7Vo5FVwV6a11YX8kR5tAcJaX4P2AMMWJ7ukmWWSQeM+4JkexGLCso+t/+PJ01A56W7z8SMgNYB9yXC7koB0AyGPBiHS1UsTrMqoPgREiVLzZBmG1fPVlu1dUmrGGk+Jzzxfk6FFCA6esdlaBXHaRy3O9QRhQWIjldP6dVHH4wt5MivXGRB5xaDh9L27VmFjffNaPgz3JKSx7O23h3zPm6KV04mywZ2Y7MhwFO1xjy2FvrTBvotj1O0p8+aq8UOrk9A== X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Nov 2016 07:57:23.2923 (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: BN1PR0301MB0737 Cc: Joe Hershberger , Kumar Gala , Aneesh Bansal , Mingkai Hu , Jagan Teki , Stefan Roese , Andy Fleming , Ruchika Gupta Subject: [U-Boot] [PATCH 83/97] powerpc: T2080, T2081: Remove macro CONFIG_PPC_T2080 and CONFIG_PPC_T2081 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_ARCH_T2080 and CONFIG_ARCH_T2081 instead. Signed-off-by: York Sun --- arch/powerpc/cpu/mpc85xx/Kconfig | 9 +++++++++ arch/powerpc/cpu/mpc85xx/Makefile | 8 ++++---- arch/powerpc/cpu/mpc85xx/fdt.c | 4 ++-- arch/powerpc/cpu/mpc85xx/speed.c | 10 +++++----- arch/powerpc/cpu/mpc85xx/t2080_serdes.c | 4 ++-- arch/powerpc/include/asm/config_mpc85xx.h | 6 +++--- arch/powerpc/include/asm/immap_85xx.h | 4 ++-- configs/T2080QDS_NAND_defconfig | 2 +- configs/T2080QDS_SDCARD_defconfig | 2 +- configs/T2080QDS_SECURE_BOOT_defconfig | 2 +- configs/T2080QDS_SPIFLASH_defconfig | 2 +- configs/T2080QDS_SRIO_PCIE_BOOT_defconfig | 2 +- configs/T2080QDS_defconfig | 1 - configs/T2080RDB_NAND_defconfig | 2 +- configs/T2080RDB_SDCARD_defconfig | 2 +- configs/T2080RDB_SECURE_BOOT_defconfig | 2 +- configs/T2080RDB_SPIFLASH_defconfig | 2 +- configs/T2080RDB_SRIO_PCIE_BOOT_defconfig | 2 +- configs/T2080RDB_defconfig | 1 - configs/T2081QDS_NAND_defconfig | 2 +- configs/T2081QDS_SDCARD_defconfig | 2 +- configs/T2081QDS_SPIFLASH_defconfig | 2 +- configs/T2081QDS_SRIO_PCIE_BOOT_defconfig | 2 +- configs/T2081QDS_defconfig | 1 - drivers/net/fm/Makefile | 4 ++-- include/configs/T208xQDS.h | 16 ++++++++-------- scripts/config_whitelist.txt | 2 -- 27 files changed, 51 insertions(+), 47 deletions(-) diff --git a/arch/powerpc/cpu/mpc85xx/Kconfig b/arch/powerpc/cpu/mpc85xx/Kconfig index e4a7b88..c1003a3 100644 --- a/arch/powerpc/cpu/mpc85xx/Kconfig +++ b/arch/powerpc/cpu/mpc85xx/Kconfig @@ -244,16 +244,19 @@ config TARGET_T1042RDB_PI config TARGET_T2080QDS bool "Support T2080QDS" + select ARCH_T2080 select SUPPORT_SPL select PHYS_64BIT config TARGET_T2080RDB bool "Support T2080RDB" + select ARCH_T2080 select SUPPORT_SPL select PHYS_64BIT config TARGET_T2081QDS bool "Support T2081QDS" + select ARCH_T2081 select SUPPORT_SPL select PHYS_64BIT @@ -400,6 +403,12 @@ config ARCH_T1040 config ARCH_T1042 bool +config ARCH_T2080 + bool + +config ARCH_T2081 + 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 375a905..f74018b 100644 --- a/arch/powerpc/cpu/mpc85xx/Makefile +++ b/arch/powerpc/cpu/mpc85xx/Makefile @@ -55,8 +55,8 @@ obj-$(CONFIG_PPC_T1020) += t1040_ids.o obj-$(CONFIG_PPC_T1022) += t1040_ids.o obj-$(CONFIG_ARCH_T1023) += t1024_ids.o obj-$(CONFIG_ARCH_T1024) += t1024_ids.o -obj-$(CONFIG_PPC_T2080) += t2080_ids.o -obj-$(CONFIG_PPC_T2081) += t2080_ids.o +obj-$(CONFIG_ARCH_T2080) += t2080_ids.o +obj-$(CONFIG_ARCH_T2081) += t2080_ids.o obj-$(CONFIG_QE) += qe_io.o @@ -98,8 +98,8 @@ obj-$(CONFIG_PPC_T1020) += t1040_serdes.o obj-$(CONFIG_PPC_T1022) += t1040_serdes.o obj-$(CONFIG_ARCH_T1023) += t1024_serdes.o obj-$(CONFIG_ARCH_T1024) += t1024_serdes.o -obj-$(CONFIG_PPC_T2080) += t2080_serdes.o -obj-$(CONFIG_PPC_T2081) += t2080_serdes.o +obj-$(CONFIG_ARCH_T2080) += t2080_serdes.o +obj-$(CONFIG_ARCH_T2081) += t2080_serdes.o obj-y += cpu.o obj-y += cpu_init.o diff --git a/arch/powerpc/cpu/mpc85xx/fdt.c b/arch/powerpc/cpu/mpc85xx/fdt.c index aaca15f..6bde60d 100644 --- a/arch/powerpc/cpu/mpc85xx/fdt.c +++ b/arch/powerpc/cpu/mpc85xx/fdt.c @@ -511,7 +511,7 @@ static void fdt_fixup_usb(void *fdt) #define fdt_fixup_usb(x) #endif -#if defined(CONFIG_PPC_T2080) || defined(CONFIG_PPC_T4240) || \ +#if defined(CONFIG_ARCH_T2080) || defined(CONFIG_PPC_T4240) || \ defined(CONFIG_PPC_T4160) || defined(CONFIG_PPC_T4080) void fdt_fixup_dma3(void *blob) { @@ -520,7 +520,7 @@ void fdt_fixup_dma3(void *blob) ccsr_gur_t __iomem *gur = (void *)(CONFIG_SYS_MPC85xx_GUTS_ADDR); #define CONFIG_SYS_ELO3_DMA3 (0xffe000000 + 0x102300) -#if defined(CONFIG_PPC_T2080) +#if defined(CONFIG_ARCH_T2080) u32 srds_prtcl_s2 = in_be32(&gur->rcwsr[4]) & FSL_CORENET2_RCWSR4_SRDS2_PRTCL; srds_prtcl_s2 >>= FSL_CORENET2_RCWSR4_SRDS2_PRTCL_SHIFT; diff --git a/arch/powerpc/cpu/mpc85xx/speed.c b/arch/powerpc/cpu/mpc85xx/speed.c index 18333ce..4de5dcf 100644 --- a/arch/powerpc/cpu/mpc85xx/speed.c +++ b/arch/powerpc/cpu/mpc85xx/speed.c @@ -131,8 +131,8 @@ void get_sys_info(sys_info_t *sys_info) * T2080 rev 1.1 and later also use half mem_pll comparing with rev 1.0 */ #if defined(CONFIG_PPC_T4240) || defined(CONFIG_PPC_T4160) || \ - defined(CONFIG_PPC_T4080) || defined(CONFIG_PPC_T2080) || \ - defined(CONFIG_PPC_T2081) + defined(CONFIG_PPC_T4080) || defined(CONFIG_ARCH_T2080) || \ + defined(CONFIG_ARCH_T2081) svr = get_svr(); switch (SVR_SOC_VER(svr)) { case SVR_T4240: @@ -203,7 +203,7 @@ void get_sys_info(sys_info_t *sys_info) #endif #if defined(CONFIG_ARCH_B4860) || defined(CONFIG_ARCH_B4420) || \ - defined(CONFIG_PPC_T2080) || defined(CONFIG_PPC_T2081) + defined(CONFIG_ARCH_T2080) || defined(CONFIG_ARCH_T2081) #define FM1_CLK_SEL 0xe0000000 #define FM1_CLK_SHIFT 29 #elif defined(CONFIG_ARCH_T1024) || defined(CONFIG_ARCH_T1023) @@ -456,7 +456,7 @@ void get_sys_info(sys_info_t *sys_info) #endif #ifdef CONFIG_FSL_ESDHC_USE_PERIPHERAL_CLK -#if defined(CONFIG_PPC_T2080) +#if defined(CONFIG_ARCH_T2080) #define ESDHC_CLK_SEL 0x00000007 #define ESDHC_CLK_SHIFT 0 #define ESDHC_CLK_RCWSR 15 @@ -480,7 +480,7 @@ void get_sys_info(sys_info_t *sys_info) case 4: sys_info->freq_sdhc = freq_c_pll[CONFIG_SYS_SDHC_CLK] / 4; break; -#if defined(CONFIG_PPC_T2080) +#if defined(CONFIG_ARCH_T2080) case 5: sys_info->freq_sdhc = freq_c_pll[1 - CONFIG_SYS_SDHC_CLK]; break; diff --git a/arch/powerpc/cpu/mpc85xx/t2080_serdes.c b/arch/powerpc/cpu/mpc85xx/t2080_serdes.c index c65f41d..fc63fe3 100644 --- a/arch/powerpc/cpu/mpc85xx/t2080_serdes.c +++ b/arch/powerpc/cpu/mpc85xx/t2080_serdes.c @@ -161,7 +161,7 @@ static const struct serdes_config serdes1_cfg_tbl[] = { {} }; -#ifndef CONFIG_PPC_T2081 +#ifndef CONFIG_ARCH_T2081 static const struct serdes_config serdes2_cfg_tbl[] = { /* SerDes 2 */ {0x1F, {PCIE1, PCIE1, PCIE1, PCIE1, PCIE2, PCIE2, PCIE2, PCIE2} }, @@ -181,7 +181,7 @@ static const struct serdes_config serdes2_cfg_tbl[] = { static const struct serdes_config *serdes_cfg_tbl[] = { serdes1_cfg_tbl, -#ifndef CONFIG_PPC_T2081 +#ifndef CONFIG_ARCH_T2081 serdes2_cfg_tbl, #endif }; diff --git a/arch/powerpc/include/asm/config_mpc85xx.h b/arch/powerpc/include/asm/config_mpc85xx.h index 8efc805..65a4777 100644 --- a/arch/powerpc/include/asm/config_mpc85xx.h +++ b/arch/powerpc/include/asm/config_mpc85xx.h @@ -779,7 +779,7 @@ defined(CONFIG_PPC_T1014) || defined(CONFIG_PPC_T1013) #define CONFIG_SYS_FSL_ERRATUM_A008378 #define CONFIG_SYS_FSL_ERRATUM_A009663 -#elif defined(CONFIG_PPC_T2080) || defined(CONFIG_PPC_T2081) +#elif defined(CONFIG_ARCH_T2080) || defined(CONFIG_ARCH_T2081) #define CONFIG_E6500 #define CONFIG_SYS_PPC64 /* 64-bit core */ #define CONFIG_FSL_CORENET /* Freescale CoreNet platform */ @@ -794,7 +794,7 @@ defined(CONFIG_PPC_T1014) || defined(CONFIG_PPC_T1013) #define CONFIG_SYS_FSL_CLUSTER_CLOCKS { 1, 4, 4, 4 } #define CONFIG_SYS_FSL_SRDS_1 #define CONFIG_SYS_FSL_PCI_VER_3_X -#if defined(CONFIG_PPC_T2080) +#if defined(CONFIG_ARCH_T2080) #define CONFIG_SYS_NUM_FM1_DTSEC 8 #define CONFIG_SYS_NUM_FM1_10GEC 4 #define CONFIG_SYS_FSL_SRDS_2 @@ -802,7 +802,7 @@ defined(CONFIG_PPC_T1014) || defined(CONFIG_PPC_T1013) #define CONFIG_SYS_FSL_SRIO_MAX_PORTS 2 #define CONFIG_SYS_FSL_SRIO_OB_WIN_NUM 9 #define CONFIG_SYS_FSL_SRIO_IB_WIN_NUM 5 -#elif defined(CONFIG_PPC_T2081) +#elif defined(CONFIG_ARCH_T2081) #define CONFIG_SYS_NUM_FM1_DTSEC 6 #define CONFIG_SYS_NUM_FM1_10GEC 2 #endif diff --git a/arch/powerpc/include/asm/immap_85xx.h b/arch/powerpc/include/asm/immap_85xx.h index 5d63228..783db18 100644 --- a/arch/powerpc/include/asm/immap_85xx.h +++ b/arch/powerpc/include/asm/immap_85xx.h @@ -1812,7 +1812,7 @@ defined(CONFIG_PPC_T1020) || defined(CONFIG_PPC_T1022) #define PXCKEN_MASK 0x80000000 #define PXCK_MASK 0x00FF0000 #define PXCK_BITS_START 16 -#elif defined(CONFIG_PPC_T2080) || defined(CONFIG_PPC_T2081) +#elif defined(CONFIG_ARCH_T2080) || defined(CONFIG_ARCH_T2081) #define FSL_CORENET2_RCWSR4_SRDS1_PRTCL 0xff000000 #define FSL_CORENET2_RCWSR4_SRDS1_PRTCL_SHIFT 24 #define FSL_CORENET2_RCWSR4_SRDS2_PRTCL 0x00ff0000 @@ -1885,7 +1885,7 @@ defined(CONFIG_PPC_T1020) || defined(CONFIG_PPC_T1022) #define FSL_CORENET_RCWSR13_EC2_FM1_DTSEC6_RGMII 0x08000000 #define FSL_CORENET_RCWSR13_EC2_FM1_GPIO 0x10000000 #endif -#if defined(CONFIG_PPC_T2080) || defined(CONFIG_PPC_T2081) +#if defined(CONFIG_ARCH_T2080) || defined(CONFIG_ARCH_T2081) #define FSL_CORENET_RCWSR13_EC1 0x60000000 /* bits 417..418 */ #define FSL_CORENET_RCWSR13_EC1_DTSEC3_RGMII 0x00000000 #define FSL_CORENET_RCWSR13_EC1_GPIO 0x40000000 diff --git a/configs/T2080QDS_NAND_defconfig b/configs/T2080QDS_NAND_defconfig index 5863d58..834e441 100644 --- a/configs/T2080QDS_NAND_defconfig +++ b/configs/T2080QDS_NAND_defconfig @@ -12,7 +12,7 @@ CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y -CONFIG_SYS_EXTRA_OPTIONS="PPC_T2080,RAMBOOT_PBL,SPL_FSL_PBL,NAND" +CONFIG_SYS_EXTRA_OPTIONS="RAMBOOT_PBL,SPL_FSL_PBL,NAND" CONFIG_BOOTDELAY=10 CONFIG_SPL=y CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT=y diff --git a/configs/T2080QDS_SDCARD_defconfig b/configs/T2080QDS_SDCARD_defconfig index d04731a..2393bc7 100644 --- a/configs/T2080QDS_SDCARD_defconfig +++ b/configs/T2080QDS_SDCARD_defconfig @@ -12,7 +12,7 @@ CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y -CONFIG_SYS_EXTRA_OPTIONS="PPC_T2080,RAMBOOT_PBL,SPL_FSL_PBL,SDCARD" +CONFIG_SYS_EXTRA_OPTIONS="RAMBOOT_PBL,SPL_FSL_PBL,SDCARD" CONFIG_BOOTDELAY=10 CONFIG_SPL=y CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT=y diff --git a/configs/T2080QDS_SECURE_BOOT_defconfig b/configs/T2080QDS_SECURE_BOOT_defconfig index 562c44e..ac8842e 100644 --- a/configs/T2080QDS_SECURE_BOOT_defconfig +++ b/configs/T2080QDS_SECURE_BOOT_defconfig @@ -6,7 +6,7 @@ CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y -CONFIG_SYS_EXTRA_OPTIONS="PPC_T2080,SECURE_BOOT" +CONFIG_SYS_EXTRA_OPTIONS="SECURE_BOOT" CONFIG_BOOTDELAY=10 CONFIG_HUSH_PARSER=y CONFIG_CMD_GREPENV=y diff --git a/configs/T2080QDS_SPIFLASH_defconfig b/configs/T2080QDS_SPIFLASH_defconfig index b939559..e4568b6 100644 --- a/configs/T2080QDS_SPIFLASH_defconfig +++ b/configs/T2080QDS_SPIFLASH_defconfig @@ -13,7 +13,7 @@ CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y -CONFIG_SYS_EXTRA_OPTIONS="PPC_T2080,RAMBOOT_PBL,SPL_FSL_PBL,SPIFLASH" +CONFIG_SYS_EXTRA_OPTIONS="RAMBOOT_PBL,SPL_FSL_PBL,SPIFLASH" CONFIG_BOOTDELAY=10 CONFIG_SPL=y CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT=y diff --git a/configs/T2080QDS_SRIO_PCIE_BOOT_defconfig b/configs/T2080QDS_SRIO_PCIE_BOOT_defconfig index 22a79c7..282e1c2 100644 --- a/configs/T2080QDS_SRIO_PCIE_BOOT_defconfig +++ b/configs/T2080QDS_SRIO_PCIE_BOOT_defconfig @@ -5,7 +5,7 @@ CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y -CONFIG_SYS_EXTRA_OPTIONS="PPC_T2080,SRIO_PCIE_BOOT_SLAVE,SYS_TEXT_BASE=0xFFF40000" +CONFIG_SYS_EXTRA_OPTIONS="SRIO_PCIE_BOOT_SLAVE,SYS_TEXT_BASE=0xFFF40000" CONFIG_BOOTDELAY=10 CONFIG_HUSH_PARSER=y # CONFIG_CMD_IMLS is not set diff --git a/configs/T2080QDS_defconfig b/configs/T2080QDS_defconfig index 1d3af1e..393d4e5 100644 --- a/configs/T2080QDS_defconfig +++ b/configs/T2080QDS_defconfig @@ -5,7 +5,6 @@ CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y -CONFIG_SYS_EXTRA_OPTIONS="PPC_T2080" CONFIG_BOOTDELAY=10 CONFIG_HUSH_PARSER=y CONFIG_CMD_GREPENV=y diff --git a/configs/T2080RDB_NAND_defconfig b/configs/T2080RDB_NAND_defconfig index cf402ff..f548e38 100644 --- a/configs/T2080RDB_NAND_defconfig +++ b/configs/T2080RDB_NAND_defconfig @@ -12,7 +12,7 @@ CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y -CONFIG_SYS_EXTRA_OPTIONS="PPC_T2080,RAMBOOT_PBL,SPL_FSL_PBL,NAND" +CONFIG_SYS_EXTRA_OPTIONS="RAMBOOT_PBL,SPL_FSL_PBL,NAND" CONFIG_BOOTDELAY=10 CONFIG_SPL=y CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT=y diff --git a/configs/T2080RDB_SDCARD_defconfig b/configs/T2080RDB_SDCARD_defconfig index aa0009f..ec4e576 100644 --- a/configs/T2080RDB_SDCARD_defconfig +++ b/configs/T2080RDB_SDCARD_defconfig @@ -12,7 +12,7 @@ CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y -CONFIG_SYS_EXTRA_OPTIONS="PPC_T2080,RAMBOOT_PBL,SPL_FSL_PBL,SDCARD" +CONFIG_SYS_EXTRA_OPTIONS="RAMBOOT_PBL,SPL_FSL_PBL,SDCARD" CONFIG_BOOTDELAY=10 CONFIG_SPL=y CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT=y diff --git a/configs/T2080RDB_SECURE_BOOT_defconfig b/configs/T2080RDB_SECURE_BOOT_defconfig index e5323c4..4675ac6 100644 --- a/configs/T2080RDB_SECURE_BOOT_defconfig +++ b/configs/T2080RDB_SECURE_BOOT_defconfig @@ -6,7 +6,7 @@ CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y -CONFIG_SYS_EXTRA_OPTIONS="PPC_T2080,SECURE_BOOT" +CONFIG_SYS_EXTRA_OPTIONS="SECURE_BOOT" CONFIG_BOOTDELAY=10 CONFIG_HUSH_PARSER=y CONFIG_CMD_MEMTEST=y diff --git a/configs/T2080RDB_SPIFLASH_defconfig b/configs/T2080RDB_SPIFLASH_defconfig index d0a79ad..34e1c67 100644 --- a/configs/T2080RDB_SPIFLASH_defconfig +++ b/configs/T2080RDB_SPIFLASH_defconfig @@ -13,7 +13,7 @@ CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y -CONFIG_SYS_EXTRA_OPTIONS="PPC_T2080,RAMBOOT_PBL,SPL_FSL_PBL,SPIFLASH" +CONFIG_SYS_EXTRA_OPTIONS="RAMBOOT_PBL,SPL_FSL_PBL,SPIFLASH" CONFIG_BOOTDELAY=10 CONFIG_SPL=y CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT=y diff --git a/configs/T2080RDB_SRIO_PCIE_BOOT_defconfig b/configs/T2080RDB_SRIO_PCIE_BOOT_defconfig index e44d56e..4b32880 100644 --- a/configs/T2080RDB_SRIO_PCIE_BOOT_defconfig +++ b/configs/T2080RDB_SRIO_PCIE_BOOT_defconfig @@ -5,7 +5,7 @@ CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y -CONFIG_SYS_EXTRA_OPTIONS="PPC_T2080,SRIO_PCIE_BOOT_SLAVE,SYS_TEXT_BASE=0xFFF40000" +CONFIG_SYS_EXTRA_OPTIONS="SRIO_PCIE_BOOT_SLAVE,SYS_TEXT_BASE=0xFFF40000" CONFIG_BOOTDELAY=10 CONFIG_HUSH_PARSER=y # CONFIG_CMD_IMLS is not set diff --git a/configs/T2080RDB_defconfig b/configs/T2080RDB_defconfig index 364305d..14310c4 100644 --- a/configs/T2080RDB_defconfig +++ b/configs/T2080RDB_defconfig @@ -5,7 +5,6 @@ CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y -CONFIG_SYS_EXTRA_OPTIONS="PPC_T2080" CONFIG_BOOTDELAY=10 CONFIG_HUSH_PARSER=y CONFIG_CMD_MEMTEST=y diff --git a/configs/T2081QDS_NAND_defconfig b/configs/T2081QDS_NAND_defconfig index b16ef2b..34350aa 100644 --- a/configs/T2081QDS_NAND_defconfig +++ b/configs/T2081QDS_NAND_defconfig @@ -12,7 +12,7 @@ CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y -CONFIG_SYS_EXTRA_OPTIONS="PPC_T2081,RAMBOOT_PBL,SPL_FSL_PBL,NAND" +CONFIG_SYS_EXTRA_OPTIONS="RAMBOOT_PBL,SPL_FSL_PBL,NAND" CONFIG_BOOTDELAY=10 CONFIG_SPL=y CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT=y diff --git a/configs/T2081QDS_SDCARD_defconfig b/configs/T2081QDS_SDCARD_defconfig index 2260d8f..630a5ce 100644 --- a/configs/T2081QDS_SDCARD_defconfig +++ b/configs/T2081QDS_SDCARD_defconfig @@ -12,7 +12,7 @@ CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y -CONFIG_SYS_EXTRA_OPTIONS="PPC_T2081,RAMBOOT_PBL,SPL_FSL_PBL,SDCARD" +CONFIG_SYS_EXTRA_OPTIONS="RAMBOOT_PBL,SPL_FSL_PBL,SDCARD" CONFIG_BOOTDELAY=10 CONFIG_SPL=y CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT=y diff --git a/configs/T2081QDS_SPIFLASH_defconfig b/configs/T2081QDS_SPIFLASH_defconfig index 744336c..0c43f89 100644 --- a/configs/T2081QDS_SPIFLASH_defconfig +++ b/configs/T2081QDS_SPIFLASH_defconfig @@ -13,7 +13,7 @@ CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y -CONFIG_SYS_EXTRA_OPTIONS="PPC_T2081,RAMBOOT_PBL,SPL_FSL_PBL,SPIFLASH" +CONFIG_SYS_EXTRA_OPTIONS="RAMBOOT_PBL,SPL_FSL_PBL,SPIFLASH" CONFIG_BOOTDELAY=10 CONFIG_SPL=y CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT=y diff --git a/configs/T2081QDS_SRIO_PCIE_BOOT_defconfig b/configs/T2081QDS_SRIO_PCIE_BOOT_defconfig index be2c36a..1665ca5 100644 --- a/configs/T2081QDS_SRIO_PCIE_BOOT_defconfig +++ b/configs/T2081QDS_SRIO_PCIE_BOOT_defconfig @@ -5,7 +5,7 @@ CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y -CONFIG_SYS_EXTRA_OPTIONS="PPC_T2081,SRIO_PCIE_BOOT_SLAVE,SYS_TEXT_BASE=0xFFF40000" +CONFIG_SYS_EXTRA_OPTIONS="SRIO_PCIE_BOOT_SLAVE,SYS_TEXT_BASE=0xFFF40000" CONFIG_BOOTDELAY=10 CONFIG_HUSH_PARSER=y # CONFIG_CMD_IMLS is not set diff --git a/configs/T2081QDS_defconfig b/configs/T2081QDS_defconfig index e35c003..822b92f 100644 --- a/configs/T2081QDS_defconfig +++ b/configs/T2081QDS_defconfig @@ -5,7 +5,6 @@ CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y -CONFIG_SYS_EXTRA_OPTIONS="PPC_T2081" CONFIG_BOOTDELAY=10 CONFIG_HUSH_PARSER=y CONFIG_CMD_GREPENV=y diff --git a/drivers/net/fm/Makefile b/drivers/net/fm/Makefile index cf21029..3f219e0 100644 --- a/drivers/net/fm/Makefile +++ b/drivers/net/fm/Makefile @@ -30,8 +30,8 @@ obj-$(CONFIG_PPC_T1020) += t1040.o obj-$(CONFIG_PPC_T1022) += t1040.o obj-$(CONFIG_ARCH_T1023) += t1024.o obj-$(CONFIG_ARCH_T1024) += t1024.o -obj-$(CONFIG_PPC_T2080) += t2080.o -obj-$(CONFIG_PPC_T2081) += t2080.o +obj-$(CONFIG_ARCH_T2080) += t2080.o +obj-$(CONFIG_ARCH_T2081) += t2080.o obj-$(CONFIG_PPC_T4240) += t4240.o obj-$(CONFIG_PPC_T4160) += t4240.o obj-$(CONFIG_PPC_T4080) += t4240.o diff --git a/include/configs/T208xQDS.h b/include/configs/T208xQDS.h index 8702a45..17176f4 100644 --- a/include/configs/T208xQDS.h +++ b/include/configs/T208xQDS.h @@ -14,13 +14,13 @@ #define CONFIG_ICS307_REFCLK_HZ 25000000 /* ICS307 ref clk freq */ #define CONFIG_MMC #define CONFIG_USB_EHCI -#if defined(CONFIG_PPC_T2080) +#if defined(CONFIG_ARCH_T2080) #define CONFIG_T2080QDS #define CONFIG_FSL_SATA_V2 #define CONFIG_SYS_SRIO /* Enable Serial RapidIO Support */ #define CONFIG_SRIO1 /* SRIO port 1 */ #define CONFIG_SRIO2 /* SRIO port 2 */ -#elif defined(CONFIG_PPC_T2081) +#elif defined(CONFIG_ARCH_T2081) #define CONFIG_T2081QDS #endif @@ -69,9 +69,9 @@ #define CONFIG_SYS_NAND_U_BOOT_START 0x00200000 #define CONFIG_SYS_NAND_U_BOOT_OFFS (256 << 10) #define CONFIG_SYS_LDSCRIPT "arch/powerpc/cpu/mpc85xx/u-boot-nand.lds" -#if defined(CONFIG_PPC_T2080) +#if defined(CONFIG_ARCH_T2080) #define CONFIG_SYS_FSL_PBL_RCW board/freescale/t208xqds/t2080_nand_rcw.cfg -#elif defined(CONFIG_PPC_T2081) +#elif defined(CONFIG_ARCH_T2081) #define CONFIG_SYS_FSL_PBL_RCW board/freescale/t208xqds/t2081_nand_rcw.cfg #endif #define CONFIG_SPL_NAND_BOOT @@ -88,9 +88,9 @@ #ifndef CONFIG_SPL_BUILD #define CONFIG_SYS_MPC85XX_NO_RESETVEC #endif -#if defined(CONFIG_PPC_T2080) +#if defined(CONFIG_ARCH_T2080) #define CONFIG_SYS_FSL_PBL_RCW board/freescale/t208xqds/t2080_spi_rcw.cfg -#elif defined(CONFIG_PPC_T2081) +#elif defined(CONFIG_ARCH_T2081) #define CONFIG_SYS_FSL_PBL_RCW board/freescale/t208xqds/t2081_spi_rcw.cfg #endif #define CONFIG_SPL_SPI_BOOT @@ -107,9 +107,9 @@ #ifndef CONFIG_SPL_BUILD #define CONFIG_SYS_MPC85XX_NO_RESETVEC #endif -#if defined(CONFIG_PPC_T2080) +#if defined(CONFIG_ARCH_T2080) #define CONFIG_SYS_FSL_PBL_RCW board/freescale/t208xqds/t2080_sd_rcw.cfg -#elif defined(CONFIG_PPC_T2081) +#elif defined(CONFIG_ARCH_T2081) #define CONFIG_SYS_FSL_PBL_RCW board/freescale/t208xqds/t2081_sd_rcw.cfg #endif #define CONFIG_SPL_MMC_BOOT diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 7f5a4ed..3256df7 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -3640,8 +3640,6 @@ CONFIG_PPC4xx_EMAC CONFIG_PPC64BRIDGE CONFIG_PPC_CLUSTER_START CONFIG_PPC_SPINTABLE_COMPATIBLE -CONFIG_PPC_T2080 -CONFIG_PPC_T2081 CONFIG_PPC_T4160 CONFIG_PPC_T4240 CONFIG_PQ_MDS_PIB