system76 · crawfxrd · Nov 2, 2023 · Nov 2, 2023
diff --git a/models/addw1/edk2.config b/models/addw1/edk2.config
@@ -7,3 +7,7 @@ SERIAL_DRIVER_ENABLE=FALSE
 SHELL_TYPE=NONE
 TPM_ENABLE=TRUE
 #SYSTEM76_EC_LOGGING=TRUE
+
+# FMP UUIDs for ESRT
+SYSTEM_FMP_UUID=230b1cbc-6df5-437a-a364-b61f9fa6a4f6
+EC_FMP_UUID=45a6839a-1666-40e3-8e90-103de469f025
diff --git a/models/addw2/edk2.config b/models/addw2/edk2.config
@@ -7,3 +7,7 @@ SERIAL_DRIVER_ENABLE=FALSE
 SHELL_TYPE=NONE
 TPM_ENABLE=TRUE
 #SYSTEM76_EC_LOGGING=TRUE
+
+# FMP UUIDs for ESRT
+SYSTEM_FMP_UUID=baaca94e-b8e8-4357-acb9-35819eeba12b
+EC_FMP_UUID=3e21b09a-c90c-43b7-a9e9-07704264d44a
diff --git a/models/addw3/edk2.config b/models/addw3/edk2.config
@@ -7,3 +7,7 @@ SERIAL_DRIVER_ENABLE=FALSE
 SHELL_TYPE=NONE
 TPM_ENABLE=TRUE
 #SYSTEM76_EC_LOGGING=TRUE
+
+# FMP UUIDs for ESRT
+SYSTEM_FMP_UUID=6f4bb433-7ba2-4665-8793-72583a11ca06
+EC_FMP_UUID=7e1cd184-2ef7-490c-9201-c3229b9361b8
diff --git a/models/bonw14/edk2.config b/models/bonw14/edk2.config
@@ -7,3 +7,7 @@ SERIAL_DRIVER_ENABLE=FALSE
 SHELL_TYPE=NONE
 TPM_ENABLE=TRUE
 #SYSTEM76_EC_LOGGING=TRUE
+
+# FMP UUIDs for ESRT
+SYSTEM_FMP_UUID=ddb89e07-21a5-4fc4-a489-a1dd805de663
+EC_FMP_UUID=38bf32e8-d40d-47cd-9412-cd362779ad1b
diff --git a/models/bonw15/edk2.config b/models/bonw15/edk2.config
@@ -7,3 +7,7 @@ SERIAL_DRIVER_ENABLE=FALSE
 SHELL_TYPE=NONE
 TPM_ENABLE=TRUE
 #SYSTEM76_EC_LOGGING=TRUE
+
+# FMP UUIDs for ESRT
+SYSTEM_FMP_UUID=2cf0f73c-f043-425a-a50e-111169eb6697
+EC_FMP_UUID=50cb5c95-5618-49b9-a075-ce47d990daad
diff --git a/models/darp5/edk2.config b/models/darp5/edk2.config
@@ -7,3 +7,7 @@ SERIAL_DRIVER_ENABLE=FALSE
 SHELL_TYPE=NONE
 TPM_ENABLE=TRUE
 #SYSTEM76_EC_LOGGING=TRUE
+
+# FMP UUIDs for ESRT
+SYSTEM_FMP_UUID=6b4f28e4-5042-4800-b8ed-c7eabca4cca0
+EC_FMP_UUID=9fd9e876-faa4-4967-9bc4-1b2e4e9e82eb
diff --git a/models/darp6/edk2.config b/models/darp6/edk2.config
@@ -7,3 +7,7 @@ SERIAL_DRIVER_ENABLE=FALSE
 SHELL_TYPE=NONE
 TPM_ENABLE=TRUE
 #SYSTEM76_EC_LOGGING=TRUE
+
+# FMP UUIDs for ESRT
+SYSTEM_FMP_UUID=66291ad4-79c0-4729-b500-fe86a622a171
+EC_FMP_UUID=1b94f5e0-4e3e-4575-adec-dedab7ab9691
diff --git a/models/darp7/edk2.config b/models/darp7/edk2.config
@@ -7,3 +7,7 @@ SERIAL_DRIVER_ENABLE=FALSE
 SHELL_TYPE=NONE
 TPM_ENABLE=TRUE
 #SYSTEM76_EC_LOGGING=TRUE
+
+# FMP UUIDs for ESRT
+SYSTEM_FMP_UUID=519360a8-111a-4279-b55c-fd7d62e24f1c
+EC_FMP_UUID=d16d934a-68ac-4381-99ab-eb1dfdb97ada
diff --git a/models/darp8/edk2.config b/models/darp8/edk2.config
@@ -7,3 +7,7 @@ SERIAL_DRIVER_ENABLE=FALSE
 SHELL_TYPE=NONE
 TPM_ENABLE=TRUE
 #SYSTEM76_EC_LOGGING=TRUE
+
+# FMP UUIDs for ESRT
+SYSTEM_FMP_UUID=8e9eebcd-21c7-4187-b0c8-b4aa11ab8152
+EC_FMP_UUID=caa0f156-d2ef-4ed6-949e-322eff2f2c74
diff --git a/models/darp9/edk2.config b/models/darp9/edk2.config
@@ -7,3 +7,7 @@ SERIAL_DRIVER_ENABLE=FALSE
 SHELL_TYPE=NONE
 TPM_ENABLE=TRUE
 #SYSTEM76_EC_LOGGING=TRUE
+
+# FMP UUIDs for ESRT
+SYSTEM_FMP_UUID=7119893e-9d2e-4664-8c6a-a0cba1943a11
+EC_FMP_UUID=08a7e5c7-e04e-4968-a2db-cbc3d2392f0d
diff --git a/models/galp2/edk2.config b/models/galp2/edk2.config
@@ -7,3 +7,7 @@ SERIAL_DRIVER_ENABLE=FALSE
 SHELL_TYPE=NONE
 TPM_ENABLE=TRUE
 #SYSTEM76_EC_LOGGING=TRUE
+
+# FMP UUIDs for ESRT
+SYSTEM_FMP_UUID=0a72c745-f2b5-47ee-9f06-596a10c6d91b
+EC_FMP_UUID=6cc60ab6-68fe-4cd7-a2af-498ccea8f154
diff --git a/models/galp3-b/edk2.config b/models/galp3-b/edk2.config
@@ -7,3 +7,7 @@ SERIAL_DRIVER_ENABLE=FALSE
 SHELL_TYPE=NONE
 TPM_ENABLE=TRUE
 #SYSTEM76_EC_LOGGING=TRUE
+
+# FMP UUIDs for ESRT
+SYSTEM_FMP_UUID=748a5cf7-5d6d-48aa-88ac-9a58a7707ad7
+EC_FMP_UUID=5bbc4600-9f7b-424d-bc7a-f31528ad6887
diff --git a/models/galp3-c/edk2.config b/models/galp3-c/edk2.config
@@ -7,3 +7,7 @@ SERIAL_DRIVER_ENABLE=FALSE
 SHELL_TYPE=NONE
 TPM_ENABLE=TRUE
 #SYSTEM76_EC_LOGGING=TRUE
+
+# FMP UUIDs for ESRT
+SYSTEM_FMP_UUID=f7ff804e-00d1-4879-9fbc-5d9e98aad921
+EC_FMP_UUID=b4110dea-a9a5-4336-b3d2-1dda742f0755
diff --git a/models/galp3/edk2.config b/models/galp3/edk2.config
@@ -7,3 +7,7 @@ SERIAL_DRIVER_ENABLE=FALSE
 SHELL_TYPE=NONE
 TPM_ENABLE=TRUE
 #SYSTEM76_EC_LOGGING=TRUE
+
+# FMP UUIDs for ESRT
+SYSTEM_FMP_UUID=0ba5d88e-b62e-424a-8a83-663668ff4319
+EC_FMP_UUID=74b6d179-b96b-4ae3-8f68-38ffd421af36
diff --git a/models/galp4/edk2.config b/models/galp4/edk2.config
@@ -7,3 +7,7 @@ SERIAL_DRIVER_ENABLE=FALSE
 SHELL_TYPE=NONE
 TPM_ENABLE=TRUE
 #SYSTEM76_EC_LOGGING=TRUE
+
+# FMP UUIDs for ESRT
+SYSTEM_FMP_UUID=35a5f4e2-697c-4789-887f-1f72180b4547
+EC_FMP_UUID=b64c646c-f182-4601-bf4d-20857a8922d7
diff --git a/models/galp5/edk2.config b/models/galp5/edk2.config
@@ -7,3 +7,7 @@ SERIAL_DRIVER_ENABLE=FALSE
 SHELL_TYPE=NONE
 TPM_ENABLE=TRUE
 #SYSTEM76_EC_LOGGING=TRUE
+
+# FMP UUIDs for ESRT
+SYSTEM_FMP_UUID=db152fa9-3a66-4071-92c5-3ee90990b7fb
+EC_FMP_UUID=43bfc388-b206-4ba7-a4a3-690d28072837
diff --git a/models/galp6/edk2.config b/models/galp6/edk2.config
@@ -7,3 +7,7 @@ SERIAL_DRIVER_ENABLE=FALSE
 SHELL_TYPE=NONE
 TPM_ENABLE=TRUE
 #SYSTEM76_EC_LOGGING=TRUE
+
+# FMP UUIDs for ESRT
+SYSTEM_FMP_UUID=58363716-8335-497f-975e-c08c0267f574
+EC_FMP_UUID=68000e4c-4a53-449d-95d9-4ddacbf90704
diff --git a/models/galp7/edk2.config b/models/galp7/edk2.config
@@ -7,3 +7,7 @@ SERIAL_DRIVER_ENABLE=FALSE
 SHELL_TYPE=NONE
 TPM_ENABLE=TRUE
 #SYSTEM76_EC_LOGGING=TRUE
+
+# FMP UUIDs for ESRT
+SYSTEM_FMP_UUID=8319b52f-25ca-4eba-a449-4873ba770983
+EC_FMP_UUID=059d18e0-7e9e-444c-9f0b-53338775769d
diff --git a/models/gaze14_1650/edk2.config b/models/gaze14_1650/edk2.config
@@ -7,3 +7,7 @@ SERIAL_DRIVER_ENABLE=FALSE
 SHELL_TYPE=NONE
 TPM_ENABLE=TRUE
 #SYSTEM76_EC_LOGGING=TRUE
+
+# FMP UUIDs for ESRT
+SYSTEM_FMP_UUID=9e6089d4-a7c3-4883-a183-baa05a178b9a
+EC_FMP_UUID=d8dd8b0a-1e8a-4bb0-bbe6-3d7cc4ec55e0
diff --git a/models/gaze14_1660ti/edk2.config b/models/gaze14_1660ti/edk2.config
@@ -7,3 +7,7 @@ SERIAL_DRIVER_ENABLE=FALSE
 SHELL_TYPE=NONE
 TPM_ENABLE=TRUE
 #SYSTEM76_EC_LOGGING=TRUE
+
+# FMP UUIDs for ESRT
+SYSTEM_FMP_UUID=fbf1ff7e-c73c-4a96-b736-c2f61a15ac11
+EC_FMP_UUID=f9fb50d1-e096-41f4-b3f7-1c92cdc60f96
diff --git a/models/gaze15/edk2.config b/models/gaze15/edk2.config
@@ -7,3 +7,7 @@ SERIAL_DRIVER_ENABLE=FALSE
 SHELL_TYPE=NONE
 TPM_ENABLE=TRUE
 #SYSTEM76_EC_LOGGING=TRUE
+
+# FMP UUIDs for ESRT
+SYSTEM_FMP_UUID=6f5ea998-26e4-460f-8253-4bc11dec9147
+EC_FMP_UUID=171d941d-7945-4f93-991e-fbab63711a72
diff --git a/models/gaze16-3050/edk2.config b/models/gaze16-3050/edk2.config
@@ -7,3 +7,7 @@ SERIAL_DRIVER_ENABLE=FALSE
 SHELL_TYPE=NONE
 TPM_ENABLE=TRUE
 #SYSTEM76_EC_LOGGING=TRUE
+
+# FMP UUIDs for ESRT
+SYSTEM_FMP_UUID=5b7a128a-be0e-4582-9369-2da230a0bfdc
+EC_FMP_UUID=8fb07243-f361-4e86-9d3d-c8af04023ed9
diff --git a/models/gaze16-3060-b/edk2.config b/models/gaze16-3060-b/edk2.config
@@ -7,3 +7,7 @@ SERIAL_DRIVER_ENABLE=FALSE
 SHELL_TYPE=NONE
 TPM_ENABLE=TRUE
 #SYSTEM76_EC_LOGGING=TRUE
+
+# FMP UUIDs for ESRT
+SYSTEM_FMP_UUID=49324634-74d5-45f8-8ff3-1d6cf55f0838
+EC_FMP_UUID=19f88309-549b-4d41-b9d4-5109d4c7a43f
diff --git a/models/gaze16-3060/edk2.config b/models/gaze16-3060/edk2.config
@@ -7,3 +7,7 @@ SERIAL_DRIVER_ENABLE=FALSE
 SHELL_TYPE=NONE
 TPM_ENABLE=TRUE
 #SYSTEM76_EC_LOGGING=TRUE
+
+# FMP UUIDs for ESRT
+SYSTEM_FMP_UUID=a5b63408-83c3-4286-b4b9-89dcb4dce2ab
+EC_FMP_UUID=05db216c-9887-442c-83ad-def6976eaf2e
diff --git a/models/gaze17-3050/edk2.config b/models/gaze17-3050/edk2.config
@@ -7,3 +7,7 @@ SERIAL_DRIVER_ENABLE=FALSE
 SHELL_TYPE=NONE
 TPM_ENABLE=TRUE
 #SYSTEM76_EC_LOGGING=TRUE
+
+# FMP UUIDs for ESRT
+SYSTEM_FMP_UUID=30a601c2-017a-40e5-b699-edfb12010a68
+EC_FMP_UUID=1b906e64-5b6e-4118-9c9f-0c7675ac5bd0
diff --git a/models/gaze17-3060-b/edk2.config b/models/gaze17-3060-b/edk2.config
@@ -7,3 +7,7 @@ SERIAL_DRIVER_ENABLE=FALSE
 SHELL_TYPE=NONE
 TPM_ENABLE=TRUE
 #SYSTEM76_EC_LOGGING=TRUE
+
+# FMP UUIDs for ESRT
+SYSTEM_FMP_UUID=466987a3-59f2-45b2-8f33-b91a51cb19bb
+EC_FMP_UUID=b708506b-a265-4e99-aec5-18a2704f739a
diff --git a/models/gaze18/edk2.config b/models/gaze18/edk2.config
@@ -7,3 +7,7 @@ SERIAL_DRIVER_ENABLE=FALSE
 SHELL_TYPE=NONE
 TPM_ENABLE=TRUE
 #SYSTEM76_EC_LOGGING=TRUE
+
+# FMP UUIDs for ESRT
+SYSTEM_FMP_UUID=c950bb89-fb68-4c77-802b-6634d986951f
+EC_FMP_UUID=cdc7a1fb-eb74-44ae-b886-42e1410d4227
diff --git a/models/lemp10/edk2.config b/models/lemp10/edk2.config
@@ -7,3 +7,7 @@ SERIAL_DRIVER_ENABLE=FALSE
 SHELL_TYPE=NONE
 TPM_ENABLE=TRUE
 #SYSTEM76_EC_LOGGING=TRUE
+
+# FMP UUIDs for ESRT
+SYSTEM_FMP_UUID=6ea0e16f-746e-4799-949c-f4eb087963bf
+EC_FMP_UUID=a53fb0e2-1bb3-4844-955b-d6109273062e
diff --git a/models/lemp11/edk2.config b/models/lemp11/edk2.config
@@ -7,3 +7,7 @@ SERIAL_DRIVER_ENABLE=FALSE
 SHELL_TYPE=NONE
 TPM_ENABLE=TRUE
 #SYSTEM76_EC_LOGGING=TRUE
+
+# FMP UUIDs for ESRT
+SYSTEM_FMP_UUID=eae9abe0-3ebe-4fa1-9a77-03d934196343
+EC_FMP_UUID=e20fdee2-8f47-40fc-a53d-635b6834adc5
diff --git a/models/lemp12/edk2.config b/models/lemp12/edk2.config
@@ -7,3 +7,7 @@ SERIAL_DRIVER_ENABLE=FALSE
 SHELL_TYPE=NONE
 TPM_ENABLE=TRUE
 #SYSTEM76_EC_LOGGING=TRUE
+
+# FMP UUIDs for ESRT
+SYSTEM_FMP_UUID=2ba3e971-8799-4709-ab2a-7bb28da045f9
+EC_FMP_UUID=87f66db7-9f59-4985-80c0-f5db88556203
diff --git a/models/lemp9/edk2.config b/models/lemp9/edk2.config
@@ -7,3 +7,7 @@ SERIAL_DRIVER_ENABLE=FALSE
 SHELL_TYPE=NONE
 TPM_ENABLE=TRUE
 #SYSTEM76_EC_LOGGING=TRUE
+
+# FMP UUIDs for ESRT
+SYSTEM_FMP_UUID=546cc02a-e435-4ba3-83c0-6fa96c348d79
+EC_FMP_UUID=0b653180-a2a6-4703-8cc1-00de43b8a1fa
diff --git a/models/oryp10/edk2.config b/models/oryp10/edk2.config
@@ -7,3 +7,7 @@ SERIAL_DRIVER_ENABLE=FALSE
 SHELL_TYPE=NONE
 TPM_ENABLE=TRUE
 #SYSTEM76_EC_LOGGING=TRUE
+
+# FMP UUIDs for ESRT
+SYSTEM_FMP_UUID=99c70651-493f-4516-9319-cf9b9c1ea26a
+EC_FMP_UUID=1ec9ca56-ca05-448e-8362-5c78bb515246
diff --git a/models/oryp11/edk2.config b/models/oryp11/edk2.config
@@ -7,3 +7,7 @@ SERIAL_DRIVER_ENABLE=FALSE
 SHELL_TYPE=NONE
 TPM_ENABLE=TRUE
 #SYSTEM76_EC_LOGGING=TRUE
+
+# FMP UUIDs for ESRT
+SYSTEM_FMP_UUID=f915bafe-7912-49c2-9052-076119a4165e
+EC_FMP_UUID=963780ec-770e-4f9c-b8a2-50ff08be72d0
diff --git a/models/oryp5/edk2.config b/models/oryp5/edk2.config
@@ -7,3 +7,7 @@ SERIAL_DRIVER_ENABLE=FALSE
 SHELL_TYPE=NONE
 TPM_ENABLE=TRUE
 #SYSTEM76_EC_LOGGING=TRUE
+
+# FMP UUIDs for ESRT
+SYSTEM_FMP_UUID=f17c6779-3053-4326-a176-1bfaac00f961
+EC_FMP_UUID=392db467-b100-47e8-a2df-c12a5bd8256e
diff --git a/models/oryp6/edk2.config b/models/oryp6/edk2.config
@@ -7,3 +7,7 @@ SERIAL_DRIVER_ENABLE=FALSE
 SHELL_TYPE=NONE
 TPM_ENABLE=TRUE
 #SYSTEM76_EC_LOGGING=TRUE
+
+# FMP UUIDs for ESRT
+SYSTEM_FMP_UUID=778469a7-ab6c-441c-86e0-af6ea763c451
+EC_FMP_UUID=45432a47-7c45-4833-a05e-deed6556581d
diff --git a/models/oryp7/edk2.config b/models/oryp7/edk2.config
@@ -7,3 +7,7 @@ SERIAL_DRIVER_ENABLE=FALSE
 SHELL_TYPE=NONE
 TPM_ENABLE=TRUE
 #SYSTEM76_EC_LOGGING=TRUE
+
+# FMP UUIDs for ESRT
+SYSTEM_FMP_UUID=d4d3b541-5e6a-4a66-ae93-aa832aa58802
+EC_FMP_UUID=85db9eab-4df6-4ddf-ac96-d3fe58ec7f30
diff --git a/models/oryp8/edk2.config b/models/oryp8/edk2.config
@@ -7,3 +7,7 @@ SERIAL_DRIVER_ENABLE=FALSE
 SHELL_TYPE=NONE
 TPM_ENABLE=TRUE
 #SYSTEM76_EC_LOGGING=TRUE
+
+# FMP UUIDs for ESRT
+SYSTEM_FMP_UUID=2d71caa4-f991-4cc8-835d-89985b1df0cb
+EC_FMP_UUID=835b51bc-e0d0-4f31-b523-c1844056a6ce
diff --git a/models/oryp9/edk2.config b/models/oryp9/edk2.config
@@ -7,3 +7,7 @@ SERIAL_DRIVER_ENABLE=FALSE
 SHELL_TYPE=NONE
 TPM_ENABLE=TRUE
 #SYSTEM76_EC_LOGGING=TRUE
+
+# FMP UUIDs for ESRT
+SYSTEM_FMP_UUID=ab019fe3-5528-475c-b27f-f6add0e38dd3
+EC_FMP_UUID=0116b87c-b7c8-4ec0-8b32-63d783d3f908
diff --git a/models/serw13/edk2.config b/models/serw13/edk2.config
@@ -7,3 +7,7 @@ SERIAL_DRIVER_ENABLE=FALSE
 SHELL_TYPE=NONE
 TPM_ENABLE=TRUE
 #SYSTEM76_EC_LOGGING=TRUE
+
+# FMP UUIDs for ESRT
+SYSTEM_FMP_UUID=7aa20a68-da5a-4232-9c6d-438e49804ff6
+EC_FMP_UUID=4b03cb51-b3f8-4921-9e64-68998cb3f6ed
diff --git a/scripts/build.sh b/scripts/build.sh
@@ -24,6 +24,9 @@ REV="$(git describe --always --dirty --abbrev=7)"
 VERSION="${DATE}_${REV}"
 echo "Building '${VERSION}' for '${MODEL}'"
 
+# Path to edk2's Python script to generate UEFI capsules
+GENERATE_CAPSULE="./edk2/BaseTools/BinWrappers/PosixLike/GenerateCapsule"
+
 # Clean build directory
 mkdir -p build
 BUILD="$(realpath "build/${MODEL}")"
@@ -62,13 +65,16 @@ if [ -e "${MODEL_DIR}/edk2.config" ]
 then
     while read line
     do
-        if [[ "$line" != "#"* ]]
+        if [ -n "$line" ] && [[ "$line" != "#"* ]]
         then
             EDK2_ARGS+=(-D "$line")
         fi
     done < "${MODEL_DIR}/edk2.config"
 fi
 
+# Source edk2 config for FMP values
+. "$MODEL_DIR/edk2.config"
+
 # Rebuild UefiPayloadPkg using edk2
 PACKAGES_PATH="${MODEL_DIR}:$(realpath apps)" \
     ./scripts/_build/edk2.sh \
@@ -83,13 +89,33 @@ KERNELVERSION="${VERSION}" \
         "${MODEL_DIR}/coreboot.config" \
         "${COREBOOT}"
 
+if [ "$MODEL" != "qemu" ]; then
+    # Generate system firmware capsule
+    SYSTEM_FMP_VERSION=1
+    $GENERATE_CAPSULE -e \
+        --guid "$SYSTEM_FMP_UUID" \
+        --fw-version "$SYSTEM_FMP_VERSION" \
+        --lsv 0 \
+        -o "$BUILD/firmware.cap" \
+        "$BUILD/firmware.rom"
+fi
+
 # Rebuild EC firmware for System76 EC models
 if [ ! -e  "${MODEL_DIR}/ec.rom" ] && [ -e "${MODEL_DIR}/ec.config" ]
 then
     env VERSION="${VERSION}" \
         ./scripts/_build/ec.sh \
         "${MODEL_DIR}/ec.config" \
         "${BUILD}/ec.rom"
+
+    # Generate EC firmware capsule
+    EC_FMP_VERSION=1
+    $GENERATE_CAPSULE -e \
+        --guid "$EC_FMP_UUID" \
+        --fw-version "$EC_FMP_VERSION" \
+        --lsv 0 \
+        -o "$BUILD/ec.cap" \
+        "$BUILD/ec.rom"
 fi
 
 if [ "${MODEL}" != "qemu" ]