From dcda30deb167742f2f369225141a6495239bcb7f Mon Sep 17 00:00:00 2001
From: Francis Rowe <info@gluglug.org.uk>
Date: Sat, 10 Oct 2015 15:54:15 -0400
Subject: Update coreboot-libre based on coreboot a2bed346a

More microcode blobs were deleted upstream, which are therefore no
longer deleted by coreboot-libre.

util/broadcom/secimage/misc.c is not a blob.

Some non-blobs were deleted upstream, which are therefore no
longer listed in libreboot's nonblobs list.

New non-blobs were found, added to the nonblobs list.

vboot submodule was added, since there are parts of it that
cbfstool needs. This submodule is now deblobbed by libreboot.
---
(limited to 'resources/libreboot/config/grub/x60')

diff --git a/resources/libreboot/config/grub/x60/config b/resources/libreboot/config/grub/x60/config
index 5e6d70d..d9b1572 100644
--- a/resources/libreboot/config/grub/x60/config
+++ b/resources/libreboot/config/grub/x60/config
@@ -6,7 +6,6 @@
 #
 # General setup
 #
-CONFIG_EXPERT=y
 CONFIG_LOCALVERSION=""
 CONFIG_CBFS_PREFIX="fallback"
 CONFIG_COMPILER_GCC=y
@@ -126,9 +125,8 @@ CONFIG_ID_SECTION_OFFSET=0x80
 CONFIG_RAMTOP=0x200000
 CONFIG_USBDEBUG_HCD_INDEX=0
 CONFIG_TTYS0_LCS=3
-CONFIG_CACHE_ROM_SIZE_OVERRIDE=0
 CONFIG_CBFS_SIZE=0x200000
-CONFIG_POST_IO=y
+CONFIG_CACHE_ROM_SIZE_OVERRIDE=0
 CONFIG_POST_DEVICE=y
 # CONFIG_BOARD_LENOVO_G505S is not set
 # CONFIG_BOARD_LENOVO_R400 is not set
@@ -257,7 +255,6 @@ CONFIG_MAX_PIRQ_LINKS=4
 # CONFIG_SOUTHBRIDGE_AMD_CIMX_SB800 is not set
 # CONFIG_SOUTHBRIDGE_AMD_CIMX_SB900 is not set
 CONFIG_SOUTHBRIDGE_INTEL_COMMON=y
-# CONFIG_LOCK_DOWN_BIOS is not set
 CONFIG_SOUTHBRIDGE_INTEL_I82801GX=y
 CONFIG_SOUTHBRIDGE_RICOH_RL5C476=y
 
@@ -275,6 +272,7 @@ CONFIG_EC_LENOVO_H8=y
 CONFIG_H8_DOCK_EARLY_INIT=y
 CONFIG_EC_LENOVO_PMH7=y
 # CONFIG_MAINBOARD_HAS_CHROMEOS is not set
+# CONFIG_UEFI_2_4_BINDING is not set
 # CONFIG_ARCH_ARM is not set
 # CONFIG_ARCH_BOOTBLOCK_ARM is not set
 # CONFIG_ARCH_VERSTAGE_ARM is not set
@@ -302,6 +300,7 @@ CONFIG_EC_LENOVO_PMH7=y
 # CONFIG_ARCH_ROMSTAGE_ARMV8_64 is not set
 # CONFIG_ARCH_RAMSTAGE_ARMV8_64 is not set
 # CONFIG_ARM64_BOOTBLOCK_CUSTOM is not set
+# CONFIG_ARM64_A53_ERRATUM_843419 is not set
 # CONFIG_ARCH_MIPS is not set
 # CONFIG_ARCH_BOOTBLOCK_MIPS is not set
 # CONFIG_ARCH_VERSTAGE_MIPS is not set
@@ -339,7 +338,6 @@ CONFIG_IOAPIC_INTERRUPTS_ON_FSB=y
 CONFIG_MAINBOARD_HAS_NATIVE_VGA_INIT=y
 CONFIG_NATIVE_VGA_INIT_USE_EDID=y
 CONFIG_MAINBOARD_HAS_NATIVE_VGA_INIT_TEXTMODECFG=y
-# CONFIG_VGA_ROM_RUN is not set
 # CONFIG_ON_DEVICE_ROM_RUN is not set
 # CONFIG_MULTIPLE_VGA_ADAPTERS is not set
 # CONFIG_SPD_CACHE is not set
@@ -390,6 +388,7 @@ CONFIG_DRIVERS_MC146818=y
 # CONFIG_DRIVERS_RICOH_RCE822 is not set
 # CONFIG_DRIVERS_SIL_3114 is not set
 # CONFIG_SPI_FLASH is not set
+# CONFIG_HAVE_SPI_CONSOLE_SUPPORT is not set
 # CONFIG_DRIVER_TI_TPS65090 is not set
 # CONFIG_DRIVERS_TI_TPS65913 is not set
 # CONFIG_DRIVERS_TI_TPS65913_RTC is not set
@@ -397,6 +396,7 @@ CONFIG_DRIVERS_UART=y
 CONFIG_DRIVERS_UART_8250IO=y
 # CONFIG_NO_UART_ON_SUPERIO is not set
 # CONFIG_DRIVERS_UART_8250MEM is not set
+# CONFIG_DRIVERS_UART_8250MEM_32 is not set
 # CONFIG_HAVE_UART_SPECIAL is not set
 # CONFIG_DRIVERS_UART_OXPCIE is not set
 # CONFIG_DRIVERS_UART_PL011 is not set
@@ -452,6 +452,7 @@ CONFIG_DEFAULT_CONSOLE_LOGLEVEL_8=y
 CONFIG_POST_DEVICE_NONE=y
 # CONFIG_POST_DEVICE_LPC is not set
 # CONFIG_POST_DEVICE_PCI_PCIE is not set
+CONFIG_POST_IO=y
 CONFIG_POST_IO_PORT=0x80
 CONFIG_HAVE_ACPI_RESUME=y
 CONFIG_HAVE_HARD_RESET=y
--
cgit v0.9.1