Update coreboot + merge GM45 hybrid GPU patches

Also add power_on_after_fail to X200 and others (prevents the bug
where the system would boot when connecting the AC adapter)
(option in menuconfig to use CMOS/nvram settings is now enabled)

Also NetDCDC is now the default USB debug dongle used (compatible
with the BBB rev C).

Add two new methods for managing coreboot configs:
./build config corebootreplace
./build config corebootmodify

1 files changed, 21 insertions, 5 deletions

diff --git a/resources/libreboot/config/qemu_q35_ich9/config b/resources/libreboot/config/qemu_q35_ich9/config
index 6585e226..9c048e94 100644
--- a/resources/libreboot/config/qemu_q35_ich9/config
+++ b/resources/libreboot/config/qemu_q35_ich9/config
@@ -24,6 +24,7 @@ CONFIG_EARLY_CBMEM_INIT=y
 CONFIG_BOOTBLOCK_SIMPLE=y
 # CONFIG_BOOTBLOCK_NORMAL is not set
 CONFIG_BOOTBLOCK_SOURCE="bootblock_simple.c"
+# CONFIG_SKIP_MAX_REBOOT_CNT_CLEAR is not set
 # CONFIG_UPDATE_IMAGE is not set
 
 #
@@ -106,6 +107,7 @@ CONFIG_DCACHE_RAM_BASE=0xd0000
 CONFIG_DCACHE_RAM_SIZE=0x10000
 CONFIG_MMCONF_BASE_ADDRESS=0xb0000000
 CONFIG_MAINBOARD_SMBIOS_MANUFACTURER="Emulation"
+CONFIG_BOOTBLOCK_MAINBOARD_INIT="mainboard/emulation/qemu-q35/bootblock.c"
 # CONFIG_PCI_64BIT_PREF_MEM is not set
 CONFIG_MAINBOARD_DO_NATIVE_VGA_INIT=y
 CONFIG_UART_FOR_CONSOLE=0
@@ -115,9 +117,9 @@ CONFIG_BOARD_EMULATION_QEMU_X86_Q35=y
 # CONFIG_BOARD_EMULATION_QEMU_ARMV7 is not set
 # CONFIG_BOARD_EMULATION_QEMU_UCB_RISCV is not set
 CONFIG_BOARD_EMULATION_QEMU_X86=y
-CONFIG_BOOTBLOCK_MAINBOARD_INIT="mainboard/emulation/qemu-q35/bootblock.c"
 CONFIG_RAMTOP=0x200000
 CONFIG_STACK_SIZE=0x1000
+CONFIG_TTYS0_LCS=3
 CONFIG_CACHE_ROM_SIZE_OVERRIDE=0
 CONFIG_CBFS_SIZE=0x800000
 CONFIG_POST_IO=y
@@ -145,6 +147,7 @@ CONFIG_ARCH_X86=y
 # CONFIG_ARCH_ARM is not set
 # CONFIG_ARCH_ARM64 is not set
 # CONFIG_ARCH_RISCV is not set
+# CONFIG_ARCH_MIPS is not set
 CONFIG_ARCH_BOOTBLOCK_X86_32=y
 CONFIG_ARCH_VERSTAGE_X86_32=y
 CONFIG_ARCH_ROMSTAGE_X86_32=y
@@ -172,22 +175,28 @@ CONFIG_HPET_ADDRESS=0xfed00000
 # CONFIG_ARCH_ROMSTAGE_ARMV7 is not set
 # CONFIG_ARCH_RAMSTAGE_ARMV7 is not set
 # CONFIG_ARM_BOOTBLOCK_CUSTOM is not set
-# CONFIG_CPU_HAS_BOOTBLOCK_INIT is not set
-# CONFIG_MAINBOARD_HAS_BOOTBLOCK_INIT is not set
 # CONFIG_ARM_LPAE 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_USE_SECURE_MONITOR 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_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_CPU_HAS_BOOTBLOCK_INIT is not set
+# CONFIG_MAINBOARD_HAS_BOOTBLOCK_INIT 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_MAINBOARD_HAS_CHROMEOS is not set
 # CONFIG_SYSTEM_TYPE_LAPTOP is not set
 
@@ -202,6 +211,7 @@ CONFIG_HPET_ADDRESS=0xfed00000
 # CONFIG_CPU_ARMLTD_CORTEX_A9 is not set
 # CONFIG_CPU_TI_AM335X is not set
 CONFIG_XIP_ROM_SIZE=0x10000
+CONFIG_CONSOLE_PRERAM_BUFFER_SIZE=0xc00
 # CONFIG_CPU_AMD_AGESA is not set
 # CONFIG_CPU_AMD_PI is not set
 CONFIG_SMM_TSEG_SIZE=0
@@ -252,6 +262,7 @@ CONFIG_EHCI_BAR=0xfef00000
 # 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_I82801IX=y
 
 #
@@ -283,6 +294,8 @@ 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_PCI_OPTION_ROM_RUN_REALMODE is not set
+# CONFIG_PCI_OPTION_ROM_RUN_YABEL is not set
 # CONFIG_MULTIPLE_VGA_ADAPTERS is not set
 # CONFIG_SPD_CACHE is not set
 CONFIG_PCI=y
@@ -295,6 +308,7 @@ CONFIG_CARDBUS_PLUGIN_SUPPORT=y
 # CONFIG_PCIEXP_ASPM is not set
 # CONFIG_PCIEXP_CLK_PM is not set
 # CONFIG_EARLY_PCI_BRIDGE is not set
+# CONFIG_PCIEXP_L1_SUB_STATE is not set
 CONFIG_SUBSYSTEM_VENDOR_ID=0x0000
 CONFIG_SUBSYSTEM_DEVICE_ID=0x0000
 # CONFIG_PXE_ROM is not set
@@ -312,6 +326,7 @@ CONFIG_FRAMEBUFFER_KEEP_VESA_MODE=y
 CONFIG_DRIVERS_EMULATION_QEMU_BOCHS=y
 CONFIG_DRIVERS_EMULATION_QEMU_BOCHS_XRES=800
 CONFIG_DRIVERS_EMULATION_QEMU_BOCHS_YRES=600
+# CONFIG_GIC is not set
 # CONFIG_DRIVERS_I2C_RTD2132 is not set
 # CONFIG_INTEL_DP is not set
 # CONFIG_INTEL_DDI is not set
@@ -358,12 +373,10 @@ CONFIG_CONSOLE_SERIAL_115200=y
 # CONFIG_CONSOLE_SERIAL_19200 is not set
 # CONFIG_CONSOLE_SERIAL_9600 is not set
 CONFIG_TTYS0_BAUD=115200
-CONFIG_TTYS0_LCS=3
 # CONFIG_SPKMODEM is not set
 # CONFIG_CONSOLE_NE2K is not set
 CONFIG_CONSOLE_CBMEM=y
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
-CONFIG_CONSOLE_PRERAM_BUFFER_SIZE=0xc00
 CONFIG_CONSOLE_QEMU_DEBUGCON=y
 CONFIG_CONSOLE_QEMU_DEBUGCON_PORT=0x402
 CONFIG_DEFAULT_CONSOLE_LOGLEVEL_8=y
@@ -417,6 +430,8 @@ CONFIG_PAYLOAD_ELF=y
 # CONFIG_PAYLOAD_FILO is not set
 # CONFIG_PAYLOAD_GRUB2 is not set
 # CONFIG_PAYLOAD_TIANOCORE is not set
+# CONFIG_SEABIOS_STABLE is not set
+# CONFIG_SEABIOS_MASTER is not set
 # CONFIG_SEABIOS_THREAD_OPTIONROMS is not set
 # CONFIG_SEABIOS_VGA_COREBOOT is not set
 CONFIG_PAYLOAD_FILE="grub.elf"
@@ -435,6 +450,7 @@ CONFIG_COMPRESSED_PAYLOAD_LZMA=y
 # CONFIG_DEBUG_MALLOC is not set
 # CONFIG_DEBUG_ACPI is not set
 # CONFIG_TRACE is not set
+# CONFIG_BOARD_ID_SUPPORT is not set
 # CONFIG_ENABLE_APIC_EXT_ID is not set
 CONFIG_WARNINGS_ARE_ERRORS=y
 # CONFIG_POWER_BUTTON_DEFAULT_ENABLE is not set