From 3146e4fb3b87212845012d50fa7c3b6d144cfb57 Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Fri, 1 Nov 2019 14:56:47 -0600 Subject: [PATCH] Update config for darp5 and galp3-c, update coreboot --- coreboot | 2 +- models/darp5/coreboot.config | 36 ++++++++++++++++++++++++++-------- models/galp3-c/coreboot.config | 36 ++++++++++++++++++++++++++-------- 3 files changed, 57 insertions(+), 17 deletions(-) diff --git a/coreboot b/coreboot index 27b4ae2..37c69a0 160000 --- a/coreboot +++ b/coreboot @@ -1 +1 @@ -Subproject commit 27b4ae24f40854bb2a0395669aca2df491170010 +Subproject commit 37c69a0123f3666a0bed0348b65a0c43014c4f1b diff --git a/models/darp5/coreboot.config b/models/darp5/coreboot.config index f59925e..41292f7 100644 --- a/models/darp5/coreboot.config +++ b/models/darp5/coreboot.config @@ -92,6 +92,7 @@ CONFIG_MAINBOARD_DIR="system76/whl-u" CONFIG_MAINBOARD_PART_NUMBER="darp5" CONFIG_MAX_CPUS=8 CONFIG_CBFS_SIZE=0xA00000 +CONFIG_UART_FOR_CONSOLE=2 CONFIG_MAINBOARD_VENDOR="System76" CONFIG_VGA_BIOS_ID="8086,3ea0" CONFIG_ONBOARD_VGA_IS_PRIMARY=y @@ -124,6 +125,7 @@ CONFIG_SPI_FLASH_WINBOND=y # CONFIG_VBOOT is not set # CONFIG_DRIVERS_UART_8250IO is not set CONFIG_DIMM_MAX=2 +CONFIG_TTYS0_LCS=3 CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="Darter Pro" CONFIG_IFD_BIN_PATH="$(FIRMWARE_OPEN_MODEL_DIR)/fd.rom" CONFIG_ME_BIN_PATH="$(FIRMWARE_OPEN_MODEL_DIR)/me.rom" @@ -153,12 +155,10 @@ CONFIG_CONSOLE_POST=y # CONFIG_BOARD_SYSTEM76_THELIO_B1 is not set # CONFIG_BOARD_SYSTEM76_GALP3_C is not set CONFIG_BOARD_SYSTEM76_DARP5=y -CONFIG_MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID=0x1558 -CONFIG_MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID=0x1325 CONFIG_PXE_ROM_ID="10ec,8168" CONFIG_FSP_M_XIP=y -CONFIG_SUBSYSTEM_VENDOR_ID=0x0000 -CONFIG_SUBSYSTEM_DEVICE_ID=0x0000 +CONFIG_SUBSYSTEM_VENDOR_ID=0x1558 +CONFIG_SUBSYSTEM_DEVICE_ID=0x1325 CONFIG_BOARD_ROMSIZE_KB_16384=y # CONFIG_COREBOOT_ROMSIZE_KB_64 is not set # CONFIG_COREBOOT_ROMSIZE_KB_128 is not set @@ -199,6 +199,7 @@ CONFIG_SYSTEM_TYPE_LAPTOP=y CONFIG_CPU_SPECIFIC_OPTIONS=y CONFIG_HAVE_BOOTBLOCK=y CONFIG_CPU_ADDR_BITS=36 +CONFIG_CONSOLE_UART_BASE_ADDRESS=0xfe032000 CONFIG_SMM_TSEG_SIZE=0x800000 CONFIG_SMM_RESERVED_SIZE=0x200000 CONFIG_SMM_MODULE_STACK_SIZE=0x800 @@ -231,6 +232,7 @@ CONFIG_PCIEXP_ASPM=y CONFIG_PCIEXP_COMMON_CLOCK=y CONFIG_PCIEXP_CLK_PM=y CONFIG_IED_REGION_SIZE=0x400000 +CONFIG_TTYS0_BASE=0x3e8 CONFIG_SOC_INTEL_CANNONLAKE_BASE=y CONFIG_SOC_INTEL_CANNONLAKE_ALTERNATE_HEADERS=y CONFIG_SOC_INTEL_WHISKEYLAKE=y @@ -284,6 +286,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 @@ -312,6 +315,7 @@ CONFIG_SOC_INTEL_COMMON_BLOCK_THERMAL=y CONFIG_SOC_INTEL_COMMON_BLOCK_TIMER=y CONFIG_USE_LEGACY_8254_TIMER=y CONFIG_SOC_INTEL_COMMON_BLOCK_UART=y +CONFIG_INTEL_LPSS_UART_FOR_CONSOLE=y CONFIG_SOC_INTEL_COMMON_BLOCK_XDCI=y CONFIG_SOC_INTEL_COMMON_BLOCK_XHCI=y CONFIG_SOC_INTEL_COMMON_BLOCK_XHCI_ELOG=y @@ -521,6 +525,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 @@ -566,13 +571,13 @@ 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_UART=y CONFIG_NO_UART_ON_SUPERIO=y # CONFIG_UART_OVERRIDE_INPUT_CLOCK_DIVIDER is not set # CONFIG_UART_OVERRIDE_REFCLK is not set -# CONFIG_DRIVERS_UART_8250MEM is not set -# CONFIG_DRIVERS_UART_8250MEM_32 is not set +CONFIG_DRIVERS_UART_8250MEM=y +CONFIG_DRIVERS_UART_8250MEM_32=y # CONFIG_HAVE_UART_SPECIAL is not set -# CONFIG_DRIVERS_UART_OXPCIE is not set # CONFIG_DRIVERS_UART_PL011 is not set # CONFIG_UART_USE_REFCLK_AS_INPUT_CLOCK is not set # CONFIG_HAVE_USBDEBUG is not set @@ -675,11 +680,25 @@ CONFIG_RTC=y CONFIG_BOOTBLOCK_CONSOLE=y CONFIG_POSTCAR_CONSOLE=y CONFIG_SQUELCH_EARLY_SMP=y +CONFIG_CONSOLE_SERIAL=y +CONFIG_FIXED_UART_FOR_CONSOLE=y + +# +# memory mapped, 8250-compatible +# +# CONFIG_CONSOLE_SERIAL_921600 is not set +# CONFIG_CONSOLE_SERIAL_460800 is not set +# CONFIG_CONSOLE_SERIAL_230400 is not set +CONFIG_CONSOLE_SERIAL_115200=y +# CONFIG_CONSOLE_SERIAL_57600 is not set +# CONFIG_CONSOLE_SERIAL_38400 is not set +# CONFIG_CONSOLE_SERIAL_19200 is not set +# CONFIG_CONSOLE_SERIAL_9600 is not set +CONFIG_TTYS0_BAUD=115200 # CONFIG_SPKMODEM is not set # CONFIG_CONSOLE_NE2K is not set CONFIG_CONSOLE_CBMEM=y CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000 -# CONFIG_CONSOLE_CBMEM_DUMP_TO_UART is not set # CONFIG_CONSOLE_SPI_FLASH is not set # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_8 is not set CONFIG_DEFAULT_CONSOLE_LOGLEVEL_7=y @@ -762,6 +781,7 @@ CONFIG_HAVE_DISPLAY_MTRRS=y # # General Debug Settings # +# CONFIG_GDB_STUB is not set # CONFIG_FATAL_ASSERTS is not set CONFIG_HAVE_DEBUG_GPIO=y # CONFIG_DEBUG_GPIO is not set diff --git a/models/galp3-c/coreboot.config b/models/galp3-c/coreboot.config index badf98a..df8c8aa 100644 --- a/models/galp3-c/coreboot.config +++ b/models/galp3-c/coreboot.config @@ -92,6 +92,7 @@ CONFIG_MAINBOARD_DIR="system76/whl-u" CONFIG_MAINBOARD_PART_NUMBER="galp3-c" CONFIG_MAX_CPUS=8 CONFIG_CBFS_SIZE=0xA00000 +CONFIG_UART_FOR_CONSOLE=2 CONFIG_MAINBOARD_VENDOR="System76" CONFIG_VGA_BIOS_ID="8086,3ea0" CONFIG_ONBOARD_VGA_IS_PRIMARY=y @@ -124,6 +125,7 @@ CONFIG_SPI_FLASH_WINBOND=y # CONFIG_VBOOT is not set # CONFIG_DRIVERS_UART_8250IO is not set CONFIG_DIMM_MAX=2 +CONFIG_TTYS0_LCS=3 CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="Galago Pro" CONFIG_IFD_BIN_PATH="$(FIRMWARE_OPEN_MODEL_DIR)/fd.rom" CONFIG_ME_BIN_PATH="$(FIRMWARE_OPEN_MODEL_DIR)/me.rom" @@ -153,12 +155,10 @@ CONFIG_CONSOLE_POST=y # CONFIG_BOARD_SYSTEM76_THELIO_B1 is not set CONFIG_BOARD_SYSTEM76_GALP3_C=y # CONFIG_BOARD_SYSTEM76_DARP5 is not set -CONFIG_MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID=0x1558 -CONFIG_MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID=0x1323 CONFIG_PXE_ROM_ID="10ec,8168" CONFIG_FSP_M_XIP=y -CONFIG_SUBSYSTEM_VENDOR_ID=0x0000 -CONFIG_SUBSYSTEM_DEVICE_ID=0x0000 +CONFIG_SUBSYSTEM_VENDOR_ID=0x1558 +CONFIG_SUBSYSTEM_DEVICE_ID=0x1323 CONFIG_BOARD_ROMSIZE_KB_16384=y # CONFIG_COREBOOT_ROMSIZE_KB_64 is not set # CONFIG_COREBOOT_ROMSIZE_KB_128 is not set @@ -199,6 +199,7 @@ CONFIG_SYSTEM_TYPE_LAPTOP=y CONFIG_CPU_SPECIFIC_OPTIONS=y CONFIG_HAVE_BOOTBLOCK=y CONFIG_CPU_ADDR_BITS=36 +CONFIG_CONSOLE_UART_BASE_ADDRESS=0xfe032000 CONFIG_SMM_TSEG_SIZE=0x800000 CONFIG_SMM_RESERVED_SIZE=0x200000 CONFIG_SMM_MODULE_STACK_SIZE=0x800 @@ -231,6 +232,7 @@ CONFIG_PCIEXP_ASPM=y CONFIG_PCIEXP_COMMON_CLOCK=y CONFIG_PCIEXP_CLK_PM=y CONFIG_IED_REGION_SIZE=0x400000 +CONFIG_TTYS0_BASE=0x3e8 CONFIG_SOC_INTEL_CANNONLAKE_BASE=y CONFIG_SOC_INTEL_CANNONLAKE_ALTERNATE_HEADERS=y CONFIG_SOC_INTEL_WHISKEYLAKE=y @@ -284,6 +286,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 @@ -312,6 +315,7 @@ CONFIG_SOC_INTEL_COMMON_BLOCK_THERMAL=y CONFIG_SOC_INTEL_COMMON_BLOCK_TIMER=y CONFIG_USE_LEGACY_8254_TIMER=y CONFIG_SOC_INTEL_COMMON_BLOCK_UART=y +CONFIG_INTEL_LPSS_UART_FOR_CONSOLE=y CONFIG_SOC_INTEL_COMMON_BLOCK_XDCI=y CONFIG_SOC_INTEL_COMMON_BLOCK_XHCI=y CONFIG_SOC_INTEL_COMMON_BLOCK_XHCI_ELOG=y @@ -521,6 +525,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 @@ -566,13 +571,13 @@ 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_UART=y CONFIG_NO_UART_ON_SUPERIO=y # CONFIG_UART_OVERRIDE_INPUT_CLOCK_DIVIDER is not set # CONFIG_UART_OVERRIDE_REFCLK is not set -# CONFIG_DRIVERS_UART_8250MEM is not set -# CONFIG_DRIVERS_UART_8250MEM_32 is not set +CONFIG_DRIVERS_UART_8250MEM=y +CONFIG_DRIVERS_UART_8250MEM_32=y # CONFIG_HAVE_UART_SPECIAL is not set -# CONFIG_DRIVERS_UART_OXPCIE is not set # CONFIG_DRIVERS_UART_PL011 is not set # CONFIG_UART_USE_REFCLK_AS_INPUT_CLOCK is not set # CONFIG_HAVE_USBDEBUG is not set @@ -675,11 +680,25 @@ CONFIG_RTC=y CONFIG_BOOTBLOCK_CONSOLE=y CONFIG_POSTCAR_CONSOLE=y CONFIG_SQUELCH_EARLY_SMP=y +CONFIG_CONSOLE_SERIAL=y +CONFIG_FIXED_UART_FOR_CONSOLE=y + +# +# memory mapped, 8250-compatible +# +# CONFIG_CONSOLE_SERIAL_921600 is not set +# CONFIG_CONSOLE_SERIAL_460800 is not set +# CONFIG_CONSOLE_SERIAL_230400 is not set +CONFIG_CONSOLE_SERIAL_115200=y +# CONFIG_CONSOLE_SERIAL_57600 is not set +# CONFIG_CONSOLE_SERIAL_38400 is not set +# CONFIG_CONSOLE_SERIAL_19200 is not set +# CONFIG_CONSOLE_SERIAL_9600 is not set +CONFIG_TTYS0_BAUD=115200 # CONFIG_SPKMODEM is not set # CONFIG_CONSOLE_NE2K is not set CONFIG_CONSOLE_CBMEM=y CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000 -# CONFIG_CONSOLE_CBMEM_DUMP_TO_UART is not set # CONFIG_CONSOLE_SPI_FLASH is not set # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_8 is not set CONFIG_DEFAULT_CONSOLE_LOGLEVEL_7=y @@ -762,6 +781,7 @@ CONFIG_HAVE_DISPLAY_MTRRS=y # # General Debug Settings # +# CONFIG_GDB_STUB is not set # CONFIG_FATAL_ASSERTS is not set CONFIG_HAVE_DEBUG_GPIO=y # CONFIG_DEBUG_GPIO is not set