From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pj1-f42.google.com (mail-pj1-f42.google.com [209.85.216.42]) by mx.groups.io with SMTP id smtpd.web10.132069.1671109024584539938 for ; Thu, 15 Dec 2022 04:57:04 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@ventanamicro.com header.s=google header.b=ZOhEFbK1; spf=pass (domain: ventanamicro.com, ip: 209.85.216.42, mailfrom: sunilvl@ventanamicro.com) Received: by mail-pj1-f42.google.com with SMTP id q17-20020a17090aa01100b002194cba32e9so2661526pjp.1 for ; Thu, 15 Dec 2022 04:57:04 -0800 (PST) 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=6HY4l3nCzYu2uSMiBtVmPDjsqYucDW04TBPxVQr2X5k=; b=ZOhEFbK1CeFJHUDMiFpepxLc/b1dJncitgkhDy3LTJuQM5cXKS4ggCaRXjmeQLyjzj qFpwUPsny9+sWBgMu1XuQUGla8gSekCmGqLpjQ6f/23gigcd/pDst+X2auBc9WKFstBV Ph/qXUNS04RF3046ybWeeduVSaiS5WQfD9REr4mKLw82NGo50/tMYoAJdGzFMhFG9uV2 qmVJhqj+tQcQWeRSLZHEE3zKWcWH0XpfuhDYO73bGfPlR2nsV0RttJlpFsji4VyfvpWT OWn/cMH1MNj2LVG6QdJ044TDTZthf38ZCck7kMLx1n7bOyZ3vmGLikFmWVL6Z0Dcpbzb ZY8g== 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=6HY4l3nCzYu2uSMiBtVmPDjsqYucDW04TBPxVQr2X5k=; b=C+T+Q5iVYuIaDfutJo3T8dYmp6TN/8BdDiRkzOBeTsXQKrZ9TIOB1lQPkXEz0TQtrw bSEn5vOYUAn7sTJOKuLLJG4v3hvdG3lA7Jr8s89o63ERTqe3AGpl/Ewc+x39U+nyYBPk jTltdHOH137PzVlhuVi5Y5zTD3Q4E8V6c/KaI6L/Ra9vmUsOUd03yc4L0U/hRwO8fMKk DVbbW4m50elPtx4ZCuuen1+zIPTJNcdFPn6gNFrHi5yEN/tqcxjfR+yzgDq7/aADURQq WJerWuv/tWcOb55NT2RXTCiv1EwLOuYT4HaBlPiMP787kmjygywttKQS1VpRY4uhERZw t/dQ== X-Gm-Message-State: ANoB5pmsbg/U3KbjfEastR9tXFmuyo2TYspvwTdRgdHHGXagsxQkdVHy kflkf+wH20DwiFNvh+0UfohsMkc2k0KfylXpYog= X-Google-Smtp-Source: AA0mqf5BdmgLiyd13TZtnobLNTRZAwMtRU7p+Odp0ZjqUGV2oPmAZ/5sX1+xowA+e0VIQNBeogdNTA== X-Received: by 2002:a05:6a20:9e4a:b0:ac:1265:d5bb with SMTP id mt10-20020a056a209e4a00b000ac1265d5bbmr31051406pzb.49.1671109023803; Thu, 15 Dec 2022 04:57:03 -0800 (PST) Return-Path: Received: from localhost.localdomain ([49.206.11.246]) by smtp.gmail.com with ESMTPSA id j2-20020a625502000000b005762905c89asm1674384pfb.66.2022.12.15.04.57.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 15 Dec 2022 04:57:03 -0800 (PST) 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 , Ard Biesheuvel Subject: [edk2-staging/RiscV64QemuVirt PATCH V6 11/23] EmbeddedPkg/NvVarStoreFormattedLib: Migrate to MdeModulePkg Date: Thu, 15 Dec 2022 18:26:14 +0530 Message-Id: <20221215125626.545372-12-sunilvl@ventanamicro.com> X-Mailer: git-send-email 2.38.0 In-Reply-To: <20221215125626.545372-1-sunilvl@ventanamicro.com> References: <20221215125626.545372-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 Acked-by: Ard Biesheuvel --- 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 e7407a300a76..68702867312b 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 be5e829ca9c5..e46bfd6d593c 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