From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from EUR05-VI1-obe.outbound.protection.outlook.com (EUR05-VI1-obe.outbound.protection.outlook.com [40.107.21.49]) by mx.groups.io with SMTP id smtpd.web12.2021.1588225926669643129 for ; Wed, 29 Apr 2020 22:52:07 -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=aQU2GE9f; spf=pass (domain: oss.nxp.com, ip: 40.107.21.49, mailfrom: pankaj.bansal@oss.nxp.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Er8kV+dNBuoG6r7rcV/Qw7pE+qz3uj6q6yF0dTus9J2MuUmrqj9EBN2ylcXZ7aWDAur/gAEe1xToB0oqLHqIdBcohcR9sMeKDwsnmVOV59Yl+jZhcjvRlYqewQZ9XWuEF3sne2AmlXCw66rWqGeJdID9pdx3hJYGM2nMZTmb6ipsOpVxSOOMAxgTxdMYgTmuDUje7eW+mKGgkvycE90uCi42i+ov+VB+HJfVJBjbPWy2cT08k5cZfNetbXS76/5OdyWFII90BC4mFPpFrnE/vvlMS70bQE7G6egJzLxw+zPDjJf+qWyGk2urcpcpDeFQuAil+neVMJl6xNqwLn8vjQ== 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=RL2kWbragBblM7iVJJADYbKP6FodTQEf5aZtEsB6jJI=; b=MUiXRdA6TwbgrEjwJKmw1wzodjyh8i/0XSJk+GsMb9BjPLD7X5V6yALmlOj7x1pXOOlrjhr86xxi5lwly1pnE5b6kkOu0Z7sc6+NHYyi/F67lNV99FKxgnEtpZmDcUUkw5m3G0AhLvisozoftmAkJN7ijlPcGEwX9Jn9G0ioxSXdSxZowxD2S3gVVMJeIsyXiypr1er2JVdalJL5+lWglv77OeerCXFM8HFDAhOBMYAkfXT0l5F1xqolpzxRQPVdD2GYNnymKXR3afwGoP70qOPmE4p024SUh3ulaZmsDmd/BVjutO5OQtu34uiB3nkFqxjCm0SUy8YuzpHVSIOsgw== 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=RL2kWbragBblM7iVJJADYbKP6FodTQEf5aZtEsB6jJI=; b=aQU2GE9fhDHpTyA4xvUsaSV06d/kdJ650j1llgVvP+WaxE3vrR2D6HAYn4EDHtKYoJnsU0dk0ey/4xCQhjwj5LEqli+FUoZUaHEP7PkO+GOeGq5IbWW5AHaDQFUhBA0cy3vvdrXUAUa9wvNNaJTjBSowB16kQ+Z8f9pCRAIgp18= 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:52:02 +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:52:02 +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 21/24] Platform/NXP: Use FV rules from ArmVirtPkg Date: Fri, 1 May 2020 11:19:52 +0530 Message-ID: <20200501054955.13025-22-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:59 +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: 3b978e19-8c46-46ba-d5ca-08d7ecca9ac6 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:353; 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)(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: 6svoX0ctWqh3A8FUPXlJeCMNwoDQsaH3yJxyBs4RBHsaRbFDMKEKsuJ0lK3MNtWPnWvSa5GqUG6Y7E8ZBlkU0TDD5SsBeH+Zgh7q77tJtIjnsZ+7+4VotV28UzptUYNt7OcdX24JuDwAAXGOO6GasxPgjDAxCbzYf+B3tkwedujPf8hOO31ulCknQvpCT52XMhPtGjKtjl6S1+k7N91KHblNqYIKRpxRV0HCWvLWiMYnR0CD7YYYT56geFYzOxi7cy1xUYfQeDmmNaa67xrzAjzEo44nc4LAQkTCQwIxM9clXkOxrAcxt/OOB6Gu2v6gWtRps8d7HTIGL0sa5N18MP8yeJlzdW2WevUtEgUvstEanhTXqCya7iQYb1mAQGi+KaZEbsB559LPH0TtUZWs7VNR580Afj4gcaNJR6VOFJjAfoo4BVYpBWdgzQJOs8v9 X-MS-Exchange-AntiSpam-MessageData: riwmCe679ESd1Ajen/zqHrcWRzdpW2pJJ+5ZHBXq88w2v1pcKKd+rPsr8bL0onDNM9vxyp+243FRYlRGRspM9WYBP19gVSvcVZykuuUHbbHgbFe14femQb7vvTZ8Q2ppclr2drWk1I1BbyGNkkueEVifmdZov7xHpKFDPNnMLytM60GoPvKx3Cbrqaam/rjoUcZPTeUDmfyZRkuZx2ec83Sr8Oa5m0ltJioqe7UV6JbtFodqHIBbR5aH3S5E5fLQY9NRy3o9MJaIztUJ9o1RLt0rSV6vKJECfdOx8Ejsh/ShZhUUQc2JAjZ5zmSKtdzBFNoVFm0a4EJsCcwQeOt2tu4LSoxpM7uUFRADbHr+x5o0TiD3E2AHJ8ZRD/Y45hKhTPm18YdTIMvuSBLD5jtamTbBKCGp7gmyaCWjmkd5ZZu8BpH2pofMN7fce4celGPPtnNiYzZ4yzOY96DMhNnhmm+k5Tw2PJcAbvIWBI/DHP1w070RP12Td02WQcvTxodENe3DhHOBht2LjTQFWq7aYcdtJg7cZtkhFjYxVQt6Qe7NiFGT+N/8+pdoCzRfUTZmQZmb6rXPhdyDrWmEagFAJ+UgzkPhmK5nU0dlpwq6uROwjUe6PzUNec1P9VDKfAkVC5FiOoeDRosTaztkcTQ1f7Cu8W6dhQCLz+E6i0EBFpZY98C02lOunFzce9DxVL/Minfvl3BAizuhw9citbPx3/UHe6wp7flzFBPsgaUyUHDJGecW0D117Ay7u+y/0WV0eY1Hcg5Ofcgon9AfzUfIVdoIgKRpZY+x+VQWeAp27ak= X-OriginatorOrg: oss.nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 3b978e19-8c46-46ba-d5ca-08d7ecca9ac6 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Apr 2020 05:52:02.2734 (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: rq3+GukeDI83FOwWz/mRPDQg3pgjIYJRXmJ7S9OasENXabCmsc42Iqxm/Bxe6MC5SEff9ujNwl3oHUoKuK2JfA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB4429 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain From: Pankaj Bansal FVRules.fdf.inc is being replaced by the ArmVirtPkg/ArmVirtRules.fdf.inc at commit hash 746c5b6238f1ee55deb4b3ec32a6d732e27eeeaa Signed-off-by: Pankaj Bansal Reviewed-by: Leif Lindholm --- Notes: V4: - No change =20 V3: - Modify commit description Platform/NXP/FVRules.fdf.inc | 59 +++++++++++++------- 1 file changed, 38 insertions(+), 21 deletions(-) diff --git a/Platform/NXP/FVRules.fdf.inc b/Platform/NXP/FVRules.fdf.inc index c9fba65dae85..63de26abe056 100644 --- a/Platform/NXP/FVRules.fdf.inc +++ b/Platform/NXP/FVRules.fdf.inc @@ -1,8 +1,7 @@ -# FvRules.fdf.inc # -# Rules for creating FD. -# -# Copyright 2017-2019 NXP +# Copyright (c) 2011-2015, ARM Limited. All rights reserved. +# Copyright (c) 2014-2016, Linaro Limited. All rights reserved. +# Copyright (c) 2015 - 2016, Intel Corporation. All rights reserved. # # SPDX-License-Identifier: BSD-2-Clause-Patent # @@ -16,40 +15,49 @@ # ##########################################################################= ###### =20 + +##########################################################################= ## +# Example of a DXE_DRIVER FFS file with a Checksum encapsulation section = # +##########################################################################= ## +# +#[Rule.Common.DXE_DRIVER] +# FILE DRIVER =3D $(NAMED_GUID) { +# DXE_DEPEX DXE_DEPEX Optional $(INF_OUTPUT)/$(MODULE_= NAME).depex +# COMPRESS PI_STD { +# GUIDED { +# PE32 PE32 $(INF_OUTPUT)/$(MODULE_NAME).efi +# UI STRING=3D"$(MODULE_NAME)" Optional +# VERSION STRING=3D"$(INF_VERSION)" Optional BUILD_NUM=3D$(BUILD_N= UMBER) +# } +# } +# } +# +##########################################################################= ## + [Rule.Common.SEC] - FILE SEC =3D $(NAMED_GUID) RELOCS_STRIPPED { - TE TE Align =3D 32 $(INF_OUTPUT)/$(MODULE_NAME).efi + FILE SEC =3D $(NAMED_GUID) RELOCS_STRIPPED FIXED { + TE TE Align =3D Auto $(INF_OUTPUT)/$(MODULE_NAME).efi } =20 [Rule.Common.PEI_CORE] - FILE PEI_CORE =3D $(NAMED_GUID) { - TE TE $(INF_OUTPUT)/$(MODULE_NAME).efi + FILE PEI_CORE =3D $(NAMED_GUID) FIXED { + TE TE Align =3D Auto $(INF_OUTPUT)/$(MODULE_NAME).efi UI STRING =3D"$(MODULE_NAME)" Optional } =20 [Rule.Common.PEIM] - FILE PEIM =3D $(NAMED_GUID) { + FILE PEIM =3D $(NAMED_GUID) FIXED { PEI_DEPEX PEI_DEPEX Optional $(INF_OUTPUT)/$(MODULE_NAME).depex - PE32 PE32 $(INF_OUTPUT)/$(MODULE_NAME).efi + TE TE Align =3D Auto $(INF_OUTPUT)/$(MODULE_NAME).efi UI STRING=3D"$(MODULE_NAME)" Optional } =20 -[Rule.Common.PEIM.TIANOCOMPRESSED] - FILE PEIM =3D $(NAMED_GUID) DEBUG_MYTOOLS_IA32 { - PEI_DEPEX PEI_DEPEX Optional $(INF_OUTPUT)/$(MODULE_NAME).depex - GUIDED A31280AD-481E-41B6-95E8-127F4C984779 PROCESSING_REQUIRED =3D TR= UE { - PE32 PE32 $(INF_OUTPUT)/$(MODULE_NAME).efi - UI STRING=3D"$(MODULE_NAME)" Optional - } - } - [Rule.Common.DXE_CORE] FILE DXE_CORE =3D $(NAMED_GUID) { PE32 PE32 $(INF_OUTPUT)/$(MODULE_NAME).efi UI STRING=3D"$(MODULE_NAME)" Optional } =20 - [Rule.Common.UEFI_DRIVER] FILE DRIVER =3D $(NAMED_GUID) { DXE_DEPEX DXE_DEPEX Optional $(INF_OUTPUT)/$(MODULE_NA= ME).depex @@ -62,6 +70,8 @@ DXE_DEPEX DXE_DEPEX Optional $(INF_OUTPUT)/$(MODULE_NA= ME).depex PE32 PE32 $(INF_OUTPUT)/$(MODULE_NAME).efi UI STRING=3D"$(MODULE_NAME)" Optional + RAW ACPI Optional |.acpi + RAW ASL Optional |.aml } =20 [Rule.Common.DXE_RUNTIME_DRIVER] @@ -73,7 +83,7 @@ =20 [Rule.Common.UEFI_APPLICATION] FILE APPLICATION =3D $(NAMED_GUID) { - UI STRING =3D"$(MODULE_NAME)" Optional + UI STRING =3D"$(MODULE_NAME)" Optional PE32 PE32 $(INF_OUTPUT)/$(MODULE_NAME).efi } =20 @@ -91,3 +101,10 @@ UI STRING=3D"$(MODULE_NAME)" Optional VERSION STRING=3D"$(INF_VERSION)" Optional BUILD_NUM=3D$(BUILD_NUMBE= R) } + +[Rule.Common.USER_DEFINED.ACPITABLE] + FILE FREEFORM =3D $(NAMED_GUID) { + RAW ACPI |.acpi + RAW ASL |.aml + UI STRING=3D"$(MODULE_NAME)" Optional + } --=20 2.17.1