From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: None (no SPF record) identity=mailfrom; client-ip=2a00:1450:4010:c07::241; helo=mail-lf0-x241.google.com; envelope-from=mw@semihalf.com; receiver=edk2-devel@lists.01.org Received: from mail-lf0-x241.google.com (mail-lf0-x241.google.com [IPv6:2a00:1450:4010:c07::241]) (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 3A30621B00DDB for ; Mon, 20 Nov 2017 22:42:56 -0800 (PST) Received: by mail-lf0-x241.google.com with SMTP id x68so12839661lff.0 for ; Mon, 20 Nov 2017 22:47:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=semihalf-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=qYGspALF4Khu2PKddInywzyZe4VYQItBQGy78JYVeVk=; b=fSZxh/FJFpjLXZyGXcGUm0xEWjsSHVk9PEbIDGOsPtwBlT/HmUM6T387u7Enyhd+DD M/zxtELvlrM51639AuqP+vNEPa0d5yV5dTVV8PINXkuLyqJPhUa7fBcebaN7/Pcijhe+ Y2VxO9DKcMbQ7ecM/O8nUSEOuPn2yL8p0H2fK9tYg8XuXg1Wkry8U4nALIyD2+EHbpTf uHnsMAUTOG5xV2QluRJdalAq4I7/JR07dN6VB8hFOSD/CJ0vhi/ItMA/d+cX81a5myzM pOwlNkNOveSxz3CiY7JghlyKOcSrwI+LCGvPUZSgjZc77qC83L9BDQTnNYBfZyag7W5l CKwQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=qYGspALF4Khu2PKddInywzyZe4VYQItBQGy78JYVeVk=; b=XCFJedog+UTy2vOH4jqV3+1KPWvV7qSEc/XknDS3i0eurK2pphl+d9di4cVUGDj10+ ixEHr5Go62+4L4I+A57mnwvYV9mEQZxcyJqISGQsDs92bS0VC+C0r7Nn2bY7PONWE3r7 NWhpc4viUr+zrTR2ehCY2ltLmoYLzk1SlXl4mldq03yIll/znuCAZQxGOXG8QKt3NS3m RTD8SN8Elvin6TEYIfKBCZpihL3I7F0gjVIoH2oX88PNaE2fhBFx+r7YyRY7RTA4EGoN vvFEYiS6r4KQBXFadWz/g+eOHB5T1cdDPthn0J7b8YgdqIBg+SMwYkLYjWvKxZjClZIs yZjg== X-Gm-Message-State: AJaThX4W5zN4zXMJENs/Z83bX0SbbU6CYI4mQ0KJ/qezzjhbJE5UEelP 3kK28k9fgtJ6PBtMql2jvGwUM1DC20o= X-Google-Smtp-Source: AGs4zMbjgddxXwBXcGNwhEEk7zErD66Q7vgiZXHe7k85biHibZ04Er5MClgWIhPQMLY/3bP2n+/F8g== X-Received: by 10.46.7.68 with SMTP id i4mr5117578ljd.150.1511246829164; Mon, 20 Nov 2017 22:47:09 -0800 (PST) Received: from gilgamesh.semihalf.com (31-172-191-173.noc.fibertech.net.pl. [31.172.191.173]) by smtp.gmail.com with ESMTPSA id f79sm2267015lfk.57.2017.11.20.22.47.08 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 20 Nov 2017 22:47:08 -0800 (PST) From: Marcin Wojtas To: edk2-devel@lists.01.org Cc: leif.lindholm@linaro.org, ard.biesheuvel@linaro.org, nadavh@marvell.com, neta@marvell.com, kostap@marvell.com, jinghua@marvell.com, mw@semihalf.com, jsd@semihalf.com Date: Tue, 21 Nov 2017 07:46:21 +0100 Message-Id: <1511246781-7073-5-git-send-email-mw@semihalf.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1511246781-7073-1-git-send-email-mw@semihalf.com> References: <1511246781-7073-1-git-send-email-mw@semihalf.com> Subject: [platforms: PATCH v2 4/4] Marvell/Armada: Enable variables support X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 21 Nov 2017 06:42:56 -0000 Wire up the non-volatile EFI variable store support, by switching from the emulation driver to the real one. Define default values for memory mapped SPI access, which must be configured by the early firmware. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Marcin Wojtas --- Platform/Marvell/Armada/Armada.dsc.inc | 25 +++++++++++++++++++- Platform/Marvell/Armada/Armada70x0.fdf | 6 ++++- 2 files changed, 29 insertions(+), 2 deletions(-) diff --git a/Platform/Marvell/Armada/Armada.dsc.inc b/Platform/Marvell/Armada/Armada.dsc.inc index 2cd96e6..cccc3e0 100644 --- a/Platform/Marvell/Armada/Armada.dsc.inc +++ b/Platform/Marvell/Armada/Armada.dsc.inc @@ -371,6 +371,17 @@ # TRNG gMarvellTokenSpaceGuid.PcdEip76TrngBaseAddress|0xF2760000 + # + # Variable store - default values + # + gMarvellTokenSpaceGuid.PcdSpiMemoryBase|0xF9000000 + gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableBase|0xF93C0000 + gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableSize|0x00010000 + gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingBase|0xF93D0000 + gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingSize|0x00010000 + gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareBase|0xF93E0000 + gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareSize|0x00010000 + ################################################################################ # # Components Section - list of all EDK II Modules needed by this Platform @@ -428,7 +439,6 @@ MdeModulePkg/Core/RuntimeDxe/RuntimeDxe.inf MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxe.inf MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleRuntimeDxe.inf - MdeModulePkg/Universal/Variable/EmuRuntimeDxe/EmuVariableRuntimeDxe.inf EmbeddedPkg/EmbeddedMonotonicCounter/EmbeddedMonotonicCounter.inf MdeModulePkg/Universal/ResetSystemRuntimeDxe/ResetSystemRuntimeDxe.inf @@ -485,6 +495,19 @@ NULL|MdeModulePkg/Library/BootMaintenanceManagerUiLib/BootMaintenanceManagerUiLib.inf } + # + # Variable services + # + Platform/Marvell/Drivers/Spi/Variables/MvFvbDxe.inf + MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteDxe.inf + MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf { + + AuthVariableLib|MdeModulePkg/Library/AuthVariableLibNull/AuthVariableLibNull.inf + NULL|MdeModulePkg/Library/VarCheckUefiLib/VarCheckUefiLib.inf + TpmMeasurementLib|MdeModulePkg/Library/TpmMeasurementLibNull/TpmMeasurementLibNull.inf + VarCheckLib|MdeModulePkg/Library/VarCheckLib/VarCheckLib.inf + } + # UEFI application (Shell Embedded Boot Loader) ShellPkg/Application/Shell/Shell.inf { diff --git a/Platform/Marvell/Armada/Armada70x0.fdf b/Platform/Marvell/Armada/Armada70x0.fdf index ec2c368..ca92c60 100644 --- a/Platform/Marvell/Armada/Armada70x0.fdf +++ b/Platform/Marvell/Armada/Armada70x0.fdf @@ -103,7 +103,6 @@ FvNameGuid = 5eda4200-2c5f-43cb-9da3-0baf74b1b30c INF MdeModulePkg/Core/RuntimeDxe/RuntimeDxe.inf INF MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxe.inf INF MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleRuntimeDxe.inf - INF MdeModulePkg/Universal/Variable/EmuRuntimeDxe/EmuVariableRuntimeDxe.inf INF EmbeddedPkg/EmbeddedMonotonicCounter/EmbeddedMonotonicCounter.inf INF MdeModulePkg/Universal/ResetSystemRuntimeDxe/ResetSystemRuntimeDxe.inf INF EmbeddedPkg/RealTimeClockRuntimeDxe/RealTimeClockRuntimeDxe.inf @@ -115,6 +114,11 @@ FvNameGuid = 5eda4200-2c5f-43cb-9da3-0baf74b1b30c INF Platform/Marvell/Drivers/Spi/Devices/MvSpiFlash.inf INF Platform/Marvell/Armada/Drivers/Armada70x0RngDxe/Armada70x0RngDxe.inf + # Variable services + INF Platform/Marvell/Drivers/Spi/Variables/MvFvbDxe.inf + INF MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteDxe.inf + INF MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf + # Network support INF MdeModulePkg/Universal/Network/SnpDxe/SnpDxe.inf INF MdeModulePkg/Universal/Network/DpcDxe/DpcDxe.inf -- 2.7.4