From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=2607:f8b0:4864:20::141; helo=mail-it1-x141.google.com; envelope-from=ard.biesheuvel@linaro.org; receiver=edk2-devel@lists.01.org Received: from mail-it1-x141.google.com (mail-it1-x141.google.com [IPv6:2607:f8b0:4864:20::141]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 961D4211AD35C for ; Wed, 16 Jan 2019 04:56:16 -0800 (PST) Received: by mail-it1-x141.google.com with SMTP id h193so2511524ita.5 for ; Wed, 16 Jan 2019 04:56:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=9TksRAeaG3ZOPQqGRLxWOLD6quOby0hagAMZk6QuzNI=; b=Mh2J4u93KVLr7gdeelp8TEFDBWZ6uQys6oiKBBq+7e13Q35s7PUhvYO2/8OmlUtJp5 vICy7IKoMAQzeh3YmntZitYgR+X4Cu1cdaImV1ibccLOPokrUdaSORSRNtAE04a1U/h9 UbwzkUpUQNe82/MdUUZynmieunt7iILAYFO2o= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=9TksRAeaG3ZOPQqGRLxWOLD6quOby0hagAMZk6QuzNI=; b=fXVRMG1rFYNP4NzPCs21eSS796oCQMspK2Z+8nKHdU0SKUH+qn3V78xq5ZPpkt8ekp m00wGl8dvYgRMhpQdtG9pwFvbFfOBJSKNHcH6lzRk09WhKlc9MSeb8b4QidLqFyD/gv2 R1ON/opt8fiCTY/ixl9OfPJIwyLM8O0pJuH76m3J4ZgrVfrWzPPFPDzo1d0OiJeLgyRT eZ5ucWQxddyWcTze8r7Ni5ta6C38ZS2bXffwwX/+27OZZrqkUcF7x+kA4ovUd6Mtgfka XvbjmaQHMgsafZGfmLGjbLeruAplXY1/jex9UC6u3VYirnZrgpTerDP1AuKdnYoIBW76 VsaA== X-Gm-Message-State: AJcUukf7yReb3oFSpFRMnUDOP4xptutmuCNxgQ6XBmHnRyLvLO1jwc0R xQYPbY9uKXVe2rc6bU5+T5yMXmTT8aoG65XX1E3DBg== X-Google-Smtp-Source: ALg8bN4eNn2YO1fQ5UtdZJow9GNVXM5HnImshfs6V4qhJjK56onQRHhW7hb5pOUofllxnJC/QcaMq6noSeuBDHJFSGY= X-Received: by 2002:a02:4c9:: with SMTP id 192mr4992848jab.2.1547643374640; Wed, 16 Jan 2019 04:56:14 -0800 (PST) MIME-Version: 1.0 References: <1547634347-43704-1-git-send-email-star.zeng@intel.com> In-Reply-To: <1547634347-43704-1-git-send-email-star.zeng@intel.com> From: Ard Biesheuvel Date: Wed, 16 Jan 2019 13:56:03 +0100 Message-ID: To: Star Zeng Cc: "edk2-devel@lists.01.org" , Leif Lindholm , Michael D Kinney Subject: Re: [edk2-platforms PATCH] Platform HiKeyXXX: Use merged variable driver for emulated NV mode X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 16 Jan 2019 12:56:16 -0000 Content-Type: text/plain; charset="UTF-8" On Wed, 16 Jan 2019 at 11:25, Star Zeng wrote: > > REF: https://bugzilla.tianocore.org/show_bug.cgi?id=1323 > Merge EmuVariable and Real variable driver. > > The real variable driver has been updated to support emulated > variable NV mode and the EmuVariableRuntimeDxe will be removed > later, so use merged variable driver for emulated NV mode. > > NOTE: > FaultTolerantWriteDxe is not needed at all for emulated NV mode, > so remove FaultTolerantWriteDxe including. > > Cc: Ard Biesheuvel > Cc: Leif Lindholm > Cc: Michael D Kinney > Contributed-under: TianoCore Contribution Agreement 1.1 > Signed-off-by: Star Zeng Reviewed-by: Ard Biesheuvel > --- > Platform/Hisilicon/HiKey/HiKey.dsc | 13 +++++++++++-- > Platform/Hisilicon/HiKey/HiKey.fdf | 3 +-- > Platform/Hisilicon/HiKey960/HiKey960.dsc | 14 ++++++++++++-- > Platform/Hisilicon/HiKey960/HiKey960.fdf | 3 +-- > 4 files changed, 25 insertions(+), 8 deletions(-) > > diff --git a/Platform/Hisilicon/HiKey/HiKey.dsc b/Platform/Hisilicon/HiKey/HiKey.dsc > index 38fee902690c..7e05babb6c51 100644 > --- a/Platform/Hisilicon/HiKey/HiKey.dsc > +++ b/Platform/Hisilicon/HiKey/HiKey.dsc > @@ -59,6 +59,12 @@ [LibraryClasses.common] > IpIoLib|MdeModulePkg/Library/DxeIpIoLib/DxeIpIoLib.inf > UdpIoLib|MdeModulePkg/Library/DxeUdpIoLib/DxeUdpIoLib.inf > > + # VariableRuntimeDxe Requirements > + SynchronizationLib|MdePkg/Library/BaseSynchronizationLib/BaseSynchronizationLib.inf > + AuthVariableLib|MdeModulePkg/Library/AuthVariableLibNull/AuthVariableLibNull.inf > + TpmMeasurementLib|MdeModulePkg/Library/TpmMeasurementLibNull/TpmMeasurementLibNull.inf > + VarCheckLib|MdeModulePkg/Library/VarCheckLib/VarCheckLib.inf > + > [LibraryClasses.common.SEC] > PrePiLib|EmbeddedPkg/Library/PrePiLib/PrePiLib.inf > ExtractGuidedSectionLib|EmbeddedPkg/Library/PrePiExtractGuidedSectionLib/PrePiExtractGuidedSectionLib.inf > @@ -144,6 +150,10 @@ [PcdsFixedAtBuild.common] > gHiKeyTokenSpaceGuid.PcdAndroidBootDevicePath|L"VenHw(0D51905B-B77E-452A-A2C0-ECA0CC8D514A,00D023F70000000000)/eMMC(0x0)/Ctrl(0x0)/HD(6,GPT,5C0F213C-17E1-4149-88C8-8B50FB4EC70E,0x7000,0x20000)/\\EFI\\BOOT\\GRUBAA64.EFI" > gHiKeyTokenSpaceGuid.PcdSdBootDevicePath|L"VenHw(0D51905B-B77E-452A-A2C0-ECA0CC8D514A,00E023F70000000000)/SD(0x0)" > > + # > + # Make VariableRuntimeDxe work at emulated non-volatile variable mode. > + # > + gEfiMdeModulePkgTokenSpaceGuid.PcdEmuVariableNvModeEnable|TRUE > > ################################################################################ > # > @@ -183,8 +193,7 @@ [Components.common] > MdeModulePkg/Universal/Console/TerminalDxe/TerminalDxe.inf > MdeModulePkg/Universal/SerialDxe/SerialDxe.inf > > - MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteDxe.inf > - MdeModulePkg/Universal/Variable/EmuRuntimeDxe/EmuVariableRuntimeDxe.inf > + MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf > > ArmPkg/Drivers/ArmGic/ArmGicDxe.inf > ArmPkg/Drivers/TimerDxe/TimerDxe.inf > diff --git a/Platform/Hisilicon/HiKey/HiKey.fdf b/Platform/Hisilicon/HiKey/HiKey.fdf > index b0e533c5b1de..7e6c8083bbca 100644 > --- a/Platform/Hisilicon/HiKey/HiKey.fdf > +++ b/Platform/Hisilicon/HiKey/HiKey.fdf > @@ -182,8 +182,7 @@ [FV.FvMain] > INF FatPkg/EnhancedFatDxe/Fat.inf > INF MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf > > - INF MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteDxe.inf > - INF MdeModulePkg/Universal/Variable/EmuRuntimeDxe/EmuVariableRuntimeDxe.inf > + INF MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf > > INF MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf > > diff --git a/Platform/Hisilicon/HiKey960/HiKey960.dsc b/Platform/Hisilicon/HiKey960/HiKey960.dsc > index bd26b759dce0..a4a1a371de19 100644 > --- a/Platform/Hisilicon/HiKey960/HiKey960.dsc > +++ b/Platform/Hisilicon/HiKey960/HiKey960.dsc > @@ -59,6 +59,12 @@ [LibraryClasses.common] > IpIoLib|MdeModulePkg/Library/DxeIpIoLib/DxeIpIoLib.inf > UdpIoLib|MdeModulePkg/Library/DxeUdpIoLib/DxeUdpIoLib.inf > > + # VariableRuntimeDxe Requirements > + SynchronizationLib|MdePkg/Library/BaseSynchronizationLib/BaseSynchronizationLib.inf > + AuthVariableLib|MdeModulePkg/Library/AuthVariableLibNull/AuthVariableLibNull.inf > + TpmMeasurementLib|MdeModulePkg/Library/TpmMeasurementLibNull/TpmMeasurementLibNull.inf > + VarCheckLib|MdeModulePkg/Library/VarCheckLib/VarCheckLib.inf > + > [LibraryClasses.common.SEC] > PrePiLib|EmbeddedPkg/Library/PrePiLib/PrePiLib.inf > ExtractGuidedSectionLib|EmbeddedPkg/Library/PrePiExtractGuidedSectionLib/PrePiExtractGuidedSectionLib.inf > @@ -135,6 +141,11 @@ [PcdsFixedAtBuild.common] > gHiKey960TokenSpaceGuid.PcdAndroidBootDevicePath|L"VenHw(0D51905B-B77E-452A-A2C0-ECA0CC8D514A,00003BFF0000000000)/UFS(0x0,0x3)/HD(7,GPT,D3340696-9B95-4C64-8DF6-E6D4548FBA41,0x12100,0x4000)/\\EFI\\BOOT\\GRUBAA64.EFI" > gHiKey960TokenSpaceGuid.PcdSdBootDevicePath|L"VenHw(0D51905B-B77E-452A-A2C0-ECA0CC8D514A,00F037FF0000000000)/SD(0x0)" > > + # > + # Make VariableRuntimeDxe work at emulated non-volatile variable mode. > + # > + gEfiMdeModulePkgTokenSpaceGuid.PcdEmuVariableNvModeEnable|TRUE > + > ################################################################################ > # > # Components Section - list of all EDK II Modules needed by this Platform > @@ -172,8 +183,7 @@ [Components.common] > MdeModulePkg/Universal/Console/TerminalDxe/TerminalDxe.inf > MdeModulePkg/Universal/SerialDxe/SerialDxe.inf > > - MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteDxe.inf > - MdeModulePkg/Universal/Variable/EmuRuntimeDxe/EmuVariableRuntimeDxe.inf > + MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf > > ArmPkg/Drivers/ArmGic/ArmGicDxe.inf > ArmPkg/Drivers/TimerDxe/TimerDxe.inf > diff --git a/Platform/Hisilicon/HiKey960/HiKey960.fdf b/Platform/Hisilicon/HiKey960/HiKey960.fdf > index d9fd796d7d34..1b07284dc889 100644 > --- a/Platform/Hisilicon/HiKey960/HiKey960.fdf > +++ b/Platform/Hisilicon/HiKey960/HiKey960.fdf > @@ -171,8 +171,7 @@ [FV.FvMain] > INF FatPkg/EnhancedFatDxe/Fat.inf > INF MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf > > - INF MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteDxe.inf > - INF MdeModulePkg/Universal/Variable/EmuRuntimeDxe/EmuVariableRuntimeDxe.inf > + INF MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf > > INF MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf > > -- > 2.7.0.windows.1 >