From c90cf2f0f10e0bce12873818368f1a99c65433fd Mon Sep 17 00:00:00 2001 From: Tim Crawford Date: Wed, 2 Aug 2023 15:57:26 -0600 Subject: [PATCH] Remove firmware-smmstore firmware-smmstore is a Rust-based application for compacting SMMSTOREv1, which we no longer use. After commit af955613e09d ("models: Enable SMMSTOREv2 in coreboot") it is no longer needed. Signed-off-by: Tim Crawford --- .gitmodules | 4 ---- apps/README.md | 1 - apps/firmware-smmstore | 1 - scripts/build.sh | 10 ---------- 4 files changed, 16 deletions(-) delete mode 160000 apps/firmware-smmstore diff --git a/.gitmodules b/.gitmodules index a6f9b2b..63b08d4 100644 --- a/.gitmodules +++ b/.gitmodules @@ -62,10 +62,6 @@ path = FSP url = https://github.com/IntelFsp/FSP.git branch = master -[submodule "apps/firmware-smmstore"] - path = apps/firmware-smmstore - url = https://github.com/system76/firmware-smmstore.git - branch = master [submodule "tools/ipxe"] path = tools/ipxe url = https://github.com/ipxe/ipxe.git diff --git a/apps/README.md b/apps/README.md index 1e77c32..7bdf18c 100644 --- a/apps/README.md +++ b/apps/README.md @@ -3,6 +3,5 @@ ## Contents - [firmware-setup](https://github.com/system76/firmware-setup.git) - System76 Firmware Setup -- [firmware-smmstore](https://github.com/system76/firmware-smmstore.git) - System76 Firmware SMMSTORE - [firmware-update](https://github.com/system76/firmware-update.git) - System76 Firmware Update - [gop-policy](https://github.com/system76/gop-policy.git) - System76 Platform GOP Policy diff --git a/apps/firmware-smmstore b/apps/firmware-smmstore deleted file mode 160000 index 00c44d4..0000000 --- a/apps/firmware-smmstore +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 00c44d42ac59055382aff96aef805ea94838b906 diff --git a/scripts/build.sh b/scripts/build.sh index ef6333a..01ca5df 100755 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -45,16 +45,6 @@ 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