edk2: Cleanup build flags and switch to gcc5

Signed-off-by: Stéphane Graber <stgraber@ubuntu.com>
canonical · Mar 10, 2023 · dadf771 · dadf771
1 parent 3e4c24e
commit dadf771
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/snapcraft.yaml b/snapcraft.yaml
@@ -317,15 +317,14 @@ parts:
       cat << EOF
           . ./edksetup.sh
           make -C BaseTools ARCH=${ARCH}
-          build -a ${ARCH} -t GCC49 -b RELEASE -p ${PKG} \
+          build -a ${ARCH} -t GCC5 -b RELEASE -p ${PKG} \
+            -DSMM_REQUIRE=TRUE \
             -DSECURE_BOOT_ENABLE=TRUE \
             -DNETWORK_IP4_ENABLE=TRUE \
             -DNETWORK_IP6_ENABLE=TRUE \
             -DNETWORK_TLS_ENABLE=TRUE \
             -DNETWORK_HTTP_BOOT_ENABLE=TRUE \
             -DFD_SIZE_2MB \
-            -DTPM_ENABLE=TRUE \
-            -DTPM_CONFIG_ENABLE=TRUE \
             -DTPM2_ENABLE=TRUE \
             -DTPM2_CONFIG_ENABLE=TRUE
       EOF