Message ID | 1482943430-10231-3-git-send-email-york.sun@nxp.com |
---|---|
State | Accepted |
Commit | 26e79b6547352235fe1bdcda668fe197a8ffdb92 |
Delegated to: | Tom Rini |
Headers | show
Return-Path: <u-boot-bounces@lists.denx.de> 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 3tpdqV5YZhz9sdn for <incoming@patchwork.ozlabs.org>; Thu, 29 Dec 2016 03:44:22 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 5A623B38CB; Wed, 28 Dec 2016 17:44: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 l1jLknroKGgN; Wed, 28 Dec 2016 17:44:20 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 95D78A75EE; Wed, 28 Dec 2016 17:44:19 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id B2BB2A75EE for <u-boot@lists.denx.de>; Wed, 28 Dec 2016 17:44:16 +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 m7CptI5e_d9z for <u-boot@lists.denx.de>; Wed, 28 Dec 2016 17:44:16 +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 NAM01-BN3-obe.outbound.protection.outlook.com (mail-bn3nam01on0062.outbound.protection.outlook.com [104.47.33.62]) by theia.denx.de (Postfix) with ESMTPS id 132A2A75E4 for <u-boot@lists.denx.de>; Wed, 28 Dec 2016 17:44:12 +0100 (CET) Received: from BN6PR03CA0068.namprd03.prod.outlook.com (10.173.137.30) by CY1PR0301MB0747.namprd03.prod.outlook.com (10.160.159.153) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.803.11; Wed, 28 Dec 2016 16:44:10 +0000 Received: from BN1BFFO11FD026.protection.gbl (2a01:111:f400:7c10::1:114) by BN6PR03CA0068.outlook.office365.com (2603:10b6:404:4c::30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.803.11 via Frontend Transport; Wed, 28 Dec 2016 16:44:10 +0000 Authentication-Results: spf=fail (sender IP is 192.88.158.2) smtp.mailfrom=nxp.com; denx.de; dkim=none (message not signed) header.d=none;denx.de; 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 BN1BFFO11FD026.mail.protection.outlook.com (10.58.144.89) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.1.789.10 via Frontend Transport; Wed, 28 Dec 2016 16:44:09 +0000 Received: from oslab-l16.am.freescale.net ([10.213.172.100]) by az84smr01.freescale.net (8.14.3/8.14.0) with ESMTP id uBSGhvtL026038; Wed, 28 Dec 2016 09:44:07 -0700 From: York Sun <york.sun@nxp.com> To: U-Boot Mailing List <u-boot@lists.denx.de> Date: Wed, 28 Dec 2016 08:43:28 -0800 Message-ID: <1482943430-10231-3-git-send-email-york.sun@nxp.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1482943430-10231-1-git-send-email-york.sun@nxp.com> References: <1482943430-10231-1-git-send-email-york.sun@nxp.com> X-EOPAttributedMessage: 0 X-Matching-Connectors: 131274170499288736; (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)(336005)(39840400002)(39410400002)(39860400002)(39850400002)(39400400002)(39450400003)(39380400002)(2980300002)(1109001)(1110001)(339900001)(199003)(189002)(86362001)(76176999)(189998001)(50986999)(110136003)(33646002)(104016004)(5003940100001)(69596002)(575784001)(39060400001)(5660300001)(97736004)(6916009)(626004)(68736007)(38730400001)(6666003)(50226002)(2950100002)(77096006)(7416002)(85426001)(305945005)(105606002)(4326007)(8936002)(106466001)(2906002)(81166006)(47776003)(8656002)(356003)(36756003)(8676002)(48376002)(92566002)(50466002)(81156014)(7059030); DIR:OUT; SFP:1101; SCL:1; SRVR:CY1PR0301MB0747; H:az84smr01.freescale.net; FPR:; SPF:Fail; PTR:InfoDomainNonexistent; A:1; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BN1BFFO11FD026; 1:uHhWrwTI8UyYWFq4YA62vgXz5SP+AcTIgJsKoDuFkZtBGrltAn29Jg5jWf/zDxKzcD6VkESbThahcaqCCmouRcrpqJDZfpFE0xDE5oEwR6w7tTo77By4LLpNB3O7ZArvexpFTUGybcOsEFyex5mLwvg+xp5JOSURF5AZaVgRFvHKbuALSq5/phXj+yj7bc1lO7NjE9HGyWWAFvN4xGaHdqRcSlV6Z5cwx1fJGQ3NEI9PO/V53nOd/52nqfdHvqxXvI4uVLcCEx778yz4M0kC66StCKgNuG66+gRV3/6LbRD384r41VtyDfhlpL9wngcSPxW0QGrfqsrR2Fe/uZpr6lpwqaUKOd3gYa2j3zEUvehC21Yf09cdvtVtB5WgovJxr8Mx7mM9UQTGIUqGziWSkW2RFAJci+bzuEVSAb0s3WM4N49HOURvs1H0dtXYxDE8I48b26l22jOSaa1EWX4aDDhJX5VJwn3HRFljFPbR4y7jgadW9ru8tTe/X0UJMmpFm4+blJN11FbJSrAwgfGGrCOaRzjQ5YmW0vgKFCF+ZjfDbhk681GwvVeabpH99GGz6y2pp6FneTiWKsUhdunvO1Y4MNYSN/TZ+OnOxz1O7oZbTsXIO4miqx3HrxnvSIS3qsdj5gXJZULXRkeCMM9juIe6Mws1V7TVQ2bu3jxa8cY= MIME-Version: 1.0 X-MS-Office365-Filtering-Correlation-Id: 48e8a872-cf65-4e85-a4f9-08d42f40bf31 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001); SRVR:CY1PR0301MB0747; X-Microsoft-Exchange-Diagnostics: 1; CY1PR0301MB0747; 3:qunGOCwrl3mY7diTr1ibLA71wmzUPY3VWEXgeF1y7VefXxklHXZu8neF5Ol37Q23WusWUbNVEmIKDn909Mp8KrT3cIlYAJXjopbC5dhWE6ylq08fvVHufZhmqNyjrXiET58H/UYgvrjHtVY6w0vjuPEfSOoKmfbhlX2lnrslPgw76FMxpVgNUj3aNehK1dOAhnRDFYY2YRd8UWsWeXO1imXQ/Rl+z1wyvI/Zkahf50EGSN6n1ASSmBi35TnFent6wBvfU531NkJtLNKBMEvBXQDFdwabJ4oozZQl1WcRAfIeQyh6ZjTegYnwbIT3rk4U2BoDX9u1TArL5PNYvW+4KHFHRfePbP4yJKFnNkKNA0653ShXDr5Hab17PI0UqSg0; 25:UIUhOG1XdMaNLYwoJMwi/YsaBZ45HVQdD+VFhzBQnUdAtDuuV1fXSKVCPSJAjyehrCRXjbk8+MbhlyII/+2I1gZSK7k/bZH43jdv8HVBuF5CHWaVwcfzbj5/KjfdVS0mwZnaM3VcHv0xY1mOsdoHK6dUO4wdjonpo79fqRqnLzxeZT8uhO/8Mr0IrtNnt9JRfoGj8sSAIZ9i153dLizye9cCZq9kKtQCHcpE4b7m+rwWR2sD2L8L69Q/x/VxXgrEKLLho+DvwdgNAM9kI2cd4YKyh5t5Fsl8iRCnwcFfekNiNZKm5q2rStfwmATzj2QDD8ZiDMyk9BCjIG3ufdyWI2FOBrtfz0XJa9ID5Rp2KcvccxXiUYrw+CbH6CZyXV5vtobEPbvAHt0mBK//YYXcfA6wq1xEq5q+aQB0+8dsgjSbIKQotZQnVuVzB15Hyxs2h2BvQ6jape7oHLVCKzQf0A== X-Microsoft-Exchange-Diagnostics: 1; CY1PR0301MB0747; 31:uf7sSai/E+3oFR7sIiq1twCe004MIDM7RLYMylsX3lhdRIVoZZf/n9j0tyrzIlD8ouR5uBjwaXHw3h33hNNPbZ22dzs/nnuK2XDcKhBmnop+2SoKUUceef7e69EQbH39I8GabGMHF9JXaWOA7mHWgd9XpLERN+YiUShaFOc1X5pcwft5xJ+6zCku2OOD5jbWGrkuAgZSYLjHhcSEOpwm2etselzafHTTt8Xhkla06VurTWCHm4+Ec/sYuBZ2sPFirYME+vItn1EA7J9csMkcY+gBr4W5IK8lm+bCNveMdAw= X-Microsoft-Antispam-PRVS: <CY1PR0301MB0747A1D1B6D25C832A4416369A680@CY1PR0301MB0747.namprd03.prod.outlook.com> X-Exchange-Antispam-Report-Test: UriScan:(185117386973197); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6095060)(601004)(2401047)(13024025)(13023025)(13015025)(13017025)(13018025)(8121501046)(5005006)(3002001)(10201501046)(6055026)(6096035)(20161123561025)(20161123559025)(20161123556025)(20161123565025)(20161123563025); SRVR:CY1PR0301MB0747; BCL:0; PCL:0; RULEID:(400006); SRVR:CY1PR0301MB0747; X-Microsoft-Exchange-Diagnostics: 1; CY1PR0301MB0747; 4:0KPDTQi2PQoLcWkvQ+VeZeSvKWZIJKvRmf6O5SCWxUPI0Zd5JRt/hfQkylRRfF8C+rNVTFhpDaPwZuERObgqidse2UB9RstFb0yesf9FovwI/3TcHcyJ+1MRGIwCwpvWtsPAvFz9V5DmXfVUPKUaCwvrH6wuWG2ShaXvhKJRebJPZQyT0sl6inFJsnOC1QyWLgYAwyBT/AiNRpXTDgBH5bcrm1ukkM9hV7Kw6XQCN3IiMllPpJEjlhpXyQonSYquB80UdJA81VqzJ+/a7g49SyNm83ggJfDa9cbFjgyf5zerBeUsR4KaqvDo5mNjqF/tqaqDY3DqRyvz9ft66Rr8d3lB4KUkIAF+lOVVv+MOYbCMfBf5pbyWZ0EdpMoSKml77GcXozyjBbq7nlh3UaxMazUUbxnl8141s4nMY4m4SlO8IfEAbmfS4Q6Dgope8WVp8frWnYR4F55roRkJG4Bh88I2NbAwKuI0Tc3k85PEQP2jeQA0I07TyBkFFDov+wcZLzVdRYdPcNtkw9FzN9JnnV+bBW11z4LtVgyLhKdjttotLaPUqdSd/AyVnxk6N5ndmoXBll3Ayg73BEBbcKRZmwRoHH9Pfwq2Qaj8ZjX6M5fzRlT/hpoAZ9VKoaTvDcKfrJiFdLuvDKwoZjrBw+w3Adc+G5e3GKU5FHcLVSo6+ZOFv9+8BSuRq31oPbw857YzWdCo2iMX1rEdwjU3dC7mzT1UketVyaicqAhiccLFJHEICSoBpsgxbnKRFyNaE88Y X-Forefront-PRVS: 0170DAF08C X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; CY1PR0301MB0747; 23:yXBgjAKSBwEReTv2rVdOCtuVkhtl9JEexYw71qR?= =?us-ascii?Q?wJvRNWlg641IKBNQpNTzyllFdOGp1lOsI4clG9f2dTY9WRKEde2KxOoX5R52?= =?us-ascii?Q?NJdqlB/YzqtOvHT0kNQstUq8W2y9l2lZJ0mmK5DBO8cahZxZV+z1gCVQNdNd?= =?us-ascii?Q?aDrHNOf6fVX5C+icWj3a3lLbKr6AVLhRqY8yVuYFeRc3DwmwGuyaYbFgayOM?= =?us-ascii?Q?Jc6JiMTROCAvA9NewuBrLBOP2iowfzV9NF2ZANgNjI1i5hO/k8PpJO0MuEfI?= =?us-ascii?Q?fHmUF12NhzR5XEjh+tf+pmg6AYwILckMYlcGtGpELeBkv77MslU9hDNGnbYX?= =?us-ascii?Q?95bUQEJemwLTwUN7MWO05Gy8/DSlK3nz75gmbxvM/wKTShRAOtxR1fVGxKsC?= =?us-ascii?Q?oJi3EUOfaqN1eilvweZP4o9H644OhIjKNJloFJKvR6ZNDJTPF97C+h7nuQ1k?= =?us-ascii?Q?YJgWGvtd/+uhtnnLJY3cauU8gfaTIbOqF6xWSQ1nQegaUpvko3PGY3oo1GlU?= =?us-ascii?Q?BR2Ttf6C4pD/Tu5IwZKjHlZp3XxIZ3VXdHSdONJHC9hdka7ak1qA+sGkqaQe?= =?us-ascii?Q?XTvZ4Y8n2gadN3um1aGNpApxdaqB3unb7+A2P0eRyYlnZV5IvoOuOY2H4raT?= =?us-ascii?Q?5mE9p9a/TzHb85g/ZQOOrwFNwU71Nxe9AS/G4vd1hyAZ+QcOVUgAayM7yBox?= =?us-ascii?Q?NExKqrhfSN//ZYrPUGqBOFIRC+78u7GncJsinaSv8Zdac/KiF8wMkR17GLxm?= =?us-ascii?Q?PnKlau04xaKwfFzno4orLRWK8dSXXeUY8+ECxtv/FL1z7DnzhVu2EVr7z81J?= =?us-ascii?Q?DGWy2O7fdA++asPrjhRb4mtED1i6TvYF8MRl/X08ZpprLfZX2vGR92SJjmyg?= =?us-ascii?Q?Y/iTBJk9zDSw5054dCkxKk3IBNAoKodkY0JdIskVbrqZErP8ga2Uk0MZnV94?= =?us-ascii?Q?q+awpHOP7B7+iRq6bpxTGuShXpGgxYjy0ngfQeXOkbC1kQwjqADxzCNHygMu?= =?us-ascii?Q?z2r5AhgiaWjkl8a8byqLJCNwtg+4P/p9lcXbzWN8wZomUNA27nrrZmViCOIO?= =?us-ascii?Q?2BpNnqrZt7tI0sGsup+s9DP/uQRaMRZoNQt9LDEiLGCkeogFYfLlJ34yKLmA?= =?us-ascii?Q?PnNbS0KuQ9GDSA7ZwBkgVCaCRIpaC9CdrbT5Sl+SVa5zvGmibqjXis+onszf?= =?us-ascii?Q?lbYo4TW5n50+Fi1pm/pGRgQHxLYG44idYk8mGfPytNScUTa9hktM3a33HlQn?= =?us-ascii?Q?+z+/1GQL8N+WJ6eflF8FA7ZJrIr0X7TvLDpXqTdRulAXYxz+YKcb+LVqOv3z?= =?us-ascii?Q?DVvDbf9DEIgYZ9BkJJS3OYaWxTQhO2nRNtF8zo1IL/rv0HvCVIROB+OPuM6r?= =?us-ascii?Q?20SsNBw=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1; CY1PR0301MB0747; 6:bxIdhJFBpwl4dQCkTSly1+tYXdtkbmh/R5WWzYBARKkmHFznO7gzBOWdxaFaP/Y67mUftqNFvNZ42RwEQjQYJj/QtXvvWNcanHWs5JngP9Gh+imiL923OSkZPThhEh92khtqorkEoUyvSNcUStYY7Y3owjvDyNzMULx59IOZieITAXCGKnJhxoDfsMjrqvhtjeewaeuI5UoR/53rPZWAOcOpLatV4ApudEgcCHkmdbmk6Vvbi7z0H9cUXNucX6Yqba+o9Q9H55LN8B34Xh/7X71jvpEUQDt/LomTLB3+9etvp6bEkQ48XdpverYaFVI9MBVqBQQkheoF1R8nHsFsbKwRU+YOJsbvj5/rOQ54Hy8xjWes7oY3h4qSCLejIblKsTb4cG8hB+MgL84VHstIw78vD+pMx5qEFprh4aK4ZZO4+k25rX6t/65t1Bb5n/Ae; 5:iqFHYBZu4HTcMZyUbqjfOryjMigaIPjIgwKizrqAS/IIwvS7+0Fwm6Tdzwkj14cuL2+MSUhcBQxhmbL/H6yPII0xNx6fcycGEcBfI0vLwAug2YKzFLealRlz0NoGmMZ/nXa9kNsvhdWXa3gLGE/E/TNV1UOA7RCNplbSzpFvOeLha4G+TKrP5ETWQMl1NqTz; 24:/SiPP84Z33k0H2THkGwO4OAksXUJH07x6qO1vSZ+Ae04qD4xV/HS71ei/UeHWzNI7NPmFlxD1TIeLMxyBQOYXodNwJCMq/eqqaO/eJbpiaU= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; CY1PR0301MB0747; 7:fPz3hF0bLuG7nULbDOixrLCowomDBfNTQ4ECShee02vp4TWssGtDN4WVYm7RPcLytUwcFm8+n41ghXFdVvORwQ2icq8zUCoeJ/FQeNTxW7DxOe61+1mrdANNB2bks757Do8S8EPrUQLPnoDQ1zCfSa5cDD3fkS9l2BhXAcAX14LNkrkcWxqYuq9sk2v/EDdtauAajYGga/EBQbiRbUwVHkyytX7y/7NfxYiN+I/3LKIfegMpvK67fwgT7a9eOAWpcB5Mc4bMlNVgrVgYUu7He6cfj7T+Kl9hgxrsF2qpehxC9V6/5H9bFUvQ7LPe+MlmfbZ9++zxakDdbQ0gCPbXb7MdCmFYKlCShsbCJxgZcpxmKSUmuHDatgabzAN40lecdoDBOBlO3k6iDGLZP22J8IZ0xg0d0eBhAqh9XTFD6rjoIU3TGPN5g9ujlv4V9B7kple2EDl2BBJra5oOSN3CZQ== X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Dec 2016 16:44:09.4608 (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: CY1PR0301MB0747 Cc: trini@konsulko.com, Kumar Gala <galak@kernel.crashing.org>, Stefan Roese <sr@denx.de>, Andy Fleming <afleming@gmail.com> Subject: [U-Boot] [PATCH 02/24] powerpc: mpc85xx: Move CONFIG_SYS_NUM_TLBCAMS to Kconfig X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.15 Precedence: list List-Id: U-Boot discussion <u-boot.lists.denx.de> List-Unsubscribe: <http://lists.denx.de/mailman/options/u-boot>, <mailto:u-boot-request@lists.denx.de?subject=unsubscribe> List-Archive: <http://lists.denx.de/pipermail/u-boot/> List-Post: <mailto:u-boot@lists.denx.de> List-Help: <mailto:u-boot-request@lists.denx.de?subject=help> List-Subscribe: <http://lists.denx.de/mailman/listinfo/u-boot>, <mailto:u-boot-request@lists.denx.de?subject=subscribe> Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" <u-boot-bounces@lists.denx.de> |
On Wed, Dec 28, 2016 at 08:43:28AM -0800, York Sun wrote: > Use Kconfig option for SYS_NUM_TLBCAMS and clean up existing macros. > > Signed-off-by: York Sun <york.sun@nxp.com> Applied to u-boot/master, thanks!
diff --git a/arch/powerpc/cpu/mpc85xx/Kconfig b/arch/powerpc/cpu/mpc85xx/Kconfig index 6d8709e..2b1d0f6 100644 --- a/arch/powerpc/cpu/mpc85xx/Kconfig +++ b/arch/powerpc/cpu/mpc85xx/Kconfig @@ -647,6 +647,14 @@ config SYS_FSL_NUM_LAWS Number of local access windows. This is fixed per SoC. If not sure, do not change. +config SYS_NUM_TLBCAMS + int "Number of TLB CAM entries" + default 64 if E500MC + default 16 + help + Number of TLB CAM entries for Book-E chips. 64 for E500MC, + 16 for other E500 SoCs. + source "board/freescale/b4860qds/Kconfig" source "board/freescale/bsc9131rdb/Kconfig" source "board/freescale/bsc9132qds/Kconfig" diff --git a/arch/powerpc/include/asm/config_mpc85xx.h b/arch/powerpc/include/asm/config_mpc85xx.h index 8cfc612..5761218 100644 --- a/arch/powerpc/include/asm/config_mpc85xx.h +++ b/arch/powerpc/include/asm/config_mpc85xx.h @@ -24,13 +24,6 @@ #define CONFIG_SYS_FSL_SFP_BE #define CONFIG_SYS_FSL_SEC_MON_BE -/* Number of TLB CAM entries we have on FSL Book-E chips */ -#if defined(CONFIG_E500MC) -#define CONFIG_SYS_NUM_TLBCAMS 64 -#elif defined(CONFIG_E500) -#define CONFIG_SYS_NUM_TLBCAMS 16 -#endif - #if defined(CONFIG_ARCH_MPC8536) #define CONFIG_SYS_PPC_E500_DEBUG_TLB 1 #define CONFIG_SYS_FSL_SEC_COMPAT 2
Use Kconfig option for SYS_NUM_TLBCAMS and clean up existing macros. Signed-off-by: York Sun <york.sun@nxp.com> --- arch/powerpc/cpu/mpc85xx/Kconfig | 8 ++++++++ arch/powerpc/include/asm/config_mpc85xx.h | 7 ------- 2 files changed, 8 insertions(+), 7 deletions(-)