From acd17247070a456b39721bc6220da2f2a2a07ae1 Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Thu, 10 Oct 2019 16:15:51 -0600 Subject: [PATCH] Update coreboot and add PCIEXP_HOTPLUG to configuration --- coreboot | 2 +- models/darp6/coreboot.config | 3 ++- models/galp4/coreboot.config | 2 ++ models/qemu/coreboot.config | 1 + scripts/qemu.sh | 3 +++ 5 files changed, 9 insertions(+), 2 deletions(-) diff --git a/coreboot b/coreboot index 486c132..0a0b9c5 160000 --- a/coreboot +++ b/coreboot @@ -1 +1 @@ -Subproject commit 486c132f1e1aeec903fc3c22fcff263550bc369e +Subproject commit 0a0b9c599d499283404c2ce37c89ac150902fae0 diff --git a/models/darp6/coreboot.config b/models/darp6/coreboot.config index a8161c5..3a4db07 100644 --- a/models/darp6/coreboot.config +++ b/models/darp6/coreboot.config @@ -285,6 +285,7 @@ CONFIG_SOC_INTEL_COMMON_BLOCK_LPC=y CONFIG_SOC_INTEL_COMMON_BLOCK_LPSS=y CONFIG_SOC_INTEL_COMMON_BLOCK_P2SB=y CONFIG_SOC_INTEL_COMMON_BLOCK_PCIE=y +CONFIG_PCIE_DEBUG_INFO=y CONFIG_SOC_INTEL_COMMON_BLOCK_PCR=y CONFIG_SOC_INTEL_COMMON_BLOCK_PMC=y # CONFIG_PMC_INVALID_READ_AFTER_WRITE is not set @@ -522,6 +523,7 @@ CONFIG_PCIX_PLUGIN_SUPPORT=y CONFIG_CARDBUS_PLUGIN_SUPPORT=y # CONFIG_AZALIA_PLUGIN_SUPPORT is not set CONFIG_PCIEXP_PLUGIN_SUPPORT=y +CONFIG_PCIEXP_HOTPLUG=y # CONFIG_EARLY_PCI_BRIDGE is not set CONFIG_INTEL_GMA_HAVE_VBT=y CONFIG_INTEL_GMA_ADD_VBT=y @@ -567,7 +569,6 @@ CONFIG_SPI_FLASH_STMICRO=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_DRIVERS_THUNDERBOLT=y CONFIG_NO_UART_ON_SUPERIO=y # CONFIG_UART_OVERRIDE_INPUT_CLOCK_DIVIDER is not set # CONFIG_UART_OVERRIDE_REFCLK is not set diff --git a/models/galp4/coreboot.config b/models/galp4/coreboot.config index 967359e..dce4b9b 100644 --- a/models/galp4/coreboot.config +++ b/models/galp4/coreboot.config @@ -285,6 +285,7 @@ CONFIG_SOC_INTEL_COMMON_BLOCK_LPC=y CONFIG_SOC_INTEL_COMMON_BLOCK_LPSS=y CONFIG_SOC_INTEL_COMMON_BLOCK_P2SB=y CONFIG_SOC_INTEL_COMMON_BLOCK_PCIE=y +CONFIG_PCIE_DEBUG_INFO=y CONFIG_SOC_INTEL_COMMON_BLOCK_PCR=y CONFIG_SOC_INTEL_COMMON_BLOCK_PMC=y # CONFIG_PMC_INVALID_READ_AFTER_WRITE is not set @@ -522,6 +523,7 @@ CONFIG_PCIX_PLUGIN_SUPPORT=y CONFIG_CARDBUS_PLUGIN_SUPPORT=y # CONFIG_AZALIA_PLUGIN_SUPPORT is not set CONFIG_PCIEXP_PLUGIN_SUPPORT=y +CONFIG_PCIEXP_HOTPLUG=y # CONFIG_EARLY_PCI_BRIDGE is not set CONFIG_INTEL_GMA_HAVE_VBT=y CONFIG_INTEL_GMA_ADD_VBT=y diff --git a/models/qemu/coreboot.config b/models/qemu/coreboot.config index d9d862d..25f1bea 100644 --- a/models/qemu/coreboot.config +++ b/models/qemu/coreboot.config @@ -360,6 +360,7 @@ CONFIG_PCIX_PLUGIN_SUPPORT=y CONFIG_CARDBUS_PLUGIN_SUPPORT=y # CONFIG_AZALIA_PLUGIN_SUPPORT is not set CONFIG_PCIEXP_PLUGIN_SUPPORT=y +CONFIG_PCIEXP_HOTPLUG=y # CONFIG_EARLY_PCI_BRIDGE is not set # CONFIG_VGA_BIOS_DGPU is not set # CONFIG_SOFTWARE_I2C is not set diff --git a/scripts/qemu.sh b/scripts/qemu.sh index f440c4e..03f5a35 100755 --- a/scripts/qemu.sh +++ b/scripts/qemu.sh @@ -22,6 +22,9 @@ kvm -M q35 -m 4096 -vga std \ -chardev stdio,mux=on,id=debug \ -device isa-serial,index=2,chardev=debug \ -device isa-debugcon,iobase=0x402,chardev=debug \ + -device pcie-root-port,bus=pcie.0,id=rp1 \ + -device pcie-pci-bridge,id=br1,bus=rp1 \ + -net none \ "$@" # COM1: -device isa-serial,index=0,chardev=debug