From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from EUR01-HE1-obe.outbound.protection.outlook.com (EUR01-HE1-obe.outbound.protection.outlook.com [40.107.13.77]) by mx.groups.io with SMTP id smtpd.web09.1385.1581060251535886040 for ; Thu, 06 Feb 2020 23:24:12 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@nxp.com header.s=selector2 header.b=lcPZS0XB; spf=pass (domain: nxp.com, ip: 40.107.13.77, mailfrom: pankaj.bansal@nxp.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=L0gNOiv3BwRgDGdHVDGlpf+jtUtZofZLuNVonptOqJGtgAQgRBofY4iWN3SI8Z4OXdzBeYLwE9Ab6gdxUsAFIAdJakqorUJ5gAI7Qwjn06V3QsJrewK+S92Abo0o2ZSL1PF0nzVXAePwHblQ5R+HgFSi3gZpRWv75h8GpuryxgNfMwwXekFzziQaXmeDAA2ChzmeSnJkR0ayyapj1cXId1Izgcpg+XR5FVqy0ZJ9Anos7ftixmrNXxg/OIEeU15JFoDFMvonIEOY9Y2BeaBbG25bpqAJ9Ltflm9EhWnIYtbh77eZdKeZKDFB5Ba/UEH3yvKBopwzKRe2nTQAWZL7Hg== 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=HeeI7nWswIaOsK1XhK+yPWpwYF/FdNc8uhQAux2OtJY=; b=kFWtRKCxDtt2ITfIZC4pw2LDWxWN34fGjloDOvPpfu+XiHRhnj/5eI3Qd9+BGtvmtXiX6oC6WLuLBl1WVDdjSMfDva9Vi9guYYpgQlizTst4+LThXAGzDnUvuiW3UUkvLR/MTz7n8EENxovAx+J0IFhMVhJIG0tE40t1eQH6Q0JIAvL9xmYgyovzvMcLhyvEg9rA3SSWA4RhfrhuTSj7a/8eKzAPk425ipwpZqQGzicDdzfub4FSYLo2ZIFx0iF8RS94rN2El6UM9G/eQB9/uKnV3XgmJufhpWW8/3Q0bE2mknL0aKl3xuELjFEgOqZ2bo5a1xvdVMqG+d9q1yCDKg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nxp.com; dmarc=pass action=none header.from=nxp.com; dkim=pass header.d=nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=HeeI7nWswIaOsK1XhK+yPWpwYF/FdNc8uhQAux2OtJY=; b=lcPZS0XBv2Sniargw+p383YG+FAZQDdhpa3/n4IPY/rW2qepQ2BqHCD+Os39dKy1gqw7PQORE+qCZvRWJXIABYV7K/s8ZiKZ467doSRAXjS/Bv4WzKUK8KprgBrdTAezOciffi+pc4Q5STQWSVd1ET3XPhOaMx+yySbMrEnEb28= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=pankaj.bansal@nxp.com; Received: from VI1PR0401MB2496.eurprd04.prod.outlook.com (10.168.65.10) by VI1PR0401MB2575.eurprd04.prod.outlook.com (10.168.62.136) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2707.21; Fri, 7 Feb 2020 07:24:08 +0000 Received: from VI1PR0401MB2496.eurprd04.prod.outlook.com ([fe80::8823:663d:c6ed:cbd6]) by VI1PR0401MB2496.eurprd04.prod.outlook.com ([fe80::8823:663d:c6ed:cbd6%12]) with mapi id 15.20.2686.036; Fri, 7 Feb 2020 07:24:08 +0000 From: "Pankaj Bansal" To: Leif Lindholm , Meenakshi Aggarwal , Michael D Kinney , Varun Sethi Cc: devel@edk2.groups.io, Pankaj Bansal Subject: [PATCH 10/19] Platform/NXP: rename the ArmPlatformLib as per ArmPlatformPkg Date: Fri, 7 Feb 2020 18:13:19 +0530 Message-Id: <20200207124328.8723-11-pankaj.bansal@nxp.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200207124328.8723-1-pankaj.bansal@nxp.com> References: <20200207124328.8723-1-pankaj.bansal@nxp.com> X-ClientProxiedBy: PN1PR01CA0103.INDPRD01.PROD.OUTLOOK.COM (2603:1096:c00::19) To VI1PR0401MB2496.eurprd04.prod.outlook.com (2603:10a6:800:56::10) Return-Path: pankaj.bansal@nxp.com MIME-Version: 1.0 Received: from uefi-workstation.ap.freescale.net (92.120.1.69) by PN1PR01CA0103.INDPRD01.PROD.OUTLOOK.COM (2603:1096:c00::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2707.21 via Frontend Transport; Fri, 7 Feb 2020 07:24:07 +0000 X-Mailer: git-send-email 2.17.1 X-Originating-IP: [92.120.1.69] X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: c5111286-8f89-4e7c-f26b-08d7ab9eb880 X-MS-TrafficTypeDiagnostic: VI1PR0401MB2575:|VI1PR0401MB2575: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:7219; X-Forefront-PRVS: 0306EE2ED4 X-Forefront-Antispam-Report: SFV:NSPM;SFS:(10009020)(4636009)(346002)(366004)(376002)(39860400002)(136003)(396003)(189003)(199004)(6512007)(478600001)(86362001)(66556008)(66476007)(66946007)(52116002)(6636002)(5660300002)(19627235002)(6486002)(316002)(956004)(6666004)(26005)(8936002)(2616005)(16526019)(186003)(4326008)(44832011)(110136005)(36756003)(1076003)(8676002)(81156014)(81166006)(2906002)(6506007);DIR:OUT;SFP:1101;SCL:1;SRVR:VI1PR0401MB2575;H:VI1PR0401MB2496.eurprd04.prod.outlook.com;FPR:;SPF:None;LANG:en;PTR:InfoNoRecords;MX:1;A:1; Received-SPF: None (protection.outlook.com: nxp.com does not designate permitted sender hosts) X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: fv8fCxlQHBDda6gkeFBebdPt1gG1p61QCQuU/egnC1Pp/+hyAD5la7Az2aP5Yh1aIvpWHVSUSKbFz6rlX24fRzbDIeLxdgPQgkH9LQhHpkHQueSePTXgx3mjjknREmSiFS1yley8fD22bSSCbeLZnsdLZjxHyOUwEqruDon06cjzAb+rY8NUjdQH92sb2UddD2pe+hxVoafUzuk160xBL8zuOSzjFRuLPA3UzOZZlbc03H4juEHgg6XHdQMtFyexJFqngW6aJwiFsl8WL2Fa0k+IwxPH9O1xqS31FgbOxMOhpcaFHO97khJx/dsjlPCYE65/2iTPQHnpMvxHgmTLgkGYR8T5c1N/lNH/8+rLWFuHCCrN4jD7UEn/cE8JpHJQKQ4bqXNWgA+p1h4DiLHJ5I9O5nxpio9QvEqBBxWAyu9RnAWNHD4hKpdcaG4Zg2j2 X-MS-Exchange-AntiSpam-MessageData: X75b15Jo8ny6V4cy5sRzLAveYWSopYPmwLJp06ez0s/+Cl822FTf4OU0SuMblVfpuaWCyvPJBH+eZ53DCGhr+fzxmINa4viy9oY9DAhsucomkuATpA7dDb24NcpWTUG5gmg1nzhkJqq+BcQkUAdywQ== X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: c5111286-8f89-4e7c-f26b-08d7ab9eb880 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Feb 2020 07:24:08.7654 (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: +Mneiu8AmWgYtrpK6L8npt9zETpLRD8sGoJrvvlwu3IRfFxCCD+bOqSvOsQY7CADnug6P6GTDil/CWWDNWEzhw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR0401MB2575 Content-Type: text/plain 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 --- Platform/NXP/LS1043aRdbPkg/LS1043aRdbPkg.dsc | 2 +- .../AArch64}/NxpQoriqLsHelper.S | 2 +- .../Library/{PlatformLib => ArmPlatformLib}/ArmPlatformLib.c | 2 +- .../{PlatformLib => ArmPlatformLib}/ArmPlatformLib.inf | 4 ++-- .../NxpQoriqLsMem.c => ArmPlatformLib/ArmPlatformLibMem.c} | 0 5 files changed, 5 insertions(+), 5 deletions(-) rename Platform/NXP/LS1043aRdbPkg/Library/{PlatformLib => ArmPlatformLib/AArch64}/NxpQoriqLsHelper.S (88%) rename Platform/NXP/LS1043aRdbPkg/Library/{PlatformLib => ArmPlatformLib}/ArmPlatformLib.c (93%) rename Platform/NXP/LS1043aRdbPkg/Library/{PlatformLib => ArmPlatformLib}/ArmPlatformLib.inf (89%) rename Platform/NXP/LS1043aRdbPkg/Library/{PlatformLib/NxpQoriqLsMem.c => ArmPlatformLib/ArmPlatformLibMem.c} (100%) diff --git a/Platform/NXP/LS1043aRdbPkg/LS1043aRdbPkg.dsc b/Platform/NXP/LS1043aRdbPkg/LS1043aRdbPkg.dsc index 7cffd09d7d..bc6fa4f19d 100644 --- a/Platform/NXP/LS1043aRdbPkg/LS1043aRdbPkg.dsc +++ b/Platform/NXP/LS1043aRdbPkg/LS1043aRdbPkg.dsc @@ -26,7 +26,7 @@ !include Silicon/NXP/LS1043A/LS1043A.dsc.inc [LibraryClasses.common] - ArmPlatformLib|Platform/NXP/LS1043aRdbPkg/Library/PlatformLib/ArmPlatformLib.inf + ArmPlatformLib|Platform/NXP/LS1043aRdbPkg/Library/ArmPlatformLib/ArmPlatformLib.inf RealTimeClockLib|Silicon/Maxim/Library/Ds1307RtcLib/Ds1307RtcLib.inf [PcdsFixedAtBuild.common] diff --git a/Platform/NXP/LS1043aRdbPkg/Library/PlatformLib/NxpQoriqLsHelper.S b/Platform/NXP/LS1043aRdbPkg/Library/ArmPlatformLib/AArch64/NxpQoriqLsHelper.S similarity index 88% rename from Platform/NXP/LS1043aRdbPkg/Library/PlatformLib/NxpQoriqLsHelper.S rename to Platform/NXP/LS1043aRdbPkg/Library/ArmPlatformLib/AArch64/NxpQoriqLsHelper.S index 84ee8c9f97..dfbf73675a 100644 --- a/Platform/NXP/LS1043aRdbPkg/Library/PlatformLib/NxpQoriqLsHelper.S +++ b/Platform/NXP/LS1043aRdbPkg/Library/ArmPlatformLib/AArch64/NxpQoriqLsHelper.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 # 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 eac7d4aa4e..718c71bf02 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/ArmPlatformLib.inf b/Platform/NXP/LS1043aRdbPkg/Library/ArmPlatformLib/ArmPlatformLib.inf similarity index 89% rename from Platform/NXP/LS1043aRdbPkg/Library/PlatformLib/ArmPlatformLib.inf rename to Platform/NXP/LS1043aRdbPkg/Library/ArmPlatformLib/ArmPlatformLib.inf index 054dc4d003..6396d2982b 100644 --- a/Platform/NXP/LS1043aRdbPkg/Library/PlatformLib/ArmPlatformLib.inf +++ b/Platform/NXP/LS1043aRdbPkg/Library/ArmPlatformLib/ArmPlatformLib.inf @@ -27,8 +27,8 @@ SocLib [Sources.common] - NxpQoriqLsHelper.S | GCC - NxpQoriqLsMem.c + AArch64/NxpQoriqLsHelper.S | GCC + ArmPlatformLibMem.c ArmPlatformLib.c [Ppis] 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/ArmPlatformLibMem.c -- 2.17.1