| Message ID | 1462371243-16929-3-git-send-email-prabhakar.kushwaha@nxp.com |
|---|---|
| State | Accepted |
| Commit | 22a44d087acdfe55c48c0f096a0238fb7ed49762 |
| Delegated to: | York Sun |
| 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 3r0L6h10CDz9t3Z for <incoming@patchwork.ozlabs.org>; Thu, 5 May 2016 00:30:20 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id AEC49A776D; Wed, 4 May 2016 16:30:18 +0200 (CEST) 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 7RP616iaW0ql; Wed, 4 May 2016 16:30:18 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id E0C40A760B; Wed, 4 May 2016 16:30:17 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 317D8A7620 for <u-boot@lists.denx.de>; Wed, 4 May 2016 16:30:15 +0200 (CEST) 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 ps59xpaI9t-T for <u-boot@lists.denx.de>; Wed, 4 May 2016 16:30:15 +0200 (CEST) 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 na01-bl2-obe.outbound.protection.outlook.com (mail-bl2on0077.outbound.protection.outlook.com [65.55.169.77]) by theia.denx.de (Postfix) with ESMTPS id 833BDA760B for <u-boot@lists.denx.de>; Wed, 4 May 2016 16:30:10 +0200 (CEST) Received: from CH1PR03CA009.namprd03.prod.outlook.com (10.255.156.154) by BY2PR0301MB0712.namprd03.prod.outlook.com (10.160.63.154) with Microsoft SMTP Server (TLS) id 15.1.485.9; Wed, 4 May 2016 14:14:46 +0000 Received: from BL2FFO11FD010.protection.gbl (10.255.156.132) by CH1PR03CA009.outlook.office365.com (10.255.156.154) with Microsoft SMTP Server (TLS) id 15.1.466.19 via Frontend Transport; Wed, 4 May 2016 14:14:45 +0000 Authentication-Results: spf=fail (sender IP is 192.88.168.50) smtp.mailfrom=nxp.com; nxp.com; dkim=none (message not signed) header.d=none;nxp.com; dmarc=none action=none header.from=nxp.com; Received-SPF: Fail (protection.outlook.com: domain of nxp.com does not designate 192.88.168.50 as permitted sender) receiver=protection.outlook.com; client-ip=192.88.168.50; helo=tx30smr01.am.freescale.net; Received: from tx30smr01.am.freescale.net (192.88.168.50) by BL2FFO11FD010.mail.protection.outlook.com (10.173.161.16) with Microsoft SMTP Server (TLS) id 15.1.477.4 via Frontend Transport; Wed, 4 May 2016 14:14:45 +0000 Received: from b32579-VirtualBox.ap.freescale.net (B32579-02.ap.freescale.net [10.232.40.10]) by tx30smr01.am.freescale.net (8.14.3/8.14.0) with ESMTP id u44EE5R4023191; Wed, 4 May 2016 07:14:43 -0700 From: Prabhakar Kushwaha <prabhakar.kushwaha@nxp.com> To: <u-boot@lists.denx.de> Date: Wed, 4 May 2016 19:43:58 +0530 Message-ID: <1462371243-16929-3-git-send-email-prabhakar.kushwaha@nxp.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1462371243-16929-1-git-send-email-prabhakar.kushwaha@nxp.com> References: <1462371243-16929-1-git-send-email-prabhakar.kushwaha@nxp.com> X-EOPAttributedMessage: 0 X-Matching-Connectors: 131068448857053137; (91ab9b29-cfa4-454e-5278-08d120cd25b8); () X-Forefront-Antispam-Report: CIP:192.88.168.50; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(6009001)(2980300002)(1109001)(1110001)(339900001)(199003)(189002)(76176999)(4326007)(50986999)(189998001)(81166005)(36756003)(33646002)(77096005)(50226002)(86362001)(11100500001)(50466002)(48376002)(5003940100001)(19580395003)(2950100001)(6806005)(1220700001)(8936002)(2906002)(47776003)(87936001)(104016004)(85426001)(19580405001)(110136002)(92566002)(105606002)(5008740100001)(229853001)(2351001)(106466001)(586003)(7059030); DIR:OUT; SFP:1101; SCL:1; SRVR:BY2PR0301MB0712; H:tx30smr01.am.freescale.net; FPR:; SPF:Fail; MLV:sfv; A:1; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BL2FFO11FD010; 1:iEeAP5AchEv22OLS5tvJ6gyuAWau5rhDyMP7wUBsrVzoX73OiH2lbTdZVAZFRWaXdpPEQjv87xts+tqGxcQJLLogfl8CopA2ovgHWB1GV52N2XpbSnbbkBNCtyL3zntwJ6htzcc5JVvG9HW6HpKuGw6OwTo8xrurX57vsq5LN5aQ4O1jziVoq2AwL5FYlM4/qP2j2rROoDh5ailwzjD/6p8sPQ5zBrUhfDT5YSJS5q8eZANuuB9flrIjwblcuthTiNb9HGWQddL/DIBQRSsQ22EFp8BfmbQ6i/Eqzwzd2+sWM/emLKR5lKyumak353mowbXPee1HiOTL7Q4HqsvPxAtsomCTxkAOtkhywKSVlu05pr3ZP8AHvCiIPGD3g8yu9T3zqn/Oo8ra4gZMDmRBgTXm1ryQLtNixWwbZUAstQ80+rEJ8B7gb0vlfO733NS5iU+thZMz+x/cvaOIimmFiOfJMzNzEUL642i0f5BkwfqN5Wl6H4qjO7T7wigcJCLoYxcqtgxVg4IlcYbsyi72TmWJx7vtJyR+HetUeJ+qyydjO82z3nrT6w1/+TkPLxMHrmwiygLAguknG/IDhDsnNrOzXMRaTyhn815IvTjqRz6rWQwAg+E6Z+j2pA7o5Ttt8K02UEJWqKfZ+5PbjCFeqNdMkHHNQ+mRvWvoKcgHfiv4qJ676EAzFdCojQnvSG2OaDaJV/OGJ5b2wjGXnpX8Sw== MIME-Version: 1.0 X-MS-Office365-Filtering-Correlation-Id: 9b7a5637-38b4-4dc5-7671-08d3742671d7 X-Microsoft-Exchange-Diagnostics: 1; BY2PR0301MB0712; 2:Y91Z9rGhsc84NXo0+mcp/eg+BWPOUMyoUOx08xK/mMIcpba0XrDrB4H98/DPQ+g5GxDpIKMTD3yiK6TcrF6mol2sdKEN97ExXOqLmGa+LN7Eu6YNceCaYPmOhvRSrfylIFfaqkydcNJYhM4ouFsjcFRPtwKiiOdbaZQdMTJsJO3udU6+cfbuTpXQKBc30p72; 3:t73JcbNmO0PP/r5ttqlrlt6FePNpW3aiuD4D2Tnh197+4OPcblMklwv+JfxF/kSkLAfbl/L0cqIBLXIrZbYV84mnoW+BPtN9reTrt+QdFUguPEYZvqkTepmFTnvW6g41LPFIkO7e6jB6uzGsGR8ybHe00wSu6lNeijELncvL5NxVQoD3Ka196tlhYwRyvYF3C90HqVo2VJel7qsbIBYcqi4Hvt/PYLWc9vrwq8pSWRs=; 25:WjhW6qhm0rU1LDE3oii5Ua6mqKGCW8Cgi9Qu19Ncn23np07dkqAsUQoHjtw9jGk7TwdPzTDJOwaeOgwB2fFsdieeOpyWuEDM+2FNCgjACuQEoUczlPUiaPNtjutMVtmmkqLPcOGtcFeb8DevVWSsWZZ2RC98uwtezty7DZihZO9E2isYEGSDMBrVasIvDBTLNMA2NdMBzDXs9Wes7JShEi55T+CGeHM+lAxH4dhvJLvSrcjFO77YEn21R4c6cHL4BvUBmdlAXBiidOhZo+CosiwJeZmL6xwo+sx1SEbsgSFBrnysikDrX4G7dyfmXEJUtH5BQ1Hyh/W+8Jk6kNVlivbPU5NOU3fyINtKFBlD54REuV/lyti4eQhFa2kT0BZ4Xbu3Wd3sb0+EH7F12bM9LcZf74u6sXU64m0JHRuODY7JjEfkuIJCEJ9XGS+BTORD X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:BY2PR0301MB0712; X-Microsoft-Antispam-PRVS: <BY2PR0301MB0712D9E70A5D62E7D2260B51977B0@BY2PR0301MB0712.namprd03.prod.outlook.com> X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(2401047)(13017025)(13018025)(13024025)(13015025)(8121501046)(5005006)(13023025)(3002001)(10201501046)(6055026); SRVR:BY2PR0301MB0712; BCL:0; PCL:0; RULEID:(400006); SRVR:BY2PR0301MB0712; X-Microsoft-Exchange-Diagnostics: 1; BY2PR0301MB0712; 4:8itP0jeoh2zRd9u+yPvmuOcPOyEZ4HEBOCP3Bmu+CvqPsmu7vMsxz8G0bWUeska7zw33xymKGQQEOCR1rf5xrrbPhD1yGi3qXwXhkSuUea9DbBWimCacSdsq1yDD2xGKDokTbu+a9LNWOs1BpILuO9k6+3rPWILtx4B5c1fhNxNrD2Tu1DUJxn2GBEIGH7OPtmO9kbNbw+ieydbpsb/92V9LAeMrL5cpS0jGza3TDdZo7X/IQR432tuU4/ei6D9jfEeNEVYjo/CpK8XBn+1kfK4Ru7vm3nRI5vnH3PS19YX8j0zXwD9mUjBPIj8VdXGvFh1DHcxMZmEAHd+6YcNCibLnPfJXN+gQDBLZrUrvl5prSe5XeY1a7G4EdIht5qx5/HDll0omy/oG8ft9yiE/5c7339a9SBAF0CLE9buk9V4rKE5dQD/cFu8HhFdQ8Lf7OdxG1npAEh86N5L1lQqg34TXUsgMXyg1SPSa473A4aY= X-Forefront-PRVS: 093290AD39 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BY2PR0301MB0712; 23:XI4QGAO4qXvfi8dlw06YXObxevfQBfWTzbfSx97?= =?us-ascii?Q?WTCaSDQAgSCaw3goxNbH83w3qvMWdDmURW+FTed9BmT7jgNiJEWilfQE6/lS?= =?us-ascii?Q?SpS+TkIBlN/yh67V1VFkqwWkDbVQcMduI+N17U1BOIBNcyEysSjSSGgsA8Px?= =?us-ascii?Q?ZstF2dt5K6er4YqcscPRp5ZlfKLvzQ+eHYhllAau4CchTxdHvevYa5cbID8V?= =?us-ascii?Q?sIc++TmWyf2i70BI7bGOW4K4qufR0wLQqx5M/OfjhZ0HNPFraJ1NwRic81G0?= =?us-ascii?Q?ekH85YvldxZ9bKDXrdIYnNWnkdahN5bW4KBGQj539AuDIPLCRrM3V1LXCMIq?= =?us-ascii?Q?0fMZSy8GzqZEeqWQM8UyNBtTDzXrgjIWqfDaG3o545on+RYHxmfEzd5uybaN?= =?us-ascii?Q?AkuBhRMlA6tG67a9RlMg5mzk92S7ptwK8rrYm5iV07sPm5RLtQiS0ZTeQAeX?= =?us-ascii?Q?UlwQJPDATafWwt3/vuDkQpYqgVdfTzTl+2ZCDvVaTD3H82UyVDnJDesO99W+?= =?us-ascii?Q?QVGyhEzOWg0VlxSw6EeFhkuRE7O7dmogML3ihoJmLnbZikqfHTvnV3jKirA5?= =?us-ascii?Q?2ULvG1Rpy43BWnxZhSw6CLp2ZDBHSGJUbbZMGBfCpnJDImHk7DmHxqyxcuTm?= =?us-ascii?Q?Y4YT+dXppqRLxdk1Tx8ZN6nF3W5F6UmtlaVCte5oB2iHlzfeSxLNeSJ6IQtR?= =?us-ascii?Q?RrNrgVMbyAsGi7/Qzr3eU6P04e3ixfGWT5PBppaUOnxkKXpSlOZSJikwIlze?= =?us-ascii?Q?MQzw9bMVtLZbQaiCcqgrkj2g6vG0/eC3cza/T9aryPtvrX2Idhqm/xaoDzUG?= =?us-ascii?Q?uw/Aqwcf2BBlzGLf2BmEB4IHkZeafiSgsypnPaqtFjo8CDPBOspBLMECNlUx?= =?us-ascii?Q?hhDJpDiWyPyjNSqL50hzI0p+5ln2NDq516qohPBAe8YK3jq2iUgfp4h5vt1x?= =?us-ascii?Q?ATenKjX+8V08wbs2nAii5MAXXf3rxlXA3cgviU5wA21gJDNpuMkDxYZudqHZ?= =?us-ascii?Q?KwijMf8KyTKTEwRnt3i6a9BYtP32Qbe0QB9T6we9ZVItbStodc2yKa6IcLHj?= =?us-ascii?Q?EGUUN3Sw=3D?= X-Microsoft-Exchange-Diagnostics: 1; BY2PR0301MB0712; 5:BqY70dVUx2bfZosxkJIXRvV6e8oBpor+HMGgn5pkdCGUyVdcCJrxVfr9Fa4dBmemqwmVEcV6Bnysjln57z2XpniWosh7akrB4PTRjjg1r8Ye5fVaMrhAedCeHlXXqbAvtWCC+/vNVfqlnLUIMV5FcmYOk/psiiX0aJ3VewjS2dA=; 24:rmwYr9evtYA/KnxCykq/OPBUGRfTzu3/Jpbk9vKgLp9QrD9Pc6MAD34ZZi8fWZLmUP0/LcGETMlx2KxueOHlfCXdzu+k4QyLqPgAW+CUPGM=; 7:Pg+XigIbZUZUyOJWhriydSTxBoiG2ZKaKlKqd1m3JwVl6VqDOZBX+dw6C++e0MotvhowuK3wCOxYc9pBeh6nfB7KVkobIJH9t5SmZnnpZytZ94ou3WJGWES57Uei0o0E0ApkWEHbm5W9wsWwKDLBSmvdn3BsQM4w/C2p0oG+gRCFnO1ozv9pecBesLMGKimk SpamDiagnosticOutput: 1:23 SpamDiagnosticMetadata: NSPM X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 May 2016 14:14:45.5181 (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.168.50]; Helo=[tx30smr01.am.freescale.net] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY2PR0301MB0712 Subject: [U-Boot] [PATCH 2/7] armv8: fsl-layerscape: Avoid LS1043A specifc defines 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> |
diff --git a/arch/arm/cpu/armv8/fsl-layerscape/soc.c b/arch/arm/cpu/armv8/fsl-layerscape/soc.c index 0cb0100..41f9547 100644 --- a/arch/arm/cpu/armv8/fsl-layerscape/soc.c +++ b/arch/arm/cpu/armv8/fsl-layerscape/soc.c @@ -222,7 +222,7 @@ int sata_init(void) } #endif -#elif defined(CONFIG_LS1043A) +#elif defined(CONFIG_FSL_LSCH2) #ifdef CONFIG_SCSI_AHCI_PLAT int sata_init(void) { diff --git a/arch/arm/include/asm/arch-fsl-layerscape/fsl_serdes.h b/arch/arm/include/asm/arch-fsl-layerscape/fsl_serdes.h index f71c2c1..c4fb7c9 100644 --- a/arch/arm/include/asm/arch-fsl-layerscape/fsl_serdes.h +++ b/arch/arm/include/asm/arch-fsl-layerscape/fsl_serdes.h @@ -55,7 +55,7 @@ enum srds { FSL_SRDS_1 = 0, FSL_SRDS_2 = 1, }; -#elif defined(CONFIG_LS1043A) +#elif defined(CONFIG_FSL_LSCH2) enum srds_prtcl { NONE = 0, PCIE1,
Other than LS1043A, LS1012A also Chassis Gen2 Architecture compliant. So Avoid LS1043A specific defines in arch/arm Signed-off-by: Prabhakar Kushwaha <prabhakar.kushwaha@nxp.com> --- arch/arm/cpu/armv8/fsl-layerscape/soc.c | 2 +- arch/arm/include/asm/arch-fsl-layerscape/fsl_serdes.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)