diff --git a/config/examples/kontron_vx3060_s2.config b/config/examples/kontron_vx3060_s2.config index f80702c45..08157d754 100644 --- a/config/examples/kontron_vx3060_s2.config +++ b/config/examples/kontron_vx3060_s2.config @@ -1,8 +1,8 @@ ARCH=x86_64 TARGET=kontron_vx3060_s2 WOLFBOOT_SMALL_STACK=0 -SIGN=ECC384 -HASH=SHA384 +SIGN=ECC256 +HASH=SHA256 DEBUG=1 SPMATH=1 ENCRYPTION=0 @@ -13,7 +13,9 @@ FORCE_32BIT=1 WOLFBOOT_PARTITION_BOOT_ADDRESS=0xff400000 WOLFBOOT_PARTITION_SWAP_ADDRESS=0x0 WOLFBOOT_PARTITION_UPDATE_ADDRESS=0x0 -WOLFBOOT_LOAD_BASE=0x4000000 + +# 128mb +WOLFBOOT_LOAD_BASE=0x8000000 WOLFBOOT_LOAD_ADDRESS=0x1000000 # required for keytools @@ -26,7 +28,7 @@ FSP_S_UPD_DATA_BASE=0xffd00000 FSP_T_BASE=0xfff59000 FSP_M_BASE=0xfff60000 -WOLFBOOT_ORIGIN=0xfff20000 +WOLFBOOT_ORIGIN=0xfff00000 # 4 MB BOOTLOADER_PARTITION_SIZE=0x600000 # 12 MB @@ -50,12 +52,15 @@ PCI_ECAM_BASE=0xC0000000 PCI_USE_ECAM=1 PCH_HAS_PCR=1 -WOLFTPM=0 64BIT=1 ELF=1 DEBUG_ELF=0 MULTIBOOT2=1 -STAGE1_AUTH=1 FSP_S_LOAD_BASE=0x0FED5F00 - +STAGE1_AUTH=1 +# MEASURED_BOOT=1 +# MEASURED_PCR_A=0 +# DISK_LOCK=1 +# WOLFTPM=1 +# WOLFBOOT_TPM_SEAL=1 diff --git a/config/examples/x86_fsp_qemu_tpm.config b/config/examples/x86_fsp_qemu_tpm.config index 35cd9ca1d..3926227dd 100644 --- a/config/examples/x86_fsp_qemu_tpm.config +++ b/config/examples/x86_fsp_qemu_tpm.config @@ -1,8 +1,8 @@ ARCH=x86_64 TARGET=x86_fsp_qemu WOLFBOOT_SMALL_STACK=0 -SIGN?=ECC384 -HASH?=SHA384 +SIGN?=ECC256 +HASH?=SHA256 DEBUG=1 SPMATH=1 FORCE_32BIT=1 @@ -11,7 +11,10 @@ WOLFBOOT_NO_PARTITIONS=1 WOLFTPM=1 # Measured boot -WOLFBOOT_MEASURED_BOOT=1 +MEASURED_BOOT=1 +MEASURED_PCR_A=0 +WOLFBOOT_TPM_SEAL=1 +DISK_LOCK=1 # TPM Keystore options #WOLFBOOT_TPM_KEYSTORE?=1 @@ -33,10 +36,10 @@ FSP_M_BASE=0xffe30000 FSP_S_BASE=0xffed6000 FSP_T_BASE=0xfffe0000 FSP_S_LOAD_BASE=0x0FED5F00 -WOLFBOOT_ORIGIN=0xfffa0000 +WOLFBOOT_ORIGIN=0xfff90000 LINUX_PAYLOAD=1 -BOOTLOADER_PARTITION_SIZE=0xa0000 +BOOTLOADER_PARTITION_SIZE=0xb0000 BIOS_REGION_SIZE=0x800000 MACHINE_OBJ=src/x86/qemu_fsp.o FSP_T_BIN=./src/x86/fsp_t.bin