From 9a04b9695bce016e2d0570bd1611b7ca3b2aa74d Mon Sep 17 00:00:00 2001 From: Martin Kepplinger Date: Mon, 5 Nov 2018 13:47:19 +0100 Subject: [PATCH] x230: bump to coreboot 715cb40963 --- common/download_coreboot.sh | 4 +-- x230/NEWS | 2 ++ x230/{config-8823037d50 => config-715cb40963} | 34 +++++++++++++------ 3 files changed, 27 insertions(+), 13 deletions(-) rename x230/{config-8823037d50 => config-715cb40963} (97%) diff --git a/common/download_coreboot.sh b/common/download_coreboot.sh index 41ac0e0..0d28d8d 100755 --- a/common/download_coreboot.sh +++ b/common/download_coreboot.sh @@ -30,9 +30,9 @@ function gitUpdate() { # 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/4 + git pull https://review.coreboot.org/blobs refs/changes/52/27352/5 cd "$DOCKER_COREBOOT_DIR" || exit - git pull https://review.coreboot.org/coreboot refs/changes/64/27864/2 + git pull https://review.coreboot.org/coreboot refs/changes/64/27864/3 } ################################################################################ diff --git a/x230/NEWS b/x230/NEWS index d9974ff..f08ec9b 100644 --- a/x230/NEWS +++ b/x230/NEWS @@ -2,6 +2,8 @@ skulls-x230 0.0.11 - unreleased ---------------------------------------- This release includes the following changes: +* based on coreboot commit 27ffa4c790 + (parent in master branch 715cb40963) * -b option for external scripts for RPi SPI speed diff --git a/x230/config-8823037d50 b/x230/config-715cb40963 similarity index 97% rename from x230/config-8823037d50 rename to x230/config-715cb40963 index 56370f8..791bb21 100644 --- a/x230/config-8823037d50 +++ b/x230/config-715cb40963 @@ -68,7 +68,6 @@ CONFIG_CACHE_RELOCATED_RAMSTAGE_OUTSIDE_CBMEM=y # CONFIG_VENDOR_KONTRON is not set CONFIG_VENDOR_LENOVO=y # CONFIG_VENDOR_LIPPERT is not set -# CONFIG_VENDOR_LOWRISC is not set # CONFIG_VENDOR_MSI is not set # CONFIG_VENDOR_OCP is not set # CONFIG_VENDOR_OPENCELLULAR is not set @@ -109,22 +108,24 @@ CONFIG_USBDEBUG_HCD_INDEX=2 CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=0 CONFIG_FMDFILE="" CONFIG_MMCONF_BASE_ADDRESS=0xf0000000 +CONFIG_HAVE_INTEL_FIRMWARE=y # CONFIG_DRIVERS_UART_8250IO is not set # CONFIG_VBOOT is not set -CONFIG_TPM_PIRQ=0x0 CONFIG_OVERRIDE_DEVICETREE="" +CONFIG_TPM_PIRQ=0x0 CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00 # CONFIG_HAVE_IFD_BIN is not set # CONFIG_BOARD_LENOVO_G505S is not set # CONFIG_BOARD_LENOVO_L520 is not set -# CONFIG_BOARD_LENOVO_R400 is not set # CONFIG_BOARD_LENOVO_S230U is not set # CONFIG_BOARD_LENOVO_T400 is not set +# CONFIG_BOARD_LENOVO_T500 is not set +# CONFIG_BOARD_LENOVO_R400 is not set +# CONFIG_BOARD_LENOVO_W500 is not set # CONFIG_BOARD_LENOVO_T420 is not set # 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_T500 is not set # CONFIG_BOARD_LENOVO_T520 is not set # CONFIG_BOARD_LENOVO_W520 is not set # CONFIG_BOARD_LENOVO_T530 is not set @@ -204,12 +205,10 @@ CONFIG_BOOTBLOCK_NORTHBRIDGE_INIT="northbridge/intel/sandybridge/bootblock.c" CONFIG_BOOTBLOCK_SOUTHBRIDGE_INIT="southbridge/intel/bd82x6x/bootblock.c" CONFIG_CACHE_MRC_SIZE_KB=512 # CONFIG_SOC_INTEL_COFFEELAKE is not set -# CONFIG_CANNONLAKE_SOC_PCH_H is not set -CONFIG_RAMTOP=0x200000 +# CONFIG_SOC_INTEL_CANNONLAKE_PCH_H is not set CONFIG_CONSOLE_CBMEM=y CONFIG_UART_PCI_ADDR=0x0 # CONFIG_SOC_INTEL_KABYLAKE is not set -# CONFIG_SOC_LOWRISC_LOWRISC is not set # CONFIG_SOC_MEDIATEK_MT8173 is not set # CONFIG_SOC_MEDIATEK_MT8183 is not set # CONFIG_SOC_NVIDIA_TEGRA124 is not set @@ -256,6 +255,7 @@ CONFIG_TSC_SYNC_MFENCE=y CONFIG_LOGICAL_CPUS=y CONFIG_SMM_TSEG=y CONFIG_SMM_MODULE_HEAP_SIZE=0x4000 +CONFIG_SMM_STUB_STACK_SIZE=0x400 # CONFIG_SMM_LAPIC_REMAP_MITIGATION is not set # CONFIG_SERIALIZED_SMM_INITIALIZATION is not set # CONFIG_X86_AMD_FIXED_MTRRS is not set @@ -301,6 +301,7 @@ 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 CONFIG_SOUTHBRIDGE_INTEL_COMMON_SMBUS=y CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI=y @@ -308,6 +309,9 @@ CONFIG_SOUTHBRIDGE_INTEL_COMMON_PIRQ_ACPI_GEN=y 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_INTEL_DESCRIPTOR_MODE_CAPABLE=y +CONFIG_INTEL_DESCRIPTOR_MODE_REQUIRED=y CONFIG_INTEL_CHIPSET_LOCKDOWN=y # CONFIG_LOCK_MANAGEMENT_ENGINE is not set @@ -320,13 +324,18 @@ CONFIG_INTEL_CHIPSET_LOCKDOWN=y # Embedded Controllers # CONFIG_EC_ACPI=y +# CONFIG_EC_GOOGLE_WILCO is not set +CONFIG_EC_BASE_ACPI_DATA=0x930 +CONFIG_EC_BASE_ACPI_COMMAND=0x934 +CONFIG_EC_BASE_HOST_DATA=0x940 +CONFIG_EC_BASE_HOST_COMMAND=0x944 +CONFIG_EC_BASE_PACKET=0x950 CONFIG_EC_LENOVO_H8=y CONFIG_SEABIOS_PS2_TIMEOUT=3000 # CONFIG_H8_BEEP_ON_DEATH is not set CONFIG_H8_FLASH_LEDS_ON_DEATH=y # CONFIG_H8_SUPPORT_BT_ON_WIFI is not set CONFIG_EC_LENOVO_PMH7=y -CONFIG_HAVE_INTEL_FIRMWARE=y # # Intel Firmware @@ -388,6 +397,7 @@ CONFIG_UDK_VERSION=2013 # CONFIG_ARCH_VERSTAGE_RISCV is not set # CONFIG_ARCH_ROMSTAGE_RISCV is not set # CONFIG_ARCH_RAMSTAGE_RISCV is not set +# CONFIG_RISCV_USE_ARCH_TIMER is not set CONFIG_ARCH_X86=y CONFIG_ARCH_BOOTBLOCK_X86_32=y CONFIG_ARCH_VERSTAGE_X86_32=y @@ -400,7 +410,8 @@ CONFIG_ARCH_RAMSTAGE_X86_32=y # CONFIG_USE_MARCH_586 is not set # CONFIG_AP_IN_SIPI_WAIT is not set # CONFIG_SIPI_VECTOR_IN_ROM is not set -CONFIG_RAMBASE=0x100000 +CONFIG_RAMBASE=0xe00000 +CONFIG_RAMTOP=0x1000000 # CONFIG_CBMEM_TOP_BACKUP is not set # CONFIG_LATE_CBMEM_INIT is not set # CONFIG_EARLY_EBDA_INIT is not set @@ -424,6 +435,7 @@ CONFIG_BOOTBLOCK_SOURCE="bootblock_simple.c" CONFIG_COLLECT_TIMESTAMPS_TSC=y # CONFIG_PAGING_IN_CACHE_AS_RAM is not set # CONFIG_IDT_IN_EVERY_STAGE is not set +CONFIG_HAVE_CF9_RESET=y # # Devices @@ -512,6 +524,7 @@ CONFIG_NO_UART_ON_SUPERIO=y # CONFIG_UART_USE_REFCLK_AS_INPUT_CLOCK is not set CONFIG_HAVE_USBDEBUG=y CONFIG_HAVE_USBDEBUG_OPTIONS=y +# CONFIG_VPD is not set # CONFIG_DRIVERS_AMD_PI is not set CONFIG_SMBIOS_PROVIDED_BY_MOBO=y # CONFIG_DRIVERS_I2C_MAX98373 is not set @@ -613,7 +626,6 @@ CONFIG_HWBASE_DEBUG_CB=y CONFIG_HAVE_ACPI_RESUME=y # CONFIG_ACPI_HUGE_LOWMEM_BACKUP is not set CONFIG_RESUME_PATH_SAME_AS_BOOT=y -CONFIG_HAVE_HARD_RESET=y # CONFIG_HAVE_ROMSTAGE_CONSOLE_SPINLOCK is not set # CONFIG_HAVE_ROMSTAGE_NVRAM_CBFS_SPINLOCK is not set # CONFIG_HAVE_ROMSTAGE_MICROCODE_CBFS_SPINLOCK is not set @@ -643,13 +655,13 @@ CONFIG_GENERATE_SMBIOS_TABLES=y # # CONFIG_PAYLOAD_NONE is not set # CONFIG_PAYLOAD_ELF is not set -# CONFIG_PAYLOAD_FIT is not set # CONFIG_PAYLOAD_BAYOU is not set # CONFIG_PAYLOAD_FILO is not set # CONFIG_PAYLOAD_GRUB2 is not set # CONFIG_PAYLOAD_LINUXBOOT is not set CONFIG_PAYLOAD_SEABIOS=y # CONFIG_PAYLOAD_UBOOT is not set +# CONFIG_PAYLOAD_YABITS is not set # CONFIG_PAYLOAD_LINUX is not set # CONFIG_PAYLOAD_TIANOCORE is not set CONFIG_PAYLOAD_FILE="payloads/external/SeaBIOS/seabios/out/bios.bin.elf"