From b865edf5deea296e1fd315d2aa8120361beef603 Mon Sep 17 00:00:00 2001 From: Martin Kepplinger Date: Mon, 6 Aug 2018 09:43:42 +0200 Subject: [PATCH] x230: bump the config and patches to current coreboot master --- common/download_coreboot.sh | 4 ++-- x230/{config-e49ac56808 => config-4591bb6f7b} | 23 +++++++++++-------- 2 files changed, 16 insertions(+), 11 deletions(-) rename x230/{config-e49ac56808 => config-4591bb6f7b} (98%) diff --git a/common/download_coreboot.sh b/common/download_coreboot.sh index a6bbefa..dcf768e 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/1 + git pull https://review.coreboot.org/blobs refs/changes/52/27352/4 cd "$DOCKER_COREBOOT_DIR" || exit - git pull https://review.coreboot.org/coreboot refs/changes/54/27354/3 + git pull https://review.coreboot.org/coreboot refs/changes/64/27864/1 } ################################################################################ diff --git a/x230/config-e49ac56808 b/x230/config-4591bb6f7b similarity index 98% rename from x230/config-e49ac56808 rename to x230/config-4591bb6f7b index a53f17e..221995b 100644 --- a/x230/config-e49ac56808 +++ b/x230/config-4591bb6f7b @@ -48,6 +48,7 @@ CONFIG_CACHE_RELOCATED_RAMSTAGE_OUTSIDE_CBMEM=y # CONFIG_VENDOR_AVALUE is not set # CONFIG_VENDOR_BAP is not set # CONFIG_VENDOR_BIOSTAR is not set +# CONFIG_VENDOR_CAVIUM is not set # CONFIG_VENDOR_COMPULAB is not set # CONFIG_VENDOR_CUBIETECH is not set # CONFIG_VENDOR_ELMEX is not set @@ -98,23 +99,22 @@ CONFIG_VGA_BIOS=y CONFIG_VGA_BIOS_FILE="pci8086,0166.rom" CONFIG_MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID=0x17aa CONFIG_MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID=0x21fa -# CONFIG_HAVE_IFD_BIN is not set -# CONFIG_HAVE_ME_BIN is not set CONFIG_DRAM_RESET_GATE_GPIO=10 CONFIG_DEVICETREE="devicetree.cb" +CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/data.vbt" CONFIG_DCACHE_RAM_BASE=0xfefe0000 CONFIG_DCACHE_RAM_SIZE=0x20000 CONFIG_MAX_REBOOT_CNT=3 CONFIG_USBDEBUG_HCD_INDEX=2 +CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=0 +CONFIG_FMDFILE="" CONFIG_MMCONF_BASE_ADDRESS=0xf0000000 # CONFIG_DRIVERS_UART_8250IO is not set -CONFIG_FMDFILE="" -CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/data.vbt" CONFIG_IFD_BIOS_SECTION="" CONFIG_IFD_ME_SECTION="" # CONFIG_VBOOT is not set +# CONFIG_HAVE_IFD_BIN is not set CONFIG_TPM_PIRQ=0x0 -CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=0 CONFIG_OVERRIDE_DEVICETREE="" CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00 CONFIG_IFD_GBE_SECTION="" @@ -187,6 +187,10 @@ 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 +# CONFIG_SOC_CAVIUM_COMMON is not set CONFIG_BOOTBLOCK_CPU_INIT="cpu/intel/model_206ax/bootblock.c" # CONFIG_SOC_INTEL_GLK is not set CONFIG_C_ENV_BOOTBLOCK_SIZE=0x10000 @@ -203,6 +207,8 @@ CONFIG_PCIEXP_COMMON_CLOCK=y 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_CONSOLE_CBMEM=y CONFIG_UART_PCI_ADDR=0x0 @@ -371,7 +377,6 @@ CONFIG_UDK_VERSION=2013 # CONFIG_ARCH_VERSTAGE_ARMV8_64 is not set # CONFIG_ARCH_ROMSTAGE_ARMV8_64 is not set # CONFIG_ARCH_RAMSTAGE_ARMV8_64 is not set -CONFIG_ARCH_ARMV8_EXTENSION=0 # CONFIG_ARM64_USE_ARCH_TIMER is not set # CONFIG_ARM64_A53_ERRATUM_843419 is not set # CONFIG_ARCH_MIPS is not set @@ -385,7 +390,6 @@ CONFIG_ARCH_ARMV8_EXTENSION=0 # CONFIG_ARCH_ROMSTAGE_POWER8 is not set # CONFIG_ARCH_RAMSTAGE_POWER8 is not set # CONFIG_ARCH_RISCV is not set -# CONFIG_ARCH_RISCV_COMPRESSED is not set # CONFIG_ARCH_BOOTBLOCK_RISCV is not set # CONFIG_ARCH_VERSTAGE_RISCV is not set # CONFIG_ARCH_ROMSTAGE_RISCV is not set @@ -501,6 +505,7 @@ CONFIG_SPI_FLASH_WINBOND=y # CONFIG_SPI_FLASH_FAST_READ_DUAL_OUTPUT_3B is not set # CONFIG_SPI_FLASH_HAS_VOLATILE_GROUP is not set # CONFIG_HAVE_SPI_CONSOLE_SUPPORT is not set +CONFIG_TPM_INIT=y # CONFIG_DRIVERS_UART is not set CONFIG_NO_UART_ON_SUPERIO=y # CONFIG_UART_OVERRIDE_INPUT_CLOCK_DIVIDER is not set @@ -589,7 +594,6 @@ CONFIG_BOOT_DEVICE_SPI_FLASH=y CONFIG_BOOT_DEVICE_MEMORY_MAPPED=y # CONFIG_BOOT_DEVICE_SUPPORTS_WRITES is not set CONFIG_RTC=y -CONFIG_STACK_SIZE=0x1000 # # Console @@ -643,9 +647,9 @@ CONFIG_GENERATE_SMBIOS_TABLES=y # # Payload # -# CONFIG_PAYLOAD_FIT is not set # 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 @@ -700,6 +704,7 @@ CONFIG_HAVE_DEBUG_SMBUS=y # CONFIG_TRACE is not set # CONFIG_DEBUG_BOOT_STATE is not set # CONFIG_DEBUG_ADA_CODE is not set +# CONFIG_HAVE_EM100_SUPPORT is not set CONFIG_NO_EDID_FILL_FB=y # CONFIG_ENABLE_APIC_EXT_ID is not set CONFIG_WARNINGS_ARE_ERRORS=y