From patchwork Wed Dec 28 16:43:34 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: York Sun X-Patchwork-Id: 709326 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 3tpdrb3vmcz9sxS for ; Thu, 29 Dec 2016 03:45:19 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 5D528B3966; Wed, 28 Dec 2016 17:45:01 +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 wJSQYf0XgoI8; Wed, 28 Dec 2016 17:45:01 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id B0192B3946; Wed, 28 Dec 2016 17:44:50 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 00126B38C8 for ; Wed, 28 Dec 2016 17:44:35 +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 HRsUbHxMcHT4 for ; Wed, 28 Dec 2016 17:44:35 +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-BY2-obe.outbound.protection.outlook.com (mail-by2nam01on0073.outbound.protection.outlook.com [104.47.34.73]) by theia.denx.de (Postfix) with ESMTPS id 26222B392A for ; Wed, 28 Dec 2016 17:44:22 +0100 (CET) Received: from BN6PR03CA0049.namprd03.prod.outlook.com (10.173.137.11) by BY2PR0301MB0742.namprd03.prod.outlook.com (10.160.63.20) 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:19 +0000 Received: from BY2FFO11FD004.protection.gbl (2a01:111:f400:7c0c::191) by BN6PR03CA0049.outlook.office365.com (2603:10b6:404:4c::11) 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:18 +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 BY2FFO11FD004.mail.protection.outlook.com (10.1.14.158) 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:16 +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 uBSGhvtR026038; Wed, 28 Dec 2016 09:44:15 -0700 From: York Sun To: U-Boot Mailing List Date: Wed, 28 Dec 2016 08:43:34 -0800 Message-ID: <1482943430-10231-9-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: 131274170586896706; (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)(2980300002)(1109001)(1110001)(339900001)(189002)(199003)(68736007)(7416002)(5660300001)(107886002)(8656002)(6666003)(97736004)(2950100002)(6916009)(189998001)(110136003)(5003940100001)(86362001)(626004)(105606002)(305945005)(8936002)(8676002)(81156014)(50226002)(356003)(50986999)(36756003)(106466001)(69596002)(92566002)(33646002)(76176999)(81166006)(85426001)(50466002)(4001430100002)(104016004)(48376002)(77096006)(39060400001)(38730400001)(4326007)(2906002)(47776003)(7059030)(19627235001); DIR:OUT; SFP:1101; SCL:1; SRVR:BY2PR0301MB0742; H:az84smr01.freescale.net; FPR:; SPF:Fail; PTR:InfoDomainNonexistent; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BY2FFO11FD004; 1:kjAUci+YhvhHnwwGIfmvQ5nDWS4WxmijbegH2WfXwc4+Uc5pGWMy0D/zpGdggtdyTxCIYbsrME56u0bqStzzxatrfr3OJ7N4braFJI3Rj66TARRcBisaqM5aL361BFuao+1M+oFqMmqbFhxx3iP/+lF/xtAhjK/6pFT210XlaNqEa17jPAsG+w1gZh0A3V62aj3j5zC46Y/bfKZiKy2KzsqzFrbw31qq14ewbPILeovUpGcWPOy0nKnjZUcTqQXbnDckx+MjZIUryMUecwXjx64loV8uKH7Hesasj9mZjjbtWmyECeYylp7xml8hXLKy9eoAgHfAQdPnb2Dw2Z6cPyNLE5ra29n7p6VcdOIiXVGaoOn3JwrP5rR4nl3x0ofUxysCi2ZsbbDpG0JH92T8xql2JKApuOI31FYLukBjiAE+OmjmvOObWmKGY1ke7/CuaHyk3rw2XIrrGb15rLjmWYfVhsadoemuv6iIPSzEM8NlE8LXobkoog/d61PpCreEs4hhb93BvphiDq+ehr/VOIUqZ85WxtwG35ZiIxIzFFtCYET5aM7f9BqScw5eBVaYHecyp6dL38CRb3Tyjjw3Kahd1/V48U4GeOofQwDy+CmKiNNmKvMWRvzFjkwXiEChwl+/9K2unPmAC6Z9i1ciXIiIo25zUKv+w1Ju16NVsORTtme7X6H0JaVJcY9tKaEHQwlIPfAROHEXzlT9roulxMSHtBTDHL95tIc1dMgHoQo= MIME-Version: 1.0 X-MS-Office365-Filtering-Correlation-Id: f5a0271d-72d2-4731-aceb-08d42f40c465 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001); SRVR:BY2PR0301MB0742; X-Microsoft-Exchange-Diagnostics: 1; BY2PR0301MB0742; 3:DBW1P8O92TiHJVtTKA5jawJ0IlkVxJWc3E0ZAeaaYPhJzqBY4dfy/Ilone20MiJi7K8r/MrerDU8YGv4M4N523hPyH5TNSGV84+vNp5q9/G2QZ9rFFp5Gv3RRvSIbSgtmXEewj09h8cSsqRSN5iSTmRoVP2lZtEnDjPkP4tRksUltCVSKu/34DgoZIMUUDouSYg8yoR5vYDLo7Lh72dYLj7VBrsdyxa8fLtyBF2TAiQWEFcBoFcTvmO6vryhx6/sgJamloGjIjQGYt2n7a3CCfPdy5ujA067E4FdAJE3RR0UiVcxxwma5vv7kugX99VNqYk7IxieTYlhpp/JcHr8PxZ7SndhMRsiSmak8HWFAkKR/WJYMb+xYOxqVnDqTgm7; 25:kPyEukI0xslLWIkxR3Gk5ijg7rH9CZ5kpEh5hw1R7qEW7qsChaeF6FUy8czyk0bicq45D26iwPP02pmgBpQ0reHVTwjRfHsHYwoa33PZLkSerdtPESnCWV9PYZ4F5i2FEZuVlCblU9nS9O/8f3719OyEHKmeR5owc2FpZldWl0rDlnJ+KC8HVJ8/pRr1vSAJpYiivDozdBlbGQIEEVVfIkOWwe0YWAxmHTl0lipIbdmPj1Nfls3dVIW3zOFnSiE05CwqgkyMRAVKoia++vxsu044qM/5Fys5j+MRkm2o0vjbegWyNQPB+fRbX6enbrbRCPi0T/LHltWlBx7T6BibLufVU93PVuqM0gMT1u1kUtgxI2m4vSUrbyOLnFSWLGGaiZ2gZNxiclj008krT4pt9ur+XirQMExcGNtPRiCgoR8UPpZDdfAzymnoVnu25Oa+KRLazZMPYMel1S0LjQoMww== X-Microsoft-Exchange-Diagnostics: 1; BY2PR0301MB0742; 31:ke1ngtDo4tnkDBDktKpN0nwJYMbARMTzKCmY0zy02J5mO/W2fdGdc6DisFQS7qO8FqYRpyZ1oU0BBVOdOZYJp9t7EMuzn4UB9BLzq4iYyUJGHToPKiAgZa5YUOdgl+gmZ3uFIERzW6kojtM4GRwHfkMTU/wfhY23a2razsNVgeSBBrXFgF1c8fdrCV0ZNxBl+M1uQeGXrSzrGiyb+L6KmFZlGpNu+BUD+UsdoCZW1T0CqpWoGQExG7iDfjrox0HnQXbN+ebb4qhbR23p0V50kg== 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)(13017025)(13015025)(13018025)(13023025)(13024025)(8121501046)(5005006)(3002001)(10201501046)(6055026)(6096035)(20161123565025)(20161123563025)(20161123559025)(20161123556025)(20161123561025); SRVR:BY2PR0301MB0742; BCL:0; PCL:0; RULEID:(400006); SRVR:BY2PR0301MB0742; X-Microsoft-Exchange-Diagnostics: 1; BY2PR0301MB0742; 4:PYE6VhrXAx2fPh8XjO+oIfBbLjkrDlsbQ0gCyT5gGYWNszLN+OWVbjgcWfIc+kIdISl/290e57LaxjtWbnMS5nQ8r+GwQLsNxmv/vIgWF0HZyVF/Ctkkt/ojCiyLsOxDaWpn+FHihA9GGG4LSJCvgPktMIcD6encR84hYHRSXv3WetfBu392yvxn6E4hfnE/LGBif4ZDBFGtJT7Kz1hu/fCGMsZK8Dtd5i1ocTDlH4REI37WPT+pHrSpHkNtC4XnU4ni2GVhO8I7K1p094GdMvrHkqCrh3hbh+lXBbBIVsQNbvky5okcJ6LUmKkd1/E6M88YcYZkfsKviPMaqWtaa7d9LpHvScGquDfBnMJKJ+PToN0wKwUVKMrFuGTWutZz+3OpKlKRA4VxN91XY6jt26em9YNArclVaOerSfDNX+o0AXy4iOYLSAXdSOE79fYvz/Jc8GP4lgfOLkvvoXxz+75JwKEGPO9a8//+YUb3ierskxxzBVXRu/RqBjleb0ps432aqA+H1PdkpNsCemiobzlZ0Mob6CqCd3kYBEagCM/kPyhD2AZCf8pS9rkKtKggg3ZIMJYCVDVEtYk308FDzqvqCh4KCXiQKwBVCeXZrBNSDRd2VELY6/xdwcizbB/Xw4MNa7ec0IGaxzJ+ze4dEnR2Z/eErkADxl2b/WFX17QRTtKBjBfNyoCVybBo97m3i1IiEWknwkz4GvQS8AXFovxLir/KIIWrLDkC8J09Xxk0X45Pf2Tk0LEfT9VXbYqA X-Forefront-PRVS: 0170DAF08C X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BY2PR0301MB0742; 23:2osuCx4HVMED5Ucr2G5KsiKivBfHMp/Z7gVFafu?= =?us-ascii?Q?GXokBsVDIXqf/CDVlVz61ORF6khg2W5kwy46h0eCVGMd5CYUjhKvasJkYJi0?= =?us-ascii?Q?xzkcNQMUtWjV25oNKJMY6M2fXTXZ0E5uqgcMYd7wJedOt5eoFykRin9pS40n?= =?us-ascii?Q?mxlct5soTRK1JYn0QOknB1Evxx7EhHWZm8jDRrhKSUBOOCHt0iUOMdY/qtn4?= =?us-ascii?Q?NKK44EXxrtEB+J4DKm0wTRMRLW3MCEDd4Uz5OFT6S9ReNF1H66AtNkxa+fYx?= =?us-ascii?Q?V79/eAZtxOJq3qKsh3fsGyjOKECOuNCF7OGc6nIY/8P1uNAjqoIYaTruSmzZ?= =?us-ascii?Q?OBAVfW+ZYFo4D7s7o8QavJqWiE9SR7rJSaKXQ9YXg3K3F2a8M9Zc4B4a9N1r?= =?us-ascii?Q?8D1v+NXHScFDzTobou9exAYFhblEDOvTBaOpe0A4vADagkX5X9aLk4ZXu23K?= =?us-ascii?Q?dy9g3BpUD8eP2ayH0sic2MGpoJ7g1iT5HdGOIZLXGsJFNbwIouUsDGcfcIg7?= =?us-ascii?Q?x53kzNvB+OOvW78zfjIDqG2xV8GUqWaiK3Zm6hb60zkVEe3x/A1aJzZip5dI?= =?us-ascii?Q?0I28Ia/BLYlPWKPNHhmiSl3cm6BjpYxQTirwXwAdY3aHDkBWc04bvcOEhPsA?= =?us-ascii?Q?O6PeIpcBH4T8NqgOrIMgw/CnGBdV/HKoEM0nmEN5imiizPAio+kdEc9GpUJJ?= =?us-ascii?Q?mwdcde62+x3jAGLXWrasmDVraobnJ4ejJt5vz0gfOKfCwm0ID9FD+ZBX0wjV?= =?us-ascii?Q?21BjYN3VNOauHbw1mwHFCd6mT6NYAWRi/JYGGSTik6QhOquBblJD8VNlvvET?= =?us-ascii?Q?H/eckySOpLMRfib9ax4QoXiZ74+8MjADn0mKpKVIxcc0kcQa6BbdbmY8gof4?= =?us-ascii?Q?9vbJ5q+WPOaoBmnyneIsqEZUFLbrEIebV8Y6Hjuyswg+GP4Q9HPtT91Jsm5K?= =?us-ascii?Q?2osipGo7lWdmp7PbLv4mHbMWPyJeFb3D36mAxMrvd+83pgy7WSlXO19SsJDf?= =?us-ascii?Q?vKB2WmGm8jyGE+ciDH4lRUG/B1Lu+cyXIbJr7+0HXSX3QftudAz/L9rSUQtV?= =?us-ascii?Q?3tf275RiVHa0YZa/aUXirSJKmxZHooeLyzW4nmbeTQ1mOBzYIYSDIKiqbxG3?= =?us-ascii?Q?WOLDKv908DKRF1/41Fn76Fv8Ec+L63rvTSx13r0XJrteoW/TsE9FMrqdUGKn?= =?us-ascii?Q?UeStg0IaratyN4zSCAD/qf98stBbeM3yTi9KiGLL3NhKtHlWjoBKbCmxfCg?= =?us-ascii?Q?=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1; BY2PR0301MB0742; 6:PxUKgdRCgVCHm0WGMANr7qIyhOJkoZldqUsSyM0asTefUn8gy4S8AHXCE7RJKeNLkm1+JqFG8p1OZUKuWUILBjibUKKUl/qJvI+yUNpngS3QsgK2D1JBB+nGUBe1CWuk0c+fY2JBbLD39UiTw4xwjlZh+oWfV68OlMRU5FqPpTyv6U68FHUDet1OiV8kVgEaGDGZdVz+KfIS/ybWgIzezXqLhw3bXTDIxJy9vl2b59D5E8J+fnyXcaUsV5KqAdYrMRYfPTeJyYyHiGfeF8go4Ouz48UA83repY5ehEwWzXw0mwM9GTVixGLSpzyGBqXEbDvlkNhBeXe4bhQM7LH9pHwDM7s7BoSceSTuHOgw+tPaLL7YuYnorbbz9qZ7sHNLURvrp0d7oRCnzE1I1BGhqDJslRtVJI2OpueN/mdaObqLZ+MSgZJGDBcE+5yPsjvS; 5:2sf8o7aOxM0O5uM79FMc82btujvqTzlUTjo+WetKY+Z7tNG9saajp4afyVmQeyRmO3mzoinh/k22/nHI0gzY65IOdFGgTdUBJ8nU6aH9ErHZyVUjxi/vhYoFJrDY/60S07iZ3S4a9OlY9hJ2Zb1uUP5Qs6QIlbtJYferRyu3lVaGxOgI9MGBw7f/vYTaCMG0; 24:pTktw30BdeiDlPz7pSpAVRs+S6LhUkewHbsO/rZEztsJneYFf0Qm3KjVSEssz8q1ADvcvlF3ooOySlWo6PjOtG2nEv2ciKKQS2EPGWKJZlM= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; BY2PR0301MB0742; 7:/NKl/nvZ/eL1q46dCzIfzfUPDE/SeKWHRau7k8U22GlgNQGPP9wk8XNIlERlTw2mudeaidXz+Ys+Cf3xFWtVeFQnSc9zZQxlnzLkKgJHLI5iLsLrzYz9h/no6UAx2dshnvGDpPm9xWrUCVbud2HUmEFjA6EPhAz9G4dJ1Q5tml/mY5WQgzTVy0c2I6APcFJq//k+Ko3KJ7NR1H2gkhDsY9nF538VQy1C0wR1mC6ER6sfJ7jRWEpbROzQoFAOTaDBUGk5zfsobmOuUYFbNo/0tzJbMwCBXsfAofLCaVNqed15R/JzwkTD0qETUZ9PfXtDbqEGpM/xgYqhxecnKb/Py3m64s9wLlsX9mwkpmoD2qkF+7fbkLkHZYiTUGiuCt18Zcv3sXKctSeeNqZNK/YYHH3lq62C1zTB6qoTG5ACp1jDvIEgXoQyqzBiBrcyZXROPwcnnP/2s+XFjeBkD6LxQA== X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Dec 2016 16:44:16.5992 (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: BY2PR0301MB0742 Cc: trini@konsulko.com, Kumar Gala , Jagan Teki , Stefan Roese , Andy Fleming Subject: [U-Boot] [PATCH 08/24] powerpc: T1024RDB: Remove macro CONFIG_T1024RDB 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_T1024RDB from Kconfig instead. Signed-off-by: York Sun --- board/freescale/t102xrdb/Makefile | 2 +- board/freescale/t102xrdb/eth_t102xrdb.c | 6 +++--- board/freescale/t102xrdb/t102xrdb.c | 10 +++++----- configs/T1024RDB_NAND_defconfig | 2 +- configs/T1024RDB_SDCARD_defconfig | 2 +- configs/T1024RDB_SECURE_BOOT_defconfig | 1 - configs/T1024RDB_SPIFLASH_defconfig | 2 +- configs/T1024RDB_defconfig | 1 - include/configs/T102xRDB.h | 24 ++++++++++++------------ scripts/config_whitelist.txt | 1 - 10 files changed, 24 insertions(+), 27 deletions(-) diff --git a/board/freescale/t102xrdb/Makefile b/board/freescale/t102xrdb/Makefile index 6452865..ddeb44f 100644 --- a/board/freescale/t102xrdb/Makefile +++ b/board/freescale/t102xrdb/Makefile @@ -8,7 +8,7 @@ ifdef CONFIG_SPL_BUILD obj-y += spl.o else obj-y += t102xrdb.o -obj-$(CONFIG_T1024RDB) += cpld.o +obj-$(CONFIG_TARGET_T1024RDB) += cpld.o obj-y += eth_t102xrdb.o obj-$(CONFIG_PCI) += pci.o endif diff --git a/board/freescale/t102xrdb/eth_t102xrdb.c b/board/freescale/t102xrdb/eth_t102xrdb.c index dadfaf1..c06d1b8 100644 --- a/board/freescale/t102xrdb/eth_t102xrdb.c +++ b/board/freescale/t102xrdb/eth_t102xrdb.c @@ -58,7 +58,7 @@ int board_eth_init(bd_t *bis) fm_info_set_phy_address(FM1_DTSEC4, RGMII_PHY1_ADDR); switch (srds_s1) { -#ifdef CONFIG_T1024RDB +#ifdef CONFIG_TARGET_T1024RDB case 0x95: /* set the on-board RGMII2 PHY */ fm_info_set_phy_address(FM1_DTSEC3, RGMII_PHY2_ADDR); @@ -94,7 +94,7 @@ int board_eth_init(bd_t *bis) case PHY_INTERFACE_MODE_SGMII: #if defined(CONFIG_TARGET_T1023RDB) dev = miiphy_get_dev_by_name(DEFAULT_FM_MDIO_NAME); -#elif defined(CONFIG_T1024RDB) +#elif defined(CONFIG_TARGET_T1024RDB) dev = miiphy_get_dev_by_name(DEFAULT_FM_TGEC_MDIO_NAME); #endif fm_info_set_mdio(i, dev); @@ -128,7 +128,7 @@ int board_eth_init(bd_t *bis) void board_ft_fman_fixup_port(void *fdt, char *compat, phys_addr_t addr, enum fm_port port, int offset) { -#if defined(CONFIG_T1024RDB) +#if defined(CONFIG_TARGET_T1024RDB) if (((fm_info_get_enet_if(port) == PHY_INTERFACE_MODE_SGMII_2500) || (fm_info_get_enet_if(port) == PHY_INTERFACE_MODE_SGMII)) && (port == FM1_DTSEC3)) { diff --git a/board/freescale/t102xrdb/t102xrdb.c b/board/freescale/t102xrdb/t102xrdb.c index 3174726..56f7c1a 100644 --- a/board/freescale/t102xrdb/t102xrdb.c +++ b/board/freescale/t102xrdb/t102xrdb.c @@ -17,7 +17,7 @@ #include #include #include "t102xrdb.h" -#ifdef CONFIG_T1024RDB +#ifdef CONFIG_TARGET_T1024RDB #include "cpld.h" #elif defined(CONFIG_TARGET_T1023RDB) #include @@ -51,7 +51,7 @@ int checkboard(void) srds_s1 >>= FSL_CORENET2_RCWSR4_SRDS1_PRTCL_SHIFT; printf("Board: %sRDB, ", cpu->name); -#if defined(CONFIG_T1024RDB) +#if defined(CONFIG_TARGET_T1024RDB) printf("Board rev: 0x%02x CPLD ver: 0x%02x, ", CPLD_READ(hw_ver), CPLD_READ(sw_ver)); #elif defined(CONFIG_TARGET_T1023RDB) @@ -63,7 +63,7 @@ int checkboard(void) puts("SD/MMC\n"); #elif CONFIG_SPIFLASH puts("SPI\n"); -#elif defined(CONFIG_T1024RDB) +#elif defined(CONFIG_TARGET_T1024RDB) u8 reg; reg = CPLD_READ(flash_csr); @@ -91,7 +91,7 @@ int checkboard(void) return 0; } -#ifdef CONFIG_T1024RDB +#ifdef CONFIG_TARGET_T1024RDB static void board_mux_lane(void) { ccsr_gur_t __iomem *gur = (void *)(CONFIG_SYS_MPC85xx_GUTS_ADDR); @@ -150,7 +150,7 @@ int board_early_init_r(void) 0, flash_esel, BOOKE_PAGESZ_256M, 1); #endif -#ifdef CONFIG_T1024RDB +#ifdef CONFIG_TARGET_T1024RDB board_mux_lane(); #endif diff --git a/configs/T1024RDB_NAND_defconfig b/configs/T1024RDB_NAND_defconfig index 96a6b65..d6ad422 100644 --- a/configs/T1024RDB_NAND_defconfig +++ b/configs/T1024RDB_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="T1024RDB,RAMBOOT_PBL,SPL_FSL_PBL,NAND" +CONFIG_SYS_EXTRA_OPTIONS="RAMBOOT_PBL,SPL_FSL_PBL,NAND" CONFIG_BOOTDELAY=10 CONFIG_SILENT_CONSOLE=y CONFIG_SYS_CONSOLE_IS_IN_ENV=y diff --git a/configs/T1024RDB_SDCARD_defconfig b/configs/T1024RDB_SDCARD_defconfig index c6fdb22..8ef312f 100644 --- a/configs/T1024RDB_SDCARD_defconfig +++ b/configs/T1024RDB_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="T1024RDB,RAMBOOT_PBL,SPL_FSL_PBL,SDCARD" +CONFIG_SYS_EXTRA_OPTIONS="RAMBOOT_PBL,SPL_FSL_PBL,SDCARD" CONFIG_BOOTDELAY=10 CONFIG_SILENT_CONSOLE=y CONFIG_SYS_CONSOLE_IS_IN_ENV=y diff --git a/configs/T1024RDB_SECURE_BOOT_defconfig b/configs/T1024RDB_SECURE_BOOT_defconfig index 9d082f7..7434ebc 100644 --- a/configs/T1024RDB_SECURE_BOOT_defconfig +++ b/configs/T1024RDB_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="T1024RDB" CONFIG_SECURE_BOOT=y CONFIG_BOOTDELAY=10 CONFIG_SILENT_CONSOLE=y diff --git a/configs/T1024RDB_SPIFLASH_defconfig b/configs/T1024RDB_SPIFLASH_defconfig index bce2a59..b8dc316 100644 --- a/configs/T1024RDB_SPIFLASH_defconfig +++ b/configs/T1024RDB_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="T1024RDB,RAMBOOT_PBL,SPL_FSL_PBL,SPIFLASH" +CONFIG_SYS_EXTRA_OPTIONS="RAMBOOT_PBL,SPL_FSL_PBL,SPIFLASH" CONFIG_BOOTDELAY=10 CONFIG_SILENT_CONSOLE=y CONFIG_SYS_CONSOLE_IS_IN_ENV=y diff --git a/configs/T1024RDB_defconfig b/configs/T1024RDB_defconfig index 0aef757..3ba1e35 100644 --- a/configs/T1024RDB_defconfig +++ b/configs/T1024RDB_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="T1024RDB" CONFIG_BOOTDELAY=10 CONFIG_SILENT_CONSOLE=y CONFIG_SYS_CONSOLE_IS_IN_ENV=y diff --git a/include/configs/T102xRDB.h b/include/configs/T102xRDB.h index 24eca18..96bf4b9 100644 --- a/include/configs/T102xRDB.h +++ b/include/configs/T102xRDB.h @@ -60,7 +60,7 @@ #define CONFIG_SYS_NAND_U_BOOT_START 0x30000000 #define CONFIG_SYS_NAND_U_BOOT_OFFS (256 << 10) #define CONFIG_SYS_LDSCRIPT "arch/powerpc/cpu/mpc85xx/u-boot-nand.lds" -#if defined(CONFIG_T1024RDB) +#if defined(CONFIG_TARGET_T1024RDB) #define CONFIG_SYS_FSL_PBL_RCW board/freescale/t102xrdb/t1024_nand_rcw.cfg #elif defined(CONFIG_TARGET_T1023RDB) #define CONFIG_SYS_FSL_PBL_RCW board/freescale/t102xrdb/t1023_nand_rcw.cfg @@ -79,7 +79,7 @@ #ifndef CONFIG_SPL_BUILD #define CONFIG_SYS_MPC85XX_NO_RESETVEC #endif -#if defined(CONFIG_T1024RDB) +#if defined(CONFIG_TARGET_T1024RDB) #define CONFIG_SYS_FSL_PBL_RCW board/freescale/t102xrdb/t1024_spi_rcw.cfg #elif defined(CONFIG_TARGET_T1023RDB) #define CONFIG_SYS_FSL_PBL_RCW board/freescale/t102xrdb/t1023_spi_rcw.cfg @@ -98,7 +98,7 @@ #ifndef CONFIG_SPL_BUILD #define CONFIG_SYS_MPC85XX_NO_RESETVEC #endif -#if defined(CONFIG_T1024RDB) +#if defined(CONFIG_TARGET_T1024RDB) #define CONFIG_SYS_FSL_PBL_RCW board/freescale/t102xrdb/t1024_sd_rcw.cfg #elif defined(CONFIG_TARGET_T1023RDB) #define CONFIG_SYS_FSL_PBL_RCW board/freescale/t102xrdb/t1023_sd_rcw.cfg @@ -175,7 +175,7 @@ #define CONFIG_ENV_SPI_MODE 0 #define CONFIG_ENV_SIZE 0x2000 /* 8KB */ #define CONFIG_ENV_OFFSET 0x100000 /* 1MB */ -#if defined(CONFIG_T1024RDB) +#if defined(CONFIG_TARGET_T1024RDB) #define CONFIG_ENV_SECT_SIZE 0x10000 #elif defined(CONFIG_TARGET_T1023RDB) #define CONFIG_ENV_SECT_SIZE 0x40000 @@ -190,7 +190,7 @@ #define CONFIG_SYS_EXTRA_ENV_RELOC #define CONFIG_ENV_IS_IN_NAND #define CONFIG_ENV_SIZE 0x2000 -#if defined(CONFIG_T1024RDB) +#if defined(CONFIG_TARGET_T1024RDB) #define CONFIG_ENV_OFFSET (2 * CONFIG_SYS_NAND_BLOCK_SIZE) #elif defined(CONFIG_TARGET_T1023RDB) #define CONFIG_ENV_OFFSET (10 * CONFIG_SYS_NAND_BLOCK_SIZE) @@ -271,7 +271,7 @@ unsigned long get_board_ddr_clk(void); #define CONFIG_DIMM_SLOTS_PER_CTLR 1 #define CONFIG_CHIP_SELECTS_PER_CTRL (4 * CONFIG_DIMM_SLOTS_PER_CTLR) #define CONFIG_FSL_DDR_INTERACTIVE -#if defined(CONFIG_T1024RDB) +#if defined(CONFIG_TARGET_T1024RDB) #define CONFIG_DDR_SPD #define CONFIG_SYS_FSL_DDR3 #define CONFIG_SYS_SPD_BUS_NUM 0 @@ -301,7 +301,7 @@ unsigned long get_board_ddr_clk(void); #define CONFIG_SYS_NOR_AMASK IFC_AMASK(128*1024*1024) /* NOR Flash Timing Params */ -#if defined(CONFIG_T1024RDB) +#if defined(CONFIG_TARGET_T1024RDB) #define CONFIG_SYS_NOR_CSOR CSOR_NAND_TRHZ_80 #elif defined(CONFIG_TARGET_T1023RDB) #define CONFIG_SYS_NOR_CSOR (CSOR_NOR_ADM_SHIFT(0) | \ @@ -330,7 +330,7 @@ unsigned long get_board_ddr_clk(void); #define CONFIG_SYS_FLASH_EMPTY_INFO #define CONFIG_SYS_FLASH_BANKS_LIST {CONFIG_SYS_FLASH_BASE_PHYS} -#ifdef CONFIG_T1024RDB +#ifdef CONFIG_TARGET_T1024RDB /* CPLD on IFC */ #define CONFIG_SYS_CPLD_BASE 0xffdf0000 #define CONFIG_SYS_CPLD_BASE_PHYS (0xf00000000ull | CONFIG_SYS_CPLD_BASE) @@ -369,7 +369,7 @@ unsigned long get_board_ddr_clk(void); | CSPR_V) #define CONFIG_SYS_NAND_AMASK IFC_AMASK(64*1024) -#if defined(CONFIG_T1024RDB) +#if defined(CONFIG_TARGET_T1024RDB) #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 */ \ @@ -707,7 +707,7 @@ unsigned long get_board_ddr_clk(void); #define CONFIG_SYS_DPAA_FMAN -#ifdef CONFIG_T1024RDB +#ifdef CONFIG_TARGET_T1024RDB #define CONFIG_QE #define CONFIG_U_QE #endif @@ -731,7 +731,7 @@ unsigned long get_board_ddr_clk(void); #define CONFIG_SYS_QE_FW_ADDR (512 * 0x920) #elif defined(CONFIG_NAND) #define CONFIG_SYS_QE_FMAN_FW_IN_NAND -#if defined(CONFIG_T1024RDB) +#if defined(CONFIG_TARGET_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_TARGET_T1023RDB) @@ -762,7 +762,7 @@ unsigned long get_board_ddr_clk(void); #define CONFIG_PHYLIB_10G #define CONFIG_PHY_REALTEK #define CONFIG_PHY_AQUANTIA -#if defined(CONFIG_T1024RDB) +#if defined(CONFIG_TARGET_T1024RDB) #define RGMII_PHY1_ADDR 0x2 #define RGMII_PHY2_ADDR 0x6 #define SGMII_AQR_PHY_ADDR 0x2 diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 30519ae..ff7f3d1 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_T1024RDB CONFIG_T1040QDS CONFIG_T2080QDS CONFIG_T2080RDB