Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Protectli adl ppi #604

Merged
merged 3 commits into from
Dec 17, 2024
Merged

Protectli adl ppi #604

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d552596
3rdparty/dasharo-blobs: Bump for Protectli ADL power cycling issue
miczyg1 Dec 12, 2024
2dab83a
payloads/external/edk2: Add option to use UEFI variable-backed TPM PPI
miczyg1 Dec 12, 2024
fed8b0a
configs/config.protectli: Bump edk2 for correct TPM PPI
miczyg1 Dec 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion 3rdparty/dasharo-blobs
Open in desktop
Submodule dasharo-blobs updated 16 files
+ − novacustom/v5x0tu/IntelGopDriver.efi
+3 −0 novacustom/v5x0tu/README.md
+1 −0 novacustom/v5x0tu/SHA256SUMS
+13 −13 novacustom/v5x0tu/SHA256SUMS.sig
+16 −4 protectli/vault_adl_n/README.md
+5 −4 protectli/vault_adl_n/SHA256SUMS
+13 −13 protectli/vault_adl_n/SHA256SUMS.sig
+ − protectli/vault_adl_n/vp2430/descriptor.bin
+ − protectli/vault_adl_n/vp2430/me.bin
+ − protectli/vault_adl_n/vp32xx/descriptor.bin
+ − protectli/vault_adl_n/vp32xx/me.bin
+8 −2 protectli/vault_adl_p/README.md
+2 −2 protectli/vault_adl_p/SHA256SUMS
+13 −13 protectli/vault_adl_p/SHA256SUMS.sig
+ − protectli/vault_adl_p/descriptor.bin
+ − protectli/vault_adl_p/me.bin
2 changes: 1 addition & 1 deletion configs/config.protectli_vault_jsl_v1210
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ CONFIG_DEFAULT_CONSOLE_LOGLEVEL_0=y
# CONFIG_CONSOLE_USE_ANSI_ESCAPES is not set
CONFIG_PAYLOAD_EDK2=y
CONFIG_EDK2_REPOSITORY="https://github.com/Dasharo/edk2"
CONFIG_EDK2_TAG_OR_REV="4625e69219549f4ad82b567767bb72436ac60b70"
CONFIG_EDK2_TAG_OR_REV="0976fc5cc0c35174ebcf09d39a9dba5878243349"
CONFIG_EDK2_USE_EDK2_PLATFORMS=y
CONFIG_EDK2_PLATFORMS_REPOSITORY="https://github.com/Dasharo/edk2-platforms"
CONFIG_EDK2_PLATFORMS_TAG_OR_REV="3323ed481d35096fb6a7eae7b49f35eff00f86cf"
Expand Down
2 changes: 1 addition & 1 deletion configs/config.protectli_vault_jsl_v1211
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ CONFIG_DEFAULT_CONSOLE_LOGLEVEL_0=y
# CONFIG_CONSOLE_USE_ANSI_ESCAPES is not set
CONFIG_PAYLOAD_EDK2=y
CONFIG_EDK2_REPOSITORY="https://github.com/Dasharo/edk2"
CONFIG_EDK2_TAG_OR_REV="4625e69219549f4ad82b567767bb72436ac60b70"
CONFIG_EDK2_TAG_OR_REV="0976fc5cc0c35174ebcf09d39a9dba5878243349"
CONFIG_EDK2_USE_EDK2_PLATFORMS=y
CONFIG_EDK2_PLATFORMS_REPOSITORY="https://github.com/Dasharo/edk2-platforms"
CONFIG_EDK2_PLATFORMS_TAG_OR_REV="3323ed481d35096fb6a7eae7b49f35eff00f86cf"
Expand Down
2 changes: 1 addition & 1 deletion configs/config.protectli_vault_jsl_v1410
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ CONFIG_DEFAULT_CONSOLE_LOGLEVEL_0=y
# CONFIG_CONSOLE_USE_ANSI_ESCAPES is not set
CONFIG_PAYLOAD_EDK2=y
CONFIG_EDK2_REPOSITORY="https://github.com/Dasharo/edk2"
CONFIG_EDK2_TAG_OR_REV="4625e69219549f4ad82b567767bb72436ac60b70"
CONFIG_EDK2_TAG_OR_REV="0976fc5cc0c35174ebcf09d39a9dba5878243349"
CONFIG_EDK2_USE_EDK2_PLATFORMS=y
CONFIG_EDK2_PLATFORMS_REPOSITORY="https://github.com/Dasharo/edk2-platforms"
CONFIG_EDK2_PLATFORMS_TAG_OR_REV="3323ed481d35096fb6a7eae7b49f35eff00f86cf"
Expand Down
2 changes: 1 addition & 1 deletion configs/config.protectli_vault_jsl_v1610
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ CONFIG_DEFAULT_CONSOLE_LOGLEVEL_0=y
# CONFIG_CONSOLE_USE_ANSI_ESCAPES is not set
CONFIG_PAYLOAD_EDK2=y
CONFIG_EDK2_REPOSITORY="https://github.com/Dasharo/edk2"
CONFIG_EDK2_TAG_OR_REV="4625e69219549f4ad82b567767bb72436ac60b70"
CONFIG_EDK2_TAG_OR_REV="0976fc5cc0c35174ebcf09d39a9dba5878243349"
CONFIG_EDK2_USE_EDK2_PLATFORMS=y
CONFIG_EDK2_PLATFORMS_REPOSITORY="https://github.com/Dasharo/edk2-platforms"
CONFIG_EDK2_PLATFORMS_TAG_OR_REV="3323ed481d35096fb6a7eae7b49f35eff00f86cf"
Expand Down
3 changes: 2 additions & 1 deletion configs/config.protectli_vp2410
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ CONFIG_DEFAULT_CONSOLE_LOGLEVEL_0=y
CONFIG_POST_DEVICE_LPC=y
CONFIG_PAYLOAD_EDK2=y
CONFIG_EDK2_REPOSITORY="https://github.com/Dasharo/edk2"
CONFIG_EDK2_TAG_OR_REV="4625e69219549f4ad82b567767bb72436ac60b70"
CONFIG_EDK2_TAG_OR_REV="0976fc5cc0c35174ebcf09d39a9dba5878243349"
CONFIG_EDK2_USE_EDK2_PLATFORMS=y
CONFIG_EDK2_PLATFORMS_REPOSITORY="https://github.com/Dasharo/edk2-platforms"
CONFIG_EDK2_PLATFORMS_TAG_OR_REV="3323ed481d35096fb6a7eae7b49f35eff00f86cf"
Expand All @@ -59,3 +59,4 @@ CONFIG_EDK2_BOOT_MENU_KEY=0x0015
CONFIG_EDK2_SETUP_MENU_KEY=0x0008
CONFIG_EDK2_DISABLE_OPTION_ROMS=y
CONFIG_EDK2_CREATE_PREINSTALLED_BOOT_OPTIONS=y
CONFIG_EDK2_USE_UEFIVAR_BACKED_TPM_PPI=y
2 changes: 1 addition & 1 deletion configs/config.protectli_vp2420
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ CONFIG_DEFAULT_CONSOLE_LOGLEVEL_0=y
CONFIG_POST_DEVICE_LPC=y
CONFIG_PAYLOAD_EDK2=y
CONFIG_EDK2_REPOSITORY="https://github.com/Dasharo/edk2"
CONFIG_EDK2_TAG_OR_REV="4625e69219549f4ad82b567767bb72436ac60b70"
CONFIG_EDK2_TAG_OR_REV="0976fc5cc0c35174ebcf09d39a9dba5878243349"
CONFIG_EDK2_USE_EDK2_PLATFORMS=y
CONFIG_EDK2_PLATFORMS_REPOSITORY="https://github.com/Dasharo/edk2-platforms"
CONFIG_EDK2_PLATFORMS_TAG_OR_REV="3323ed481d35096fb6a7eae7b49f35eff00f86cf"
Expand Down
2 changes: 1 addition & 1 deletion configs/config.protectli_vp2430
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ CONFIG_DEFAULT_CONSOLE_LOGLEVEL_0=y
# CONFIG_CONSOLE_USE_ANSI_ESCAPES is not set
CONFIG_PAYLOAD_EDK2=y
CONFIG_EDK2_REPOSITORY="https://github.com/Dasharo/edk2"
CONFIG_EDK2_TAG_OR_REV="7dbfe58ba5dc08e07c253e53b5c1bfed7758ddf6"
CONFIG_EDK2_TAG_OR_REV="0976fc5cc0c35174ebcf09d39a9dba5878243349"
CONFIG_EDK2_USE_EDK2_PLATFORMS=y
CONFIG_EDK2_PLATFORMS_REPOSITORY="https://github.com/Dasharo/edk2-platforms"
CONFIG_EDK2_PLATFORMS_TAG_OR_REV="3323ed481d35096fb6a7eae7b49f35eff00f86cf"
Expand Down
2 changes: 1 addition & 1 deletion configs/config.protectli_vp32xx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ CONFIG_DEFAULT_CONSOLE_LOGLEVEL_0=y
# CONFIG_CONSOLE_USE_ANSI_ESCAPES is not set
CONFIG_PAYLOAD_EDK2=y
CONFIG_EDK2_REPOSITORY="https://github.com/Dasharo/edk2"
CONFIG_EDK2_TAG_OR_REV="7dbfe58ba5dc08e07c253e53b5c1bfed7758ddf6"
CONFIG_EDK2_TAG_OR_REV="0976fc5cc0c35174ebcf09d39a9dba5878243349"
CONFIG_EDK2_USE_EDK2_PLATFORMS=y
CONFIG_EDK2_PLATFORMS_REPOSITORY="https://github.com/Dasharo/edk2-platforms"
CONFIG_EDK2_PLATFORMS_TAG_OR_REV="3323ed481d35096fb6a7eae7b49f35eff00f86cf"
Expand Down
2 changes: 1 addition & 1 deletion configs/config.protectli_vp46xx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ CONFIG_DEFAULT_CONSOLE_LOGLEVEL_0=y
# CONFIG_CONSOLE_USE_ANSI_ESCAPES is not set
CONFIG_PAYLOAD_EDK2=y
CONFIG_EDK2_REPOSITORY="https://github.com/Dasharo/edk2"
CONFIG_EDK2_TAG_OR_REV="4625e69219549f4ad82b567767bb72436ac60b70"
CONFIG_EDK2_TAG_OR_REV="0976fc5cc0c35174ebcf09d39a9dba5878243349"
CONFIG_EDK2_USE_EDK2_PLATFORMS=y
CONFIG_EDK2_PLATFORMS_REPOSITORY="https://github.com/Dasharo/edk2-platforms"
CONFIG_EDK2_PLATFORMS_TAG_OR_REV="3323ed481d35096fb6a7eae7b49f35eff00f86cf"
Expand Down
2 changes: 1 addition & 1 deletion configs/config.protectli_vp46xx_txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ CONFIG_DEFAULT_CONSOLE_LOGLEVEL_0=y
# CONFIG_CONSOLE_USE_ANSI_ESCAPES is not set
CONFIG_PAYLOAD_EDK2=y
CONFIG_EDK2_REPOSITORY="https://github.com/Dasharo/edk2"
CONFIG_EDK2_TAG_OR_REV="4625e69219549f4ad82b567767bb72436ac60b70"
CONFIG_EDK2_TAG_OR_REV="0976fc5cc0c35174ebcf09d39a9dba5878243349"
CONFIG_EDK2_USE_EDK2_PLATFORMS=y
CONFIG_EDK2_PLATFORMS_REPOSITORY="https://github.com/Dasharo/edk2-platforms"
CONFIG_EDK2_PLATFORMS_TAG_OR_REV="3323ed481d35096fb6a7eae7b49f35eff00f86cf"
Expand Down
2 changes: 1 addition & 1 deletion configs/config.protectli_vp66xx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ CONFIG_DEFAULT_CONSOLE_LOGLEVEL_0=y
CONFIG_POST_DEVICE_LPC=y
CONFIG_PAYLOAD_EDK2=y
CONFIG_EDK2_REPOSITORY="https://github.com/Dasharo/edk2"
CONFIG_EDK2_TAG_OR_REV="4625e69219549f4ad82b567767bb72436ac60b70"
CONFIG_EDK2_TAG_OR_REV="0976fc5cc0c35174ebcf09d39a9dba5878243349"
CONFIG_EDK2_USE_EDK2_PLATFORMS=y
CONFIG_EDK2_PLATFORMS_REPOSITORY="https://github.com/Dasharo/edk2-platforms"
CONFIG_EDK2_PLATFORMS_TAG_OR_REV="3323ed481d35096fb6a7eae7b49f35eff00f86cf"
Expand Down
3 changes: 2 additions & 1 deletion payloads/external/Makefile.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -275,7 +275,8 @@ $(obj)/UEFIPAYLOAD.fd: $(DOTCONFIG) $(IPXE_EFI)
CONFIG_EDK2_CPU_THROTTLING_THRESHOLD_OPTION=$(CONFIG_EDK2_CPU_THROTTLING_THRESHOLD_OPTION) \
CONFIG_EDK2_CPU_THROTTLING_THRESHOLD_DEFAULT=$(CONFIG_EDK2_CPU_THROTTLING_THRESHOLD_DEFAULT) \
CONFIG_CPU_MAX_TEMPERATURE=$(CONFIG_CPU_MAX_TEMPERATURE) \
CONFIG_EDK2_USE_LAPTOP_LID_LIB=$(CONFIG_EDK2_USE_LAPTOP_LID_LIB)
CONFIG_EDK2_USE_LAPTOP_LID_LIB=$(CONFIG_EDK2_USE_LAPTOP_LID_LIB) \
CONFIG_EDK2_USE_UEFIVAR_BACKED_TPM_PPI=$(CONFIG_EDK2_USE_UEFIVAR_BACKED_TPM_PPI)


$(obj)/ShimmedUniversalPayload.elf: $(DOTCONFIG)
Expand Down
11 changes: 11 additions & 0 deletions payloads/external/edk2/Kconfig.dasharo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -352,4 +352,15 @@ config EDK2_CREATE_PREINSTALLED_BOOT_OPTIONS
Tell UEFIPaylaod to scan available EFI System Partitions and create
boot options from the bootloader binaries found on the disks.

config EDK2_USE_UEFIVAR_BACKED_TPM_PPI
bool "Use UEFI variable-backed TPM PPI"
default n
depends on !EDK2_DISABLE_TPM
help
Tell UEFIPayload to use TPM PPI buffer in UEFI variables. Workaround
for platform-specific issues causing the RAM to not be preserved
across reboots.

If unsure, say N.

endif
6 changes: 5 additions & 1 deletion payloads/external/edk2/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,11 @@ endif
#
# The Dasharo repository has the following additional options:
#

ifneq ($(CONFIG_EDK2_DISABLE_TPM),y)
ifeq ($(CONFIG_EDK2_USE_UEFIVAR_BACKED_TPM_PPI),y)
BUILD_STR += -D USE_UEFIVAR_BACKED_TPM_PPI=TRUE
endif
endif
# ABOVE_4G_MEMORY = TRUE
ifneq ($(CONFIG_EDK2_ABOVE_4G_MEMORY),y)
BUILD_STR += -D ABOVE_4G_MEMORY=FALSE
Expand Down