From 2efdeda500112a708dca66ec1248de56f905ab8b Mon Sep 17 00:00:00 2001
From: Jeremy Soller <jeremy@system76.com>
Date: Mon, 28 Oct 2019 14:17:12 -0600
Subject: [PATCH] Integrate smmstore driver

---
 apps/firmware-setup    |  2 +-
 apps/firmware-smmstore |  2 +-
 edk2                   |  2 +-
 scripts/build.sh       | 10 ++++++++++
 4 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/apps/firmware-setup b/apps/firmware-setup
index 5ec786d..ca53202 160000
--- a/apps/firmware-setup
+++ b/apps/firmware-setup
@@ -1 +1 @@
-Subproject commit 5ec786d214d17da760b5f601416dd909143da71d
+Subproject commit ca53202888b7413fd46d66b99d7631c52693c6cf
diff --git a/apps/firmware-smmstore b/apps/firmware-smmstore
index d0a5307..fed0772 160000
--- a/apps/firmware-smmstore
+++ b/apps/firmware-smmstore
@@ -1 +1 @@
-Subproject commit d0a5307bccb19728af513798e50179ef49296488
+Subproject commit fed07728389d9b688d5d41684aaf76067938ed36
diff --git a/edk2 b/edk2
index 815bd80..823b50a 160000
--- a/edk2
+++ b/edk2
@@ -1 +1 @@
-Subproject commit 815bd801d666c14848dcb889a2db941ccffe5e1b
+Subproject commit 823b50a1f7f5d0c0c7891897b92c389936f0f7c7
diff --git a/scripts/build.sh b/scripts/build.sh
index 49a0d57..16eacb1 100755
--- a/scripts/build.sh
+++ b/scripts/build.sh
@@ -43,6 +43,16 @@ EDK2_ARGS+=(
     -D FIRMWARE_OPEN_FIRMWARE_SETUP="firmware-setup/firmware-setup.inf"
 )
 
+# Rebuild firmware-smmstore (used by edk2)
+if [ "${MODEL}" != "qemu" ]
+then
+    touch apps/firmware-smmstore/Cargo.toml
+    make -C apps/firmware-smmstore
+    EDK2_ARGS+=(
+        -D FIRMWARE_OPEN_FIRMWARE_SMMSTORE="firmware-smmstore/firmware-smmstore.inf"
+    )
+fi
+
 # Rebuild gop-policy (used by edk2)
 if [ -e "${MODEL_DIR}/IntelGopDriver.inf" -a -e "${MODEL_DIR}/vbt.rom" ]
 then