From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from EUR05-DB8-obe.outbound.protection.outlook.com (EUR05-DB8-obe.outbound.protection.outlook.com [40.107.20.69]) by mx.groups.io with SMTP id smtpd.web12.2013.1588225895127910103 for ; Wed, 29 Apr 2020 22:51:35 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="body hash did not verify" header.i=@nxp1.onmicrosoft.com header.s=selector2-nxp1-onmicrosoft-com header.b=czd84B4H; spf=pass (domain: oss.nxp.com, ip: 40.107.20.69, mailfrom: pankaj.bansal@oss.nxp.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=SeUpYJQDcaq9XQCaV10eugGCZvxmkzD6Czh3bKU2iwi9V4WE0CxHHox9CX8DS5JOQIT1qa1W/zeFxPvAOylQxbr9XV7CYJjTPy3dY+Yco4Avr1KaDEwTX0esE/IFrriBfTSnMsMdoh1vdrvMloQIQpZbBjF9OtxXkzZ8Veop8tbs6JiXliWGI3cu/YsHT/jtv4PfM7lpumMPR3v2ictSvxbiOrfzFUtlMQX6hXxEKE3ofneA0VZ1+cUlIQmnJMCR/72A35dQ5NcgLhmhTJ0VBa1u27hCscNLMK61mF3UdMD8U/3b1haPLlvEQ8KBX/jhVwS4o+i7rynwBLaqvdmX8A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=1Pmk02RZCQAJrqokk64zasAj0KwTmI15sIczqa1QBY0=; b=eRr0l3QesmYz1nDRkcrpJex6vA8FK/MYdzx1V+eQ9S4Csvdn1GqsWQC0P85qkFNW2bUIRIm+1A2R90xqxQHvNNHaf9MuRtihHzKIbB/Ue8wygdERmoQchMrrMyToxh9PqwLhQXRCplyLe3Qh9HNhcdbnVujhmmtcoh4/mDXGpIDHcPMZ/U3ZLLZA5dnywUsP3S3n75S83qEdX0qYXLKeJDeSTicniUjazwADcm0dUwYZ8iyUQQWbeT8fSfhBO/xRPvfF5+r8uV5ENstNcSU0Ji9mmeu2RcnB7oDoMabPiMA7E5IFepmJFhLG/ukXZGtKGrYDGwL6tY0PW/PgOYEwvA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oss.nxp.com; dmarc=pass action=none header.from=oss.nxp.com; dkim=pass header.d=oss.nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=NXP1.onmicrosoft.com; s=selector2-NXP1-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=1Pmk02RZCQAJrqokk64zasAj0KwTmI15sIczqa1QBY0=; b=czd84B4H1JgS9tXy5A5POODk1Kt5oVioqmp8Q0JmjUPhSOughkZ+uh0g6wS9YxDgWHnGC4hgbw4EQHm1s3UmT8DwtSKq312+uNU9rZApZHgE0zU5zBQ9Usi5rARPBsYr3yjszZlqInXGTc4ff/isbgD23XGW6zgQ42OsaFxI0cE= Authentication-Results: nuviainc.com; dkim=none (message not signed) header.d=none;nuviainc.com; dmarc=none action=none header.from=oss.nxp.com; Received: from VI1PR04MB5933.eurprd04.prod.outlook.com (2603:10a6:803:ec::16) by VI1PR04MB4429.eurprd04.prod.outlook.com (2603:10a6:803:6e::29) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2937.13; Thu, 30 Apr 2020 05:51:33 +0000 Received: from VI1PR04MB5933.eurprd04.prod.outlook.com ([fe80::45c4:8846:5327:9513]) by VI1PR04MB5933.eurprd04.prod.outlook.com ([fe80::45c4:8846:5327:9513%7]) with mapi id 15.20.2958.020; Thu, 30 Apr 2020 05:51:33 +0000 From: "Pankaj Bansal" To: Leif Lindholm , Meenakshi Aggarwal , Michael D Kinney , devel@edk2.groups.io, Varun Sethi , Samer El-Haj-Mahmoud , Jon Nettleton , Ard Biesheuvel Subject: [PATCH edk2-platforms v4 11/24] Platform/NXP: rename the ArmPlatformLib as per ArmPlatformPkg Date: Fri, 1 May 2020 11:19:42 +0530 Message-ID: <20200501054955.13025-12-pankaj.bansal@oss.nxp.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200501054955.13025-1-pankaj.bansal@oss.nxp.com> References: <20200501054955.13025-1-pankaj.bansal@oss.nxp.com> X-ClientProxiedBy: SG2PR03CA0131.apcprd03.prod.outlook.com (2603:1096:4:91::35) To VI1PR04MB5933.eurprd04.prod.outlook.com (2603:10a6:803:ec::16) Return-Path: pankaj.bansal@oss.nxp.com MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from uefi-workstation.ap.freescale.net (92.120.0.69) by SG2PR03CA0131.apcprd03.prod.outlook.com (2603:1096:4:91::35) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2979.14 via Frontend Transport; Thu, 30 Apr 2020 05:51:30 +0000 X-Mailer: git-send-email 2.17.1 X-Originating-IP: [92.120.0.69] X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 09f7d367-34ed-45e9-5313-08d7ecca8953 X-MS-TrafficTypeDiagnostic: VI1PR04MB4429:|VI1PR04MB4429: X-MS-Exchange-SharedMailbox-RoutingAgent-Processed: True X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:7219; X-Forefront-PRVS: 0389EDA07F X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:VI1PR04MB5933.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFTY:;SFS:(4636009)(136003)(376002)(39860400002)(346002)(366004)(396003)(6512007)(26005)(16526019)(5660300002)(6666004)(478600001)(186003)(2906002)(110136005)(52116002)(6486002)(316002)(8676002)(6506007)(66476007)(19627235002)(86362001)(2616005)(66946007)(44832011)(956004)(66556008)(1076003)(8936002);DIR:OUT;SFP:1101; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 8eMfBdhv7ssDOFsERQkzjTjAStNAoCXlwj3S2h4ddajqAbZAkjq7u8lVfNTEhpaB4Ev5K7kzqD0rOx5ZAAoQcpnkkI4yli0QgnkdYQJ5qX+4ygeE2+0iHpF1eyEdR8J5AvFG+wEyTT0ompzj/kGp63gFn34fSxtsl6dX7sWyJBK0F1+u3ncZNQFNHhxTIqA7dfU51rZT6fHF7xUe64MzVJ9zFn9HnLPadERjSrsE0xd3YQR7sEA6IB0wjKJqsnzU3halPOG6t1NFB+uleZRhe+jqEoEqxzIPRwDAcbahb0na9el4PncCQWJzxiWgoLFVkc9akaFrKpc+wnx+pVUVGD1IY5J2VDD61GeMAP2LCiKsoXlB6YmzsffXXybYGRlXgwmtEtnN70jAwahwr0bd8m9lJm6E2crj0WHrh43V5umqoZPIiSXOxR9o9jdYOuEx X-MS-Exchange-AntiSpam-MessageData: d0bmMhASdqC2Z8YvrGMl32OWwn7uZfh1Swj+kvVbh8b9H5SMJbsOekY2+Di73YtJQDX7m/qE6OgYh1ZFgsmJgg+m2Wi/2d01JCdDXwiFP59w0tBseF/Hwk8deJJhcW2iiMj6OWbwgmNyCgR1UfUg7+YpUmxBSGOxLq1BxfYnXyFYV0jhwCj1lMqXSxdyT+yLzwRi0YopCHHfBCygJ53O2BYgAhHfZN/DBMS+t2oFqlPF1UvyAhfERL7YGs/l14lfqRo8Jm3DEYthnFLWDQiBktA08/4hzGc2J4hj5UJqlk3MhZzmBpqWXdPZ7uKzUtJcFbVFfWiDulpFyOydJG1+pD0jrrACN7YAcU0gMysL/I3tUCdMJzY+wOit8EG23KN4LKBU64yM9pu0QLSLw5b2DJZuTmFEL0zcyOdlfR0CSnQ17VFNnclA49GvCPewRclBDPoMERTH1WATL18yccx9pyxyG982onwdLhJ3sHgleNy4ybRc/CgrXoyR37bvpAnx1GqZGvFJNHtBmWg3ao4RlaXqfJXYG0JO0U7YY8cnJk/cv8ZSH8ZJUWvRNiWipv6dmMw/vth/CiiNF7zZZP+TlWCPj0q19Uke45Zf8GoYKy4Qmbf96P16RVTaCjpl/uAM0It3XuoWEiRvkg08TEkHOU77qGA3PDgJU69gMYU0x3aOWFX4S5UuWO+N/mCmcTE1UC3GOx6BhaGxU1HLrriZl9MEzgu6JlinsRumIIh7zwYchmbEvueCeoS5n5GY34DqM4AWM64y59nOUdqUsQZoRB9nkCJnMppgrZXBOeJrJ0Y= X-OriginatorOrg: oss.nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 09f7d367-34ed-45e9-5313-08d7ecca8953 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Apr 2020 05:51:33.0381 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: 9eiyWxgypR6Tt5JNKjrEuQbGG5AWjJsKsp66Mjki8TzOvFUBtvx+dtXP8tibeu0Ri5A+ruppm6OL0jl+jXFx6g== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB4429 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain From: Pankaj Bansal Keep the names and location of files as mentioned in ArmPlatformPkg. This helps in porting the common changes (if any in future) easily. Signed-off-by: Pankaj Bansal Reviewed-by: Leif Lindholm --- Notes: V4: - No change =20 V3: - No change Platform/NXP/LS1043aRdbPkg/LS1043aRdbPkg.dsc = | 2 +- Platform/NXP/LS1043aRdbPkg/Library/{PlatformLib =3D> ArmPlatformLib}/ArmPl= atformLib.inf | 4 ++-- Platform/NXP/LS1043aRdbPkg/Library/{PlatformLib =3D> ArmPlatformLib}/ArmPl= atformLib.c | 2 +- Platform/NXP/LS1043aRdbPkg/Library/{PlatformLib/NxpQoriqLsMem.c =3D> ArmPl= atformLib/ArmPlatformLibMem.c} | 0 Platform/NXP/LS1043aRdbPkg/Library/{PlatformLib/NxpQoriqLsHelper.S =3D> Ar= mPlatformLib/AArch64/ArmPlatformHelper.S} | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Platform/NXP/LS1043aRdbPkg/LS1043aRdbPkg.dsc b/Platform/NXP/LS= 1043aRdbPkg/LS1043aRdbPkg.dsc index 1975f2c4c52c..e5383aaf0cc5 100644 --- a/Platform/NXP/LS1043aRdbPkg/LS1043aRdbPkg.dsc +++ b/Platform/NXP/LS1043aRdbPkg/LS1043aRdbPkg.dsc @@ -26,7 +26,7 @@ !include Silicon/NXP/LS1043A/LS1043A.dsc.inc =20 [LibraryClasses.common] - ArmPlatformLib|Platform/NXP/LS1043aRdbPkg/Library/PlatformLib/ArmPlatfor= mLib.inf + ArmPlatformLib|Platform/NXP/LS1043aRdbPkg/Library/ArmPlatformLib/ArmPlat= formLib.inf RealTimeClockLib|Silicon/Maxim/Library/Ds1307RtcLib/Ds1307RtcLib.inf =20 [PcdsFixedAtBuild.common] diff --git a/Platform/NXP/LS1043aRdbPkg/Library/PlatformLib/ArmPlatformLib.= inf b/Platform/NXP/LS1043aRdbPkg/Library/ArmPlatformLib/ArmPlatformLib.inf similarity index 89% rename from Platform/NXP/LS1043aRdbPkg/Library/PlatformLib/ArmPlatformLib.i= nf rename to Platform/NXP/LS1043aRdbPkg/Library/ArmPlatformLib/ArmPlatformLib.= inf index 7563a1c43630..7a43ad86d183 100644 --- a/Platform/NXP/LS1043aRdbPkg/Library/PlatformLib/ArmPlatformLib.inf +++ b/Platform/NXP/LS1043aRdbPkg/Library/ArmPlatformLib/ArmPlatformLib.inf @@ -27,8 +27,8 @@ SocLib =20 [Sources.common] - NxpQoriqLsHelper.S | GCC - NxpQoriqLsMem.c + AArch64/ArmPlatformHelper.S | GCC + ArmPlatformLibMem.c ArmPlatformLib.c =20 [Ppis] diff --git a/Platform/NXP/LS1043aRdbPkg/Library/PlatformLib/ArmPlatformLib.= c b/Platform/NXP/LS1043aRdbPkg/Library/ArmPlatformLib/ArmPlatformLib.c similarity index 93% rename from Platform/NXP/LS1043aRdbPkg/Library/PlatformLib/ArmPlatformLib.c rename to Platform/NXP/LS1043aRdbPkg/Library/ArmPlatformLib/ArmPlatformLib.= c index eac7d4aa4e47..718c71bf02eb 100644 --- a/Platform/NXP/LS1043aRdbPkg/Library/PlatformLib/ArmPlatformLib.c +++ b/Platform/NXP/LS1043aRdbPkg/Library/ArmPlatformLib/ArmPlatformLib.c @@ -6,7 +6,7 @@ * * Copyright (c) 2011-2012, ARM Limited. All rights reserved. * Copyright (c) 2016, Freescale Semiconductor, Inc. All rights reserved. -* Copyright 2017 NXP +* Copyright 2017, 2020 NXP * SPDX-License-Identifier: BSD-2-Clause-Patent * **/ diff --git a/Platform/NXP/LS1043aRdbPkg/Library/PlatformLib/NxpQoriqLsMem.c= b/Platform/NXP/LS1043aRdbPkg/Library/ArmPlatformLib/ArmPlatformLibMem.c similarity index 100% rename from Platform/NXP/LS1043aRdbPkg/Library/PlatformLib/NxpQoriqLsMem.c rename to Platform/NXP/LS1043aRdbPkg/Library/ArmPlatformLib/ArmPlatformLibM= em.c diff --git a/Platform/NXP/LS1043aRdbPkg/Library/PlatformLib/NxpQoriqLsHelpe= r.S b/Platform/NXP/LS1043aRdbPkg/Library/ArmPlatformLib/AArch64/ArmPlatform= Helper.S similarity index 88% rename from Platform/NXP/LS1043aRdbPkg/Library/PlatformLib/NxpQoriqLsHelper= .S rename to Platform/NXP/LS1043aRdbPkg/Library/ArmPlatformLib/AArch64/ArmPlat= formHelper.S index 84ee8c9f9700..dfbf73675a2d 100644 --- a/Platform/NXP/LS1043aRdbPkg/Library/PlatformLib/NxpQoriqLsHelper.S +++ b/Platform/NXP/LS1043aRdbPkg/Library/ArmPlatformLib/AArch64/ArmPlatform= Helper.S @@ -1,7 +1,7 @@ # @file # # Copyright (c) 2012-2013, ARM Limited. All rights reserved. -# Copyright 2017 NXP +# Copyright 2017, 2020 NXP # # SPDX-License-Identifier: BSD-2-Clause-Patent # --=20 2.17.1