From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from EUR04-HE1-obe.outbound.protection.outlook.com (EUR04-HE1-obe.outbound.protection.outlook.com [40.107.7.40]) by mx.groups.io with SMTP id smtpd.web08.7566.1666184026227619564 for ; Wed, 19 Oct 2022 05:53:47 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@armh.onmicrosoft.com header.s=selector2-armh-onmicrosoft-com header.b=PoKed0UY; spf=pass (domain: arm.com, ip: 40.107.7.40, mailfrom: sami.mujawar@arm.com) ARC-Seal: i=2; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=pass; b=huZ3Ussq6/Jvy7oRgJ5ohd5HiZVb6x56pbzg3Fx56J4JggS0KBIn4moeVFoSLF/KTokiOwSW9j27+iRHm7/WbX7757EuuADdx41fxJ18IjrBAbb2A4Myrb8uYMWlJHw3XIBfwKDhDKpP4Hsox+l6BiezxM/qYLl3r693MT3JpuzwH/2xhKyKaJSkBZK7TRQkzGn+/l72SxFSCcejkS3BAdhnNS0pJsa4a+QEKrkxPgSLeAx1ddlmn1vnJLws7oX88nFtaoxl3MoXyH9MYCHXBJt6VED/Q3bYPdLrehcZbvuHfxXlDaxJy13KbuTZrCL10PGESXE7mDDc33bAmHpx5g== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=9NfOyHRDObvptUlJBLX/H4RVKh/gmgZvniY1dqfLP1U=; b=QaqraNXg+n87y5Wk5nOthrzjmNM0XWD1oed8w47d1vDaoAyR2LAtHtN5+gVkofYeYPPbCcRfiz5N0DZjU9nTW1QOnTu2z2MtU7PYmYWrZIO/o0tvqjOogOWvQ4nhOIaSHnh2MLen87cmQP9wYNjZK+WxYfkbz1ULPm4mboO3dW1FzoqUFV09MVtVK1fPkXnNGUkMXvqKAiKrUCvBLKVCSwXJjHHdIRVuNxTnsxnhhdArq/CnJYAJtbHCkoyvIEc/aoyYYHm3Iz1ySLxy+4r7sZQesbYHcklME2MticiUdDcnvm/RxnTUy/0a42hcviX84n96WIlux5bpzUpioE6EMg== ARC-Authentication-Results: i=2; mx.microsoft.com 1; spf=pass (sender ip is 63.35.35.123) smtp.rcpttodomain=edk2.groups.io smtp.mailfrom=arm.com; dmarc=pass (p=none sp=none pct=100) action=none header.from=arm.com; dkim=pass (signature was verified) header.d=armh.onmicrosoft.com; arc=pass (0 oda=1 ltdi=1 spf=[1,1,smtp.mailfrom=arm.com] dkim=[1,1,header.d=arm.com] dmarc=[1,1,header.from=arm.com]) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=armh.onmicrosoft.com; s=selector2-armh-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=9NfOyHRDObvptUlJBLX/H4RVKh/gmgZvniY1dqfLP1U=; b=PoKed0UY8HdsQB9Ol5Pd10aW82FPD2Xv3vbPyaJdDts7SEoN5Jke6+ShLf4kJEOSpnG9SAEUfd3vbBEgWX6EqahPNSlv1+Q3E74W7s2Ab/Q18S3sQQxVKmGJkFlski7s/yjown+lXClUgp5KKh9wrZ5hdblUWFnMubzazwbXVr8= Received: from DB7PR05CA0021.eurprd05.prod.outlook.com (2603:10a6:10:36::34) by DU0PR08MB8373.eurprd08.prod.outlook.com (2603:10a6:10:40a::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5723.26; Wed, 19 Oct 2022 12:53:42 +0000 Received: from DBAEUR03FT026.eop-EUR03.prod.protection.outlook.com (2603:10a6:10:36:cafe::d1) by DB7PR05CA0021.outlook.office365.com (2603:10a6:10:36::34) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5723.30 via Frontend Transport; Wed, 19 Oct 2022 12:53:42 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 63.35.35.123) smtp.mailfrom=arm.com; dkim=pass (signature was verified) header.d=armh.onmicrosoft.com;dmarc=pass action=none header.from=arm.com; Received-SPF: Pass (protection.outlook.com: domain of arm.com designates 63.35.35.123 as permitted sender) receiver=protection.outlook.com; client-ip=63.35.35.123; helo=64aa7808-outbound-1.mta.getcheckrecipient.com; pr=C Received: from 64aa7808-outbound-1.mta.getcheckrecipient.com (63.35.35.123) by DBAEUR03FT026.mail.protection.outlook.com (100.127.142.242) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5709.10 via Frontend Transport; Wed, 19 Oct 2022 12:53:42 +0000 Received: ("Tessian outbound b4aebcc5bc64:v130"); Wed, 19 Oct 2022 12:53:42 +0000 X-CheckRecipientChecked: true X-CR-MTA-CID: 92c01bfa2014d5af X-CR-MTA-TID: 64aa7808 Received: from 4acf213ea2cb.2 by 64aa7808-outbound-1.mta.getcheckrecipient.com id EF3DCE39-7B19-48CD-B528-4167D1C62A0B.1; Wed, 19 Oct 2022 12:53:36 +0000 Received: from EUR04-HE1-obe.outbound.protection.outlook.com by 64aa7808-outbound-1.mta.getcheckrecipient.com with ESMTPS id 4acf213ea2cb.2 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384); Wed, 19 Oct 2022 12:53:36 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=G4oQ5DAWsEcAo4st190ChpfeBgPnb8mAE7cPG69EhC/x7ouoTKZqQ0d1rb0HTUBXH2e/rXI6jir6aoLLYuF4s1zbHXMD7jUn22MKNMzVZAD9cfFG/zWINenKVHg53XWohg9sIJq1RAbuQCgpXb5DbJ3S0sBE3TXMVop1lwJGURqKWYdT2/U2EplJovhmVAfDxZK3G2Rmzei05hs/3CbKjN+MH8JLAh5gvB8/nd9ZS4tKPjOInpBCGWchQlpYfG/TM/xReVYSAT5mwlubHitATqp64tGuMG465FzV/stsJjDU38LATgqAMf1ioT6IwifqmqICPVmSW0OE9pcw5lqiMA== 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-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=9NfOyHRDObvptUlJBLX/H4RVKh/gmgZvniY1dqfLP1U=; b=ER/Z3H7JWaddKIjv1uKGfLCY/EQsVOEqepZzC7w2YWus26/MyLQ+/+l4o69PCohdbc3dV6LHuPeqUrJfLaFiJsgoO3iqyhva9Uw38dXR7R/AQlp99Iw0t3Oz5eLdbT/715vb03ajirSdqr8vbyj/URTD1axC5rSis2dPsRV/RxvxofedW7fLoRx/s1o6NY8wPf2ZrNs2hs3DOtsEtRnSaMZ2/ywrfRdhCApRDrYvn9yUftwXjvQxAXfYzNYszOR0Jth/WgM2SJfIlKjA2Ef0nyU9L1j9r2knfCGzT/QtIQUtyDEy8jaKx/KvTwjWc3yop7rHyhvib0otYZCIXnDcfA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=arm.com; dmarc=pass action=none header.from=arm.com; dkim=pass header.d=arm.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=armh.onmicrosoft.com; s=selector2-armh-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=9NfOyHRDObvptUlJBLX/H4RVKh/gmgZvniY1dqfLP1U=; b=PoKed0UY8HdsQB9Ol5Pd10aW82FPD2Xv3vbPyaJdDts7SEoN5Jke6+ShLf4kJEOSpnG9SAEUfd3vbBEgWX6EqahPNSlv1+Q3E74W7s2Ab/Q18S3sQQxVKmGJkFlski7s/yjown+lXClUgp5KKh9wrZ5hdblUWFnMubzazwbXVr8= Authentication-Results-Original: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=arm.com; Received: from AS8PR08MB6806.eurprd08.prod.outlook.com (2603:10a6:20b:39b::12) by AM7PR08MB5319.eurprd08.prod.outlook.com (2603:10a6:20b:dc::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5723.30; Wed, 19 Oct 2022 12:53:34 +0000 Received: from AS8PR08MB6806.eurprd08.prod.outlook.com ([fe80::283c:fe2e:699d:2bf]) by AS8PR08MB6806.eurprd08.prod.outlook.com ([fe80::283c:fe2e:699d:2bf%5]) with mapi id 15.20.5723.033; Wed, 19 Oct 2022 12:53:34 +0000 Message-ID: <7630476e-2984-eb98-230d-a0eb698cfe8e@arm.com> Date: Wed, 19 Oct 2022 13:53:32 +0100 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:102.0) Gecko/20100101 Thunderbird/102.3.3 Subject: Re: [PATCH edk2-platforms 4/4] Platform/ARM: switch to local version of NorFlashDxe drivers To: Ard Biesheuvel , devel@edk2.groups.io Cc: Leif Lindholm , Thomas Abraham , "nd@arm.com" References: <20221019103555.493477-1-ardb@kernel.org> <20221019103555.493477-5-ardb@kernel.org> From: "Sami Mujawar" In-Reply-To: <20221019103555.493477-5-ardb@kernel.org> X-ClientProxiedBy: LO2P265CA0226.GBRP265.PROD.OUTLOOK.COM (2603:10a6:600:b::22) To AS8PR08MB6806.eurprd08.prod.outlook.com (2603:10a6:20b:39b::12) MIME-Version: 1.0 X-MS-TrafficTypeDiagnostic: AS8PR08MB6806:EE_|AM7PR08MB5319:EE_|DBAEUR03FT026:EE_|DU0PR08MB8373:EE_ X-MS-Office365-Filtering-Correlation-Id: b2fbe8b3-7218-4226-62ea-08dab1d0f396 x-checkrecipientrouted: true NoDisclaimer: true X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam-Untrusted: BCL:0; X-Microsoft-Antispam-Message-Info-Original: A/yG0QAouE9PH5aGdRkpfwqE6112xD7xPWNsKdDFZ/92h543OrRXpzmFkK4zBPTwx7/cpqtLHBYtTZHBHhjYUqMZusfsjzbmyp1MYckV1fBZ7i6tTD6ngbViAnYOU2JU478Rc2mZyTK2munZxwGpQQ4oXki+1a8rOJSxda/LQek7mrhN7DKj4TKNuDSCFbS5KOfSWj7lIxRtSVBh7a0nbCna7PsQShkiEraXO8K/3R4kQnjEWNuHNPyY+376iNdioYw3wtLxSL+4PSxrc+7lEyGd2idq98J2EZgXlN+VDkHp8Rl8Ey/B3SsPlJvNlgkhjKg4aHBdG8+NWe6ZMzDzzD+cYCPaFlfrKS295Qh7nChxYWrKJrJ8/Kr5ey1nRT0iiwGP+nPawqV/WUpx07ZV4Mu7y/RuYEuBkub67vZzg9nk1N1tUFhVWRbEKD/TNfK10ZZ3rTt0hWXC9YIYv8y2Ftto/3B8MHHEXnm2032JH+0sqlWN2Ix0KbCDsrefSI58ROZGel2APgVIYE5bu51ICZgvjWoLqbQereGzjMo0PgW3axhUEkTWkIKg8AQPgHH/P8LJrS0D6AlwLbOLVavYkep/scSAv1uJd0Rqec8NP/jGwRhrBnMYsT/75noqGxw8VfUVqGTeV0SQ7u31dAjOOxcRUe7fjQoculHzV/JAqcJ16OkLUAQ4KQ8mnmhNELQufcIEJ6X7z54DvLI70oeX7sHZYLWfbzT4Xo1FYSTJ/orbT0bVjHQnwmSYUZnBI1pKI5yDqR13WdAPaBfItz4VmpCgB7x3a3M2C6UFZU9lFVA= X-Forefront-Antispam-Report-Untrusted: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:AS8PR08MB6806.eurprd08.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230022)(4636009)(346002)(396003)(376002)(366004)(39860400002)(136003)(451199015)(6486002)(186003)(83380400001)(31696002)(38100700002)(86362001)(2616005)(44832011)(5660300002)(2906002)(478600001)(8936002)(8676002)(4326008)(6506007)(6512007)(26005)(19627235002)(316002)(41300700001)(53546011)(66556008)(66476007)(66946007)(54906003)(36756003)(31686004)(45980500001)(43740500002);DIR:OUT;SFP:1101; X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM7PR08MB5319 Original-Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=arm.com; Return-Path: Sami.Mujawar@arm.com X-EOPAttributedMessage: 0 X-MS-Exchange-Transport-CrossTenantHeadersStripped: DBAEUR03FT026.eop-EUR03.prod.protection.outlook.com X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id-Prvs: 735a6f45-c050-438b-201c-08dab1d0ee84 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: +MDulP5vzd8l1b6Q7d8GNXACNqx8sZWm94FXg+5f0ly4ZnkGJqeD2VIl9URrEVOmXWagIV76cFOGeTDSuH+ksRXH4xqFoM2Xm9Mcb/VgQsuKBArP6QGgSIxBbQP1TqQmrAwS1XkzIRhNBGxxK8dbmqfzawQfiyu/RfK0VRLQ2RKwNKuH5Gji9ODB39tTtouV4euDd/76PWVKR0kcTW3UYdaRoG3fKzi7TufFkOm+yVoSwx6gvGYbu3yJTgzOAmote8lVgstKtVVxJ25up4QRV+OJMTucDMZn0EK9SfmDmPjTWAF4wXqhyevjqdArpbu1xLBAuXDubsaQTPqIKZz+sFn4ejw1GCyVUCMIi8RL1XrTYkRC7Rd+85vtW3Cwzw65VtedNwOO0bst93my52gNSv86uR3LGYcJ8NDipVefKbfIIAVmZDgwyI7ZmzX/BGz7hgg5BgBKaSpF7NLuCjRFj8q/uai0mPVLikxHaJ6npOG8g0YX+X6KaBQ9CvMg2g6J6Lf6zlKu9hossZgiwDkcYbHqFjAU0Ki5ujNFHHMrwUKP6n4gsjQDBtsK9ebNy18gZ+O7PTPJI1KP5dmNyqR2PR526TkseNETXMldZ3xvXt6wSDm9IwSGeIzKWFfrjA41/GyaS5rWs5/Egn+lReMk2qbyTPxd1Oz4V1QNbH6wq2RKWLISGKnlNSX50g06/M6ojyGyG27GZMSNbnAGUWCGRXrOnQrhuR3LZtEXCVoIvB2/DKiH/KkywE6xvM1vUCAPLIBRtaeo/NWsfLqxlnaAWLCbdahdXhlB1P/p+/iCdUpeOMDMfPKMIGDifxWNBmKa X-Forefront-Antispam-Report: CIP:63.35.35.123;CTRY:IE;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:64aa7808-outbound-1.mta.getcheckrecipient.com;PTR:ec2-63-35-35-123.eu-west-1.compute.amazonaws.com;CAT:NONE;SFS:(13230022)(4636009)(376002)(396003)(39860400002)(346002)(136003)(451199015)(46966006)(36840700001)(40470700004)(83380400001)(2906002)(186003)(336012)(31686004)(82310400005)(40480700001)(86362001)(40460700003)(41300700001)(4326008)(6506007)(26005)(8676002)(6512007)(53546011)(356005)(81166007)(82740400003)(47076005)(70586007)(36860700001)(54906003)(316002)(19627235002)(8936002)(5660300002)(31696002)(36756003)(478600001)(70206006)(44832011)(6486002)(2616005)(43740500002);DIR:OUT;SFP:1101; X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Oct 2022 12:53:42.4379 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: b2fbe8b3-7218-4226-62ea-08dab1d0f396 X-MS-Exchange-CrossTenant-Id: f34e5979-57d9-4aaa-ad4d-b122a662184d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=f34e5979-57d9-4aaa-ad4d-b122a662184d;Ip=[63.35.35.123];Helo=[64aa7808-outbound-1.mta.getcheckrecipient.com] X-MS-Exchange-CrossTenant-AuthSource: DBAEUR03FT026.eop-EUR03.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DU0PR08MB8373 Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Hi Ard, Thank you for this patch. These changes look good to me. Reviewed-by: Sami Mujawar Regards, Sami Mujawar On 19/10/2022 11:35 am, Ard Biesheuvel wrote: > Drop the dependency on the ArmPlatformPkg version of NorFlashDxe and > NorFlashStandaloneMm, which will be going away soon. Instead, depend on > the local version under Platform/ARM. > > Signed-off-by: Ard Biesheuvel > --- > Platform/ARM/SgiPkg/SgiPlatform.dsc.inc | 2 +- > Platform/ARM/SgiPkg/SgiPlatformMm.dsc.inc | 2 +- > Platform/ARM/JunoPkg/ArmJuno.dsc | 2 +- > Platform/ARM/VExpressPkg/ArmVExpress-CTA15-A7.dsc | 2 +- > Platform/ARM/VExpressPkg/ArmVExpress-FVP-AArch64.dsc | 2 +- > Platform/ARM/JunoPkg/ArmJuno.fdf | 2 +- > Platform/ARM/SgiPkg/PlatformStandaloneMm.fdf | 2 +- > Platform/ARM/SgiPkg/SgiPlatform.fdf | 2 +- > Platform/ARM/VExpressPkg/ArmVExpress-CTA15-A7.fdf | 2 +- > Platform/ARM/VExpressPkg/ArmVExpress-FVP-AArch64.fdf | 2 +- > 10 files changed, 10 insertions(+), 10 deletions(-) > > diff --git a/Platform/ARM/SgiPkg/SgiPlatform.dsc.inc b/Platform/ARM/SgiPkg/SgiPlatform.dsc.inc > index 2f5dadfaefc6..81764368a0b7 100644 > --- a/Platform/ARM/SgiPkg/SgiPlatform.dsc.inc > +++ b/Platform/ARM/SgiPkg/SgiPlatform.dsc.inc > @@ -256,7 +256,7 @@ [Components.common] > !if $(ENABLE_GOP) == TRUE > > ArmPlatformPkg/Drivers/LcdGraphicsOutputDxe/LcdGraphicsOutputDxe.inf > > !endif > > - ArmPlatformPkg/Drivers/NorFlashDxe/NorFlashDxe.inf > > + Platform/ARM/Drivers/NorFlashDxe/NorFlashDxe.inf > > EmbeddedPkg/RealTimeClockRuntimeDxe/RealTimeClockRuntimeDxe.inf > > EmbeddedPkg/MetronomeDxe/MetronomeDxe.inf > > MdeModulePkg/Core/RuntimeDxe/RuntimeDxe.inf > > diff --git a/Platform/ARM/SgiPkg/SgiPlatformMm.dsc.inc b/Platform/ARM/SgiPkg/SgiPlatformMm.dsc.inc > index 68fc3ad93a5f..ae0ff7247a6a 100644 > --- a/Platform/ARM/SgiPkg/SgiPlatformMm.dsc.inc > +++ b/Platform/ARM/SgiPkg/SgiPlatformMm.dsc.inc > @@ -122,7 +122,7 @@ [Components.common] > [Components.AARCH64] > > StandaloneMmPkg/Drivers/StandaloneMmCpu/StandaloneMmCpu.inf > > !if $(SECURE_STORAGE_ENABLE) == TRUE > > - ArmPlatformPkg/Drivers/NorFlashDxe/NorFlashStandaloneMm.inf > > + Platform/ARM/Drivers/NorFlashDxe/NorFlashStandaloneMm.inf > > MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteStandaloneMm.inf > > MdeModulePkg/Universal/Variable/RuntimeDxe/VariableStandaloneMm.inf { > > > > diff --git a/Platform/ARM/JunoPkg/ArmJuno.dsc b/Platform/ARM/JunoPkg/ArmJuno.dsc > index f7ce397633f6..a00b866c5e9a 100644 > --- a/Platform/ARM/JunoPkg/ArmJuno.dsc > +++ b/Platform/ARM/JunoPkg/ArmJuno.dsc > @@ -277,7 +277,7 @@ [Components.common] > MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf > > > > ArmPkg/Drivers/ArmGic/ArmGicDxe.inf > > - ArmPlatformPkg/Drivers/NorFlashDxe/NorFlashDxe.inf > > + Platform/ARM/Drivers/NorFlashDxe/NorFlashDxe.inf > > ArmPkg/Drivers/TimerDxe/TimerDxe.inf > > ArmPkg/Drivers/GenericWatchdogDxe/GenericWatchdogDxe.inf > > > > diff --git a/Platform/ARM/VExpressPkg/ArmVExpress-CTA15-A7.dsc b/Platform/ARM/VExpressPkg/ArmVExpress-CTA15-A7.dsc > index cb9d2d4287e3..9c5e78d6275d 100644 > --- a/Platform/ARM/VExpressPkg/ArmVExpress-CTA15-A7.dsc > +++ b/Platform/ARM/VExpressPkg/ArmVExpress-CTA15-A7.dsc > @@ -229,7 +229,7 @@ [Components.common] > MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf > > > > ArmPkg/Drivers/ArmGic/ArmGicDxe.inf > > - ArmPlatformPkg/Drivers/NorFlashDxe/NorFlashDxe.inf > > + Platform/ARM/Drivers/NorFlashDxe/NorFlashDxe.inf > > ArmPlatformPkg/Drivers/LcdGraphicsOutputDxe/LcdGraphicsOutputDxe.inf > > ArmPkg/Drivers/TimerDxe/TimerDxe.inf > > ArmPlatformPkg/Drivers/SP805WatchdogDxe/SP805WatchdogDxe.inf > > diff --git a/Platform/ARM/VExpressPkg/ArmVExpress-FVP-AArch64.dsc b/Platform/ARM/VExpressPkg/ArmVExpress-FVP-AArch64.dsc > index 8561c21fab5a..dc081794cf98 100644 > --- a/Platform/ARM/VExpressPkg/ArmVExpress-FVP-AArch64.dsc > +++ b/Platform/ARM/VExpressPkg/ArmVExpress-FVP-AArch64.dsc > @@ -289,7 +289,7 @@ [Components.common] > } > > > > ArmPkg/Drivers/ArmGic/ArmGicDxe.inf > > - ArmPlatformPkg/Drivers/NorFlashDxe/NorFlashDxe.inf > > + Platform/ARM/Drivers/NorFlashDxe/NorFlashDxe.inf > > ArmPkg/Drivers/TimerDxe/TimerDxe.inf > > !ifdef EDK2_ENABLE_PL111 > > ArmPlatformPkg/Drivers/LcdGraphicsOutputDxe/LcdGraphicsOutputDxe.inf > > diff --git a/Platform/ARM/JunoPkg/ArmJuno.fdf b/Platform/ARM/JunoPkg/ArmJuno.fdf > index c9d51c65ffdb..fca5a78cee6c 100644 > --- a/Platform/ARM/JunoPkg/ArmJuno.fdf > +++ b/Platform/ARM/JunoPkg/ArmJuno.fdf > @@ -136,7 +136,7 @@ [FV.FvMain] > INF ArmPkg/Drivers/GenericWatchdogDxe/GenericWatchdogDxe.inf > > > > # NOR Flash driver > > - INF ArmPlatformPkg/Drivers/NorFlashDxe/NorFlashDxe.inf > > + INF Platform/ARM/Drivers/NorFlashDxe/NorFlashDxe.inf > > > > # Versatile Express FileSystem > > INF Platform/ARM/Drivers/BootMonFs/BootMonFs.inf > > diff --git a/Platform/ARM/SgiPkg/PlatformStandaloneMm.fdf b/Platform/ARM/SgiPkg/PlatformStandaloneMm.fdf > index c1c24b747fa5..653aae8285a6 100644 > --- a/Platform/ARM/SgiPkg/PlatformStandaloneMm.fdf > +++ b/Platform/ARM/SgiPkg/PlatformStandaloneMm.fdf > @@ -50,7 +50,7 @@ [FV.FVMAIN_COMPACT] > > > INF StandaloneMmPkg/Core/StandaloneMmCore.inf > > !if $(SECURE_STORAGE_ENABLE) == TRUE > > - INF ArmPlatformPkg/Drivers/NorFlashDxe/NorFlashStandaloneMm.inf > > + INF Platform/ARM/Drivers/NorFlashDxe/NorFlashStandaloneMm.inf > > INF MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteStandaloneMm.inf > > INF MdeModulePkg/Universal/Variable/RuntimeDxe/VariableStandaloneMm.inf > > !endif > > diff --git a/Platform/ARM/SgiPkg/SgiPlatform.fdf b/Platform/ARM/SgiPkg/SgiPlatform.fdf > index 4018480b424c..7e55214c2001 100644 > --- a/Platform/ARM/SgiPkg/SgiPlatform.fdf > +++ b/Platform/ARM/SgiPkg/SgiPlatform.fdf > @@ -149,7 +149,7 @@ [FV.FvMain] > INF ArmPkg/Drivers/TimerDxe/TimerDxe.inf > > > > # NOR Flash driver > > - INF ArmPlatformPkg/Drivers/NorFlashDxe/NorFlashDxe.inf > > + INF Platform/ARM/Drivers/NorFlashDxe/NorFlashDxe.inf > > INF OvmfPkg/VirtioBlkDxe/VirtioBlk.inf > > > > # Graphics Output Protocol > > diff --git a/Platform/ARM/VExpressPkg/ArmVExpress-CTA15-A7.fdf b/Platform/ARM/VExpressPkg/ArmVExpress-CTA15-A7.fdf > index 8ca70a248d09..73c4ddb0995b 100644 > --- a/Platform/ARM/VExpressPkg/ArmVExpress-CTA15-A7.fdf > +++ b/Platform/ARM/VExpressPkg/ArmVExpress-CTA15-A7.fdf > @@ -90,7 +90,7 @@ [FV.FvMain] > > > INF ArmPkg/Drivers/ArmGic/ArmGicDxe.inf > > INF ArmPkg/Drivers/TimerDxe/TimerDxe.inf > > - INF ArmPlatformPkg/Drivers/NorFlashDxe/NorFlashDxe.inf > > + INF Platform/ARM/Drivers/NorFlashDxe/NorFlashDxe.inf > > INF ArmPlatformPkg/Drivers/LcdGraphicsOutputDxe/LcdGraphicsOutputDxe.inf > > INF ArmPlatformPkg/Drivers/SP805WatchdogDxe/SP805WatchdogDxe.inf > > > > diff --git a/Platform/ARM/VExpressPkg/ArmVExpress-FVP-AArch64.fdf b/Platform/ARM/VExpressPkg/ArmVExpress-FVP-AArch64.fdf > index a7d048273b37..e836691ddf6f 100644 > --- a/Platform/ARM/VExpressPkg/ArmVExpress-FVP-AArch64.fdf > +++ b/Platform/ARM/VExpressPkg/ArmVExpress-FVP-AArch64.fdf > @@ -112,7 +112,7 @@ [FV.FvMain] > > > INF ArmPkg/Drivers/ArmGic/ArmGicDxe.inf > > INF ArmPkg/Drivers/TimerDxe/TimerDxe.inf > > - INF ArmPlatformPkg/Drivers/NorFlashDxe/NorFlashDxe.inf > > + INF Platform/ARM/Drivers/NorFlashDxe/NorFlashDxe.inf > > !ifdef EDK2_ENABLE_PL111 > > INF ArmPlatformPkg/Drivers/LcdGraphicsOutputDxe/LcdGraphicsOutputDxe.inf > > !endif >