From 65ca94b1843d370f5f4a1008f2e001815b05236d Mon Sep 17 00:00:00 2001 From: Jonathon Hall Date: Wed, 11 Oct 2023 09:06:06 -0400 Subject: [PATCH 1/2] modules/coreboot: Update Purism coreboot to 4.22.01-Purism-1 Update Purism coreboot to 4.22.01-Purism-1. Signed-off-by: Jonathon Hall --- config/coreboot-librem_11.config | 17 ++++++++++++++-- config/coreboot-librem_13v2.config | 17 +++++++++++++--- config/coreboot-librem_13v4.config | 17 +++++++++++++--- config/coreboot-librem_14.config | 29 +++++++++++++++++++++------ config/coreboot-librem_15v3.config | 17 +++++++++++++--- config/coreboot-librem_15v4.config | 17 +++++++++++++--- config/coreboot-librem_l1um_v2.config | 22 +++++++++++++++----- config/coreboot-librem_mini.config | 21 +++++++++++++++---- config/coreboot-librem_mini_v2.config | 21 +++++++++++++++---- modules/coreboot | 4 ++-- 10 files changed, 147 insertions(+), 35 deletions(-) diff --git a/config/coreboot-librem_11.config b/config/coreboot-librem_11.config index 357f22ca5..466c51c7f 100644 --- a/config/coreboot-librem_11.config +++ b/config/coreboot-librem_11.config @@ -20,6 +20,7 @@ CONFIG_ARCH_SUPPORTS_CLANG=y CONFIG_OPTION_BACKEND_NONE=y CONFIG_COMPRESS_RAMSTAGE_LZMA=y # CONFIG_COMPRESS_RAMSTAGE_LZ4 is not set +CONFIG_SEPARATE_ROMSTAGE=y CONFIG_INCLUDE_CONFIG_FILE=y CONFIG_COLLECT_TIMESTAMPS=y # CONFIG_TIMESTAMPS_ON_CONSOLE is not set @@ -143,7 +144,6 @@ CONFIG_DRIVERS_INTEL_WIFI=y CONFIG_IFD_BIN_PATH="3rdparty/purism-blobs/mainboard/purism/librem_jsl/librem_11/flashdescriptor.bin" CONFIG_ME_BIN_PATH="3rdparty/purism-blobs/mainboard/purism/librem_jsl/librem_11/me.bin" CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000 -CONFIG_VBT_DATA_SIZE_KB=9 CONFIG_CARDBUS_PLUGIN_SUPPORT=y CONFIG_SPI_FLASH_DONT_INCLUDE_ALL_DRIVERS=y CONFIG_USE_LEGACY_8254_TIMER=y @@ -221,6 +221,7 @@ CONFIG_SMM_RESERVED_SIZE=0x200000 CONFIG_SMM_MODULE_STACK_SIZE=0x800 CONFIG_ACPI_BERT_SIZE=0x0 CONFIG_DRIVERS_I2C_DESIGNWARE_CLOCK_MHZ=133 +CONFIG_PRERAM_CBFS_CACHE_SIZE=0x4000 CONFIG_ACPI_CPU_STRING="CP%02X" CONFIG_STACK_SIZE=0x2000 CONFIG_IFD_CHIPSET="jsl" @@ -297,6 +298,7 @@ CONFIG_SOC_INTEL_CSE_NPHY_CBFS_FILE="" CONFIG_SOC_INTEL_CSE_HAVE_SPEC_SUPPORT=y CONFIG_SOC_INTEL_COMMON_BLOCK_ME_SPEC_13=y CONFIG_ME_SPEC=13 +CONFIG_CSE_RESET_CLEAR_EC_AP_IDLE_FLAG=y CONFIG_SOC_INTEL_COMMON_BLOCK_DSP=y CONFIG_SOC_INTEL_COMMON_BLOCK_FAST_SPI=y CONFIG_FAST_SPI_DISABLE_WRITE_STATUS=y @@ -440,7 +442,10 @@ CONFIG_ARCH_ROMSTAGE_X86_32=y CONFIG_ARCH_POSTCAR_X86_32=y CONFIG_ARCH_RAMSTAGE_X86_32=y CONFIG_ARCH_ALL_STAGES_X86_32=y +CONFIG_RESERVED_PHYSICAL_ADDRESS_BITS_SUPPORT=y CONFIG_X86_TOP4G_BOOTMEDIA_MAP=y +CONFIG_POSTRAM_CBFS_CACHE_IN_BSS=y +CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000 CONFIG_PC80_SYSTEM=y CONFIG_POSTCAR_STAGE=y CONFIG_BOOTBLOCK_SIMPLE=y @@ -476,7 +481,7 @@ CONFIG_BOOTSPLASH=y CONFIG_PCI=y CONFIG_ECAM_MMCONF_SUPPORT=y CONFIG_PCIX_PLUGIN_SUPPORT=y -CONFIG_AZALIA_PLUGIN_SUPPORT=y +CONFIG_AZALIA_HDA_CODEC_SUPPORT=y CONFIG_AZALIA_LOCK_DOWN_R_WO_GCAP=y CONFIG_PCIEXP_PLUGIN_SUPPORT=y CONFIG_ECAM_MMCONF_LENGTH=0x10000000 @@ -546,6 +551,10 @@ CONFIG_USE_FSP_NOTIFY_PHASE_READY_TO_BOOT=y CONFIG_USE_FSP_NOTIFY_PHASE_END_OF_FIRMWARE=y # CONFIG_DISPLAY_FSP_TIMESTAMPS is not set CONFIG_INTEL_GMA_ACPI=y +CONFIG_VBT_CBFS_COMPRESSION_LZMA=y +# CONFIG_VBT_CBFS_COMPRESSION_LZ4 is not set +# CONFIG_VBT_CBFS_COMPRESSION_NONE is not set +CONFIG_VBT_CBFS_COMPRESSION_ALGORITHM="lzma" # CONFIG_DRIVERS_NXP_UWB_SR1XX is not set # CONFIG_DRIVERS_PS2_KEYBOARD is not set CONFIG_DRIVERS_MC146818=y @@ -694,6 +703,10 @@ CONFIG_COMPRESS_SECONDARY_PAYLOAD=y # # CONFIG_DISPLAY_MTRRS is not set +# +# Vendorcode Debug Settings +# + # # BLOB Debug Settings # diff --git a/config/coreboot-librem_13v2.config b/config/coreboot-librem_13v2.config index 5de06ebcb..316e8264c 100644 --- a/config/coreboot-librem_13v2.config +++ b/config/coreboot-librem_13v2.config @@ -20,6 +20,7 @@ CONFIG_ARCH_SUPPORTS_CLANG=y CONFIG_OPTION_BACKEND_NONE=y CONFIG_COMPRESS_RAMSTAGE_LZMA=y # CONFIG_COMPRESS_RAMSTAGE_LZ4 is not set +CONFIG_SEPARATE_ROMSTAGE=y CONFIG_INCLUDE_CONFIG_FILE=y CONFIG_COLLECT_TIMESTAMPS=y # CONFIG_TIMESTAMPS_ON_CONSOLE is not set @@ -150,7 +151,6 @@ CONFIG_IFD_BIN_PATH="3rdparty/purism-blobs/mainboard/purism/librem_skl/descripto CONFIG_ME_BIN_PATH="3rdparty/purism-blobs/mainboard/purism/librem_skl/me.bin" CONFIG_MAINBOARD_SUPPORTS_SKYLAKE_CPU=y CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000 -CONFIG_VBT_DATA_SIZE_KB=8 CONFIG_CARDBUS_PLUGIN_SUPPORT=y CONFIG_SPI_FLASH_DONT_INCLUDE_ALL_DRIVERS=y # CONFIG_USE_LEGACY_8254_TIMER is not set @@ -230,6 +230,7 @@ CONFIG_SMM_RESERVED_SIZE=0x200000 CONFIG_SMM_MODULE_STACK_SIZE=0x800 CONFIG_ACPI_BERT_SIZE=0x0 CONFIG_DRIVERS_I2C_DESIGNWARE_CLOCK_MHZ=120 +CONFIG_PRERAM_CBFS_CACHE_SIZE=0x4000 CONFIG_ACPI_CPU_STRING="CP%02X" CONFIG_STACK_SIZE=0x2000 CONFIG_IFD_CHIPSET="sklkbl" @@ -284,7 +285,6 @@ CONFIG_SOC_INTEL_COMMON_BLOCK_CPU_SMMRELOCATE=y CONFIG_SOC_INTEL_COMMON_BLOCK_CAR=y CONFIG_INTEL_CAR_NEM_ENHANCED=y # CONFIG_USE_INTEL_FSP_MP_INIT is not set -# CONFIG_USE_INTEL_FSP_TO_CALL_COREBOOT_PUBLISH_MP_PPI is not set CONFIG_CPU_SUPPORTS_PM_TIMER_EMULATION=y CONFIG_HAVE_HYPERTHREADING=y CONFIG_FSP_HYPERTHREADING=y @@ -465,7 +465,10 @@ CONFIG_ARCH_ROMSTAGE_X86_32=y CONFIG_ARCH_POSTCAR_X86_32=y CONFIG_ARCH_RAMSTAGE_X86_32=y CONFIG_ARCH_ALL_STAGES_X86_32=y +CONFIG_RESERVED_PHYSICAL_ADDRESS_BITS_SUPPORT=y CONFIG_X86_TOP4G_BOOTMEDIA_MAP=y +CONFIG_POSTRAM_CBFS_CACHE_IN_BSS=y +CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000 CONFIG_PC80_SYSTEM=y CONFIG_POSTCAR_STAGE=y CONFIG_BOOTBLOCK_SIMPLE=y @@ -502,7 +505,7 @@ CONFIG_BOOTSPLASH=y CONFIG_PCI=y CONFIG_ECAM_MMCONF_SUPPORT=y CONFIG_PCIX_PLUGIN_SUPPORT=y -CONFIG_AZALIA_PLUGIN_SUPPORT=y +CONFIG_AZALIA_HDA_CODEC_SUPPORT=y CONFIG_AZALIA_LOCK_DOWN_R_WO_GCAP=y CONFIG_PCIEXP_PLUGIN_SUPPORT=y CONFIG_ECAM_MMCONF_LENGTH=0x10000000 @@ -572,6 +575,10 @@ CONFIG_USE_FSP_NOTIFY_PHASE_READY_TO_BOOT=y CONFIG_USE_FSP_NOTIFY_PHASE_END_OF_FIRMWARE=y # CONFIG_DISPLAY_FSP_TIMESTAMPS is not set CONFIG_INTEL_GMA_ACPI=y +CONFIG_VBT_CBFS_COMPRESSION_LZMA=y +# CONFIG_VBT_CBFS_COMPRESSION_LZ4 is not set +# CONFIG_VBT_CBFS_COMPRESSION_NONE is not set +CONFIG_VBT_CBFS_COMPRESSION_ALGORITHM="lzma" CONFIG_GFX_GMA_IGNORE_PRESENCE_STRAPS=y CONFIG_GFX_GMA=y CONFIG_GFX_GMA_DYN_CPU=y @@ -738,6 +745,10 @@ CONFIG_COMPRESS_SECONDARY_PAYLOAD=y # # CONFIG_DISPLAY_MTRRS is not set +# +# Vendorcode Debug Settings +# + # # BLOB Debug Settings # diff --git a/config/coreboot-librem_13v4.config b/config/coreboot-librem_13v4.config index 804cb751b..fac3fa30c 100644 --- a/config/coreboot-librem_13v4.config +++ b/config/coreboot-librem_13v4.config @@ -20,6 +20,7 @@ CONFIG_ARCH_SUPPORTS_CLANG=y CONFIG_OPTION_BACKEND_NONE=y CONFIG_COMPRESS_RAMSTAGE_LZMA=y # CONFIG_COMPRESS_RAMSTAGE_LZ4 is not set +CONFIG_SEPARATE_ROMSTAGE=y CONFIG_INCLUDE_CONFIG_FILE=y CONFIG_COLLECT_TIMESTAMPS=y # CONFIG_TIMESTAMPS_ON_CONSOLE is not set @@ -150,7 +151,6 @@ CONFIG_IFD_BIN_PATH="3rdparty/purism-blobs/mainboard/purism/librem_kbl/descripto CONFIG_ME_BIN_PATH="3rdparty/purism-blobs/mainboard/purism/librem_kbl/me.bin" CONFIG_MAINBOARD_SUPPORTS_SKYLAKE_CPU=y CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000 -CONFIG_VBT_DATA_SIZE_KB=8 CONFIG_CARDBUS_PLUGIN_SUPPORT=y CONFIG_SPI_FLASH_DONT_INCLUDE_ALL_DRIVERS=y # CONFIG_USE_LEGACY_8254_TIMER is not set @@ -230,6 +230,7 @@ CONFIG_SMM_RESERVED_SIZE=0x200000 CONFIG_SMM_MODULE_STACK_SIZE=0x800 CONFIG_ACPI_BERT_SIZE=0x0 CONFIG_DRIVERS_I2C_DESIGNWARE_CLOCK_MHZ=120 +CONFIG_PRERAM_CBFS_CACHE_SIZE=0x4000 CONFIG_ACPI_CPU_STRING="CP%02X" CONFIG_STACK_SIZE=0x2000 CONFIG_IFD_CHIPSET="sklkbl" @@ -284,7 +285,6 @@ CONFIG_SOC_INTEL_COMMON_BLOCK_CPU_SMMRELOCATE=y CONFIG_SOC_INTEL_COMMON_BLOCK_CAR=y CONFIG_INTEL_CAR_NEM_ENHANCED=y # CONFIG_USE_INTEL_FSP_MP_INIT is not set -# CONFIG_USE_INTEL_FSP_TO_CALL_COREBOOT_PUBLISH_MP_PPI is not set CONFIG_CPU_SUPPORTS_PM_TIMER_EMULATION=y CONFIG_HAVE_HYPERTHREADING=y CONFIG_FSP_HYPERTHREADING=y @@ -465,7 +465,10 @@ CONFIG_ARCH_ROMSTAGE_X86_32=y CONFIG_ARCH_POSTCAR_X86_32=y CONFIG_ARCH_RAMSTAGE_X86_32=y CONFIG_ARCH_ALL_STAGES_X86_32=y +CONFIG_RESERVED_PHYSICAL_ADDRESS_BITS_SUPPORT=y CONFIG_X86_TOP4G_BOOTMEDIA_MAP=y +CONFIG_POSTRAM_CBFS_CACHE_IN_BSS=y +CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000 CONFIG_PC80_SYSTEM=y CONFIG_POSTCAR_STAGE=y CONFIG_BOOTBLOCK_SIMPLE=y @@ -502,7 +505,7 @@ CONFIG_BOOTSPLASH=y CONFIG_PCI=y CONFIG_ECAM_MMCONF_SUPPORT=y CONFIG_PCIX_PLUGIN_SUPPORT=y -CONFIG_AZALIA_PLUGIN_SUPPORT=y +CONFIG_AZALIA_HDA_CODEC_SUPPORT=y CONFIG_AZALIA_LOCK_DOWN_R_WO_GCAP=y CONFIG_PCIEXP_PLUGIN_SUPPORT=y CONFIG_ECAM_MMCONF_LENGTH=0x10000000 @@ -572,6 +575,10 @@ CONFIG_USE_FSP_NOTIFY_PHASE_READY_TO_BOOT=y CONFIG_USE_FSP_NOTIFY_PHASE_END_OF_FIRMWARE=y # CONFIG_DISPLAY_FSP_TIMESTAMPS is not set CONFIG_INTEL_GMA_ACPI=y +CONFIG_VBT_CBFS_COMPRESSION_LZMA=y +# CONFIG_VBT_CBFS_COMPRESSION_LZ4 is not set +# CONFIG_VBT_CBFS_COMPRESSION_NONE is not set +CONFIG_VBT_CBFS_COMPRESSION_ALGORITHM="lzma" CONFIG_GFX_GMA_IGNORE_PRESENCE_STRAPS=y CONFIG_GFX_GMA=y CONFIG_GFX_GMA_DYN_CPU=y @@ -738,6 +745,10 @@ CONFIG_COMPRESS_SECONDARY_PAYLOAD=y # # CONFIG_DISPLAY_MTRRS is not set +# +# Vendorcode Debug Settings +# + # # BLOB Debug Settings # diff --git a/config/coreboot-librem_14.config b/config/coreboot-librem_14.config index b15087466..3d05d26f1 100644 --- a/config/coreboot-librem_14.config +++ b/config/coreboot-librem_14.config @@ -20,6 +20,7 @@ CONFIG_ARCH_SUPPORTS_CLANG=y CONFIG_OPTION_BACKEND_NONE=y CONFIG_COMPRESS_RAMSTAGE_LZMA=y # CONFIG_COMPRESS_RAMSTAGE_LZ4 is not set +CONFIG_SEPARATE_ROMSTAGE=y CONFIG_INCLUDE_CONFIG_FILE=y CONFIG_COLLECT_TIMESTAMPS=y # CONFIG_TIMESTAMPS_ON_CONSOLE is not set @@ -148,7 +149,6 @@ CONFIG_DRIVERS_INTEL_WIFI=y CONFIG_IFD_BIN_PATH="3rdparty/purism-blobs/mainboard/purism/librem_cnl/librem_14/flashdescriptor.bin" CONFIG_ME_BIN_PATH="3rdparty/purism-blobs/mainboard/purism/librem_cnl/librem_14/me.bin" CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000 -CONFIG_VBT_DATA_SIZE_KB=8 CONFIG_CARDBUS_PLUGIN_SUPPORT=y CONFIG_SPI_FLASH_DONT_INCLUDE_ALL_DRIVERS=y CONFIG_USE_LEGACY_8254_TIMER=y @@ -217,7 +217,7 @@ CONFIG_SYSTEM_TYPE_LAPTOP=y # # SoC # -CONFIG_CHIPSET_DEVICETREE="" +CONFIG_CHIPSET_DEVICETREE="soc/intel/cannonlake/chipset.cb" CONFIG_FSP_M_FILE="$(obj)/Fsp_M.fd" CONFIG_FSP_S_FILE="$(obj)/Fsp_S.fd" CONFIG_CBFS_MCACHE_SIZE=0x4000 @@ -228,6 +228,7 @@ CONFIG_SMM_RESERVED_SIZE=0x200000 CONFIG_SMM_MODULE_STACK_SIZE=0x800 CONFIG_ACPI_BERT_SIZE=0x0 CONFIG_DRIVERS_I2C_DESIGNWARE_CLOCK_MHZ=216 +CONFIG_PRERAM_CBFS_CACHE_SIZE=0x4000 CONFIG_ACPI_CPU_STRING="CP%02X" CONFIG_STACK_SIZE=0x2000 CONFIG_IFD_CHIPSET="cnl" @@ -242,7 +243,7 @@ CONFIG_SOC_INTEL_COMMON_BLOCK_GSPI_MAX=3 CONFIG_SOC_INTEL_I2C_DEV_MAX=6 CONFIG_SOC_INTEL_COMMON_LPSS_UART_CLK_M_VAL=0x30 CONFIG_SOC_INTEL_COMMON_LPSS_UART_CLK_N_VAL=0xc35 -CONFIG_FSP_HEADER_PATH="3rdparty/fsp/CometLakeFspBinPkg/CometLake1/Include/" +CONFIG_FSP_HEADER_PATH="3rdparty/fsp/CometLakeFspBinPkg/CometLake2/Include/" CONFIG_FSP_FD_PATH="3rdparty/fsp/CometLakeFspBinPkg/CometLake1/Fsp.fd" CONFIG_INTEL_GMA_BCLV_OFFSET=0xc8258 CONFIG_INTEL_GMA_BCLV_WIDTH=32 @@ -254,7 +255,8 @@ CONFIG_HAVE_PAM0_REGISTER=y CONFIG_PCIEXP_COMMON_CLOCK=y CONFIG_SOC_INTEL_CANNONLAKE_BASE=y CONFIG_SOC_INTEL_COMETLAKE=y -CONFIG_SOC_INTEL_COMETLAKE_1=y +CONFIG_SOC_INTEL_COMETLAKE_1_2=y +CONFIG_FSP_FD_PATH_2="3rdparty/fsp/CometLakeFspBinPkg/CometLake2/Fsp.fd" CONFIG_SOC_INTEL_CANNONLAKE_DEBUG_CONSENT=0 CONFIG_INTEL_TXT_BIOSACM_ALIGNMENT=0x40000 CONFIG_CPU_INTEL_NUM_FIT_ENTRIES=4 @@ -285,7 +287,6 @@ CONFIG_SOC_INTEL_COMMON_BLOCK_CPU_SMMRELOCATE=y CONFIG_SOC_INTEL_COMMON_BLOCK_CAR=y CONFIG_INTEL_CAR_NEM_ENHANCED=y # CONFIG_USE_INTEL_FSP_MP_INIT is not set -# CONFIG_USE_INTEL_FSP_TO_CALL_COREBOOT_PUBLISH_MP_PPI is not set CONFIG_CPU_SUPPORTS_PM_TIMER_EMULATION=y CONFIG_HAVE_HYPERTHREADING=y CONFIG_FSP_HYPERTHREADING=y @@ -457,7 +458,10 @@ CONFIG_ARCH_ROMSTAGE_X86_32=y CONFIG_ARCH_POSTCAR_X86_32=y CONFIG_ARCH_RAMSTAGE_X86_32=y CONFIG_ARCH_ALL_STAGES_X86_32=y +CONFIG_RESERVED_PHYSICAL_ADDRESS_BITS_SUPPORT=y CONFIG_X86_TOP4G_BOOTMEDIA_MAP=y +CONFIG_POSTRAM_CBFS_CACHE_IN_BSS=y +CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000 CONFIG_PC80_SYSTEM=y CONFIG_POSTCAR_STAGE=y CONFIG_BOOTBLOCK_SIMPLE=y @@ -497,7 +501,7 @@ CONFIG_BOOTSPLASH=y CONFIG_PCI=y CONFIG_ECAM_MMCONF_SUPPORT=y CONFIG_PCIX_PLUGIN_SUPPORT=y -CONFIG_AZALIA_PLUGIN_SUPPORT=y +CONFIG_AZALIA_HDA_CODEC_SUPPORT=y CONFIG_AZALIA_LOCK_DOWN_R_WO_GCAP=y CONFIG_PCIEXP_PLUGIN_SUPPORT=y CONFIG_ECAM_MMCONF_LENGTH=0x10000000 @@ -554,10 +558,15 @@ CONFIG_PLATFORM_USES_FSP2_0=y CONFIG_PLATFORM_USES_FSP2_X86_32=y CONFIG_HAVE_INTEL_FSP_REPO=y CONFIG_ADD_FSP_BINARIES=y +CONFIG_PLATFORM_USES_SECOND_FSP=y CONFIG_FSP_T_LOCATION=0xfffe0000 CONFIG_FSP_S_CBFS="fsps.bin" CONFIG_FSP_M_CBFS="fspm.bin" CONFIG_FSP_FULL_FD=y +CONFIG_FSP_S_CBFS_2="fsps_2.bin" +CONFIG_FSP_M_CBFS_2="fspm_2.bin" +CONFIG_FSP_M_FILE_2="$(obj)/Fsp_2_M.fd" +CONFIG_FSP_S_FILE_2="$(obj)/Fsp_2_S.fd" CONFIG_FSP_T_RESERVED_SIZE=0x0 CONFIG_FSP_M_XIP=y CONFIG_FSP_USES_CB_STACK=y @@ -571,6 +580,10 @@ CONFIG_USE_FSP_NOTIFY_PHASE_READY_TO_BOOT=y CONFIG_USE_FSP_NOTIFY_PHASE_END_OF_FIRMWARE=y # CONFIG_DISPLAY_FSP_TIMESTAMPS is not set CONFIG_INTEL_GMA_ACPI=y +CONFIG_VBT_CBFS_COMPRESSION_LZMA=y +# CONFIG_VBT_CBFS_COMPRESSION_LZ4 is not set +# CONFIG_VBT_CBFS_COMPRESSION_NONE is not set +CONFIG_VBT_CBFS_COMPRESSION_ALGORITHM="lzma" CONFIG_GFX_GMA=y CONFIG_GFX_GMA_DYN_CPU=y CONFIG_GFX_GMA_GENERATION="Skylake" @@ -737,6 +750,10 @@ CONFIG_COMPRESS_SECONDARY_PAYLOAD=y # # CONFIG_DISPLAY_MTRRS is not set +# +# Vendorcode Debug Settings +# + # # BLOB Debug Settings # diff --git a/config/coreboot-librem_15v3.config b/config/coreboot-librem_15v3.config index 03d27de94..be69a553c 100644 --- a/config/coreboot-librem_15v3.config +++ b/config/coreboot-librem_15v3.config @@ -20,6 +20,7 @@ CONFIG_ARCH_SUPPORTS_CLANG=y CONFIG_OPTION_BACKEND_NONE=y CONFIG_COMPRESS_RAMSTAGE_LZMA=y # CONFIG_COMPRESS_RAMSTAGE_LZ4 is not set +CONFIG_SEPARATE_ROMSTAGE=y CONFIG_INCLUDE_CONFIG_FILE=y CONFIG_COLLECT_TIMESTAMPS=y # CONFIG_TIMESTAMPS_ON_CONSOLE is not set @@ -150,7 +151,6 @@ CONFIG_IFD_BIN_PATH="3rdparty/purism-blobs/mainboard/purism/librem_skl/descripto CONFIG_ME_BIN_PATH="3rdparty/purism-blobs/mainboard/purism/librem_skl/me.bin" CONFIG_MAINBOARD_SUPPORTS_SKYLAKE_CPU=y CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000 -CONFIG_VBT_DATA_SIZE_KB=8 CONFIG_CARDBUS_PLUGIN_SUPPORT=y CONFIG_SPI_FLASH_DONT_INCLUDE_ALL_DRIVERS=y # CONFIG_USE_LEGACY_8254_TIMER is not set @@ -230,6 +230,7 @@ CONFIG_SMM_RESERVED_SIZE=0x200000 CONFIG_SMM_MODULE_STACK_SIZE=0x800 CONFIG_ACPI_BERT_SIZE=0x0 CONFIG_DRIVERS_I2C_DESIGNWARE_CLOCK_MHZ=120 +CONFIG_PRERAM_CBFS_CACHE_SIZE=0x4000 CONFIG_ACPI_CPU_STRING="CP%02X" CONFIG_STACK_SIZE=0x2000 CONFIG_IFD_CHIPSET="sklkbl" @@ -284,7 +285,6 @@ CONFIG_SOC_INTEL_COMMON_BLOCK_CPU_SMMRELOCATE=y CONFIG_SOC_INTEL_COMMON_BLOCK_CAR=y CONFIG_INTEL_CAR_NEM_ENHANCED=y # CONFIG_USE_INTEL_FSP_MP_INIT is not set -# CONFIG_USE_INTEL_FSP_TO_CALL_COREBOOT_PUBLISH_MP_PPI is not set CONFIG_CPU_SUPPORTS_PM_TIMER_EMULATION=y CONFIG_HAVE_HYPERTHREADING=y CONFIG_FSP_HYPERTHREADING=y @@ -465,7 +465,10 @@ CONFIG_ARCH_ROMSTAGE_X86_32=y CONFIG_ARCH_POSTCAR_X86_32=y CONFIG_ARCH_RAMSTAGE_X86_32=y CONFIG_ARCH_ALL_STAGES_X86_32=y +CONFIG_RESERVED_PHYSICAL_ADDRESS_BITS_SUPPORT=y CONFIG_X86_TOP4G_BOOTMEDIA_MAP=y +CONFIG_POSTRAM_CBFS_CACHE_IN_BSS=y +CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000 CONFIG_PC80_SYSTEM=y CONFIG_POSTCAR_STAGE=y CONFIG_BOOTBLOCK_SIMPLE=y @@ -502,7 +505,7 @@ CONFIG_BOOTSPLASH=y CONFIG_PCI=y CONFIG_ECAM_MMCONF_SUPPORT=y CONFIG_PCIX_PLUGIN_SUPPORT=y -CONFIG_AZALIA_PLUGIN_SUPPORT=y +CONFIG_AZALIA_HDA_CODEC_SUPPORT=y CONFIG_AZALIA_LOCK_DOWN_R_WO_GCAP=y CONFIG_PCIEXP_PLUGIN_SUPPORT=y CONFIG_ECAM_MMCONF_LENGTH=0x10000000 @@ -572,6 +575,10 @@ CONFIG_USE_FSP_NOTIFY_PHASE_READY_TO_BOOT=y CONFIG_USE_FSP_NOTIFY_PHASE_END_OF_FIRMWARE=y # CONFIG_DISPLAY_FSP_TIMESTAMPS is not set CONFIG_INTEL_GMA_ACPI=y +CONFIG_VBT_CBFS_COMPRESSION_LZMA=y +# CONFIG_VBT_CBFS_COMPRESSION_LZ4 is not set +# CONFIG_VBT_CBFS_COMPRESSION_NONE is not set +CONFIG_VBT_CBFS_COMPRESSION_ALGORITHM="lzma" CONFIG_GFX_GMA_IGNORE_PRESENCE_STRAPS=y CONFIG_GFX_GMA=y CONFIG_GFX_GMA_DYN_CPU=y @@ -738,6 +745,10 @@ CONFIG_COMPRESS_SECONDARY_PAYLOAD=y # # CONFIG_DISPLAY_MTRRS is not set +# +# Vendorcode Debug Settings +# + # # BLOB Debug Settings # diff --git a/config/coreboot-librem_15v4.config b/config/coreboot-librem_15v4.config index 80a80bf72..3e25331d7 100644 --- a/config/coreboot-librem_15v4.config +++ b/config/coreboot-librem_15v4.config @@ -20,6 +20,7 @@ CONFIG_ARCH_SUPPORTS_CLANG=y CONFIG_OPTION_BACKEND_NONE=y CONFIG_COMPRESS_RAMSTAGE_LZMA=y # CONFIG_COMPRESS_RAMSTAGE_LZ4 is not set +CONFIG_SEPARATE_ROMSTAGE=y CONFIG_INCLUDE_CONFIG_FILE=y CONFIG_COLLECT_TIMESTAMPS=y # CONFIG_TIMESTAMPS_ON_CONSOLE is not set @@ -150,7 +151,6 @@ CONFIG_IFD_BIN_PATH="3rdparty/purism-blobs/mainboard/purism/librem_kbl/descripto CONFIG_ME_BIN_PATH="3rdparty/purism-blobs/mainboard/purism/librem_kbl/me.bin" CONFIG_MAINBOARD_SUPPORTS_SKYLAKE_CPU=y CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000 -CONFIG_VBT_DATA_SIZE_KB=8 CONFIG_CARDBUS_PLUGIN_SUPPORT=y CONFIG_SPI_FLASH_DONT_INCLUDE_ALL_DRIVERS=y # CONFIG_USE_LEGACY_8254_TIMER is not set @@ -230,6 +230,7 @@ CONFIG_SMM_RESERVED_SIZE=0x200000 CONFIG_SMM_MODULE_STACK_SIZE=0x800 CONFIG_ACPI_BERT_SIZE=0x0 CONFIG_DRIVERS_I2C_DESIGNWARE_CLOCK_MHZ=120 +CONFIG_PRERAM_CBFS_CACHE_SIZE=0x4000 CONFIG_ACPI_CPU_STRING="CP%02X" CONFIG_STACK_SIZE=0x2000 CONFIG_IFD_CHIPSET="sklkbl" @@ -284,7 +285,6 @@ CONFIG_SOC_INTEL_COMMON_BLOCK_CPU_SMMRELOCATE=y CONFIG_SOC_INTEL_COMMON_BLOCK_CAR=y CONFIG_INTEL_CAR_NEM_ENHANCED=y # CONFIG_USE_INTEL_FSP_MP_INIT is not set -# CONFIG_USE_INTEL_FSP_TO_CALL_COREBOOT_PUBLISH_MP_PPI is not set CONFIG_CPU_SUPPORTS_PM_TIMER_EMULATION=y CONFIG_HAVE_HYPERTHREADING=y CONFIG_FSP_HYPERTHREADING=y @@ -465,7 +465,10 @@ CONFIG_ARCH_ROMSTAGE_X86_32=y CONFIG_ARCH_POSTCAR_X86_32=y CONFIG_ARCH_RAMSTAGE_X86_32=y CONFIG_ARCH_ALL_STAGES_X86_32=y +CONFIG_RESERVED_PHYSICAL_ADDRESS_BITS_SUPPORT=y CONFIG_X86_TOP4G_BOOTMEDIA_MAP=y +CONFIG_POSTRAM_CBFS_CACHE_IN_BSS=y +CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000 CONFIG_PC80_SYSTEM=y CONFIG_POSTCAR_STAGE=y CONFIG_BOOTBLOCK_SIMPLE=y @@ -502,7 +505,7 @@ CONFIG_BOOTSPLASH=y CONFIG_PCI=y CONFIG_ECAM_MMCONF_SUPPORT=y CONFIG_PCIX_PLUGIN_SUPPORT=y -CONFIG_AZALIA_PLUGIN_SUPPORT=y +CONFIG_AZALIA_HDA_CODEC_SUPPORT=y CONFIG_AZALIA_LOCK_DOWN_R_WO_GCAP=y CONFIG_PCIEXP_PLUGIN_SUPPORT=y CONFIG_ECAM_MMCONF_LENGTH=0x10000000 @@ -572,6 +575,10 @@ CONFIG_USE_FSP_NOTIFY_PHASE_READY_TO_BOOT=y CONFIG_USE_FSP_NOTIFY_PHASE_END_OF_FIRMWARE=y # CONFIG_DISPLAY_FSP_TIMESTAMPS is not set CONFIG_INTEL_GMA_ACPI=y +CONFIG_VBT_CBFS_COMPRESSION_LZMA=y +# CONFIG_VBT_CBFS_COMPRESSION_LZ4 is not set +# CONFIG_VBT_CBFS_COMPRESSION_NONE is not set +CONFIG_VBT_CBFS_COMPRESSION_ALGORITHM="lzma" CONFIG_GFX_GMA_IGNORE_PRESENCE_STRAPS=y CONFIG_GFX_GMA=y CONFIG_GFX_GMA_DYN_CPU=y @@ -738,6 +745,10 @@ CONFIG_COMPRESS_SECONDARY_PAYLOAD=y # # CONFIG_DISPLAY_MTRRS is not set +# +# Vendorcode Debug Settings +# + # # BLOB Debug Settings # diff --git a/config/coreboot-librem_l1um_v2.config b/config/coreboot-librem_l1um_v2.config index 8b473eb0a..4d60e9f7f 100644 --- a/config/coreboot-librem_l1um_v2.config +++ b/config/coreboot-librem_l1um_v2.config @@ -20,6 +20,7 @@ CONFIG_ARCH_SUPPORTS_CLANG=y CONFIG_OPTION_BACKEND_NONE=y CONFIG_COMPRESS_RAMSTAGE_LZMA=y # CONFIG_COMPRESS_RAMSTAGE_LZ4 is not set +CONFIG_SEPARATE_ROMSTAGE=y CONFIG_INCLUDE_CONFIG_FILE=y CONFIG_COLLECT_TIMESTAMPS=y # CONFIG_TIMESTAMPS_ON_CONSOLE is not set @@ -146,7 +147,6 @@ CONFIG_DRIVERS_INTEL_WIFI=y CONFIG_IFD_BIN_PATH="3rdparty/purism-blobs/mainboard/purism/librem_l1um_v2/flashdescriptor.bin" CONFIG_ME_BIN_PATH="3rdparty/purism-blobs/mainboard/purism/librem_l1um_v2/me.bin" CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000 -CONFIG_VBT_DATA_SIZE_KB=8 CONFIG_CARDBUS_PLUGIN_SUPPORT=y CONFIG_SPI_FLASH_DONT_INCLUDE_ALL_DRIVERS=y # CONFIG_USE_LEGACY_8254_TIMER is not set @@ -213,7 +213,7 @@ CONFIG_MAINBOARD_POWER_FAILURE_STATE=1 # # SoC # -CONFIG_CHIPSET_DEVICETREE="" +CONFIG_CHIPSET_DEVICETREE="soc/intel/cannonlake/chipset_pch_h.cb" CONFIG_FSP_M_FILE="$(obj)/Fsp_M.fd" CONFIG_FSP_S_FILE="$(obj)/Fsp_S.fd" CONFIG_CBFS_MCACHE_SIZE=0x4000 @@ -224,6 +224,8 @@ CONFIG_SMM_RESERVED_SIZE=0x200000 CONFIG_SMM_MODULE_STACK_SIZE=0x800 CONFIG_ACPI_BERT_SIZE=0x0 CONFIG_DRIVERS_I2C_DESIGNWARE_CLOCK_MHZ=216 +# CONFIG_USE_EXP_X86_64_SUPPORT is not set +CONFIG_PRERAM_CBFS_CACHE_SIZE=0x4000 CONFIG_ACPI_CPU_STRING="CP%02X" CONFIG_STACK_SIZE=0x2000 CONFIG_IFD_CHIPSET="cnl" @@ -281,7 +283,6 @@ CONFIG_SOC_INTEL_COMMON_BLOCK_CPU_SMMRELOCATE=y CONFIG_SOC_INTEL_COMMON_BLOCK_CAR=y CONFIG_INTEL_CAR_NEM=y # CONFIG_USE_INTEL_FSP_MP_INIT is not set -# CONFIG_USE_INTEL_FSP_TO_CALL_COREBOOT_PUBLISH_MP_PPI is not set CONFIG_CPU_SUPPORTS_PM_TIMER_EMULATION=y CONFIG_HAVE_HYPERTHREADING=y CONFIG_FSP_HYPERTHREADING=y @@ -303,6 +304,7 @@ CONFIG_SOC_INTEL_CSE_NPHY_CBFS_FILE="" CONFIG_SOC_INTEL_CSE_HAVE_SPEC_SUPPORT=y CONFIG_SOC_INTEL_COMMON_BLOCK_ME_SPEC_12=y CONFIG_ME_SPEC=12 +CONFIG_CSE_RESET_CLEAR_EC_AP_IDLE_FLAG=y CONFIG_SOC_INTEL_COMMON_BLOCK_DSP=y CONFIG_SOC_INTEL_COMMON_BLOCK_FAST_SPI=y CONFIG_FAST_SPI_DISABLE_WRITE_STATUS=y @@ -456,8 +458,10 @@ CONFIG_ARCH_POSTCAR_X86_32=y CONFIG_ARCH_RAMSTAGE_X86_32=y CONFIG_ARCH_ALL_STAGES_X86_32=y CONFIG_HAVE_EXP_X86_64_SUPPORT=y -# CONFIG_USE_EXP_X86_64_SUPPORT is not set +CONFIG_RESERVED_PHYSICAL_ADDRESS_BITS_SUPPORT=y CONFIG_X86_TOP4G_BOOTMEDIA_MAP=y +CONFIG_POSTRAM_CBFS_CACHE_IN_BSS=y +CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000 CONFIG_PC80_SYSTEM=y CONFIG_POSTCAR_STAGE=y CONFIG_BOOTBLOCK_SIMPLE=y @@ -497,7 +501,7 @@ CONFIG_BOOTSPLASH=y CONFIG_PCI=y CONFIG_ECAM_MMCONF_SUPPORT=y CONFIG_PCIX_PLUGIN_SUPPORT=y -CONFIG_AZALIA_PLUGIN_SUPPORT=y +CONFIG_AZALIA_HDA_CODEC_SUPPORT=y CONFIG_PCIEXP_PLUGIN_SUPPORT=y CONFIG_ECAM_MMCONF_LENGTH=0x10000000 CONFIG_PCI_ALLOW_BUS_MASTER=y @@ -573,6 +577,10 @@ CONFIG_USE_FSP_NOTIFY_PHASE_READY_TO_BOOT=y CONFIG_USE_FSP_NOTIFY_PHASE_END_OF_FIRMWARE=y # CONFIG_DISPLAY_FSP_TIMESTAMPS is not set CONFIG_INTEL_GMA_ACPI=y +CONFIG_VBT_CBFS_COMPRESSION_LZMA=y +# CONFIG_VBT_CBFS_COMPRESSION_LZ4 is not set +# CONFIG_VBT_CBFS_COMPRESSION_NONE is not set +CONFIG_VBT_CBFS_COMPRESSION_ALGORITHM="lzma" # CONFIG_DRIVERS_NXP_UWB_SR1XX is not set # CONFIG_DRIVERS_PS2_KEYBOARD is not set CONFIG_DRIVERS_MC146818=y @@ -740,6 +748,10 @@ CONFIG_COMPRESS_SECONDARY_PAYLOAD=y # # CONFIG_DISPLAY_MTRRS is not set +# +# Vendorcode Debug Settings +# + # # BLOB Debug Settings # diff --git a/config/coreboot-librem_mini.config b/config/coreboot-librem_mini.config index 68fea7412..9893f5017 100644 --- a/config/coreboot-librem_mini.config +++ b/config/coreboot-librem_mini.config @@ -22,6 +22,7 @@ CONFIG_USE_OPTION_TABLE=y # CONFIG_STATIC_OPTION_TABLE is not set CONFIG_COMPRESS_RAMSTAGE_LZMA=y # CONFIG_COMPRESS_RAMSTAGE_LZ4 is not set +CONFIG_SEPARATE_ROMSTAGE=y CONFIG_INCLUDE_CONFIG_FILE=y CONFIG_COLLECT_TIMESTAMPS=y # CONFIG_TIMESTAMPS_ON_CONSOLE is not set @@ -151,7 +152,6 @@ CONFIG_DRIVERS_INTEL_WIFI=y CONFIG_IFD_BIN_PATH="3rdparty/purism-blobs/mainboard/purism/librem_cnl/mini/flashdescriptor.bin" CONFIG_ME_BIN_PATH="3rdparty/purism-blobs/mainboard/purism/librem_cnl/mini/me.bin" CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000 -CONFIG_VBT_DATA_SIZE_KB=8 CONFIG_CARDBUS_PLUGIN_SUPPORT=y CONFIG_SPI_FLASH_DONT_INCLUDE_ALL_DRIVERS=y CONFIG_USE_LEGACY_8254_TIMER=y @@ -218,7 +218,7 @@ CONFIG_MAINBOARD_POWER_FAILURE_STATE=1 # # SoC # -CONFIG_CHIPSET_DEVICETREE="" +CONFIG_CHIPSET_DEVICETREE="soc/intel/cannonlake/chipset.cb" CONFIG_FSP_M_FILE="$(obj)/Fsp_M.fd" CONFIG_FSP_S_FILE="$(obj)/Fsp_S.fd" CONFIG_CBFS_MCACHE_SIZE=0x4000 @@ -229,6 +229,7 @@ CONFIG_SMM_RESERVED_SIZE=0x200000 CONFIG_SMM_MODULE_STACK_SIZE=0x800 CONFIG_ACPI_BERT_SIZE=0x0 CONFIG_DRIVERS_I2C_DESIGNWARE_CLOCK_MHZ=216 +CONFIG_PRERAM_CBFS_CACHE_SIZE=0x4000 CONFIG_ACPI_CPU_STRING="CP%02X" CONFIG_STACK_SIZE=0x2000 CONFIG_IFD_CHIPSET="cnl" @@ -285,7 +286,6 @@ CONFIG_SOC_INTEL_COMMON_BLOCK_CPU_SMMRELOCATE=y CONFIG_SOC_INTEL_COMMON_BLOCK_CAR=y CONFIG_INTEL_CAR_NEM_ENHANCED=y # CONFIG_USE_INTEL_FSP_MP_INIT is not set -# CONFIG_USE_INTEL_FSP_TO_CALL_COREBOOT_PUBLISH_MP_PPI is not set CONFIG_CPU_SUPPORTS_PM_TIMER_EMULATION=y CONFIG_HAVE_HYPERTHREADING=y CONFIG_FSP_HYPERTHREADING=y @@ -307,6 +307,7 @@ CONFIG_SOC_INTEL_CSE_NPHY_CBFS_FILE="" CONFIG_SOC_INTEL_CSE_HAVE_SPEC_SUPPORT=y CONFIG_SOC_INTEL_COMMON_BLOCK_ME_SPEC_12=y CONFIG_ME_SPEC=12 +CONFIG_CSE_RESET_CLEAR_EC_AP_IDLE_FLAG=y CONFIG_SOC_INTEL_COMMON_BLOCK_DSP=y CONFIG_SOC_INTEL_COMMON_BLOCK_FAST_SPI=y CONFIG_FAST_SPI_DISABLE_WRITE_STATUS=y @@ -458,7 +459,10 @@ CONFIG_ARCH_ROMSTAGE_X86_32=y CONFIG_ARCH_POSTCAR_X86_32=y CONFIG_ARCH_RAMSTAGE_X86_32=y CONFIG_ARCH_ALL_STAGES_X86_32=y +CONFIG_RESERVED_PHYSICAL_ADDRESS_BITS_SUPPORT=y CONFIG_X86_TOP4G_BOOTMEDIA_MAP=y +CONFIG_POSTRAM_CBFS_CACHE_IN_BSS=y +CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000 CONFIG_PC80_SYSTEM=y CONFIG_HAVE_CMOS_DEFAULT=y CONFIG_POSTCAR_STAGE=y @@ -467,6 +471,7 @@ CONFIG_BOOTBLOCK_SIMPLE=y CONFIG_COLLECT_TIMESTAMPS_TSC=y CONFIG_IDT_IN_EVERY_STAGE=y CONFIG_HAVE_CF9_RESET=y +CONFIG_ACPI_CF9_FULL_RESET=y CONFIG_DEBUG_HW_BREAKPOINTS=y CONFIG_DEBUG_HW_BREAKPOINTS_IN_ALL_STAGES=y CONFIG_DEBUG_NULL_DEREF_BREAKPOINTS=y @@ -499,7 +504,7 @@ CONFIG_BOOTSPLASH=y CONFIG_PCI=y CONFIG_ECAM_MMCONF_SUPPORT=y CONFIG_PCIX_PLUGIN_SUPPORT=y -CONFIG_AZALIA_PLUGIN_SUPPORT=y +CONFIG_AZALIA_HDA_CODEC_SUPPORT=y CONFIG_AZALIA_LOCK_DOWN_R_WO_GCAP=y CONFIG_PCIEXP_PLUGIN_SUPPORT=y CONFIG_ECAM_MMCONF_LENGTH=0x10000000 @@ -569,6 +574,10 @@ CONFIG_USE_FSP_NOTIFY_PHASE_READY_TO_BOOT=y CONFIG_USE_FSP_NOTIFY_PHASE_END_OF_FIRMWARE=y # CONFIG_DISPLAY_FSP_TIMESTAMPS is not set CONFIG_INTEL_GMA_ACPI=y +CONFIG_VBT_CBFS_COMPRESSION_LZMA=y +# CONFIG_VBT_CBFS_COMPRESSION_LZ4 is not set +# CONFIG_VBT_CBFS_COMPRESSION_NONE is not set +CONFIG_VBT_CBFS_COMPRESSION_ALGORITHM="lzma" CONFIG_GFX_GMA=y CONFIG_GFX_GMA_DYN_CPU=y CONFIG_GFX_GMA_GENERATION="Skylake" @@ -724,6 +733,10 @@ CONFIG_COMPRESS_SECONDARY_PAYLOAD=y # # CONFIG_DISPLAY_MTRRS is not set +# +# Vendorcode Debug Settings +# + # # BLOB Debug Settings # diff --git a/config/coreboot-librem_mini_v2.config b/config/coreboot-librem_mini_v2.config index 8c2e5c3e1..e2943e249 100644 --- a/config/coreboot-librem_mini_v2.config +++ b/config/coreboot-librem_mini_v2.config @@ -22,6 +22,7 @@ CONFIG_USE_OPTION_TABLE=y # CONFIG_STATIC_OPTION_TABLE is not set CONFIG_COMPRESS_RAMSTAGE_LZMA=y # CONFIG_COMPRESS_RAMSTAGE_LZ4 is not set +CONFIG_SEPARATE_ROMSTAGE=y CONFIG_INCLUDE_CONFIG_FILE=y CONFIG_COLLECT_TIMESTAMPS=y # CONFIG_TIMESTAMPS_ON_CONSOLE is not set @@ -151,7 +152,6 @@ CONFIG_DRIVERS_INTEL_WIFI=y CONFIG_IFD_BIN_PATH="3rdparty/purism-blobs/mainboard/purism/librem_cnl/mini_v2/flashdescriptor.bin" CONFIG_ME_BIN_PATH="3rdparty/purism-blobs/mainboard/purism/librem_cnl/mini_v2/me.bin" CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000 -CONFIG_VBT_DATA_SIZE_KB=8 CONFIG_CARDBUS_PLUGIN_SUPPORT=y CONFIG_SPI_FLASH_DONT_INCLUDE_ALL_DRIVERS=y CONFIG_USE_LEGACY_8254_TIMER=y @@ -218,7 +218,7 @@ CONFIG_MAINBOARD_POWER_FAILURE_STATE=1 # # SoC # -CONFIG_CHIPSET_DEVICETREE="" +CONFIG_CHIPSET_DEVICETREE="soc/intel/cannonlake/chipset.cb" CONFIG_FSP_M_FILE="$(obj)/Fsp_M.fd" CONFIG_FSP_S_FILE="$(obj)/Fsp_S.fd" CONFIG_CBFS_MCACHE_SIZE=0x4000 @@ -229,6 +229,7 @@ CONFIG_SMM_RESERVED_SIZE=0x200000 CONFIG_SMM_MODULE_STACK_SIZE=0x800 CONFIG_ACPI_BERT_SIZE=0x0 CONFIG_DRIVERS_I2C_DESIGNWARE_CLOCK_MHZ=216 +CONFIG_PRERAM_CBFS_CACHE_SIZE=0x4000 CONFIG_ACPI_CPU_STRING="CP%02X" CONFIG_STACK_SIZE=0x2000 CONFIG_IFD_CHIPSET="cnl" @@ -286,7 +287,6 @@ CONFIG_SOC_INTEL_COMMON_BLOCK_CPU_SMMRELOCATE=y CONFIG_SOC_INTEL_COMMON_BLOCK_CAR=y CONFIG_INTEL_CAR_NEM_ENHANCED=y # CONFIG_USE_INTEL_FSP_MP_INIT is not set -# CONFIG_USE_INTEL_FSP_TO_CALL_COREBOOT_PUBLISH_MP_PPI is not set CONFIG_CPU_SUPPORTS_PM_TIMER_EMULATION=y CONFIG_HAVE_HYPERTHREADING=y CONFIG_FSP_HYPERTHREADING=y @@ -308,6 +308,7 @@ CONFIG_SOC_INTEL_CSE_NPHY_CBFS_FILE="" CONFIG_SOC_INTEL_CSE_HAVE_SPEC_SUPPORT=y CONFIG_SOC_INTEL_COMMON_BLOCK_ME_SPEC_12=y CONFIG_ME_SPEC=12 +CONFIG_CSE_RESET_CLEAR_EC_AP_IDLE_FLAG=y CONFIG_SOC_INTEL_COMMON_BLOCK_DSP=y CONFIG_SOC_INTEL_COMMON_BLOCK_FAST_SPI=y CONFIG_FAST_SPI_DISABLE_WRITE_STATUS=y @@ -459,7 +460,10 @@ CONFIG_ARCH_ROMSTAGE_X86_32=y CONFIG_ARCH_POSTCAR_X86_32=y CONFIG_ARCH_RAMSTAGE_X86_32=y CONFIG_ARCH_ALL_STAGES_X86_32=y +CONFIG_RESERVED_PHYSICAL_ADDRESS_BITS_SUPPORT=y CONFIG_X86_TOP4G_BOOTMEDIA_MAP=y +CONFIG_POSTRAM_CBFS_CACHE_IN_BSS=y +CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000 CONFIG_PC80_SYSTEM=y CONFIG_HAVE_CMOS_DEFAULT=y CONFIG_POSTCAR_STAGE=y @@ -468,6 +472,7 @@ CONFIG_BOOTBLOCK_SIMPLE=y CONFIG_COLLECT_TIMESTAMPS_TSC=y CONFIG_IDT_IN_EVERY_STAGE=y CONFIG_HAVE_CF9_RESET=y +CONFIG_ACPI_CF9_FULL_RESET=y CONFIG_DEBUG_HW_BREAKPOINTS=y CONFIG_DEBUG_HW_BREAKPOINTS_IN_ALL_STAGES=y CONFIG_DEBUG_NULL_DEREF_BREAKPOINTS=y @@ -500,7 +505,7 @@ CONFIG_BOOTSPLASH=y CONFIG_PCI=y CONFIG_ECAM_MMCONF_SUPPORT=y CONFIG_PCIX_PLUGIN_SUPPORT=y -CONFIG_AZALIA_PLUGIN_SUPPORT=y +CONFIG_AZALIA_HDA_CODEC_SUPPORT=y CONFIG_AZALIA_LOCK_DOWN_R_WO_GCAP=y CONFIG_PCIEXP_PLUGIN_SUPPORT=y CONFIG_ECAM_MMCONF_LENGTH=0x10000000 @@ -570,6 +575,10 @@ CONFIG_USE_FSP_NOTIFY_PHASE_READY_TO_BOOT=y CONFIG_USE_FSP_NOTIFY_PHASE_END_OF_FIRMWARE=y # CONFIG_DISPLAY_FSP_TIMESTAMPS is not set CONFIG_INTEL_GMA_ACPI=y +CONFIG_VBT_CBFS_COMPRESSION_LZMA=y +# CONFIG_VBT_CBFS_COMPRESSION_LZ4 is not set +# CONFIG_VBT_CBFS_COMPRESSION_NONE is not set +CONFIG_VBT_CBFS_COMPRESSION_ALGORITHM="lzma" CONFIG_GFX_GMA=y CONFIG_GFX_GMA_DYN_CPU=y CONFIG_GFX_GMA_GENERATION="Skylake" @@ -725,6 +734,10 @@ CONFIG_COMPRESS_SECONDARY_PAYLOAD=y # # CONFIG_DISPLAY_MTRRS is not set +# +# Vendorcode Debug Settings +# + # # BLOB Debug Settings # diff --git a/modules/coreboot b/modules/coreboot index aaebdc14f..9aaf29cfc 100644 --- a/modules/coreboot +++ b/modules/coreboot @@ -82,10 +82,10 @@ coreboot-talos_2_repo := https://github.com/Dasharo/coreboot coreboot-talos_2_commit_hash := fc47236e9877f4113dfcce07fa928f52d4d2c8ee $(eval $(call coreboot_module,talos_2,)) -# Similarly, purism is based on 4.21, but nothing builds against 4.21 itself +# Similarly, purism is based on 4.22.01, but nothing builds against that release # or any other fork - no benefit to sharing the toolchain yet. coreboot-purism_repo := https://source.puri.sm/firmware/coreboot.git -coreboot-purism_commit_hash := 0d57cff58fba2f3a4d3a714a4eae65753e58c6ff +coreboot-purism_commit_hash := 0d12e16886ac41d63cb3d60687866060fa75deee $(eval $(call coreboot_module,purism,)) # MSI and Nitropad NV41 / NS50 boards are based on Dasharo coreboot port From a15f77e3361d5baeb7500e75d749b92f0d1e9e0e Mon Sep 17 00:00:00 2001 From: Jonathon Hall Date: Fri, 9 Feb 2024 15:20:50 -0500 Subject: [PATCH 2/2] config/coreboot-librem_11.config: intel_iommu=igfx_off on Heads cmdline intel_iommu=igfx_off is needed on the Heads kernel command line for memtest86+ to work. Without this parameter, the screen blanks when memtest86+ starts testing. This is unique to Librem 11, probably because it is the only device using FSP GOP for graphics init in coreboot. (libgfxinit does not yet support Jasper Lake.) Signed-off-by: Jonathon Hall --- config/coreboot-librem_11.config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/coreboot-librem_11.config b/config/coreboot-librem_11.config index 466c51c7f..16b902ffb 100644 --- a/config/coreboot-librem_11.config +++ b/config/coreboot-librem_11.config @@ -176,7 +176,7 @@ CONFIG_BOARD_PURISM_BASEBOARD_LIBREM_JSL=y CONFIG_FSP_TEMP_RAM_SIZE=0x28000 CONFIG_HEAP_SIZE=0x8000 CONFIG_EC_GPE_SCI=0x50 -CONFIG_LINUX_COMMAND_LINE="quiet loglevel=2" +CONFIG_LINUX_COMMAND_LINE="intel_iommu=igfx_off quiet loglevel=2" CONFIG_BOARD_ROMSIZE_KB_16384=y # CONFIG_COREBOOT_ROMSIZE_KB_256 is not set # CONFIG_COREBOOT_ROMSIZE_KB_512 is not set