diff --git a/common/download_coreboot.sh b/common/download_coreboot.sh index be73ea2..8f1d3e5 100755 --- a/common/download_coreboot.sh +++ b/common/download_coreboot.sh @@ -28,11 +28,10 @@ function gitUpdate() { git fetch --all --tags --prune fi - # pull in microcode update to the blobs repo - cd "$DOCKER_COREBOOT_DIR/3rdparty/blobs/" || exit - git pull https://review.coreboot.org/blobs refs/changes/52/27352/5 + # update the blobs repo to include the microcode update we need + # cd "$DOCKER_COREBOOT_DIR/3rdparty/blobs/" || exit cd "$DOCKER_COREBOOT_DIR" || exit - git pull https://review.coreboot.org/coreboot refs/changes/64/27864/5 + git pull https://review.coreboot.org/coreboot refs/changes/08/30308/1 } ################################################################################ diff --git a/x230/config-717f4d5e14 b/x230/config-2ca2acc51f similarity index 98% rename from x230/config-717f4d5e14 rename to x230/config-2ca2acc51f index fb1e6d7..801da53 100644 --- a/x230/config-717f4d5e14 +++ b/x230/config-2ca2acc51f @@ -128,11 +128,13 @@ CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00 # CONFIG_BOARD_LENOVO_T420S is not set # CONFIG_BOARD_LENOVO_THINKPAD_T430 is not set # CONFIG_BOARD_LENOVO_T430S is not set +# CONFIG_BOARD_LENOVO_T431S is not set # CONFIG_BOARD_LENOVO_T520 is not set # CONFIG_BOARD_LENOVO_W520 is not set # CONFIG_BOARD_LENOVO_T530 is not set # CONFIG_BOARD_LENOVO_W530 is not set # CONFIG_BOARD_LENOVO_T60 is not set +# CONFIG_BOARD_LENOVO_THINKCENTRE_A58 is not set # CONFIG_BOARD_LENOVO_X131E is not set # CONFIG_BOARD_LENOVO_X1_CARBON_GEN1 is not set # CONFIG_BOARD_LENOVO_X200 is not set @@ -186,7 +188,6 @@ CONFIG_SMM_TSEG_SIZE=0x800000 CONFIG_SMM_RESERVED_SIZE=0x100000 CONFIG_SMM_MODULE_STACK_SIZE=0x400 CONFIG_ACPI_CPU_STRING="\\_PR.CP%02d" -# CONFIG_SOC_BROADCOM_CYGNUS is not set # CONFIG_SOC_CAVIUM_CN81XX is not set CONFIG_ARCH_ARMV8_EXTENSION=0 CONFIG_STACK_SIZE=0x1000 @@ -298,9 +299,6 @@ CONFIG_MAX_PIRQ_LINKS=4 CONFIG_HPET_MIN_TICKS=0x80 CONFIG_SOUTHBRIDGE_INTEL_C216=y CONFIG_SOUTH_BRIDGE_OPTIONS=y -CONFIG_LOCK_SPI_FLASH_NONE=y -# CONFIG_LOCK_SPI_FLASH_RO is not set -# CONFIG_LOCK_SPI_FLASH_NO_ACCESS is not set CONFIG_SOUTHBRIDGE_INTEL_COMMON=y CONFIG_SOUTHBRIDGE_INTEL_COMMON_RESET=y CONFIG_SOUTHBRIDGE_INTEL_COMMON_GPIO=y @@ -311,9 +309,13 @@ CONFIG_SOUTHBRIDGE_INTEL_COMMON_RCBA_PIRQ=y CONFIG_HAVE_INTEL_CHIPSET_LOCKDOWN=y CONFIG_SOUTHBRIDGE_INTEL_COMMON_SMM=y CONFIG_SOUTHBRIDGE_INTEL_COMMON_ACPI_MADT=y +CONFIG_SOUTHBRIDGE_INTEL_COMMON_FINALIZE=y CONFIG_INTEL_DESCRIPTOR_MODE_CAPABLE=y CONFIG_INTEL_DESCRIPTOR_MODE_REQUIRED=y CONFIG_INTEL_CHIPSET_LOCKDOWN=y +CONFIG_LOCK_SPI_FLASH_NONE=y +# CONFIG_LOCK_SPI_FLASH_RO is not set +# CONFIG_LOCK_SPI_FLASH_NO_ACCESS is not set # CONFIG_LOCK_MANAGEMENT_ENGINE is not set # @@ -388,11 +390,11 @@ CONFIG_UDK_VERSION=2013 # CONFIG_ARCH_VERSTAGE_MIPS is not set # CONFIG_ARCH_ROMSTAGE_MIPS is not set # CONFIG_ARCH_RAMSTAGE_MIPS is not set -# CONFIG_ARCH_POWER8 is not set -# CONFIG_ARCH_BOOTBLOCK_POWER8 is not set -# CONFIG_ARCH_VERSTAGE_POWER8 is not set -# CONFIG_ARCH_ROMSTAGE_POWER8 is not set -# CONFIG_ARCH_RAMSTAGE_POWER8 is not set +# CONFIG_ARCH_PPC64 is not set +# CONFIG_ARCH_BOOTBLOCK_PPC64 is not set +# CONFIG_ARCH_VERSTAGE_PPC64 is not set +# CONFIG_ARCH_ROMSTAGE_PPC64 is not set +# CONFIG_ARCH_RAMSTAGE_PPC64 is not set # CONFIG_ARCH_RISCV is not set # CONFIG_ARCH_BOOTBLOCK_RISCV is not set # CONFIG_ARCH_VERSTAGE_RISCV is not set @@ -497,6 +499,7 @@ CONFIG_MRC_SETTINGS_CACHE_SIZE=0x10000 # CONFIG_MRC_WRITE_NV_LATE is not set # CONFIG_RT8168_GET_MAC_FROM_VPD is not set # CONFIG_RT8168_SET_LED_MODE is not set +# CONFIG_SMMSTORE_IN_CBFS is not set CONFIG_SPI_FLASH=y CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP=y # CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP_EARLY is not set @@ -696,15 +699,22 @@ CONFIG_NVRAMCUI_SECONDARY_PAYLOAD=y # # Debugging # + +# +# CPU Debug Settings +# +# CONFIG_DEBUG_SMM_RELOCATION is not set + +# +# General Debug Settings +# # CONFIG_FATAL_ASSERTS is not set # CONFIG_DEBUG_CBFS is not set CONFIG_HAVE_DEBUG_RAM_SETUP=y # CONFIG_DEBUG_RAM_SETUP is not set -# CONFIG_HAVE_DEBUG_CAR is not set CONFIG_HAVE_DEBUG_SMBUS=y # CONFIG_DEBUG_SMBUS is not set # CONFIG_DEBUG_SMI is not set -# CONFIG_DEBUG_SMM_RELOCATION is not set # CONFIG_DEBUG_MALLOC is not set # CONFIG_DEBUG_ACPI is not set # CONFIG_X86EMU_DEBUG is not set diff --git a/x230/free-config-717f4d5e14 b/x230/free-config-2ca2acc51f similarity index 98% rename from x230/free-config-717f4d5e14 rename to x230/free-config-2ca2acc51f index 593f5cb..25f1d12 100644 --- a/x230/free-config-717f4d5e14 +++ b/x230/free-config-2ca2acc51f @@ -128,11 +128,13 @@ CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00 # CONFIG_BOARD_LENOVO_T420S is not set # CONFIG_BOARD_LENOVO_THINKPAD_T430 is not set # CONFIG_BOARD_LENOVO_T430S is not set +# CONFIG_BOARD_LENOVO_T431S is not set # CONFIG_BOARD_LENOVO_T520 is not set # CONFIG_BOARD_LENOVO_W520 is not set # CONFIG_BOARD_LENOVO_T530 is not set # CONFIG_BOARD_LENOVO_W530 is not set # CONFIG_BOARD_LENOVO_T60 is not set +# CONFIG_BOARD_LENOVO_THINKCENTRE_A58 is not set # CONFIG_BOARD_LENOVO_X131E is not set # CONFIG_BOARD_LENOVO_X1_CARBON_GEN1 is not set # CONFIG_BOARD_LENOVO_X200 is not set @@ -185,7 +187,6 @@ CONFIG_SMM_TSEG_SIZE=0x800000 CONFIG_SMM_RESERVED_SIZE=0x100000 CONFIG_SMM_MODULE_STACK_SIZE=0x400 CONFIG_ACPI_CPU_STRING="\\_PR.CP%02d" -# CONFIG_SOC_BROADCOM_CYGNUS is not set # CONFIG_SOC_CAVIUM_CN81XX is not set CONFIG_ARCH_ARMV8_EXTENSION=0 CONFIG_STACK_SIZE=0x1000 @@ -298,9 +299,6 @@ CONFIG_MAX_PIRQ_LINKS=4 CONFIG_HPET_MIN_TICKS=0x80 CONFIG_SOUTHBRIDGE_INTEL_C216=y CONFIG_SOUTH_BRIDGE_OPTIONS=y -CONFIG_LOCK_SPI_FLASH_NONE=y -# CONFIG_LOCK_SPI_FLASH_RO is not set -# CONFIG_LOCK_SPI_FLASH_NO_ACCESS is not set CONFIG_SOUTHBRIDGE_INTEL_COMMON=y CONFIG_SOUTHBRIDGE_INTEL_COMMON_RESET=y CONFIG_SOUTHBRIDGE_INTEL_COMMON_GPIO=y @@ -311,9 +309,13 @@ CONFIG_SOUTHBRIDGE_INTEL_COMMON_RCBA_PIRQ=y CONFIG_HAVE_INTEL_CHIPSET_LOCKDOWN=y CONFIG_SOUTHBRIDGE_INTEL_COMMON_SMM=y CONFIG_SOUTHBRIDGE_INTEL_COMMON_ACPI_MADT=y +CONFIG_SOUTHBRIDGE_INTEL_COMMON_FINALIZE=y CONFIG_INTEL_DESCRIPTOR_MODE_CAPABLE=y CONFIG_INTEL_DESCRIPTOR_MODE_REQUIRED=y CONFIG_INTEL_CHIPSET_LOCKDOWN=y +CONFIG_LOCK_SPI_FLASH_NONE=y +# CONFIG_LOCK_SPI_FLASH_RO is not set +# CONFIG_LOCK_SPI_FLASH_NO_ACCESS is not set # CONFIG_LOCK_MANAGEMENT_ENGINE is not set # @@ -388,11 +390,11 @@ CONFIG_UDK_VERSION=2013 # CONFIG_ARCH_VERSTAGE_MIPS is not set # CONFIG_ARCH_ROMSTAGE_MIPS is not set # CONFIG_ARCH_RAMSTAGE_MIPS is not set -# CONFIG_ARCH_POWER8 is not set -# CONFIG_ARCH_BOOTBLOCK_POWER8 is not set -# CONFIG_ARCH_VERSTAGE_POWER8 is not set -# CONFIG_ARCH_ROMSTAGE_POWER8 is not set -# CONFIG_ARCH_RAMSTAGE_POWER8 is not set +# CONFIG_ARCH_PPC64 is not set +# CONFIG_ARCH_BOOTBLOCK_PPC64 is not set +# CONFIG_ARCH_VERSTAGE_PPC64 is not set +# CONFIG_ARCH_ROMSTAGE_PPC64 is not set +# CONFIG_ARCH_RAMSTAGE_PPC64 is not set # CONFIG_ARCH_RISCV is not set # CONFIG_ARCH_BOOTBLOCK_RISCV is not set # CONFIG_ARCH_VERSTAGE_RISCV is not set @@ -492,6 +494,7 @@ CONFIG_MRC_SETTINGS_CACHE_SIZE=0x10000 # CONFIG_MRC_WRITE_NV_LATE is not set # CONFIG_RT8168_GET_MAC_FROM_VPD is not set # CONFIG_RT8168_SET_LED_MODE is not set +# CONFIG_SMMSTORE_IN_CBFS is not set CONFIG_SPI_FLASH=y CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP=y # CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP_EARLY is not set @@ -693,15 +696,22 @@ CONFIG_NVRAMCUI_SECONDARY_PAYLOAD=y # # Debugging # + +# +# CPU Debug Settings +# +# CONFIG_DEBUG_SMM_RELOCATION is not set + +# +# General Debug Settings +# # CONFIG_FATAL_ASSERTS is not set # CONFIG_DEBUG_CBFS is not set CONFIG_HAVE_DEBUG_RAM_SETUP=y # CONFIG_DEBUG_RAM_SETUP is not set -# CONFIG_HAVE_DEBUG_CAR is not set CONFIG_HAVE_DEBUG_SMBUS=y # CONFIG_DEBUG_SMBUS is not set # CONFIG_DEBUG_SMI is not set -# CONFIG_DEBUG_SMM_RELOCATION is not set # CONFIG_DEBUG_MALLOC is not set # CONFIG_DEBUG_ACPI is not set # CONFIG_DEBUG_SPI_FLASH is not set