From nobody Mon Apr 29 07:27:14 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+91143+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+91143+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1657210650; cv=none; d=zohomail.com; s=zohoarc; b=V8tWIcgaslkfQt/O6fhNQ5yRLWlverljrk2PVKlCSMopiQN5Fc/LHPYLEsIGdJcrqOGX46VUuSddbxyynTxGG2aP+nuguTQwTiQ9jx+OGsnNpX5Ta/LTgKUPIhNpMTOz+TvxUwpTGdNNR++l2g80PQwuptnaCgmhq0x6maWkkoc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1657210650; h=Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Sender:Subject:To; bh=JuLih3/wdGmHpSMgAVL4CllC9VPLhI0G5MjrNErygKI=; b=mBgqchGceWXA/cITawfpAgrSgjnGGVeu0EGFb4UvBJkKdsNMr10eoai95j+HNkJGXMqYRKBuOem4e5crW73Fxg+HIVPzhsmEp6PdEHV75XHjKkzFX4V38M27twICA1ky6A0KgZX4y5EPsGp5eCzugDfJa7GXOTJlFKc6T+EwaTo= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+91143+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1657210650438778.3489129971861; Thu, 7 Jul 2022 09:17:30 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id 21G9YY1788612x4p84pK3YUF; Thu, 07 Jul 2022 09:17:29 -0700 X-Received: from mga17.intel.com (mga17.intel.com [192.55.52.151]) by mx.groups.io with SMTP id smtpd.web10.7591.1657210648837117307 for ; Thu, 07 Jul 2022 09:17:29 -0700 X-IronPort-AV: E=McAfee;i="6400,9594,10401"; a="264477953" X-IronPort-AV: E=Sophos;i="5.92,253,1650956400"; d="scan'208";a="264477953" X-Received: from orsmga008.jf.intel.com ([10.7.209.65]) by fmsmga107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 07 Jul 2022 09:15:24 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.92,253,1650956400"; d="scan'208";a="620854644" X-Received: from jameslu8-desk2.gar.corp.intel.com ([10.5.215.168]) by orsmga008.jf.intel.com with ESMTP; 07 Jul 2022 09:15:22 -0700 From: "Lu, James" To: devel@edk2.groups.io Cc: James Lu , Guo Dong , Ray Ni , Gua Guo Subject: [edk2-devel] [PATCH v3] UefiPayloadPkg: Add macro to support selective driver in UPL Date: Fri, 8 Jul 2022 00:15:09 +0800 Message-Id: <20220707161509.1471-1-james.lu@intel.com> MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: List-Subscribe: List-Help: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,james.lu@intel.com X-Gm-Message-State: eB4VVU9XZl23ObMVNCIZl7Kax1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1657210649; bh=3YTD9jDn64zPr/d+HM0c/twJbZs3UI/bRWhKgFbx8zo=; h=Cc:Date:From:Reply-To:Subject:To; b=fbWN66fBERAtrBOEPkk6+nWCZgoOWaqJUMV1x+gVAsu1Wp9j3T1l2kOD8CYJ7AXgZIn mzPscTUnUqyqIgvRwk4Q+XfM9ZVWOUq0uG3j06gu1YPBmuGoe1qPmRVx9G/A7tcnoVVtH sZFf0KCwYr4sUwwjAlVAH2bT+uFHfttaSFk= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1657210650881100001 Content-Type: text/plain; charset="utf-8" From: James Lu REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3D3967 Add macros to decide modules built into UPL.elf. Macro list: - GENERIC_MEMORY_TEST_ENABLE: GenericMemoryTestDxe - MEMORY_TEST: NullMemoryTestDxe or GenericMemoryDxe - ATA_ENABLE: SataControllerDxe, AtaBusDxe - SD_ENABLE: SdMmcPciDxe, EmmcDxe, SdDxe - PS2_MOUSE_ENABLE: Ps2MouseDxe Cc: Guo Dong Cc: Ray Ni Cc: Gua Guo Signed-off-by: James Lu Reviewed-by: Guo Dong Reviewed-by: Ray Ni > Reviewed-by: Ray Ni --- UefiPayloadPkg/UefiPayloadPkg.dsc | 21 ++++++++++++++++++++ UefiPayloadPkg/UefiPayloadPkg.fdf | 14 ++++++++++++- 2 files changed, 34 insertions(+), 1 deletion(-) diff --git a/UefiPayloadPkg/UefiPayloadPkg.dsc b/UefiPayloadPkg/UefiPayload= Pkg.dsc index cfcf38578d..ec79914f45 100644 --- a/UefiPayloadPkg/UefiPayloadPkg.dsc +++ b/UefiPayloadPkg/UefiPayloadPkg.dsc @@ -36,7 +36,16 @@ DEFINE PLATFORM_BOOT_TIMEOUT =3D 3 DEFINE ABOVE_4G_MEMORY =3D TRUE DEFINE BOOT_MANAGER_ESCAPE =3D FALSE + DEFINE ATA_ENABLE =3D TRUE + DEFINE SD_ENABLE =3D TRUE + DEFINE PS2_MOUSE_ENABLE =3D TRUE DEFINE SD_MMC_TIMEOUT =3D 1000000 + + # + # NULL: NullMemoryTestDxe + # GENERIC: GenericMemoryTestDxe + # + DEFINE MEMORY_TEST =3D NULL # # SBL: UEFI payload for Slim Bootloader # COREBOOT: UEFI payload for coreboot @@ -596,7 +605,11 @@ MdeModulePkg/Universal/StatusCodeHandler/RuntimeDxe/StatusCodeHandlerRun= timeDxe.inf UefiCpuPkg/CpuIo2Dxe/CpuIo2Dxe.inf MdeModulePkg/Universal/DevicePathDxe/DevicePathDxe.inf +!if $(MEMORY_TEST) =3D=3D "GENERIC" + MdeModulePkg/Universal/MemoryTest/GenericMemoryTestDxe/GenericMemoryTest= Dxe.inf +!elseif $(MEMORY_TEST) =3D=3D "NULL" MdeModulePkg/Universal/MemoryTest/NullMemoryTestDxe/NullMemoryTestDxe.inf +!endif MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf MdeModulePkg/Universal/DisplayEngineDxe/DisplayEngineDxe.inf @@ -631,8 +644,10 @@ MdeModulePkg/Universal/Disk/PartitionDxe/PartitionDxe.inf MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf FatPkg/EnhancedFatDxe/Fat.inf +!if $(ATA_ENABLE) =3D=3D TRUE MdeModulePkg/Bus/Pci/SataControllerDxe/SataControllerDxe.inf MdeModulePkg/Bus/Ata/AtaBusDxe/AtaBusDxe.inf +!endif MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AtaAtapiPassThru.inf MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBusDxe.inf MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDiskDxe.inf @@ -644,9 +659,11 @@ # # SD/eMMC Support # +!if $(SD_ENABLE) =3D=3D TRUE MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHcDxe.inf MdeModulePkg/Bus/Sd/EmmcDxe/EmmcDxe.inf MdeModulePkg/Bus/Sd/SdDxe/SdDxe.inf +!endif =20 # # Usb Support @@ -671,7 +688,9 @@ !if $(PS2_KEYBOARD_ENABLE) =3D=3D TRUE MdeModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2KeyboardDxe.inf !endif +!if $(PS2_MOUSE_ENABLE) =3D=3D TRUE MdeModulePkg/Bus/Isa/Ps2MouseDxe/Ps2MouseDxe.inf +!endif =20 # # Console Support @@ -742,12 +761,14 @@ # This should be FALSE for compiling the dynamic command. gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE } +!if $(PERFORMANCE_MEASUREMENT_ENABLE) =3D=3D TRUE ShellPkg/DynamicCommand/DpDynamicCommand/DpDynamicCommand.inf { ## This flag is used to control initialization of the shell library # This should be FALSE for compiling the dynamic command. gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE } +!endif ShellPkg/Application/Shell/Shell.inf { ## This flag is used to control initialization of the shell library diff --git a/UefiPayloadPkg/UefiPayloadPkg.fdf b/UefiPayloadPkg/UefiPayload= Pkg.fdf index c7b04978ad..35f79be2f0 100644 --- a/UefiPayloadPkg/UefiPayloadPkg.fdf +++ b/UefiPayloadPkg/UefiPayloadPkg.fdf @@ -149,7 +149,11 @@ INF PcAtChipsetPkg/PcatRealTimeClockRuntimeDxe/PcatRea= lTimeClockRuntimeDxe.inf =20 INF UefiCpuPkg/CpuIo2Dxe/CpuIo2Dxe.inf INF MdeModulePkg/Universal/DevicePathDxe/DevicePathDxe.inf -INF MdeModulePkg/Universal/MemoryTest/NullMemoryTestDxe/NullMemoryTestDxe.= inf +!if $(MEMORY_TEST) =3D=3D "GENERIC" +INF MdeModulePkg/Universal/MemoryTest/GenericMemoryTestDxe/GenericMemoryT= estDxe.inf +!elseif $(MEMORY_TEST) =3D=3D "NULL" +INF MdeModulePkg/Universal/MemoryTest/NullMemoryTestDxe/NullMemoryTestDxe= .inf +!endif INF MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf INF MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf INF MdeModulePkg/Universal/DisplayEngineDxe/DisplayEngineDxe.inf @@ -176,7 +180,9 @@ INF OvmfPkg/SioBusDxe/SioBusDxe.inf !if $(PS2_KEYBOARD_ENABLE) =3D=3D TRUE INF MdeModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2KeyboardDxe.inf !endif +!if $(PS2_MOUSE_ENABLE) =3D=3D TRUE INF MdeModulePkg/Bus/Isa/Ps2MouseDxe/Ps2MouseDxe.inf +!endif =20 # # Console Support @@ -195,8 +201,10 @@ INF UefiPayloadPkg/GraphicsOutputDxe/GraphicsOutputDxe= .inf INF MdeModulePkg/Universal/Disk/DiskIoDxe/DiskIoDxe.inf INF MdeModulePkg/Universal/Disk/PartitionDxe/PartitionDxe.inf INF MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf +!if $(ATA_ENABLE) =3D=3D TRUE INF MdeModulePkg/Bus/Pci/SataControllerDxe/SataControllerDxe.inf INF MdeModulePkg/Bus/Ata/AtaBusDxe/AtaBusDxe.inf +!endif INF MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AtaAtapiPassThru.inf INF MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBusDxe.inf INF MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDiskDxe.inf @@ -209,9 +217,11 @@ INF FatPkg/EnhancedFatDxe/Fat.inf # # SD/eMMC Support # +!if $(SD_ENABLE) =3D=3D TRUE INF MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHcDxe.inf INF MdeModulePkg/Bus/Sd/EmmcDxe/EmmcDxe.inf INF MdeModulePkg/Bus/Sd/SdDxe/SdDxe.inf +!endif =20 # # Usb Support @@ -241,7 +251,9 @@ INF MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTable= Dxe.inf # !if $(SHELL_TYPE) =3D=3D BUILD_SHELL INF ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf +!if $(PERFORMANCE_MEASUREMENT_ENABLE) =3D=3D TRUE INF ShellPkg/DynamicCommand/DpDynamicCommand/DpDynamicCommand.inf +!endif INF ShellPkg/Application/Shell/Shell.inf !endif =20 --=20 2.26.2.windows.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#91143): https://edk2.groups.io/g/devel/message/91143 Mute This Topic: https://groups.io/mt/92231909/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-