Update coreboot to the latest as of 4 August 2015

1 files changed, 68 insertions, 73 deletions

diff --git a/resources/libreboot/config/grub/x60/config b/resources/libreboot/config/grub/x60/config
index 8cfe35b..5e6d70d 100644
--- a/resources/libreboot/config/grub/x60/config
+++ b/resources/libreboot/config/grub/x60/config
@@ -117,15 +117,13 @@ CONFIG_VGA_BIOS_ID="8086,27a2"
 # CONFIG_ONBOARD_VGA_IS_PRIMARY is not set
 # CONFIG_VGA_BIOS is not set
 # CONFIG_UDELAY_IO is not set
-CONFIG_RAMTOP=0x200000
-CONFIG_HEAP_SIZE=0x4000
-CONFIG_RAMBASE=0x100000
 CONFIG_DCACHE_RAM_BASE=0xffdf8000
 CONFIG_DCACHE_RAM_SIZE=0x8000
 CONFIG_MMCONF_BASE_ADDRESS=0xf0000000
 CONFIG_MAINBOARD_DO_NATIVE_VGA_INIT=y
 CONFIG_UART_FOR_CONSOLE=0
 CONFIG_ID_SECTION_OFFSET=0x80
+CONFIG_RAMTOP=0x200000
 CONFIG_USBDEBUG_HCD_INDEX=0
 CONFIG_TTYS0_LCS=3
 CONFIG_CACHE_ROM_SIZE_OVERRIDE=0
@@ -165,67 +163,6 @@ CONFIG_COREBOOT_ROMSIZE_KB_2048=y
 # CONFIG_COREBOOT_ROMSIZE_KB_16384 is not set
 CONFIG_COREBOOT_ROMSIZE_KB=2048
 CONFIG_ROM_SIZE=0x200000
-# CONFIG_ARCH_ARM is not set
-# CONFIG_ARCH_BOOTBLOCK_ARM is not set
-# CONFIG_ARCH_VERSTAGE_ARM is not set
-# CONFIG_ARCH_ROMSTAGE_ARM is not set
-# CONFIG_ARCH_RAMSTAGE_ARM is not set
-# CONFIG_ARCH_BOOTBLOCK_ARMV4 is not set
-# CONFIG_ARCH_VERSTAGE_ARMV4 is not set
-# CONFIG_ARCH_ROMSTAGE_ARMV4 is not set
-# CONFIG_ARCH_RAMSTAGE_ARMV4 is not set
-# CONFIG_ARCH_BOOTBLOCK_ARMV7 is not set
-# CONFIG_ARCH_VERSTAGE_ARMV7 is not set
-# CONFIG_ARCH_ROMSTAGE_ARMV7 is not set
-# CONFIG_ARCH_RAMSTAGE_ARMV7 is not set
-# CONFIG_ARCH_BOOTBLOCK_ARMV7_M is not set
-# CONFIG_ARCH_VERSTAGE_ARMV7_M is not set
-# CONFIG_ARM_BOOTBLOCK_CUSTOM is not set
-# CONFIG_ARM_LPAE is not set
-# CONFIG_ARCH_ARM64 is not set
-# CONFIG_ARCH_BOOTBLOCK_ARM64 is not set
-# CONFIG_ARCH_VERSTAGE_ARM64 is not set
-# CONFIG_ARCH_ROMSTAGE_ARM64 is not set
-# CONFIG_ARCH_RAMSTAGE_ARM64 is not set
-# CONFIG_ARCH_BOOTBLOCK_ARMV8_64 is not set
-# 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_ARM64_BOOTBLOCK_CUSTOM is not set
-# CONFIG_ARCH_MIPS is not set
-# CONFIG_ARCH_BOOTBLOCK_MIPS is not set
-# CONFIG_ARCH_VERSTAGE_MIPS is not set
-# CONFIG_ARCH_ROMSTAGE_MIPS is not set
-# CONFIG_ARCH_RAMSTAGE_MIPS is not set
-# CONFIG_ARCH_RISCV is not set
-# CONFIG_ARCH_BOOTBLOCK_RISCV is not set
-# CONFIG_ARCH_VERSTAGE_RISCV is not set
-# CONFIG_ARCH_ROMSTAGE_RISCV is not set
-# CONFIG_ARCH_RAMSTAGE_RISCV is not set
-# CONFIG_RISCV_BOOTBLOCK_CUSTOM is not set
-CONFIG_ARCH_X86=y
-CONFIG_ARCH_BOOTBLOCK_X86_32=y
-CONFIG_ARCH_VERSTAGE_X86_32=y
-CONFIG_ARCH_ROMSTAGE_X86_32=y
-CONFIG_ARCH_RAMSTAGE_X86_32=y
-# CONFIG_ARCH_BOOTBLOCK_X86_64 is not set
-# CONFIG_ARCH_VERSTAGE_X86_64 is not set
-# CONFIG_ARCH_ROMSTAGE_X86_64 is not set
-# CONFIG_ARCH_RAMSTAGE_X86_64 is not set
-CONFIG_AP_IN_SIPI_WAIT=y
-# CONFIG_SIPI_VECTOR_IN_ROM is not set
-CONFIG_NUM_IPI_STARTS=2
-# CONFIG_ROMCC is not set
-# CONFIG_LATE_CBMEM_INIT is not set
-CONFIG_PC80_SYSTEM=y
-CONFIG_BOOTBLOCK_NORTHBRIDGE_INIT="northbridge/intel/i945/bootblock.c"
-CONFIG_HAVE_CMOS_DEFAULT=y
-CONFIG_CMOS_DEFAULT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.default"
-CONFIG_BOOTBLOCK_SOUTHBRIDGE_INIT="southbridge/intel/i82801gx/bootblock.c"
-CONFIG_IOAPIC_INTERRUPTS_ON_FSB=y
-# CONFIG_IOAPIC_INTERRUPTS_ON_APIC_SERIAL_BUS is not set
-CONFIG_HPET_ADDRESS=0xfed00000
-# CONFIG_MAINBOARD_HAS_CHROMEOS is not set
 CONFIG_SYSTEM_TYPE_LAPTOP=y
 
 #
@@ -236,12 +173,15 @@ CONFIG_SYSTEM_TYPE_LAPTOP=y
 # SoC
 #
 # CONFIG_SOC_BROADCOM_CYGNUS is not set
+CONFIG_BOOTBLOCK_NORTHBRIDGE_INIT="northbridge/intel/i945/bootblock.c"
+CONFIG_BOOTBLOCK_SOUTHBRIDGE_INIT="southbridge/intel/i82801gx/bootblock.c"
 CONFIG_TTYS0_BASE=0x3f8
 CONFIG_EHCI_BAR=0xfef00000
-# CONFIG_SOC_INTEL_COMMON_RESET is not set
+CONFIG_HEAP_SIZE=0x4000
 # CONFIG_SOC_MARVELL_BG4CD is not set
 # CONFIG_SOC_NVIDIA_TEGRA124 is not set
 # CONFIG_SOC_NVIDIA_TEGRA132 is not set
+# CONFIG_SOC_NVIDIA_TEGRA210 is not set
 # CONFIG_SOC_QC_IPQ806X is not set
 # CONFIG_SOC_ROCKCHIP_RK3288 is not set
 # CONFIG_CPU_SAMSUNG_EXYNOS5250 is not set
@@ -254,6 +194,7 @@ CONFIG_EHCI_BAR=0xfef00000
 # CONFIG_CPU_ALLWINNER_A10 is not set
 CONFIG_SOCKET_SPECIFIC_OPTIONS=y
 CONFIG_XIP_ROM_SIZE=0x10000
+CONFIG_NUM_IPI_STARTS=2
 # CONFIG_CPU_AMD_AGESA is not set
 # CONFIG_CPU_AMD_PI is not set
 # CONFIG_CPU_ARMLTD_CORTEX_A9 is not set
@@ -297,6 +238,7 @@ CONFIG_CPU_MICROCODE_CBFS_NONE=y
 # CONFIG_NORTHBRIDGE_AMD_CIMX_RD890 is not set
 CONFIG_VIDEO_MB=0
 # CONFIG_NORTHBRIDGE_AMD_PI is not set
+CONFIG_RAMBASE=0x100000
 CONFIG_NORTHBRIDGE_SPECIFIC_OPTIONS=y
 CONFIG_NORTHBRIDGE_INTEL_I945=y
 # CONFIG_NORTHBRIDGE_INTEL_SUBTYPE_I945GC is not set
@@ -304,6 +246,7 @@ CONFIG_NORTHBRIDGE_INTEL_SUBTYPE_I945GM=y
 CONFIG_CHANNEL_XOR_RANDOMIZATION=y
 # CONFIG_OVERRIDE_CLOCK_DISABLE is not set
 # CONFIG_CHECK_SLFRCS_ON_RESUME is not set
+CONFIG_HPET_ADDRESS=0xfed00000
 CONFIG_HPET_MIN_TICKS=0x80
 CONFIG_MAX_PIRQ_LINKS=4
 
@@ -331,6 +274,64 @@ CONFIG_EC_ACPI=y
 CONFIG_EC_LENOVO_H8=y
 CONFIG_H8_DOCK_EARLY_INIT=y
 CONFIG_EC_LENOVO_PMH7=y
+# CONFIG_MAINBOARD_HAS_CHROMEOS is not set
+# CONFIG_ARCH_ARM is not set
+# CONFIG_ARCH_BOOTBLOCK_ARM is not set
+# CONFIG_ARCH_VERSTAGE_ARM is not set
+# CONFIG_ARCH_ROMSTAGE_ARM is not set
+# CONFIG_ARCH_RAMSTAGE_ARM is not set
+# CONFIG_ARCH_BOOTBLOCK_ARMV4 is not set
+# CONFIG_ARCH_VERSTAGE_ARMV4 is not set
+# CONFIG_ARCH_ROMSTAGE_ARMV4 is not set
+# CONFIG_ARCH_RAMSTAGE_ARMV4 is not set
+# CONFIG_ARCH_BOOTBLOCK_ARMV7 is not set
+# CONFIG_ARCH_VERSTAGE_ARMV7 is not set
+# CONFIG_ARCH_ROMSTAGE_ARMV7 is not set
+# CONFIG_ARCH_RAMSTAGE_ARMV7 is not set
+# CONFIG_ARCH_BOOTBLOCK_ARMV7_M is not set
+# CONFIG_ARCH_VERSTAGE_ARMV7_M is not set
+# CONFIG_ARM_BOOTBLOCK_CUSTOM is not set
+# CONFIG_ARM_LPAE is not set
+# CONFIG_ARCH_ARM64 is not set
+# CONFIG_ARCH_BOOTBLOCK_ARM64 is not set
+# CONFIG_ARCH_VERSTAGE_ARM64 is not set
+# CONFIG_ARCH_ROMSTAGE_ARM64 is not set
+# CONFIG_ARCH_RAMSTAGE_ARM64 is not set
+# CONFIG_ARCH_BOOTBLOCK_ARMV8_64 is not set
+# 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_ARM64_BOOTBLOCK_CUSTOM is not set
+# CONFIG_ARCH_MIPS is not set
+# CONFIG_ARCH_BOOTBLOCK_MIPS is not set
+# CONFIG_ARCH_VERSTAGE_MIPS is not set
+# CONFIG_ARCH_ROMSTAGE_MIPS is not set
+# CONFIG_ARCH_RAMSTAGE_MIPS is not set
+# CONFIG_ARCH_RISCV is not set
+# CONFIG_ARCH_BOOTBLOCK_RISCV is not set
+# CONFIG_ARCH_VERSTAGE_RISCV is not set
+# CONFIG_ARCH_ROMSTAGE_RISCV is not set
+# CONFIG_ARCH_RAMSTAGE_RISCV is not set
+# CONFIG_RISCV_BOOTBLOCK_CUSTOM is not set
+CONFIG_ARCH_X86=y
+CONFIG_ARCH_BOOTBLOCK_X86_32=y
+CONFIG_ARCH_VERSTAGE_X86_32=y
+CONFIG_ARCH_ROMSTAGE_X86_32=y
+CONFIG_ARCH_RAMSTAGE_X86_32=y
+# CONFIG_ARCH_BOOTBLOCK_X86_64 is not set
+# CONFIG_ARCH_VERSTAGE_X86_64 is not set
+# CONFIG_ARCH_ROMSTAGE_X86_64 is not set
+# CONFIG_ARCH_RAMSTAGE_X86_64 is not set
+CONFIG_AP_IN_SIPI_WAIT=y
+# CONFIG_SIPI_VECTOR_IN_ROM is not set
+# CONFIG_ROMCC is not set
+# CONFIG_LATE_CBMEM_INIT is not set
+CONFIG_PC80_SYSTEM=y
+CONFIG_HAVE_CMOS_DEFAULT=y
+CONFIG_CMOS_DEFAULT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.default"
+CONFIG_IOAPIC_INTERRUPTS_ON_FSB=y
+# CONFIG_IOAPIC_INTERRUPTS_ON_APIC_SERIAL_BUS is not set
+# CONFIG_COMPILE_IN_DSDT is not set
 
 #
 # Devices
@@ -371,10 +372,6 @@ CONFIG_SUBSYSTEM_DEVICE_ID=0x0000
 CONFIG_SMBIOS_PROVIDED_BY_MOBO=y
 # CONFIG_DRIVERS_I2C_RTD2132 is not set
 CONFIG_DRIVERS_ICS_954309=y
-
-#
-# Intel FSP
-#
 # CONFIG_INTEL_DP is not set
 # CONFIG_INTEL_DDI is not set
 CONFIG_INTEL_EDID=y
@@ -486,13 +483,11 @@ CONFIG_GENERATE_SMBIOS_TABLES=y
 #
 # CONFIG_PAYLOAD_NONE is not set
 CONFIG_PAYLOAD_ELF=y
-# CONFIG_PAYLOAD_LINUX is not set
-# CONFIG_PAYLOAD_SEABIOS is not set
 # CONFIG_PAYLOAD_FILO is not set
 # CONFIG_PAYLOAD_GRUB2 is not set
+# CONFIG_PAYLOAD_SEABIOS is not set
+# CONFIG_PAYLOAD_LINUX is not set
 # CONFIG_PAYLOAD_TIANOCORE is not set
-# CONFIG_SEABIOS_THREAD_OPTIONROMS is not set
-# CONFIG_SEABIOS_VGA_COREBOOT is not set
 CONFIG_PAYLOAD_FILE="grub.elf"
 CONFIG_COMPRESSED_PAYLOAD_LZMA=y