From patchwork Thu Nov 24 07:54:26 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: York Sun X-Patchwork-Id: 698681 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 3tPWqp411sz9t1Q for ; Thu, 24 Nov 2016 19:01:26 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id C8BE5B3959; Thu, 24 Nov 2016 08:58: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 7UIIyKvB1Wui; Thu, 24 Nov 2016 08:58:20 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 6DC1DB38F0; Thu, 24 Nov 2016 08:57:13 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 0A8FFA7550 for ; Thu, 24 Nov 2016 08:56:58 +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 Z5YZ7SDPijBx for ; Thu, 24 Nov 2016 08:56:57 +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 NAM02-CY1-obe.outbound.protection.outlook.com (mail-cys01nam02on0042.outbound.protection.outlook.com [104.47.37.42]) by theia.denx.de (Postfix) with ESMTPS id 26F24B3870 for ; Thu, 24 Nov 2016 08:56:34 +0100 (CET) Received: from BY2PR03CA052.namprd03.prod.outlook.com (10.141.249.25) by BY2PR0301MB0743.namprd03.prod.outlook.com (10.160.63.21) 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:32 +0000 Received: from BY2FFO11FD024.protection.gbl (2a01:111:f400:7c0c::159) by BY2PR03CA052.outlook.office365.com (2a01:111:e400:2c5d::25) 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:32 +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 BY2FFO11FD024.mail.protection.outlook.com (10.1.15.213) 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:31 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:; UpperCasedChecksum:; SizeAsReceived:1110; 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 uAO7tR3Q012503; Thu, 24 Nov 2016 00:56:29 -0700 From: York Sun To: Date: Wed, 23 Nov 2016 23:54:26 -0800 Message-ID: <1479974118-2912-45-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: 131244477924814141; (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)(336004)(339900001)(189002)(199003)(39410400001)(92566002)(77096005)(69596002)(189998001)(8666005)(5660300001)(6666003)(38730400001)(2351001)(356003)(2906002)(36756003)(86362001)(575784001)(305945005)(85426001)(47776003)(81156014)(8676002)(97736004)(4326007)(48376002)(33646002)(50986999)(76176999)(110136003)(50226002)(50466002)(7416002)(626004)(68736007)(7846002)(106466001)(105606002)(2950100002)(6916009)(8936002)(5003940100001)(39060400001)(81166006)(104016004)(39390400001)(39400400001)(39380400001)(7059030); DIR:OUT; SFP:1101; SCL:1; SRVR:BY2PR0301MB0743; H:az84smr01.freescale.net; FPR:; SPF:Fail; PTR:InfoDomainNonexistent; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BY2FFO11FD024; 1:4GnU0Moq2BO1dGfl5jOC6633XgxDpqZbRH/SYivwn3S6wZ9fCTO7sT7Wuy0vyTFLlqSgoc9y9mG89S2yoss44NLsG2N4P9bufdBCUhMj5dvnHT63c8CaCeIfgrdxmS/nT9pnCKXrPoSzYh9bEYrTy//ttcSiVDnzdPVNMzqexIfLvM0/LzdtgjS8b9oATT6HVjOL3QLop1sZZmbhe7dRWH0AfomSrhZ5BeoK6xM6lfSVxtjQWcfQLmH9rpyy7xrzvgyKgd/ZTR9ylO0MGKFfSAo9SC3tNY9U8/H+k3xq/FXGtT/2Oe6KrBCIvK1NNBw8GWsPIefGRA68/UtGISLXAvlWcpHcYGdzVai9SXSkkuqv1G8I8Hheysk4ValieP2LDgn4Nrdsf82FJXPKsoZUjzaCLzFSJfBPKnkJH8FRwUjx15Y11Yp2CPyu7tsmnI4O1jNol4sJD3jHPkCtmGlYbv4q3W13v4VDzus1swTffPj3mm2vGd/skQv+zSC+pZ7tybrvoZpMjC9nxE46oWUlYJKKKGmhAfHvukACwFmWZ74c3Um5chr1bZyRKNHK6ZTw2lSf9L0ilp198979xm264SzrWq+PpY05VKK7vdT9Oz8S0+KD22ESxEPgXd4pRn6t MIME-Version: 1.0 X-Microsoft-Exchange-Diagnostics: 1; BY2PR0301MB0743; 2:z6O8SNs/cbxtFjRiaTscfuA+iFQXvL1cWRBV3nJOqsE7JHw6ieg/E5QdQbRhWP4MLJz0n2B1bb9Enqyvq5av/dF1nDFPfryCJPMSZCY27KWL2guTg2JnedF4kFUtP6QHcjMwoMNQkHhF5Mn0MuvlxuE1AsOL5uU99YXGSmT0qo8=; 3:idiBSdBTa1xEe+GrFzJy/StjUDDokbGFWtX4WuDZfEYeZxT7+a88u0juRxHWZ0JxjxpHrhcmk/nktHCHjqUKdXfPLWpUKZ7cTY6Anl5Mu9ddShxCkwAQ4HKxNpVmtZTZds4nAypcXzHGmP5aIm6MSDhX212l+J2AlmttAfEQTPscb2AuDNpdzr69szozq7K5UONsErKvdiLHOlYv3eXVF7xu5s6Cxzj4/x9eaVWewkLb3hTlkmkUAmyTuAFbiX3R21FVTjst+Ne/KXLlwWrtvA== X-MS-Office365-Filtering-Correlation-Id: 32327ad8-cc17-4e4c-ad3d-08d4143f67e7 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001); SRVR:BY2PR0301MB0743; X-Microsoft-Exchange-Diagnostics: 1; BY2PR0301MB0743; 25:aysYBEZ0B7BFC8RNJ44MV4VUHCnqrqsH62QS+e731VgSXJNuwyGQcqnht/wwf3bQKscrwgOPCQ9JgJqE9+oPFg217D5mmPSj0JGi7ntkTFneZ0rovdvbDDMo6vfAJXNIeYnqJ+o/nefh/OYPpD36J7gZCxHejSyUwmObbis3Rc0zA+db/Qb4wUAJZmW9KzlZzHAXTY4i99LzTnHhBxaXJHMxqCK/0k4T9+Hzc9ZEP00Dh5Z0XjJOju6Jg2nncK8wtzIFFkLuN6xsuh76+p4fyaH/GTc4M64bbDg91BbSez1hP0dGCWod1UZK3Ty+4S+/OhIfBAzBO9N+gXh4wkgWofNVrf7wQBN5Slh7mm/KstgddAP1UDaIl/iNl6lE2OYQvd6TECzCmhsSDv02R9n2iTXc3K0GSvrr56dF64XwAyObb965GjmDJMTAQQfNZA4MmVRBExBkUdv8xeGO4T5FT9Y4lLDpiBurAaI9a/RM90l4VBuCkxYlmEuI2lHPmm7G+kQt4pocdZ3bkbDcixPAw6fq2s2RjKn2eFJBQeIa4DIpeKVB1jZbz/FtJFYU0NHc/SSgPz8yzVE8rYLbpjq4s1jnitqlyK2g5OHx9raiYOPS1B9cpnpQmn34xtmA3An1Pxjj8PBzTqdho1r+DjC6BJm2vtOIju3OeNVW63zwuyn0MQppd+hlhSFcjtgzB6s65rDWJgDr16qG1kArKOWPWjHNgXlPSnwHmErSd4UiEX0TjIFNsD9y8uIYPbGgev7222S9Ikj44t+lntcq+Ilc2w== X-Microsoft-Exchange-Diagnostics: 1; BY2PR0301MB0743; 31:cdd5FWGNt1z3shvKaLFNFDLMkAxgJwNGEx9QCrwb7XrMoGX6SfcafkAegMHOMaCRv6zSILVk0U4+1YDjGP3uS5KDRSEV21TiH36772DJHq1YctMcdHAVtUxq7tEYgxlm8bwPOT5NTeVphpwJAxzY0xUiMYYIabzUBXffiQhXc8hq/1SStH4W4dFjZjlVDN367Yq1yGfsWbhz+rTwCVwcEkvi3S0s0ChD3gZneyd0JWlNm6ptm1i5CbdtqjYMjroJJfgH2bOtizMKQIpEnvfeOVhvKHvXKjws1Xoqm8f3DYk= 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)(8121501046)(13024025)(13023025)(13015025)(13017025)(13018025)(5005006)(3002001)(10201501046)(6055026)(6096035)(20161123556025)(20161123561025)(20161123565025)(20161123559025)(20161123563025); SRVR:BY2PR0301MB0743; BCL:0; PCL:0; RULEID:(400006); SRVR:BY2PR0301MB0743; X-Microsoft-Exchange-Diagnostics: 1; BY2PR0301MB0743; 4:jjQcocoV+XHRfcCXK/eBstm471SEXOdWMnflOKqXyfOqpnYwHyojzb9ejlf+6Af64Fzwj0SnjPdBael/iLQ1sN9ReEPqipcWQ/sJzCQuyxSqGBV6O6wdIvxv/khNN85iekSeCULTAQ+wA8JxlnahgS8siNdB0Si5xzxH/4Av/0yng0eJGj6//cPQrgZ7u2sfYM4kmw624fqRS+wi+/h7iZYMGADGpMvIEcd2PXrRujQrxUbO/KdUIbyG2m6OM200QpWwsl0qDmNxnFhg2Sv0wba5ZkiikjOHqt26tC2EO71VYf+83klvlksWFgDWc+hlPWCjzo/VYcUhmQet9hL8480Csw77+Rzn6JgOo2xFIbx/K836ykCbTC+66FVaVfiuCgfDRd8FQ5ymQpm8v8xRGlHifiszQZ6zGKsR1h9DNvTJA7yNPuEXQiwPlA8d6ipnfk9EOrj4eehdGw2TR95l9Bg83B/Abr4NKrK3oPSrJwNeTnF22+rvWM3IhxhjilhGy5QF6JuDn+zhQrTahRvKIrGP3QM67KZWmsEAkRfQDtRw9DTJarSKRA4I0RidLHHoN56OCKroSQ4J2LMdDqLdYHRBh20+ne3DckR4CeWyc4HmCSD96ajj4qRb7LWoJdqZjw1uF0jmu/vaKuhw2dAITLyX58iB1t9hlLNf2SRkwuiNM3omjP7jYbHRw7VI4g50vkXrjuSWke77h7BmHw5DhuwpY/U/+DvwRUk8j8x0jwnAHxkxb56heldO9lEW4PlO X-Forefront-PRVS: 0136C1DDA4 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BY2PR0301MB0743; 23:atV36jbkLIK+NJ4jI+Oan2D2/6dyfrMsjrfGoOT?= =?us-ascii?Q?MIupPHUSFNw8/mCoIwJ1a2dhcKS5TbOyMGzMb+jXVUKgoA88xfHXLUMt5Kw/?= =?us-ascii?Q?6AlHNtlH8jPJv3/WYB8Pecm/f35nE/EbMl3gUHfTug5wXuPXS6SRLiEvIyXz?= =?us-ascii?Q?R4RVywiAzvzuGXQTwaOdNvFF4PoZ8VQhK9JM6lja7eILNneXPSf9ZM4zE7bQ?= =?us-ascii?Q?KoIFa9tPRybg0JbU1NNbAqQO/JOWIuDAv7cLadKIdS8ShtxTxUuGfEnJG6tf?= =?us-ascii?Q?X1hMvVe50zr+Ef1ibSma2hxCsIeu+ci8Xo0uYv6B7TXxKLRJ1uyl9cAX80dW?= =?us-ascii?Q?Zp4jUlTSSzEhnf1URRVYyYoBueALaSDAMVVB50KUVIRO0dC8nFrkyl48Djeu?= =?us-ascii?Q?eFy+ymVWWpGjo+Ghrn8cNeVgqicvZwZ2lwtitOd+Pm20QRgPvYuNbbgTVUJV?= =?us-ascii?Q?Y4dW305wDHgtCU6rI+88+7J2XFHDkL2OA5PQ853OS91P9yCm/BJsH/PTme3B?= =?us-ascii?Q?cdczu9HwHonQJnSVB6JjvCiXG6ig4mD7iTz5JKu7yenBULawduG4SH65jGr2?= =?us-ascii?Q?RvlGKeQ6boYG+TJVvfUj6tlCCX86adM7lFpOfkZdnyMM29RJp713sttKXMNt?= =?us-ascii?Q?PehsB5MiJ6uTQxPtbnnT2dIgMfUNzIZmO/tBjYP96fLDkCfj6nQEMOhH+1MV?= =?us-ascii?Q?Q3CnvH6S8941507RBWZqurOTP6xEpAIvy4VkIFkmALplcBquVgaikOoQfLqO?= =?us-ascii?Q?JhhsitC9GDA8InXPtAwv5DClj1i0bsTueRxYMaxtyW5i0Niy7sjbD8TXsghd?= =?us-ascii?Q?dgrvbzXqTIxdil+Sqtf+4c8E7pSuYBuJGT2/dj+vR78LEN9Wj7lJB7JlzAFL?= =?us-ascii?Q?2MCUDpK1bZoSFTAPYxzWl7/ILueiHkl4RTymYj2/oYT5pYWsmvMCjVdXBgHe?= =?us-ascii?Q?vfGoXryer3HZytShuYmhJCIl9OQTWM26knJVndcQ8fgieBgau0mR4r/OOjdM?= =?us-ascii?Q?TGnMAi1VEAvwSe5Igjor4SYzuT3dhxJgdl4qkn95/tkEohm1ltkqqC43Iy0C?= =?us-ascii?Q?xg3Jg6qaC6Jmcs4Z+d/cF/ZffKZqJ0MmVFLZyOaGHEwBv77/V9IOwSOprjPM?= =?us-ascii?Q?gz/sYSmPglKAma1Vwia1PIywHlObRyODDt1tzK3+gtENjK0ekkituJCjp1kR?= =?us-ascii?Q?JnwaYql2fKqJSNUxd5pcjBMDz8zKo+SfGFH+7tdeY7chHJ81sXSiTgNafrY1?= =?us-ascii?Q?RAWXzENDlGmzknjHwMhw1HZwr2FLN4llFPGaGnlt+rEHw24dNingRBMu8lk/?= =?us-ascii?Q?D2ltSP7Xi5759sPzZjpnTc+Y=3D?= X-Microsoft-Exchange-Diagnostics: 1; BY2PR0301MB0743; 6:H288BDp1c3UCp5r2O04JMX9m4NpaY0Bu4I3eC4TpJ3E1NkjFM9E6MtgrH0FoeisG4J9LpE90bHEYQaPvXXupcSk+yVFse9WkNPrzFXqX0BOAt2XtYikum3+lTKvQq8bd/ejxX9dg9SwNABLyvYvkYQSJoXE/+TX4c3uERIL0wS5wUPB2Q4KHhvlN9c7CsoG5pYu47AmV5ccXZ3U8CfLT5rsOo4hrh48Haw3LaCaHD2SZKe7Qc4sYz3nl09XW/9q0JFdsn+mfHGIdSSH+0E8bdULYIEL7u7NCdC2qY/HzSav6+YhTV9lqQ1GrHpj8vSxis03InRIjpEfQIywQKUF75g==; 5:lUR5Pkj2w/J1gfu6Aqdf1/aFEVhXfet/R7htCjQuSN1LkcuDENziiP+cW1ZK9oGqOeaj1ltjalBMsPpGChzKRk5iTo2vWMinHomoDVGFZDEHdhoGUhY1GTQeIRo4C8LRr51hvJ92BiYVQVH7j+g4PS5gFgJW475p/MhHewUMTZWHQ137kTW2M35dJmS9EQk9; 24:MR6F+mUOQft+j7tmI0oPp5QZrRvAGvkhbZt+3853o8I5dfr8d/iGpjJS5OTsHuTdPQT+qy/r5gd/9nZUqYU56z7wQjmJ46KkYMKwUaiU0Zc= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; BY2PR0301MB0743; 7:uWs7KH4yFeP+Fpo1YihFF/gMNZ5j28eVuaNYSLYJT1DLWsgBAiR8bEd8jhNzDuobmFkRNqLF76qt9tRbBCq3+UNJhYtJWkeOb7G3gP0hC65AADo8cm9ehW0G7mJNwoRIiwusfSzpuMWUiH/8j9GtYD4UEoD8cCoV1nJ9CQb10iuZuKttqazjd9VJbZ+LRdt4k6yJRk8Zh+LgOZW9fa8GLohRZvJfD4wp7Izznm6jsDQTFBqlS1WD0YoH+fsmsMB7cEKv+DL3/quBecCn2IFvEFGDdhIevi5BnwBP5wGu7sJOPB7kPsSOupa/xmX7x6Ra+O1Z+8eqv7AInB+rp+FV0kj/qXwoXv0eAzVn6G+7/x4= X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Nov 2016 07:56:31.4362 (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: BY2PR0301MB0743 Cc: Stefan Roese , Viresh Kumar , Kumar Gala , Jagan Teki , Andy Fleming Subject: [U-Boot] [PATCH 45/97] powerpc: P2020RDB-PC: Separate from P1_P2_RDB_PC in Kconfig 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 TARGET_P2020RDB_PC instead of sharing with P1_P2_RDB_PC to simplify Kconfig and config macros. Remove macro CONFIG_P2020RDB. Signed-off-by: York Sun --- arch/powerpc/cpu/mpc85xx/Kconfig | 5 +++++ board/freescale/p1_p2_rdb_pc/Kconfig | 3 ++- board/freescale/p1_p2_rdb_pc/ddr.c | 2 +- configs/P2020RDB-PC_36BIT_NAND_defconfig | 4 ++-- configs/P2020RDB-PC_36BIT_SDCARD_defconfig | 4 ++-- configs/P2020RDB-PC_36BIT_SPIFLASH_defconfig | 4 ++-- configs/P2020RDB-PC_36BIT_defconfig | 3 +-- configs/P2020RDB-PC_NAND_defconfig | 4 ++-- configs/P2020RDB-PC_SDCARD_defconfig | 4 ++-- configs/P2020RDB-PC_SPIFLASH_defconfig | 4 ++-- configs/P2020RDB-PC_defconfig | 3 +-- include/configs/p1_p2_rdb_pc.h | 10 +++++----- scripts/config_whitelist.txt | 1 - 13 files changed, 27 insertions(+), 24 deletions(-) diff --git a/arch/powerpc/cpu/mpc85xx/Kconfig b/arch/powerpc/cpu/mpc85xx/Kconfig index 632e0f0..ea517dc 100644 --- a/arch/powerpc/cpu/mpc85xx/Kconfig +++ b/arch/powerpc/cpu/mpc85xx/Kconfig @@ -150,6 +150,11 @@ config TARGET_P1025RDB select SUPPORT_SPL select SUPPORT_TPL +config TARGET_P2020RDB + bool "Support P2020RDB-PC" + select SUPPORT_SPL + select SUPPORT_TPL + config TARGET_P1_P2_RDB_PC bool "Support p1_p2_rdb_pc" select SUPPORT_SPL diff --git a/board/freescale/p1_p2_rdb_pc/Kconfig b/board/freescale/p1_p2_rdb_pc/Kconfig index f02549e..fb506d4 100644 --- a/board/freescale/p1_p2_rdb_pc/Kconfig +++ b/board/freescale/p1_p2_rdb_pc/Kconfig @@ -5,7 +5,8 @@ if TARGET_P1_P2_RDB_PC || \ TARGET_P1020UTM || \ TARGET_P1021RDB || \ TARGET_P1024RDB || \ - TARGET_P1025RDB + TARGET_P1025RDB || \ + TARGET_P2020RDB config SYS_BOARD default "p1_p2_rdb_pc" diff --git a/board/freescale/p1_p2_rdb_pc/ddr.c b/board/freescale/p1_p2_rdb_pc/ddr.c index 44ab123..fc38326 100644 --- a/board/freescale/p1_p2_rdb_pc/ddr.c +++ b/board/freescale/p1_p2_rdb_pc/ddr.c @@ -47,7 +47,7 @@ dimm_params_t ddr_raw_timing = { .refresh_rate_ps = 7800000, .tfaw_ps = 37500, }; -#elif defined(CONFIG_P2020RDB) +#elif defined(CONFIG_TARGET_P2020RDB) /* Micron MT41J128M16_15E */ dimm_params_t ddr_raw_timing = { .n_ranks = 1, diff --git a/configs/P2020RDB-PC_36BIT_NAND_defconfig b/configs/P2020RDB-PC_36BIT_NAND_defconfig index 1661db2..d8f375b 100644 --- a/configs/P2020RDB-PC_36BIT_NAND_defconfig +++ b/configs/P2020RDB-PC_36BIT_NAND_defconfig @@ -2,13 +2,13 @@ CONFIG_PPC=y CONFIG_SPL_NAND_SUPPORT=y CONFIG_SPL_SERIAL_SUPPORT=y CONFIG_MPC85xx=y -CONFIG_TARGET_P1_P2_RDB_PC=y +CONFIG_TARGET_P2020RDB=y CONFIG_PHYS_64BIT=y CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y -CONFIG_SYS_EXTRA_OPTIONS="P2020RDB,NAND" +CONFIG_SYS_EXTRA_OPTIONS="NAND" CONFIG_BOOTDELAY=10 CONFIG_SPL=y CONFIG_TPL=y diff --git a/configs/P2020RDB-PC_36BIT_SDCARD_defconfig b/configs/P2020RDB-PC_36BIT_SDCARD_defconfig index 220bafc..d5e44a0 100644 --- a/configs/P2020RDB-PC_36BIT_SDCARD_defconfig +++ b/configs/P2020RDB-PC_36BIT_SDCARD_defconfig @@ -6,13 +6,13 @@ CONFIG_SPL_MMC_SUPPORT=y CONFIG_SPL_SERIAL_SUPPORT=y CONFIG_SPL_ENV_SUPPORT=y CONFIG_MPC85xx=y -CONFIG_TARGET_P1_P2_RDB_PC=y +CONFIG_TARGET_P2020RDB=y CONFIG_PHYS_64BIT=y CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y -CONFIG_SYS_EXTRA_OPTIONS="P2020RDB,SDCARD" +CONFIG_SYS_EXTRA_OPTIONS="SDCARD" CONFIG_BOOTDELAY=10 CONFIG_SPL=y CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT=y diff --git a/configs/P2020RDB-PC_36BIT_SPIFLASH_defconfig b/configs/P2020RDB-PC_36BIT_SPIFLASH_defconfig index ebb89dd..7112255 100644 --- a/configs/P2020RDB-PC_36BIT_SPIFLASH_defconfig +++ b/configs/P2020RDB-PC_36BIT_SPIFLASH_defconfig @@ -7,13 +7,13 @@ CONFIG_SPL_ENV_SUPPORT=y CONFIG_SPL_SPI_FLASH_SUPPORT=y CONFIG_SPL_SPI_SUPPORT=y CONFIG_MPC85xx=y -CONFIG_TARGET_P1_P2_RDB_PC=y +CONFIG_TARGET_P2020RDB=y CONFIG_PHYS_64BIT=y CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y -CONFIG_SYS_EXTRA_OPTIONS="P2020RDB,SPIFLASH" +CONFIG_SYS_EXTRA_OPTIONS="SPIFLASH" CONFIG_BOOTDELAY=10 CONFIG_SPL=y CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT=y diff --git a/configs/P2020RDB-PC_36BIT_defconfig b/configs/P2020RDB-PC_36BIT_defconfig index c422273..a2af2d7 100644 --- a/configs/P2020RDB-PC_36BIT_defconfig +++ b/configs/P2020RDB-PC_36BIT_defconfig @@ -1,12 +1,11 @@ CONFIG_PPC=y CONFIG_MPC85xx=y -CONFIG_TARGET_P1_P2_RDB_PC=y +CONFIG_TARGET_P2020RDB=y CONFIG_PHYS_64BIT=y CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y -CONFIG_SYS_EXTRA_OPTIONS="P2020RDB" CONFIG_BOOTDELAY=10 CONFIG_HUSH_PARSER=y CONFIG_CMD_MMC=y diff --git a/configs/P2020RDB-PC_NAND_defconfig b/configs/P2020RDB-PC_NAND_defconfig index 4af6039..fd36351c 100644 --- a/configs/P2020RDB-PC_NAND_defconfig +++ b/configs/P2020RDB-PC_NAND_defconfig @@ -2,12 +2,12 @@ CONFIG_PPC=y CONFIG_SPL_NAND_SUPPORT=y CONFIG_SPL_SERIAL_SUPPORT=y CONFIG_MPC85xx=y -CONFIG_TARGET_P1_P2_RDB_PC=y +CONFIG_TARGET_P2020RDB=y CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y -CONFIG_SYS_EXTRA_OPTIONS="P2020RDB,NAND" +CONFIG_SYS_EXTRA_OPTIONS="NAND" CONFIG_BOOTDELAY=10 CONFIG_SPL=y CONFIG_TPL=y diff --git a/configs/P2020RDB-PC_SDCARD_defconfig b/configs/P2020RDB-PC_SDCARD_defconfig index fc8378b..7330926 100644 --- a/configs/P2020RDB-PC_SDCARD_defconfig +++ b/configs/P2020RDB-PC_SDCARD_defconfig @@ -6,12 +6,12 @@ CONFIG_SPL_MMC_SUPPORT=y CONFIG_SPL_SERIAL_SUPPORT=y CONFIG_SPL_ENV_SUPPORT=y CONFIG_MPC85xx=y -CONFIG_TARGET_P1_P2_RDB_PC=y +CONFIG_TARGET_P2020RDB=y CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y -CONFIG_SYS_EXTRA_OPTIONS="P2020RDB,SDCARD" +CONFIG_SYS_EXTRA_OPTIONS="SDCARD" CONFIG_BOOTDELAY=10 CONFIG_SPL=y CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT=y diff --git a/configs/P2020RDB-PC_SPIFLASH_defconfig b/configs/P2020RDB-PC_SPIFLASH_defconfig index 754ef24..2d380d5 100644 --- a/configs/P2020RDB-PC_SPIFLASH_defconfig +++ b/configs/P2020RDB-PC_SPIFLASH_defconfig @@ -7,12 +7,12 @@ CONFIG_SPL_ENV_SUPPORT=y CONFIG_SPL_SPI_FLASH_SUPPORT=y CONFIG_SPL_SPI_SUPPORT=y CONFIG_MPC85xx=y -CONFIG_TARGET_P1_P2_RDB_PC=y +CONFIG_TARGET_P2020RDB=y CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y -CONFIG_SYS_EXTRA_OPTIONS="P2020RDB,SPIFLASH" +CONFIG_SYS_EXTRA_OPTIONS="SPIFLASH" CONFIG_BOOTDELAY=10 CONFIG_SPL=y CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT=y diff --git a/configs/P2020RDB-PC_defconfig b/configs/P2020RDB-PC_defconfig index 7c40cd6..7fc2dcd 100644 --- a/configs/P2020RDB-PC_defconfig +++ b/configs/P2020RDB-PC_defconfig @@ -1,11 +1,10 @@ CONFIG_PPC=y CONFIG_MPC85xx=y -CONFIG_TARGET_P1_P2_RDB_PC=y +CONFIG_TARGET_P2020RDB=y CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y -CONFIG_SYS_EXTRA_OPTIONS="P2020RDB" CONFIG_BOOTDELAY=10 CONFIG_HUSH_PARSER=y CONFIG_CMD_MMC=y diff --git a/include/configs/p1_p2_rdb_pc.h b/include/configs/p1_p2_rdb_pc.h index 6c2fdd1..fa7d059 100644 --- a/include/configs/p1_p2_rdb_pc.h +++ b/include/configs/p1_p2_rdb_pc.h @@ -148,8 +148,8 @@ #define CONFIG_SYS_L2_SIZE (256 << 10) #endif -#if defined(CONFIG_P2020RDB) -#define CONFIG_BOARDNAME "P2020RDB-PCA" +#if defined(CONFIG_TARGET_P2020RDB) +#define CONFIG_BOARDNAME "P2020RDB-PC" #define CONFIG_NAND_FSL_ELBC #define CONFIG_P2020 #define CONFIG_VSC7385_ENET @@ -292,7 +292,7 @@ #define CONFIG_LIBATA #define CONFIG_LBA48 -#if defined(CONFIG_P2020RDB) +#if defined(CONFIG_TARGET_P2020RDB) #define CONFIG_SYS_CLK_FREQ 100000000 #else #define CONFIG_SYS_CLK_FREQ 66666666 @@ -351,7 +351,7 @@ #define CONFIG_DIMM_SLOTS_PER_CTLR 1 /* Default settings for DDR3 */ -#ifndef CONFIG_P2020RDB +#ifndef CONFIG_TARGET_P2020RDB #define CONFIG_SYS_DDR_CS0_BNDS 0x0000003f #define CONFIG_SYS_DDR_CS0_CONFIG 0x80014302 #define CONFIG_SYS_DDR_CS0_CONFIG_2 0x00000000 @@ -584,7 +584,7 @@ #define CONFIG_SPL_RELOC_STACK (CONFIG_SYS_INIT_L2_ADDR + 116 * 1024) #define CONFIG_SPL_RELOC_STACK_SIZE (32 << 10) #define CONFIG_SPL_RELOC_MALLOC_ADDR (CONFIG_SYS_INIT_L2_ADDR + 148 * 1024) -#if defined(CONFIG_P2020RDB) +#if defined(CONFIG_TARGET_P2020RDB) #define CONFIG_SPL_RELOC_MALLOC_SIZE (364 << 10) #else #define CONFIG_SPL_RELOC_MALLOC_SIZE (108 << 10) diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index c95daac..53b10f2 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -3388,7 +3388,6 @@ CONFIG_P1021 CONFIG_P1024 CONFIG_P1025 CONFIG_P2020 -CONFIG_P2020RDB CONFIG_P2041RDB CONFIG_P3041DS CONFIG_P4080DS