| Message ID | 1464959496-8595-3-git-send-email-prabhakar.kushwaha@nxp.com |
|---|---|
| State | Accepted |
| 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 3rLkzX4yyRz9t60 for <incoming@patchwork.ozlabs.org>; Fri, 3 Jun 2016 23:12:56 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 8C1F3A756B; Fri, 3 Jun 2016 15:12:46 +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 YQ_iprApoD84; Fri, 3 Jun 2016 15:12:46 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 5CB94A74DB; Fri, 3 Jun 2016 15:12:40 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 8070FA7516 for <u-boot@lists.denx.de>; Fri, 3 Jun 2016 15:12:37 +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 SCj_AhrJNAmb for <u-boot@lists.denx.de>; Fri, 3 Jun 2016 15:12:37 +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-bn1-obe.outbound.protection.outlook.com (mail-bn1on0064.outbound.protection.outlook.com [157.56.110.64]) by theia.denx.de (Postfix) with ESMTPS id 2A765A74DA for <u-boot@lists.denx.de>; Fri, 3 Jun 2016 15:12:30 +0200 (CEST) Received: from DM2PR03CA0053.namprd03.prod.outlook.com (10.141.96.52) by BL2PR03MB196.namprd03.prod.outlook.com (10.255.230.155) with Microsoft SMTP Server (TLS) id 15.1.501.7; Fri, 3 Jun 2016 13:12:28 +0000 Received: from BY2FFO11FD040.protection.gbl (2a01:111:f400:7c0c::114) by DM2PR03CA0053.outlook.office365.com (2a01:111:e400:2428::52) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.506.9 via Frontend Transport; Fri, 3 Jun 2016 13:12:28 +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=none 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 BY2FFO11FD040.mail.protection.outlook.com (10.1.14.225) with Microsoft SMTP Server (TLS) id 15.1.497.8 via Frontend Transport; Fri, 3 Jun 2016 13:12:27 +0000 Received: from b32579-VirtualBox.ap.freescale.net (B32579-02.ap.freescale.net [10.232.40.4]) by az84smr01.freescale.net (8.14.3/8.14.0) with ESMTP id u53DBcUv010588; Fri, 3 Jun 2016 06:12:25 -0700 From: Prabhakar Kushwaha <prabhakar.kushwaha@nxp.com> To: <u-boot@lists.denx.de> Date: Fri, 3 Jun 2016 18:41:27 +0530 Message-ID: <1464959496-8595-3-git-send-email-prabhakar.kushwaha@nxp.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1464959496-8595-1-git-send-email-prabhakar.kushwaha@nxp.com> References: <1464959496-8595-1-git-send-email-prabhakar.kushwaha@nxp.com> X-EOPAttributedMessage: 0 X-Matching-Connectors: 131094331479127489; (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)(2980300002)(1109001)(1110001)(339900001)(199003)(189002)(9170700003)(2351001)(81166006)(8666004)(586003)(50466002)(8936002)(36756003)(48376002)(11100500001)(50226002)(92566002)(8676002)(76176999)(50986999)(19580395003)(19580405001)(104016004)(6806005)(33646002)(229853001)(106466001)(5008740100001)(85426001)(105606002)(110136002)(77096005)(2906002)(87936001)(4326007)(189998001)(47776003)(5003940100001)(86362001)(2950100001)(7059030); DIR:OUT; SFP:1101; SCL:1; SRVR:BL2PR03MB196; H:az84smr01.freescale.net; FPR:; SPF:Fail; MLV:sfv; A:1; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BY2FFO11FD040; 1:EtGdLOEz7SveJk/A+KGBxe7zA8hiTCPOym0nRdTgonDvwimIB3Ytu3atf+EIZ5YhY+hUP2hHwfmnrIzGv5cicu/8nryhq2RCN8I9MYiqrBs/5AO5znFJkjYnBpnwjrpyQWsM+2iOGMyAtpE9yIzS819Me4PCvFgiJ59yqdKYHTlZ4eyRMAbPmd0hzcykmMy6lXFeX39dM/gCVrszAPUL/BBBpXUkeItmeGy3rNCxWu5saS1bFqbf2vzmzFiUFC3LsJqf/kVzdOkKS4ryCm9ogH51TuWOQ976IC2wQ9gbhKL6HeeuAGDbRdQLVZTozHFMDq78F5mHMuw9APrVDeQT+ijB0pLiZyI3ORkRFUVwfjcTcBwy81jpDeUDqoUgrieySyNBKHbAgAdaPEZweiKmJoitYBDdZUIeBGsmiYniUq7kgRQl7Y5K5dLbjN/yj22HxJ9nZbiFymhIax8/uJCJAwOiip3L8qqMg1DpVHYyX2eQx5VDsSKeN49HVZGQRB1O2mL5PscFujQNdvEuzKM2ViJbhJGLRzbBYofInQygkYA3FwyX/rKEBHl9cqQkJzzB2HlnMr7vCE7Zb7GgYupachgyPKp9I488VhCnoh0wcKt3DIjLuWp14wd6lTgM5bKxruPU6otYr2f8xGjlrXHgcDWbSDQdh38zH9S91DNJjpQjEaszBGjg3hBh7wgcfs5B MIME-Version: 1.0 X-MS-Office365-Filtering-Correlation-Id: 34b8de58-2dd0-4004-6ab9-08d38bb0b645 X-Microsoft-Exchange-Diagnostics: 1; BL2PR03MB196; 2:UJW2KIuqUJvGvWBu5UshKu5Zm7AeRGRGVpK7kiLVeQC+erBjtfsc2n6K8NlTYR/dX8aO/inVu/JNvHuwlxfov9o3BG+uBuNQGA3pSXUQaqigSlhlq5Acx2faNn18XVAMROwgwdgEAO7thnL6Ow497xQMcIB+zFUBp6WW2e1H4xwd2WUaB6Lmffj01emgnnPR; 3:COmaHiARSA1Q7TgOG1rQcFImbHSDD0w+WqE47pguz7GRrIOrIbRI/VZ5kq1mQUmFZ6RqTozP3qZFXlPtwwKgEX1yqkQZtmcxgjDzZm7336qCjuxgvd0oJc2isOhg7DZXClBKhDgkBG5mTJAzrkuSpCmOG664jTv/nRSaS9IWIXeX41wUHdVYLuGmA/5Tdhn0bAHIYxATemUdrc83VrR4Q552w8UGTf9PUurXQUUVYNs= X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:BL2PR03MB196; X-Microsoft-Exchange-Diagnostics: 1; BL2PR03MB196; 25:nquz7Cwg1+LUDxu1MphWm1hjAtBA/3f8/ZW4z35ekE6L4r9MGlbOFlUdAOaz4S8qxJxinyzTa6oykQnrbkv5TGgmyvS9Rg91QpndeMOCtnA0qlwryG7O532y/o6Q+BcH0xQYkLray8gWsHO2Y/aNp2bgotkQTz6mfAmOXSPE86sCJ9PTb3zEVTXmYZOrdQTvfy6NyM657jm451z5ChXtlO6ahD/VvsIxqBkgcZ8np7TH7kMThqoe+fZhqjd9daRLTdmC+pN8dYpqrbXo59x6hRSI9H9c0vVfyNMq66x28awW8DtRazfi1EecxWTZPpvM6sboJk8kEOZ4xSgp6sXc0P+oirI6bXW2+hIiTShOpGtUmmOXPM9fcJiDlawCtvmMtO0MC7uBd36ZQS9xSp8ITCsgGVz/Yz6n6tIAzuihpVKQcM1Uk96hpRUmQfdCSWiZWwWqQXFG/A18u3aDQh4XbgMQ1BXkjRxsN+WD1mt9oFjmSQcEo/N8lHSFUxKdmlba96Bhbw1Pqf2Pt6fl7fNaTReLQQmzsRWVbssNP1TpJqTewYVqanJ7im0vOu3k443o0ZpSnMNoMhcKBo7Cgz9x9XkCk853e2XGSK4M8JrGdQbfHgct7q/rf2LueX7uYvpPdCHSLODXzLCQwaF1VaDg+704FONLEc/chzWSlL/3C3sS9lvGQDqbm+IvJwjI/+RuboDYyoHJOMgb5zXp33eNVosHp1ooUoFxsX28G4rb8LM= X-Microsoft-Antispam-PRVS: <BL2PR03MB196277CFF683AEC20D99B0997590@BL2PR03MB196.namprd03.prod.outlook.com> X-Exchange-Antispam-Report-Test: UriScan:(185117386973197); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(2401047)(8121501046)(13024025)(13017025)(13018025)(13023025)(5005006)(13015025)(10201501046)(3002001)(6055026); SRVR:BL2PR03MB196; BCL:0; PCL:0; RULEID:(400006); SRVR:BL2PR03MB196; X-Microsoft-Exchange-Diagnostics: 1; BL2PR03MB196; 4:RcSLZ9iASjRn4oB9NXRxFjPl32gXwmKKZMScJWfZFHG/J9fnQDNGh9MF0LktM0F9P0oEibfpgTzeq7noWLuKsiL5nsrpBrba4JuV3TR4cGspnbCYNs5kKO5qXFF32CoDfm+AVVYhzOE+cN3K5znkC3/zhc9qEeazGE04X314vlAoj6RGtQZCbrtETgduRF/0gcZL8u1ClgFbwcNZmaRf/7EtVYFViitl8u5UelmJ5LsXeVXgz1lrJtwJcbuqa3YLHiqEEczhe8VCikvKE5qCM5/7AgkkVL6GjHk+UbSDOU6BlqD0lfwTn3bBkpvDpRc5ErPkBo8YdMHdDJ0QIrKh3nL/FI1g0XOwvwyELrb3OXtdPAn4MEaDFmHsNeQ8V7D1KJi7fb2xtIs2px0pObQYmfwAi6KIb5ZzPDcdUOnzhdUHd+bu/lRJ0Mes/B/WgLq1DJUHEbRn4hkiyP+xKzdjhwpn01BEuyoXGyGHpazXJk1SQV54a+OzfsUeSvVWxSJS13Tu7uvFwLxQ6p9N0ldW9Q== X-Forefront-PRVS: 0962D394D2 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BL2PR03MB196; 23:d1TBE8L7qhlQ3ipuxiz+S6Htoh0n+ZQyhHEInTa87h?= =?us-ascii?Q?Qz+P84t4iSYjFcG4sJMakZM+xdqCcoMMY2lCjTovBYRv7jSxIf/z5MDNQ2KJ?= =?us-ascii?Q?4kHvp187Xo6phdLHsV6AD8nSpn/D2r1vdp+v+pcB3I5kUgsAgZBWq9fWa9lS?= =?us-ascii?Q?mKxBL3UBwvkkFhwyEpefen27v0Z0VY6DljgklOkFLAr6RmlEzePUkAyMW9YB?= =?us-ascii?Q?mjdgCZxOLxMQ/S04U2PpDWqFHRokNil0+0cpeNzg4o6lwAF0/7mutvNzqQxt?= =?us-ascii?Q?Ls1Of1dgfZwbz9/Fg4PEZaBR2ADsFQ12ebIrtgPgf5F9o4OU9alT4jnoh7CR?= =?us-ascii?Q?NbHLXsPHzGReFv7tWxMU3eP8HisI5dfdKRlYyouoyy3uQRT8erCGr8zz719F?= =?us-ascii?Q?xz8y8yOxv38r0Y4+3icf6gvgr59/9AoMpgmapNQgQxCwCsHabPD6iL9/T7RD?= =?us-ascii?Q?0iRV3OV99uDOgD7JWu/rsN6jFLrF96vJ8QSEwHrNydmFkMgqW1V0mCXM8HJj?= =?us-ascii?Q?Z5Xjf0/pljHVWm2chYzqk6wl+cr8VWMmKgvtUmzic7rMyAtBRpD7kQjk2pM4?= =?us-ascii?Q?X4tKvdVqt4FKD2q6L/DMSPkNa1/d2S27ERi1SHfaTvCJU5D0U0Q540U9/i5A?= =?us-ascii?Q?LCsEitHhJHXQkE1jISpouwNoM3NZ7d1S39BQA7LlGdgG0VRcJiHiNZgyRtz3?= =?us-ascii?Q?hJw23u+9njA/19y3og3Pjj+FI90TDf6jKfeMhLz532xoPtsTydrX/zTshDct?= =?us-ascii?Q?Mx/Tl4XECftustllOAdiHMT+GWr245bIn7e9854lIg7O011EIlUojyuQdmKX?= =?us-ascii?Q?c16j3MgsHzqhyeIyH5gdC65DgmFsOGxAopzrXAGDraLnY8r7HxqNW9DMe47/?= =?us-ascii?Q?oiBnZLinFDQoqRCipT/mQ/6WFLU34Yvnpk13vk8dC2FmxgNKj74xY2vb/PJx?= =?us-ascii?Q?9/71iraxzmYiuvJ37GXD2g8oUJajXtTpWEQ5GyL5t7+mWCVpRXUaHzcS2Fd0?= =?us-ascii?Q?czmCCYqjjCIINkmND9Cab56kPwbBO6CGRXvl7iNDHbbxxzy9sXkZnkJf01kh?= =?us-ascii?Q?VbAxSXKXd7k8qmEl223ysJMK375d6GaueTOOaPHhCuIT3Qpw=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1; BL2PR03MB196; 5:cl1giakVOp3EvRrVtukQyCnBkIn/NwRffAN6HObvgtj/inTizpjeIE9U9RkNpPES7/OP6wJ1xBTkAERstRbpDP5VSdvkz+YpMvFsArrkXqFj49iX7igX4xNsLWXv37+kTEci6/cu+CwSouafsWkUw9GquM7tNaNLyqFNtOka37g=; 24:T6BLgT9mwKQMgeh+wrgWQe3S76laoyEvP8sLrTxcoOpP1m6/OFSNG7vBeR48asyzVYNM/yRlwNw+/MuQ00xpnfzUJem9d1OBpckO9aDPWSk=; 7:Fy6ONB+XZ80NlQTZUX/mPFx8w5OgOlOOOTMzS3uabX4g0T99ViArIOxuQirhoL9m8b+oi/eXdMqhTGsFjlSb7IpqspGfFLuFhEms4lHQrD4DLrIdZYX+Oy6T/BM9HGkEDWWHTsx2xt3YwkwRRL43DhvvybDWMvQ6w0KsNp2roSwg2KiClnYJTl4XCEAL4Jsd5lsQs40Z3aBEKIQc56JtlSo/UmC5SiB8ToH+WxmcPqk= SpamDiagnosticOutput: 1:23 SpamDiagnosticMetadata: NSPM X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Jun 2016 13:12:27.6631 (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: BL2PR03MB196 Subject: [U-Boot] [PATCH 02/11][v5] 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 0fb5c7f..0ae61d6 100644 --- a/arch/arm/cpu/armv8/fsl-layerscape/soc.c +++ b/arch/arm/cpu/armv8/fsl-layerscape/soc.c @@ -224,7 +224,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> --- Changes for v2: Sending as it is Changes for v3: Sending as it is Changes for v4: Sending as it is Changes for v5: Sending as it is 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(-)