From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pj1-f46.google.com (mail-pj1-f46.google.com [209.85.216.46]) by mx.groups.io with SMTP id smtpd.web09.9645.1665766195646784020 for ; Fri, 14 Oct 2022 09:49:55 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@ventanamicro.com header.s=google header.b=bknq7TI9; spf=pass (domain: ventanamicro.com, ip: 209.85.216.46, mailfrom: sunilvl@ventanamicro.com) Received: by mail-pj1-f46.google.com with SMTP id q10-20020a17090a304a00b0020b1d5f6975so5282208pjl.0 for ; Fri, 14 Oct 2022 09:49:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ventanamicro.com; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=XvfR+PYj9F+Dy81+U1F7eiFFS+8t75atoOuseMtBhp4=; b=bknq7TI9oNFmPH1RxJubzaHAahU7gpU6VntmbbETchXq++zPYlHF/6+b6md6ck804T Cc+qdhPdwbg1gJqMujO+cuPgqhUCleEfryasf5lVCuumtYndv5+N+3FaCWAajsp77LM2 Qwx6/3CA7fWrshctBnOQNWwUpPvAM3STXQ5B0fA5zoH0vRl3iGlBusPGym1WhEkpVHw+ NYpaPkGz3Bb/NryHP+CKFkgMwgugDAW5ZiuxrS5M47xU94vTtAy50EXjUyvVi77TSO0L /7dZ+7coGp/J5ScsqnWizuYdED/4mY0JuYyhd322cu8t6wGIaV2njBvUT2DwK2UKoaUD OlWw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=XvfR+PYj9F+Dy81+U1F7eiFFS+8t75atoOuseMtBhp4=; b=qxMRCfXlJouflb54K81M+k+ki2SD5LtGkMBkF7ynu9Y/UF1eICWs7JAP25MtbFcCLw RdPr4fLunUkJSPjSarXLZ4h3cf7YcDXfDjy2tE6MqBGakJCDASzOmb7Exk4nDcoNRC8Y rYe62iAryUP82MnFgGxdwKX7qTZ91KjQwsCcaNo51n+JvpljXMDCZdKdfyL0RMxYRVHQ WFWPGNQCiEW+f2ofLz+4x4v5v7fcnlogVW0SEbZSavVW6BXj2ojWt5EJ5WzAojqk8uFn lLFvvBJ54iCn9kJeFjDiZVouw6S1PjOIfNKLY86X4pbDvJJ7qtfkTxvZ0U8HeBK9f1YM nDUw== X-Gm-Message-State: ACrzQf2htqd9liETHLPn3r++2sC0DkojEIeADLKe8ao5tLR7UGMCY1r/ /1G3yM0hGYVAVwDVrhNIusuJyaeQNfxyig== X-Google-Smtp-Source: AMsMyM4IrFNmKAeOGU7NJFX+86RSxMwbdGQtSluESEz7TpN0uU66x9uOv493BrSzn17tfSYt13SDaw== X-Received: by 2002:a17:90a:f286:b0:20a:b521:7bbe with SMTP id fs6-20020a17090af28600b0020ab5217bbemr18566961pjb.246.1665766194712; Fri, 14 Oct 2022 09:49:54 -0700 (PDT) Return-Path: Received: from localhost.localdomain ([49.206.13.138]) by smtp.gmail.com with ESMTPSA id f3-20020a62db03000000b0056265011136sm1963368pfg.112.2022.10.14.09.49.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 14 Oct 2022 09:49:54 -0700 (PDT) From: "Sunil V L" To: devel@edk2.groups.io Cc: Leif Lindholm , Ard Biesheuvel , Abner Chang , Daniel Schaefer , Jian J Wang , Liming Gao , Andrew Fish , Michael D Kinney Subject: [edk2-staging/RiscV64QemuVirt PATCH V4 26/34] EmbeddedPkg/NvVarStoreFormattedLib: Migrate to MdeModulePkg Date: Fri, 14 Oct 2022 22:18:28 +0530 Message-Id: <20221014164836.1513036-27-sunilvl@ventanamicro.com> X-Mailer: git-send-email 2.38.0 In-Reply-To: <20221014164836.1513036-1-sunilvl@ventanamicro.com> References: <20221014164836.1513036-1-sunilvl@ventanamicro.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit This library is required by NorFlashDxe. Since it will be used by both virtual and real platforms, migrate this library to MdeModulePkg. Cc: Leif Lindholm Cc: Ard Biesheuvel Cc: Abner Chang Cc: Daniel Schaefer Cc: Jian J Wang Cc: Liming Gao Cc: Andrew Fish Cc: Michael D Kinney Signed-off-by: Sunil V L --- EmbeddedPkg/EmbeddedPkg.dec | 3 --- MdeModulePkg/MdeModulePkg.dec | 3 +++ MdeModulePkg/MdeModulePkg.dsc | 2 ++ {EmbeddedPkg => MdeModulePkg}/Library/NvVarStoreFormattedLib/NvVarStoreFormattedLib.inf | 1 - {EmbeddedPkg => MdeModulePkg}/Include/Guid/NvVarStoreFormatted.h | 0 {EmbeddedPkg => MdeModulePkg}/Library/NvVarStoreFormattedLib/NvVarStoreFormattedLib.c | 0 6 files changed, 5 insertions(+), 4 deletions(-) diff --git a/EmbeddedPkg/EmbeddedPkg.dec b/EmbeddedPkg/EmbeddedPkg.dec index 341ef5e6a679..b1f5654835f6 100644 --- a/EmbeddedPkg/EmbeddedPkg.dec +++ b/EmbeddedPkg/EmbeddedPkg.dec @@ -69,9 +69,6 @@ [Guids.common] # HII form set GUID for ConsolePrefDxe driver gConsolePrefFormSetGuid = { 0x2d2358b4, 0xe96c, 0x484d, { 0xb2, 0xdd, 0x7c, 0x2e, 0xdf, 0xc7, 0xd5, 0x6f } } - ## Include/Guid/NvVarStoreFormatted.h - gEdkiiNvVarStoreFormattedGuid = { 0xd1a86e3f, 0x0707, 0x4c35, { 0x83, 0xcd, 0xdc, 0x2c, 0x29, 0xc8, 0x91, 0xa3 } } - [Protocols.common] gHardwareInterruptProtocolGuid = { 0x2890B3EA, 0x053D, 0x1643, { 0xAD, 0x0C, 0xD6, 0x48, 0x08, 0xDA, 0x3F, 0xF1 } } gHardwareInterrupt2ProtocolGuid = { 0x32898322, 0x2da1, 0x474a, { 0xba, 0xaa, 0xf3, 0xf7, 0xcf, 0x56, 0x94, 0x70 } } diff --git a/MdeModulePkg/MdeModulePkg.dec b/MdeModulePkg/MdeModulePkg.dec index 58e6ab004882..492bff8b7890 100644 --- a/MdeModulePkg/MdeModulePkg.dec +++ b/MdeModulePkg/MdeModulePkg.dec @@ -412,6 +412,9 @@ [Guids] ## Include/Guid/MigratedFvInfo.h gEdkiiMigratedFvInfoGuid = { 0xc1ab12f7, 0x74aa, 0x408d, { 0xa2, 0xf4, 0xc6, 0xce, 0xfd, 0x17, 0x98, 0x71 } } + ## Include/Guid/NvVarStoreFormatted.h + gEdkiiNvVarStoreFormattedGuid = { 0xd1a86e3f, 0x0707, 0x4c35, { 0x83, 0xcd, 0xdc, 0x2c, 0x29, 0xc8, 0x91, 0xa3 } } + # # GUID defined in UniversalPayload # diff --git a/MdeModulePkg/MdeModulePkg.dsc b/MdeModulePkg/MdeModulePkg.dsc index 659482ab737f..4142e1178dcd 100644 --- a/MdeModulePkg/MdeModulePkg.dsc +++ b/MdeModulePkg/MdeModulePkg.dsc @@ -104,6 +104,7 @@ [LibraryClasses] VariablePolicyHelperLib|MdeModulePkg/Library/VariablePolicyHelperLib/VariablePolicyHelperLib.inf MmUnblockMemoryLib|MdePkg/Library/MmUnblockMemoryLib/MmUnblockMemoryLibNull.inf VariableFlashInfoLib|MdeModulePkg/Library/BaseVariableFlashInfoLib/BaseVariableFlashInfoLib.inf + NvVarStoreFormattedLib|MdeModulePkg/Library/NvVarStoreFormattedLib/NvVarStoreFormattedLib.inf [LibraryClasses.EBC.PEIM] IoLib|MdePkg/Library/PeiIoLibCpuIo/PeiIoLibCpuIo.inf @@ -443,6 +444,7 @@ [Components] MdeModulePkg/Library/DxeCapsuleLibFmp/DxeCapsuleLib.inf MdeModulePkg/Library/DxeCapsuleLibFmp/DxeRuntimeCapsuleLib.inf MdeModulePkg/Library/BaseVariableFlashInfoLib/BaseVariableFlashInfoLib.inf + MdeModulePkg/Library/NvVarStoreFormattedLib/NvVarStoreFormattedLib.inf [Components.IA32, Components.X64, Components.AARCH64] MdeModulePkg/Universal/EbcDxe/EbcDxe.inf diff --git a/EmbeddedPkg/Library/NvVarStoreFormattedLib/NvVarStoreFormattedLib.inf b/MdeModulePkg/Library/NvVarStoreFormattedLib/NvVarStoreFormattedLib.inf similarity index 96% rename from EmbeddedPkg/Library/NvVarStoreFormattedLib/NvVarStoreFormattedLib.inf rename to MdeModulePkg/Library/NvVarStoreFormattedLib/NvVarStoreFormattedLib.inf index e2eed26c5b2d..5e8cd94cc9e0 100644 --- a/EmbeddedPkg/Library/NvVarStoreFormattedLib/NvVarStoreFormattedLib.inf +++ b/MdeModulePkg/Library/NvVarStoreFormattedLib/NvVarStoreFormattedLib.inf @@ -32,7 +32,6 @@ [Sources] NvVarStoreFormattedLib.c [Packages] - EmbeddedPkg/EmbeddedPkg.dec MdeModulePkg/MdeModulePkg.dec MdePkg/MdePkg.dec diff --git a/EmbeddedPkg/Include/Guid/NvVarStoreFormatted.h b/MdeModulePkg/Include/Guid/NvVarStoreFormatted.h similarity index 100% rename from EmbeddedPkg/Include/Guid/NvVarStoreFormatted.h rename to MdeModulePkg/Include/Guid/NvVarStoreFormatted.h diff --git a/EmbeddedPkg/Library/NvVarStoreFormattedLib/NvVarStoreFormattedLib.c b/MdeModulePkg/Library/NvVarStoreFormattedLib/NvVarStoreFormattedLib.c similarity index 100% rename from EmbeddedPkg/Library/NvVarStoreFormattedLib/NvVarStoreFormattedLib.c rename to MdeModulePkg/Library/NvVarStoreFormattedLib/NvVarStoreFormattedLib.c -- 2.38.0