From patchwork Wed Dec 28 16:43:33 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: York Sun X-Patchwork-Id: 709324 X-Patchwork-Delegate: trini@ti.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 3tpdr56qWcz9sdn for ; Thu, 29 Dec 2016 03:44:53 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 1747BB3920; Wed, 28 Dec 2016 17:44:47 +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 L8T3BDHZwdrA; Wed, 28 Dec 2016 17:44:46 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 54F33B3938; Wed, 28 Dec 2016 17:44:44 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 4B9FDB3923 for ; Wed, 28 Dec 2016 17:44:29 +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 4FatSZ68Wna5 for ; Wed, 28 Dec 2016 17:44:29 +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-SN1-obe.outbound.protection.outlook.com (mail-sn1nam01on0081.outbound.protection.outlook.com [104.47.32.81]) by theia.denx.de (Postfix) with ESMTPS id 16671B391C for ; Wed, 28 Dec 2016 17:44:19 +0100 (CET) Received: from BN3PR03CA0108.namprd03.prod.outlook.com (10.174.66.26) by MWHPR03MB2479.namprd03.prod.outlook.com (10.169.200.149) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.817.10; Wed, 28 Dec 2016 16:44:16 +0000 Received: from BL2FFO11OLC015.protection.gbl (2a01:111:f400:7c09::197) by BN3PR03CA0108.outlook.office365.com (2603:10b6:400:4::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.817.10 via Frontend Transport; Wed, 28 Dec 2016 16:44:16 +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 BL2FFO11OLC015.mail.protection.outlook.com (10.173.160.81) 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:15 +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 uBSGhvtQ026038; Wed, 28 Dec 2016 09:44:14 -0700 From: York Sun To: U-Boot Mailing List Date: Wed, 28 Dec 2016 08:43:33 -0800 Message-ID: <1482943430-10231-8-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: 131274170561796304; (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)(336005)(7916002)(39410400002)(39450400003)(39400400002)(39380400002)(39860400002)(39840400002)(39850400002)(2980300002)(1110001)(1109001)(339900001)(189002)(199003)(2906002)(68736007)(39060400001)(4326007)(38730400001)(7416002)(107886002)(85426001)(189998001)(48376002)(50466002)(5660300001)(110136003)(2950100002)(6666003)(106466001)(76176999)(105606002)(6916009)(50986999)(36756003)(626004)(8656002)(81156014)(81166006)(8676002)(356003)(305945005)(77096006)(50226002)(8936002)(47776003)(33646002)(5003940100001)(104016004)(69596002)(92566002)(86362001)(4001430100002)(97736004)(575784001)(7059030)(19627235001); DIR:OUT; SFP:1101; SCL:1; SRVR:MWHPR03MB2479; H:az84smr01.freescale.net; FPR:; SPF:Fail; PTR:InfoDomainNonexistent; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BL2FFO11OLC015; 1:dKNhxZMlTPZoF1hXgkzcu34HO2YLFQjOL6YYMESmyoxFMQrTO0jrGEZgk0ZNKNJ6ZzHpccju1bxmwWFTWWvYPEli506GuHzlnk99XzWO9QqMLoey+QI1i4Oh/eC1pgBt4QjhwZFYIBAjUrjPR3vs3kwjIvX7f/MJJxJRjfz+b+xzwnz4aYgbS6opZ2JEDVBqQ7IZG4EINGjXSZLgRt1HRoGntxqz33TXAOlhMZLuGKcQNoxpladDWxmL5/5gO3SHpnqc1UBGSauHSTfGeKQuhRmvVBua35aSHAg/xKOtGwbBxR6R116XHcvUkkO/K7J1LrsYZVix6WI4qNhNJe4Fn7WvhGepj0jgSKY6SNgTTw7zdcPwtBpTyI5THbHwtfuytqneABtJrao29NAW8Llkjc29HiYJI5apg/7gnQU4PbprNPI5SM6qel5CZl8NYybjgklWpvSGWe3NJl0i39nu8675W6msuob1ROYGilxzmWaZ7cvSuXVwAnCJiO5XmKaG713Zf24OjiyQHd7w1s3ShABDsaSffV9GJ0w/Ci8qShjB4BbJwO0y/DTRZ5zl7PVIi9cD5jW3o2PvVr4fcidHz0t5kNApgBezDt6XtcUIPp9H6/HLN+hXUhTntpgaKFlOGrzy+KtkItq34lCH86Js4C9fEmh8vrGl7X9zxWaNVXD02M4H/iX6dpRWJ4mENJg36y3o0+A0X6S0jskNotHegmysHc7mXsJOFA9yjcREzuc= MIME-Version: 1.0 X-MS-Office365-Filtering-Correlation-Id: 159eadfa-287c-4c69-b775-08d42f40c2f9 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001); SRVR:MWHPR03MB2479; X-Microsoft-Exchange-Diagnostics: 1; MWHPR03MB2479; 3:CMeAF6yAFeROlHt1gH3v2ppUSuzif2BzfeYzWALf2JHbwkwnXGB+JFLHW1yHel/6CYJ0Fo7BfnNf3Vm1pNtxQpRgC3WijdIorklxTQhEQ6KtNBgforf/FD3moDA7bW3k/btC2IUPoFRUJkMvN1jYRpjmWeMXYozoziHSArcQK+BbjhfoMIBLY0KLPUyZAWkVIsEE47naTqzQpd33whN6NigP1e/Xar6FEnBuiTmHKIdCwKQpiDvFVRvi0Uf2rk3TfuneMJDi9slFO+fhaM1eDxFk46Z7TjftPQKkGYmd4wa5jBiVrJVeczTC/Ly0EykuTbm2H4bAYRwBTBH6/z5KTukl8zT41a0X3qkOelmpQNrl+adkzxQI8Q3ysONr98rc; 25:THUcGsdDNxrE3TLmqFYKlsrR3ICDK1yFNKSCDAafGXShFcMDwj8oi7EMZS/mQQyLd6/hgRqik8e0teGXOz7MBZcZE68917feqDz+9fLv9IsH4ysgWlSFU6yc7i132b3+7Z+xVjtLRKnTBZ4j5yAEZavhO4XPxew/7TAB1iedmcw1b4WiVp1VfgyryA1/qPRzi4XqROjkAiXF6duboBjn59YzfK4hqBpnqtPONQIKAKrtLaCA6DJtCYjMCAaQ1ppfgt4wDtxOfnW6DPKommH9oXS24jGsJ17eimKslpxVJIqr2l/ADxbnK6d010KzOguumngOl4wKMlTbTYnuFi7RElBape5Yf/BI5hFjED8WEleO/yn8oocunwcIWYP85MygtWPGJuZvhwIs/Iae7HtjYcm82D5OHjsrBjIPvdtsUqcFvwrEcALLdq3OfXikyFqB58I3wnr2OqUNrRxkuDUZ0g== X-Microsoft-Exchange-Diagnostics: 1; MWHPR03MB2479; 31:2FDGh4obKCdyjZOlZisqE1D4yaVipCbntsRz/NlGDyiIRagYkCnPrg4xrgfZ6zwaI5yg3+qZw5684qYKY+NcCfs+RV+VIAOx6X2jcJDhcb7l+jsR2zpxqB1Xe8MCtMBOu26v6RFdLAIicMhyMJ0WaTAc5viNUC6Nskz6eMKBYqvqHRG0XU7Wf0+Hg5XxzO6OKlior6fYkHqT6MTzM2iQtVNaDMKdKMy48fQuXlhtbsMhN0WOwTci6oYBT1OsZgWX14pXqraN9NY1Mdnq03axTAHzbwoWZAd5cGOD4u1owtc= 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)(13023025)(13024025)(13015025)(13017025)(13018025)(8121501046)(5005006)(3002001)(10201501046)(6055026)(6096035)(20161123563025)(20161123565025)(20161123561025)(20161123559025)(20161123556025); SRVR:MWHPR03MB2479; BCL:0; PCL:0; RULEID:(400006); SRVR:MWHPR03MB2479; X-Microsoft-Exchange-Diagnostics: 1; MWHPR03MB2479; 4:ZPHgG8RP0niCRY8wSHjJhiQs+AUfkUGtTWqd3ijjXtJ8hN78N0GtJUN9owlKvDMG5r0KnQbdMJPd9NzcePFIt+2eSJR+WKzGqsGnpAQd2bPgsxgzEwRbHLo1GjAsKwh8x4hQkmQ4m8K1JyQKeRCI+erk4rBsVccbY4PcvduT7tXZh258aOLeBttXSmqCLZhdmHhvd3f37asZ8TLchjCrhLf5XlfzOuWqpaJJpzr5xtfq8nxPsCYALGKuGTXMdPzY8ewFtKH3npyWI0vv5VFzszpxDK6RWYipjjSct5KCmfelE7VLH3eifu/p8hS3hwbRQ5yHz8ROtq32TsfHqTYzwlUMwIFi/6W+CJ8s1oeJzsDH2xdzm3jxOjq0Yoxt5P9quwTRl+8dAqqCw1vN0jIQxGhCydTgeGrVx0KcS8GheKCROjxjrMys6hXOFAL3bAzuU+uiN84ExShpwSyoBExqnmsqWRRr/6T38WyqQCUzj9VpzF/xBdhVSoS/FobwPoYM1XD6I/IcuZ4femt2G3PU5SWSsaQ96YXgcmzhV7w+AnnNzXMfa0BRpZ2xOvUXSmjM51t/4gDV5uDGjZvlb5cDvNnEZsUHqQuIk1uGf2x1iB6Po0LTlCejwUBRV5iSz6G/YmnkLTg81umPotXvWdCvKigjWlPSRtaYaNASQ4MMhaNHYCmgUEtBxSY2YMGxrWQZBHUPzLA84oSlZmZCmH3wCFgw79A6TaszQQod7pJj/g8TyDAyczqI7gngOlxGJM1/ X-Forefront-PRVS: 0170DAF08C X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; MWHPR03MB2479; 23:sFxK2jTWJIosBR6fRZOR38fEIhbbuBn4YGFTNucW0?= =?us-ascii?Q?lDcyrL43fuvycEoGPzZluVlbAvWw12oTtKunG8h+2XKGLDdFfRV7HUFvsRYn?= =?us-ascii?Q?Ghdv9gBM0gVDVP5bMCbQFDIQLINrWX+7xEC4Sh/jMCVjp+5DEuvQdZps8Tzz?= =?us-ascii?Q?7BQoYK6ItzIjgCYuYaoZloc9un7OQC1BU+8iegBywFvYp+BqFkg/U1TKXmfH?= =?us-ascii?Q?iCn8yowDe3vDNcVY0Zc8jjdib2aUaR048OfNNI6By4cdA9Wjw0wpgxd0o71d?= =?us-ascii?Q?bpQIt+c/aThlAOlKjjC+XuJ3Fk6frpKrA9EBYj0z/ErZRuJQbPMOCYJvxEPx?= =?us-ascii?Q?dUL0ykt2RU3PeaCWyk9Pff8e2H66noxnj1CXwfzRQ2ewCm8C38l0bcubJiIA?= =?us-ascii?Q?BnzMhsPS7ul18AiRd0ycF2FieZN8EBZfUR29Abs31MQhhXx8plMR4jtgtDUL?= =?us-ascii?Q?zYLA2ZNFXOv1uFu/iOjEMvz7Ho9Psyj8OFXL286A9pVI77sdFl64V8jRBNfY?= =?us-ascii?Q?Ve74yvvkBS1L0bawXeOM9HCCABC6eOkkbxLLZxkGR0ki53yasjmAyCB9PqpN?= =?us-ascii?Q?eZgGC2QbJ/foHDilMbc+p07Bkxo/67/NRbjzguryR4FVHDBeIByQKlUVG9EK?= =?us-ascii?Q?tJ7omzhRbc3/rl7953bWsVMBzoAbEs+GdwY8lTPOUF3ZJ5t6UvQUOrbfW5fy?= =?us-ascii?Q?84Sb6KCuVrsg+FJKJ11XMDkTJvh72DcKJ9Nx0r54ZFv9K7l83UqapRT0Ur6Y?= =?us-ascii?Q?TAIZWj25UWcKnqOHDtoTWojvks5qMgI9ad3FGr6NCFa67Wnl6qf+hij/XERK?= =?us-ascii?Q?n/GWd5CMfguCueoh0Yiwm1gZ31Y8F9tHM2V6TLMyYROwWWQdw/BSNJVess8f?= =?us-ascii?Q?3QMiWprh8OptoyTiMVYdXtS8GCekaTeheG46efLXSOIt4PVjs0Ln9wWkeXuu?= =?us-ascii?Q?+HWrtMcmF1SU2ssohLkn0woxmJgf1wZLdgMbV6ux65CQ9GhPzkiyu3WSjkav?= =?us-ascii?Q?YsrPqZlQ3ohXSwz7YJqnS5qfnY6PjpCUK61p86yBKM02YR6Zk0xgq9CwQOE9?= =?us-ascii?Q?3BZm/jSAl+wRVB8GYcy4LOCttyfnRbVwQQSVkP6BAVsYnMd6vqR0cuXaNNaF?= =?us-ascii?Q?l8U1Dufid2NE2IwdzZOExTb9HCbFmRzgOQvEM6/J/2uuRQUg/9alK0p3tZKt?= =?us-ascii?Q?I8BHXTnUP6E1A7K/c7HXAmzFfrliXgL6xwQ54zTMwc9zMUk3Owtn5RsanqvY?= =?us-ascii?Q?PzEyR2y+clLpH62xnxVMUWd91YyqpllCKj6svNBXh7APhHNNzMwx9ltKxAyu?= =?us-ascii?Q?bfV7xHdvJSsw84nTdVsyXIRIvhTcT6AlKvOA1DfF5uRlsVdMbK8vennDClmb?= =?us-ascii?Q?PWn7jliLchuA8VSy5G3kl1STYbFRqE055SFpbtMdzWVBgRw/EBFZdNEqvi/2?= =?us-ascii?Q?M2QPfBIJPnsAvLMjFwJdLoXzGiGiOg=3D?= X-Microsoft-Exchange-Diagnostics: 1; MWHPR03MB2479; 6:+c127AyG9nxyXD1bbzqAMgtKeYomXePMUS/WlaC2ShLKZ5kSlyHyVCpRSoQeyiED8u5dEu6kToG3G0dmHByywedAWoGjgm36pfMPEGQbh0tjhg/dMBK3g1oXT1ABjIG8hGJ3XJX93XMim0/vqWHvojPHrQ5Ctztz6Cc3IMxyjjVJz+iRKh1+tbRqPCZA4IRnhhTteR9VmG37LfVUBMkUhcFWfrW38jg5jxxSyzsYuQ/u6f/oaxzYzEYhxpUaB6Sx0A9E8IQ4mEapvTbCF8vD11FFL5ageUC36L2ZvODpVy7XMtiVJ5aHnILCY5kpTJWOBJX1PtWC64ys9kdmsgZB1h+qLC8e41SolqZGyYO6pnkm+4FoyyzBMf/+hSrBDqM30APMzkPqDLAAdwaaLtKT2EGWbYxxdS6Igu4V2nTV68VI3/UBHuKzo9aEHQq4du8Z; 5:IXijcnyCWlQGT/MNLjs8A5L82cPQg/iu5lcMGsnoL7GQrd6/09jTJhaSQ4tGIbAzPw9A211RoBB+sJuztLAkwf3G7/GJPC0FZYPfUJ4/rvjQyJeBzRLMAPnrJrHN2axx6lKiIiTiZ8FsafBviCHmtWtCcHNHRTikSkguYoCecCBicjTHrCibTW7VhPErUxe6; 24:KSLKeQ9lq6LYfbLrkCq4AO41J6URE5Bml89RE1cpTMZkMHnqNQ2UkPSbJWS033EzDrhKZO2Eljm0DSV/euznZSJLPULtG3i3vPG5ZQPKGv0= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; MWHPR03MB2479; 7:Vsb9OnOHdENvHVIatQn8mwif+/huXSQJf2WUmBR5eoISdETPZPKOfixH7+BKZhMvWMzYy1Te5pBhNa8hwP2ZvjX+FXbzfqhviNj+sJRg/gMQt0VlagsOPtvwQxBjb3ruC1HW956sABw9RIXBcaJvBI0HWuJa+fuIR4MdMANm7t/TMP+9GJKu4KRwFSus5rWTVusAaFQ/nzvpLigY4vRgBL/FllFgq78ZIWwjFbSg3sTlMJ/YqSaC4VlFdX6arn9CuQwgGib222PKiaPEBOHedJhstHjagisMas5hP/eatozVgAy6+fvzRaUj5wiQoMLWs05KuNEdm8Kq0fww72FbccIT/k0NJI57Nsy6Wlz/g1romwOAMJSehInzs2/If4Ny2Azqo7ri6NZuLtAq3Plq3HmCVW1Wu/m05SX7igo9gSMdcpng9jS6O+B9Oa1uvqnQrRUkeB3ciLkj6qvMyiAXdQ== X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Dec 2016 16:44:15.8520 (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: MWHPR03MB2479 Cc: trini@konsulko.com, Kumar Gala , Jagan Teki , Stefan Roese , Andy Fleming Subject: [U-Boot] [PATCH 07/24] powerpc: T1023RDB: Remove macro CONFIG_T1023RDB 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_T1023RDB from Kconfig instead. Signed-off-by: York Sun --- board/freescale/t102xrdb/ddr.c | 2 +- board/freescale/t102xrdb/eth_t102xrdb.c | 4 ++-- board/freescale/t102xrdb/t102xrdb.c | 12 ++++++------ board/freescale/t102xrdb/t102xrdb.h | 2 +- configs/T1023RDB_NAND_defconfig | 2 +- configs/T1023RDB_SDCARD_defconfig | 2 +- configs/T1023RDB_SECURE_BOOT_defconfig | 1 - configs/T1023RDB_SPIFLASH_defconfig | 2 +- configs/T1023RDB_defconfig | 1 - include/configs/T102xRDB.h | 20 ++++++++++---------- scripts/config_whitelist.txt | 1 - 11 files changed, 23 insertions(+), 26 deletions(-) diff --git a/board/freescale/t102xrdb/ddr.c b/board/freescale/t102xrdb/ddr.c index 9e1b16b..c09199f 100644 --- a/board/freescale/t102xrdb/ddr.c +++ b/board/freescale/t102xrdb/ddr.c @@ -136,7 +136,7 @@ found: popts->data_bus_width = DDR_DATA_BUS_WIDTH_32; #endif -#ifdef CONFIG_T1023RDB +#ifdef CONFIG_TARGET_T1023RDB popts->wrlvl_ctl_2 = 0x07070606; popts->half_strength_driver_enable = 1; popts->cpo_sample = 0x43; diff --git a/board/freescale/t102xrdb/eth_t102xrdb.c b/board/freescale/t102xrdb/eth_t102xrdb.c index 02b283d..dadfaf1 100644 --- a/board/freescale/t102xrdb/eth_t102xrdb.c +++ b/board/freescale/t102xrdb/eth_t102xrdb.c @@ -73,7 +73,7 @@ int board_eth_init(bd_t *bis) case 0x135: /* set the on-board 2.5G SGMII AQR105 PHY */ fm_info_set_phy_address(FM1_DTSEC3, SGMII_AQR_PHY_ADDR); -#ifdef CONFIG_T1023RDB +#ifdef CONFIG_TARGET_T1023RDB /* set the on-board 1G SGMII RTL8211F PHY */ fm_info_set_phy_address(FM1_DTSEC1, SGMII_RTK_PHY_ADDR); #endif @@ -92,7 +92,7 @@ int board_eth_init(bd_t *bis) fm_info_set_mdio(i, dev); break; case PHY_INTERFACE_MODE_SGMII: -#if defined(CONFIG_T1023RDB) +#if defined(CONFIG_TARGET_T1023RDB) dev = miiphy_get_dev_by_name(DEFAULT_FM_MDIO_NAME); #elif defined(CONFIG_T1024RDB) dev = miiphy_get_dev_by_name(DEFAULT_FM_TGEC_MDIO_NAME); diff --git a/board/freescale/t102xrdb/t102xrdb.c b/board/freescale/t102xrdb/t102xrdb.c index 24df4b4..3174726 100644 --- a/board/freescale/t102xrdb/t102xrdb.c +++ b/board/freescale/t102xrdb/t102xrdb.c @@ -19,7 +19,7 @@ #include "t102xrdb.h" #ifdef CONFIG_T1024RDB #include "cpld.h" -#elif defined(CONFIG_T1023RDB) +#elif defined(CONFIG_TARGET_T1023RDB) #include #include #endif @@ -27,7 +27,7 @@ DECLARE_GLOBAL_DATA_PTR; -#ifdef CONFIG_T1023RDB +#ifdef CONFIG_TARGET_T1023RDB enum { GPIO1_SD_SEL = 0x00020000, /* GPIO1_14, 0: eMMC, 1:SD/MMC */ GPIO1_EMMC_SEL, @@ -54,7 +54,7 @@ int checkboard(void) #if defined(CONFIG_T1024RDB) printf("Board rev: 0x%02x CPLD ver: 0x%02x, ", CPLD_READ(hw_ver), CPLD_READ(sw_ver)); -#elif defined(CONFIG_T1023RDB) +#elif defined(CONFIG_TARGET_T1023RDB) printf("Rev%c, ", t1023rdb_ctrl(GPIO3_GET_VERSION) + 'B'); #endif printf("boot from "); @@ -74,7 +74,7 @@ int checkboard(void) reg = ((reg & CPLD_LBMAP_MASK) >> CPLD_LBMAP_SHIFT); printf("NOR vBank%d\n", reg); } -#elif defined(CONFIG_T1023RDB) +#elif defined(CONFIG_TARGET_T1023RDB) #ifdef CONFIG_NAND puts("NAND\n"); #else @@ -196,7 +196,7 @@ int ft_board_setup(void *blob, bd_t *bd) fdt_fixup_board_enet(blob); #endif -#ifdef CONFIG_T1023RDB +#ifdef CONFIG_TARGET_T1023RDB if (t1023rdb_ctrl(GPIO3_GET_VERSION) > 0) fdt_enable_nor(blob); #endif @@ -204,7 +204,7 @@ int ft_board_setup(void *blob, bd_t *bd) return 0; } -#ifdef CONFIG_T1023RDB +#ifdef CONFIG_TARGET_T1023RDB /* Enable NOR flash for RevC */ static void fdt_enable_nor(void *blob) { diff --git a/board/freescale/t102xrdb/t102xrdb.h b/board/freescale/t102xrdb/t102xrdb.h index ae5c60f..6634e7a 100644 --- a/board/freescale/t102xrdb/t102xrdb.h +++ b/board/freescale/t102xrdb/t102xrdb.h @@ -9,7 +9,7 @@ void fdt_fixup_board_enet(void *blob); void pci_of_setup(void *blob, bd_t *bd); -#ifdef CONFIG_T1023RDB +#ifdef CONFIG_TARGET_T1023RDB static u32 t1023rdb_ctrl(u32 ctrl_type); static void fdt_enable_nor(void *blob); #endif diff --git a/configs/T1023RDB_NAND_defconfig b/configs/T1023RDB_NAND_defconfig index 5649652..71de2a5 100644 --- a/configs/T1023RDB_NAND_defconfig +++ b/configs/T1023RDB_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="T1023RDB,RAMBOOT_PBL,SPL_FSL_PBL,NAND" +CONFIG_SYS_EXTRA_OPTIONS="RAMBOOT_PBL,SPL_FSL_PBL,NAND" CONFIG_BOOTDELAY=10 CONFIG_SYS_CONSOLE_IS_IN_ENV=y CONFIG_SPL=y diff --git a/configs/T1023RDB_SDCARD_defconfig b/configs/T1023RDB_SDCARD_defconfig index cc15635..dee5690 100644 --- a/configs/T1023RDB_SDCARD_defconfig +++ b/configs/T1023RDB_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="T1023RDB,RAMBOOT_PBL,SPL_FSL_PBL,SDCARD" +CONFIG_SYS_EXTRA_OPTIONS="RAMBOOT_PBL,SPL_FSL_PBL,SDCARD" CONFIG_BOOTDELAY=10 CONFIG_SYS_CONSOLE_IS_IN_ENV=y CONFIG_SPL=y diff --git a/configs/T1023RDB_SECURE_BOOT_defconfig b/configs/T1023RDB_SECURE_BOOT_defconfig index 1b474d3..d76c3b9 100644 --- a/configs/T1023RDB_SECURE_BOOT_defconfig +++ b/configs/T1023RDB_SECURE_BOOT_defconfig @@ -6,7 +6,6 @@ CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y -CONFIG_SYS_EXTRA_OPTIONS="T1023RDB" CONFIG_SECURE_BOOT=y CONFIG_BOOTDELAY=10 CONFIG_SYS_CONSOLE_IS_IN_ENV=y diff --git a/configs/T1023RDB_SPIFLASH_defconfig b/configs/T1023RDB_SPIFLASH_defconfig index 28350ad..5fd23e8 100644 --- a/configs/T1023RDB_SPIFLASH_defconfig +++ b/configs/T1023RDB_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="T1023RDB,RAMBOOT_PBL,SPL_FSL_PBL,SPIFLASH" +CONFIG_SYS_EXTRA_OPTIONS="RAMBOOT_PBL,SPL_FSL_PBL,SPIFLASH" CONFIG_BOOTDELAY=10 CONFIG_SYS_CONSOLE_IS_IN_ENV=y CONFIG_SPL=y diff --git a/configs/T1023RDB_defconfig b/configs/T1023RDB_defconfig index ef0005e..255da1b 100644 --- a/configs/T1023RDB_defconfig +++ b/configs/T1023RDB_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="T1023RDB" CONFIG_BOOTDELAY=10 CONFIG_SYS_CONSOLE_IS_IN_ENV=y CONFIG_HUSH_PARSER=y diff --git a/include/configs/T102xRDB.h b/include/configs/T102xRDB.h index f3ba0cd..24eca18 100644 --- a/include/configs/T102xRDB.h +++ b/include/configs/T102xRDB.h @@ -62,7 +62,7 @@ #define CONFIG_SYS_LDSCRIPT "arch/powerpc/cpu/mpc85xx/u-boot-nand.lds" #if defined(CONFIG_T1024RDB) #define CONFIG_SYS_FSL_PBL_RCW board/freescale/t102xrdb/t1024_nand_rcw.cfg -#elif defined(CONFIG_T1023RDB) +#elif defined(CONFIG_TARGET_T1023RDB) #define CONFIG_SYS_FSL_PBL_RCW board/freescale/t102xrdb/t1023_nand_rcw.cfg #endif #define CONFIG_SPL_NAND_BOOT @@ -81,7 +81,7 @@ #endif #if defined(CONFIG_T1024RDB) #define CONFIG_SYS_FSL_PBL_RCW board/freescale/t102xrdb/t1024_spi_rcw.cfg -#elif defined(CONFIG_T1023RDB) +#elif defined(CONFIG_TARGET_T1023RDB) #define CONFIG_SYS_FSL_PBL_RCW board/freescale/t102xrdb/t1023_spi_rcw.cfg #endif #define CONFIG_SPL_SPI_BOOT @@ -100,7 +100,7 @@ #endif #if defined(CONFIG_T1024RDB) #define CONFIG_SYS_FSL_PBL_RCW board/freescale/t102xrdb/t1024_sd_rcw.cfg -#elif defined(CONFIG_T1023RDB) +#elif defined(CONFIG_TARGET_T1023RDB) #define CONFIG_SYS_FSL_PBL_RCW board/freescale/t102xrdb/t1023_sd_rcw.cfg #endif #define CONFIG_SPL_MMC_BOOT @@ -177,7 +177,7 @@ #define CONFIG_ENV_OFFSET 0x100000 /* 1MB */ #if defined(CONFIG_T1024RDB) #define CONFIG_ENV_SECT_SIZE 0x10000 -#elif defined(CONFIG_T1023RDB) +#elif defined(CONFIG_TARGET_T1023RDB) #define CONFIG_ENV_SECT_SIZE 0x40000 #endif #elif defined(CONFIG_SDCARD) @@ -192,7 +192,7 @@ #define CONFIG_ENV_SIZE 0x2000 #if defined(CONFIG_T1024RDB) #define CONFIG_ENV_OFFSET (2 * CONFIG_SYS_NAND_BLOCK_SIZE) -#elif defined(CONFIG_T1023RDB) +#elif defined(CONFIG_TARGET_T1023RDB) #define CONFIG_ENV_OFFSET (10 * CONFIG_SYS_NAND_BLOCK_SIZE) #endif #elif defined(CONFIG_SRIO_PCIE_BOOT_SLAVE) @@ -277,7 +277,7 @@ unsigned long get_board_ddr_clk(void); #define CONFIG_SYS_SPD_BUS_NUM 0 #define SPD_EEPROM_ADDRESS 0x51 #define CONFIG_SYS_SDRAM_SIZE 4096 /* for fixed parameter use */ -#elif defined(CONFIG_T1023RDB) +#elif defined(CONFIG_TARGET_T1023RDB) #define CONFIG_SYS_FSL_DDR4 #define CONFIG_SYS_DDR_RAW_TIMING #define CONFIG_SYS_SDRAM_SIZE 2048 @@ -303,7 +303,7 @@ unsigned long get_board_ddr_clk(void); /* NOR Flash Timing Params */ #if defined(CONFIG_T1024RDB) #define CONFIG_SYS_NOR_CSOR CSOR_NAND_TRHZ_80 -#elif defined(CONFIG_T1023RDB) +#elif defined(CONFIG_TARGET_T1023RDB) #define CONFIG_SYS_NOR_CSOR (CSOR_NOR_ADM_SHIFT(0) | \ CSOR_NAND_TRHZ_80 | CSOR_NOR_ADM_SHFT_MODE_EN) #endif @@ -378,7 +378,7 @@ unsigned long get_board_ddr_clk(void); | CSOR_NAND_SPRZ_224 /* Spare size = 224 */ \ | CSOR_NAND_PB(64)) /*Pages Per Block = 64*/ #define CONFIG_SYS_NAND_BLOCK_SIZE (512 * 1024) -#elif defined(CONFIG_T1023RDB) +#elif defined(CONFIG_TARGET_T1023RDB) #define CONFIG_SYS_NAND_CSOR (CSOR_NAND_ECC_ENC_EN /* ECC on encode */ \ | CSOR_NAND_ECC_DEC_EN /* ECC on decode */ \ | CSOR_NAND_ECC_MODE_4 /* 4-bit ECC */ \ @@ -734,7 +734,7 @@ unsigned long get_board_ddr_clk(void); #if defined(CONFIG_T1024RDB) #define CONFIG_SYS_FMAN_FW_ADDR (3 * CONFIG_SYS_NAND_BLOCK_SIZE) #define CONFIG_SYS_QE_FW_ADDR (4 * CONFIG_SYS_NAND_BLOCK_SIZE) -#elif defined(CONFIG_T1023RDB) +#elif defined(CONFIG_TARGET_T1023RDB) #define CONFIG_SYS_FMAN_FW_ADDR (11 * CONFIG_SYS_NAND_BLOCK_SIZE) #define CONFIG_SYS_QE_FW_ADDR (12 * CONFIG_SYS_NAND_BLOCK_SIZE) #endif @@ -767,7 +767,7 @@ unsigned long get_board_ddr_clk(void); #define RGMII_PHY2_ADDR 0x6 #define SGMII_AQR_PHY_ADDR 0x2 #define FM1_10GEC1_PHY_ADDR 0x1 -#elif defined(CONFIG_T1023RDB) +#elif defined(CONFIG_TARGET_T1023RDB) #define RGMII_PHY1_ADDR 0x1 #define SGMII_RTK_PHY_ADDR 0x3 #define SGMII_AQR_PHY_ADDR 0x2 diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index fcae43a..30519ae 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -7794,7 +7794,6 @@ CONFIG_SYS_XWAY_EBU_BOOTCFG CONFIG_SYS_ZYNQ_QSPI_WAIT CONFIG_SYS_ZYNQ_SPI_WAIT CONFIG_SYS_i2C_FSL -CONFIG_T1023RDB CONFIG_T1024RDB CONFIG_T1040QDS CONFIG_T2080QDS