From patchwork Thu Nov 24 07:54:22 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: York Sun X-Patchwork-Id: 698680 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 3tPWqT4L9fz9t0w for ; Thu, 24 Nov 2016 19:01:09 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 6E91FB3947; Thu, 24 Nov 2016 08:58:12 +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 pZr1BSdH84F9; Thu, 24 Nov 2016 08:58:12 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id DEA69B38E5; Thu, 24 Nov 2016 08:57:10 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 86C89B3869 for ; Thu, 24 Nov 2016 08:56:51 +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 G5fT2zhc54N8 for ; Thu, 24 Nov 2016 08:56:51 +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-CO1-obe.outbound.protection.outlook.com (mail-co1nam03on0042.outbound.protection.outlook.com [104.47.40.42]) by theia.denx.de (Postfix) with ESMTPS id 1CEE9A7607 for ; Thu, 24 Nov 2016 08:56:30 +0100 (CET) Received: from DM2PR03CA0047.namprd03.prod.outlook.com (10.141.96.46) by CY4PR03MB2470.namprd03.prod.outlook.com (10.168.163.148) 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:27 +0000 Received: from BN1BFFO11FD017.protection.gbl (2a01:111:f400:7c10::1:184) by DM2PR03CA0047.outlook.office365.com (2a01:111:e400:2428::46) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.721.10 via Frontend Transport; Thu, 24 Nov 2016 07:56:27 +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 BN1BFFO11FD017.mail.protection.outlook.com (10.58.144.80) 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:26 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:; UpperCasedChecksum:; SizeAsReceived:1058; 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 uAO7tR3M012503; Thu, 24 Nov 2016 00:56:24 -0700 From: York Sun To: Date: Wed, 23 Nov 2016 23:54:22 -0800 Message-ID: <1479974118-2912-41-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: 131244477867125273; (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)(8936002)(6916009)(86362001)(4326007)(575784001)(85426001)(110136003)(36756003)(77096005)(69596002)(50226002)(7416002)(76176999)(5003940100001)(38730400001)(2950100002)(50986999)(81166006)(2351001)(39060400001)(92566002)(81156014)(105606002)(33646002)(8676002)(48376002)(97736004)(189998001)(50466002)(626004)(8666005)(305945005)(104016004)(5660300001)(7846002)(2906002)(68736007)(47776003)(106466001)(39390400001)(356003)(39400400001)(39380400001)(7059030); DIR:OUT; SFP:1101; SCL:1; SRVR:CY4PR03MB2470; H:az84smr01.freescale.net; FPR:; SPF:Fail; PTR:InfoDomainNonexistent; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BN1BFFO11FD017; 1:TpA6yNJMsnBu/MSOE6uYwPGRya1E4F4kFMLTsKvXEXK5kVPaqpb0irxV9MVCMIRLRZp6JMkP8vY3xgJFFtPcVBuIbpiUBZUBCXA+vYibOMj9HeMd3yzSF0Mzqmsg5gfKWRRmoTexlpYCGR4WKRxlL65PXk4sTqU5EnKASd+C8ooF6Mr+Q4Z+UM3N0SqzfZKAU8cwlzcLz8oYSZnjvC4F+6wKf6JWtjeJCNIk+XmBCuiUtfpdKOypBQiu1yJBGCBhz8uKkQAbNix5SrWuk/hB9WHjVv+wPYgsKIVNdPohsHirX08RoKG5BAjcaEodvfzmzk71vCKOdQiaIweTaqlHCd4q4Oca25AAPN6uLfrQi+y1Q1fb1hYO+tWvKGKx1JkSlQFcd11FrL1gmiAyExezyWmZrYxdRX3yiDfxs2DgHDOzZtqe7eXP00OreWLGgRcJyfr1SeZFrWFNNgu4CbWBqAO2a4DxNtY/+d9qcxYNNnVsB4sDwP/nCOwo5FEwUAIbbB5+aprpms8VXV6fWgoEOMrS90uKxRFc4PEglDO3oqxwx1hevX6Lh8E7uusaQW4+twPDOz0fkQKnL7NS/6NAQMDwysyPp4ys7d+MhIIyxMrftuBsvLpU3qDxCTcFMFCb MIME-Version: 1.0 X-Microsoft-Exchange-Diagnostics: 1; CY4PR03MB2470; 2:0cznV85UtEYF+4KlpTU1BHohA7FLTRe5rHQ0/7P2KbhEvjnkwmY/Kk5YDQUmt8xyBzJCNpFnwUM91D2+G0bkyo3cPAgtJt4R+zslYqthl/SIgML0zFjR56pzoMRJZ/Tl6dtNQAxgnKmocrIUPsQ9aM2XR5MJ75L7nR1O91SjCcU=; 3:DEQgLYrYqTGVvbt/uhU9jod4io/jYiFFHmPBYkIc07wCGAfWshkyzDBYiBZ10bmbUfqMbvXyfuLqpQySc2jitUmI79fzXaSybJSyGfM1aap+qEtqfrtZFmzK5LCoVwL0Ocp1VllmZpM+EQdiAoBNlp++2kN8meiJb8wQz8e3MjxpjIoE793uA9fbePKhpHJvhU0rJZqK5iA5er/fp/vs6AgY2wSU1NpeEDMJOtI4CS8FqIQYfNCZbFoUJlkcvxNvg89aUOzDcEWebm6IrMsFLw== X-MS-Office365-Filtering-Correlation-Id: 2387d0aa-6b66-408b-08ba-08d4143f6475 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001); SRVR:CY4PR03MB2470; X-Microsoft-Exchange-Diagnostics: 1; CY4PR03MB2470; 25:4zu27iv5L1CnUpemI+WwZfQV8+aJZmRhJOsmf57deOMJceHYfi140+/FLHt5DZZSkbHBntijaDkNkKlthCn/dBC4LtxsF1l/ITZU/yUHz9H/m/XeImr4EAOELr3Y53UipBj2bgM8mxrJV2os5WAjfYvah2JxOIxbubHtHNI20fVtXVliOr1JWFvXK/VD0HoQ5Gpi4pl1GylNImchLZVDfK4JrxDcxsVB9/itoCGDOy25q1pVGK9NGM+X8YgviI7yZbciSnS7S9pngmdH/dbKFkxnClpiofLzfAKnk6F/xAcNKAiXlwfliH3EHeqpOV4lHn/0gRRI7w97AybfSjTZ+mmLfhiffWmcjU93GSNinouASKTrT9d4IyviKfcW6kBGUDFNSajBph3UmbLCBDoAnX106IzEDRhd/me5bg/NkSCebdvH1eU33YPHsaeU+iv3I0KSELcKGdF2/RNAtyNruAmL9Yk0slo26nm6e1PzmRW3/mo6YIIOgDGkwsAkaZlFRjs7p3pANs8+MbWc+YnMUcBV7N9o9VT1+UhFY9LmlDOxh01z1Ye1bCUdq02t5PsbuhgBMLOg6Sk3g5PU0RZS8uAlgBGmHIMOdjIQB/hmh7Y+mz9y8L4Ir4aN+X3w3yvulYoKxKyatsu1roBoQEwpNydOi0JJGU0KyTTojTzOxeLpnFHGM2irac0yS537rzkPOO3WjcYbFd6spVfwlwgdOmrb5sR+xxmC60PO+rNLpFpuDJll0qQ0LHKgmewimw8AKbsmomWshBVI8r8yXuFNQQ== X-Microsoft-Exchange-Diagnostics: 1; CY4PR03MB2470; 31:SB3MNTqW/sFM17pE9Z9qhwa8M6GWDrn44vmwzX3nNgP8x4fZkTyyK3j+FGul/txxQArINIuV7959x9g1p0KXLSkrLRjTC3hmsPtgayz7fNtMJ47V0ZH2nZlvI5d4CzuBo9nfn7tSM/taPnWB7ajYkEVrxILFqfKnc/ZtTMGVDtEzh5+BVD5VA6VR4+yKYgLJ6HvdlD1pgGL1VCE/Nsz40RdHSeYVN9n+E55VilczTHiJXL0z1YREVaivSv6ozEOoVLRY9vmxh7UNWiszg8c/Ja43+jaSO8pES+15GFVcIS8= 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)(13015025)(13017025)(13023025)(13024025)(5005006)(13018025)(3002001)(10201501046)(6055026)(6096035)(20161123556025)(20161123561025)(20161123565025)(20161123559025)(20161123563025); SRVR:CY4PR03MB2470; BCL:0; PCL:0; RULEID:(400006); SRVR:CY4PR03MB2470; X-Microsoft-Exchange-Diagnostics: 1; CY4PR03MB2470; 4:eap43NJBnHuG1JUDfV3PYUYgDK9ez4EfFBIyvszQnezDzFBYn0O7wjEEXpjebk3yDY+om+6iD1QICVk3Itf1iqroNEwgHhm/tVpsqJkHaVs8v+ydjgRqTk6I3sREY4s9i+sIWGdV6DUCEoK5hHTpMhUJSxTYXm+gsLext7RoZUuiC/B0o0tzpc1U+1wo/WdRNzmRMNIBIPKydzKfae82SGobg3V5YQ+bpSF552885NLsQCTYXU9UyFb7cMGQRW84V3waKLQjlnJ6rze5yRW3eb0v7z0TCuhGoxUTzitaBq2jnJn31PxPoJdX1i/iTNKIGTxroKwyEUm1KiyqxJuhhQvc1W2tBe7nzXxBcAmrDFPv12nkKqqDDj93p0JOStTHoVIXhrNiLq+lr9GZpUA07Fv/Lqj4ASwhEuHD9xL4kBWJ/4UslPxJa15njAl8c1SQoP+7ZPvUF1RUfrbZgrHJg5JeJr5tQ1z9hWE+u2rWC/zEV9BNlZ+gmHV0PDapmPKJB5qXnn1wK0Fbsal8XsQgmsAmItQ+BZ82UgBlk92F68ozyxmQA7WgG5zcm0orr8+WvuvsLq9eeZd5/AHb5+Q9Thwj2yw+NMM6tGA1NmAW2XyVKpbtV0raYnkw8gSFgxvOpOR+Sdp28RMhSy8TakkR71gqnYknzcKN4e8+lxiqYeXioVnnjQoae5EyvXL6yHZcNU7wGVJrmECsF6uS5pHDmQxjjADtl9fxiJo6l0hcp5Z1BztFcHH5ocsztrK3vsf3 X-Forefront-PRVS: 0136C1DDA4 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; CY4PR03MB2470; 23:KuFbCs9zVRQEEgJN12cEQoNX5XHkg7hgVfo05wWci?= =?us-ascii?Q?b5mWNRObYXW6dGf2Cd6a6/w3TKtmnVfdZtiiTDH//lySdIrrZHq+x3ycTPv2?= =?us-ascii?Q?KzQbQlUZGutubIPAkzUckBqhAHf4KgLqbSx9S7vrZ6E4zXzUxNX2NanrgMNN?= =?us-ascii?Q?Ju4qvMgJElBW8zNV95WK5ljqJGW80fvf/MxtvGj0zcpRoWHjRGOhNK1as81g?= =?us-ascii?Q?FGC6zrlWMBN5UCGn7m9oBCU1aULRIxHqIjnjtGja+LjgCgV5l74eM0s/2SMS?= =?us-ascii?Q?JstaX/NtpATrVDMAzgyELin6Tl5jxOL+LCl4t/3knA3t6A6Hes7a+iBbD1oR?= =?us-ascii?Q?OHDcZMK6OkHn22sfOamgUo9ECUjWUy0K/29H60WQdKEPoArm8HaBLAO2GRKV?= =?us-ascii?Q?e19LVLDaDswZwzU/J+H2MrphMKgXnxve3N0SSkiRLlj1HafSQ0GWS79tMntN?= =?us-ascii?Q?qOcSlKKIV2h/1CydUKrojJut7hyq65wtOEgoEkJMJ4FPWEZEM5Ncti9YwUlc?= =?us-ascii?Q?wevewGttyhjFA5n/t/6aU2B4T14/Gn/UaO3/G/kMybdWzImLOQPp81MusrMh?= =?us-ascii?Q?qMFJQEQ48cogkFZiNTH2bVz5cgFJcQe+gmNgemF8NUV7RBIIDNgzUbeA5XAS?= =?us-ascii?Q?V1jRvBOyBlMnPiPkWg4bkG1//2LvwP/sWOhzUNq7yW0p+nLmtUy1Exiv5Rpv?= =?us-ascii?Q?OIR39LdMPj7ZK/jNrSHgyXAE5nT4p5D10OdpKLVylA6u45JoRVakOHG4A4VJ?= =?us-ascii?Q?q5yYaDTvbz75FDyMGqu5kmrFLIgB9xwBFgWg2K/8UYgFytIbEyEib0VTMwZS?= =?us-ascii?Q?q2FASqtqYAGtjUhh8BPiu1AT1UU6i4+/vNrjBm1xVhCh6CNJj3saOms6t8bM?= =?us-ascii?Q?W2kyNoXjOsbTYRRJbnviGFgyX1qowya3ggphbd/pX8g6B0LGo85xaIf6X1+s?= =?us-ascii?Q?Hz0HV6hubONSlu2l+v+N4iIGJdCLIFCR2fHrqCPqkN43xKGG9MjEV0TLtnv+?= =?us-ascii?Q?I90vS6CP+45G2c6CayP7vOpEE8WF8N20/kS+xgRb9pRKTvJI2PXf81thX48E?= =?us-ascii?Q?Lc5Oq61zZpnzJ3RmKi3lsXe91ts6gfyRjmMrbImMICC0hfACNVEiAE0kz1z2?= =?us-ascii?Q?+ZA31V+zjqa8zecvd+lRYk9Ln0vtQSGN8RScO+MmZJ3TQhlGuhi/roTys/Ty?= =?us-ascii?Q?W+Eckbju9hWwXXxOj5rlafuejfGegxyOtUQJ7SH3Vnos4EnoAJS5dL1d4deU?= =?us-ascii?Q?O9NKi4Lps5bje1YXgiTCj1rezSiePqtP/tHc+RnbN0KnJHd/WHOVTYoI8qKb?= =?us-ascii?B?QT09?= X-Microsoft-Exchange-Diagnostics: 1; CY4PR03MB2470; 6:eNlN9TE3BVJeICKOtNLjF+bS0sDnZcPnfLyuARJ5x59DE9VZaCK5mU/PA6TQmaDhNZNPtdpoFBHhEaCRvv/4+vl2d+XM0xYYymcuiSzOLjFeU6pyzXR7tbd7wPhoHgSaR+f2msMzecbxe70vR8FDLO3uztJZWPtQGHpcUfznTFMYlyFHNdqnoqVTooSJMC1F/OAD/8tpDzl8nsTLZcpkXmc50xPxM0aNTZn2lSZpCoaJRQ5fkePLegqGB4HvmK4ptnW7WP9GG+Dv9B4evtpcy3WCEE4Q6NfyzDBO4WvaLGfL9kWp6i/DyNNMhTn7osBofPITewBnM2Uu7J4JiSRZEg==; 5:XVFQAse/tEFrXLik1nzlqLiZhZ2mcUfrA4/f/sM5xO3cVdzqJifPqLu+zHHzxwpQeH9F7HBLjG76JD28gpO1YZPojybY0V3AD5GpQsXnxKkWZyBRIZpqseMUb+NIGpjhOkZTZ3CzwU8jpRhE3ODovl5Zn6CbBxvFEeWc9S/63YBdIbO17YXtvrplf3SjFWPm; 24:1c6ITdkyAqAB1x0pi6RFtatmMkAZlfUOrCOYOLJVMs6gTONK3MsbX62OgRnl+bvs5wnJ9VNIs2LI8MtZ5ujOcVcsRMSHmleI6MNJFJ1cEjQ= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; CY4PR03MB2470; 7:F7hcUOFBXBGPZpnIIPdanc/dykHHkuAgH+hSBFVMSCLEeb/EdOOiogHxEyhxCs9/wXazLH/w/lHmvKHQ9c2AgUBcknaTbaQOjOqNDF4ckdax5azVyGURIarltL6b8W4+AOIghUFarFNdHTT7177hmL231/rqg2Zvosu+jqJ4uoEqFiHZPLHtkyDYEABlltaOWj/MPYlChsTRUaKf28GP7Zo50Iw4NHZqjntiFInrKbgusqAxZrfVJ96V3+m5jES/L/Fk2eJC6GEGUbJvaOAorFT9yY3kG5GPmUquuF1wjTKYPfFw+TlcH09G17FY/rjrT5/DswvKOnCqZ+UZ0OGN0RQ3Z9XT8v31ZgYum0ndUQk= X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Nov 2016 07:56:26.3381 (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: CY4PR03MB2470 Cc: Stefan Roese , Kumar Gala , Jagan Teki , Andy Fleming Subject: [U-Boot] [PATCH 41/97] powerpc: P1020UTM: Separate from P1_P2_RDB_P2 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_P1020UTM instead of sharing with TARGET_P1_P2_RDB_PC to simplify Kconfig and config macros. Remove macro CONFIG_P1020UTM. Signed-off-by: York Sun --- arch/powerpc/cpu/mpc85xx/Kconfig | 4 ++++ board/freescale/p1_p2_rdb_pc/Kconfig | 3 ++- board/freescale/p1_p2_rdb_pc/ddr.c | 2 +- configs/P1020UTM-PC_36BIT_SDCARD_defconfig | 4 ++-- configs/P1020UTM-PC_36BIT_defconfig | 3 +-- configs/P1020UTM-PC_SDCARD_defconfig | 4 ++-- configs/P1020UTM-PC_defconfig | 3 +-- include/configs/p1_p2_rdb_pc.h | 4 ++-- scripts/config_whitelist.txt | 1 - 9 files changed, 15 insertions(+), 13 deletions(-) diff --git a/arch/powerpc/cpu/mpc85xx/Kconfig b/arch/powerpc/cpu/mpc85xx/Kconfig index d7414e2..14ef053 100644 --- a/arch/powerpc/cpu/mpc85xx/Kconfig +++ b/arch/powerpc/cpu/mpc85xx/Kconfig @@ -130,6 +130,10 @@ config TARGET_P1020RDB_PD select SUPPORT_SPL select SUPPORT_TPL +config TARGET_P1020UTM + bool "Support P1020UTM" + select SUPPORT_SPL + select SUPPORT_TPL config TARGET_P1_P2_RDB_PC bool "Support p1_p2_rdb_pc" diff --git a/board/freescale/p1_p2_rdb_pc/Kconfig b/board/freescale/p1_p2_rdb_pc/Kconfig index c46e04e..7deb2ae 100644 --- a/board/freescale/p1_p2_rdb_pc/Kconfig +++ b/board/freescale/p1_p2_rdb_pc/Kconfig @@ -1,7 +1,8 @@ if TARGET_P1_P2_RDB_PC || \ TARGET_P1020MBG || \ TARGET_P1020RDB_PC || \ - TARGET_P1020RDB_PD + TARGET_P1020RDB_PD || \ + TARGET_P1020UTM 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 8291c18..6dc3957 100644 --- a/board/freescale/p1_p2_rdb_pc/ddr.c +++ b/board/freescale/p1_p2_rdb_pc/ddr.c @@ -16,7 +16,7 @@ #ifdef CONFIG_SYS_DDR_RAW_TIMING #if defined(CONFIG_P1020RDB_PROTO) || \ defined(CONFIG_P1021RDB) || \ - defined(CONFIG_P1020UTM) + defined(CONFIG_TARGET_P1020UTM) /* Micron MT41J256M8_187E */ dimm_params_t ddr_raw_timing = { .n_ranks = 1, diff --git a/configs/P1020UTM-PC_36BIT_SDCARD_defconfig b/configs/P1020UTM-PC_36BIT_SDCARD_defconfig index 1e7c608..19e448d 100644 --- a/configs/P1020UTM-PC_36BIT_SDCARD_defconfig +++ b/configs/P1020UTM-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_P1020UTM=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="P1020UTM,SDCARD" +CONFIG_SYS_EXTRA_OPTIONS="SDCARD" CONFIG_BOOTDELAY=10 CONFIG_SPL=y CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT=y diff --git a/configs/P1020UTM-PC_36BIT_defconfig b/configs/P1020UTM-PC_36BIT_defconfig index 7044b78..aa266f9 100644 --- a/configs/P1020UTM-PC_36BIT_defconfig +++ b/configs/P1020UTM-PC_36BIT_defconfig @@ -1,12 +1,11 @@ CONFIG_PPC=y CONFIG_MPC85xx=y -CONFIG_TARGET_P1_P2_RDB_PC=y +CONFIG_TARGET_P1020UTM=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="P1020UTM" CONFIG_BOOTDELAY=10 CONFIG_HUSH_PARSER=y CONFIG_CMD_MMC=y diff --git a/configs/P1020UTM-PC_SDCARD_defconfig b/configs/P1020UTM-PC_SDCARD_defconfig index 20353a7..c03c7c5 100644 --- a/configs/P1020UTM-PC_SDCARD_defconfig +++ b/configs/P1020UTM-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_P1020UTM=y CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y -CONFIG_SYS_EXTRA_OPTIONS="P1020UTM,SDCARD" +CONFIG_SYS_EXTRA_OPTIONS="SDCARD" CONFIG_BOOTDELAY=10 CONFIG_SPL=y CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT=y diff --git a/configs/P1020UTM-PC_defconfig b/configs/P1020UTM-PC_defconfig index 9f70afd..c47d514 100644 --- a/configs/P1020UTM-PC_defconfig +++ b/configs/P1020UTM-PC_defconfig @@ -1,11 +1,10 @@ CONFIG_PPC=y CONFIG_MPC85xx=y -CONFIG_TARGET_P1_P2_RDB_PC=y +CONFIG_TARGET_P1020UTM=y CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y -CONFIG_SYS_EXTRA_OPTIONS="P1020UTM" 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 010a9ed..97a0b19 100644 --- a/include/configs/p1_p2_rdb_pc.h +++ b/include/configs/p1_p2_rdb_pc.h @@ -21,7 +21,7 @@ #define CONFIG_SYS_L2_SIZE (256 << 10) #endif -#if defined(CONFIG_P1020UTM) +#if defined(CONFIG_TARGET_P1020UTM) #define CONFIG_BOARDNAME "P1020UTM-PC" #define CONFIG_P1020 #define __SW_BOOT_MASK 0x03 @@ -409,7 +409,7 @@ #if (defined(CONFIG_TARGET_P1020MBG) || defined(CONFIG_TARGET_P1020RDB_PD)) #define CONFIG_SYS_MAX_FLASH_SECT 512 /* 64M */ #define CONFIG_SYS_FLASH_BASE 0xec000000 -#elif defined(CONFIG_P1020UTM) +#elif defined(CONFIG_TARGET_P1020UTM) #define CONFIG_SYS_MAX_FLASH_SECT 256 /* 32M */ #define CONFIG_SYS_FLASH_BASE 0xee000000 #else diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 6d7b5ff..3b70543 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -3384,7 +3384,6 @@ CONFIG_OS_ENV_ADDR CONFIG_OTHBOOTARGS CONFIG_OVERWRITE_ETHADDR_ONCE CONFIG_P1020 -CONFIG_P1020UTM CONFIG_P1021 CONFIG_P1021RDB CONFIG_P1024