From 3fab7d1d91afac2cbca9f5897cefc486b12bde77 Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Wed, 27 Feb 2019 12:43:18 -0700 Subject: [PATCH] UEFI for darp5 and galp3-c --- system76/darp5/config | 58 +++++++++-------------------------------- system76/galp3-c/config | 58 +++++++++-------------------------------- 2 files changed, 24 insertions(+), 92 deletions(-) diff --git a/system76/darp5/config b/system76/darp5/config index d8280614d6..536b666f31 100644 --- a/system76/darp5/config +++ b/system76/darp5/config @@ -88,8 +88,6 @@ 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_PAYLOAD_CONFIGFILE="" CONFIG_MAINBOARD_VENDOR="System76" CONFIG_VGA_BIOS_ID="8086,3ea0" CONFIG_ONBOARD_VGA_IS_PRIMARY=y @@ -115,11 +113,10 @@ CONFIG_DCACHE_BSP_STACK_SIZE=0x4000 CONFIG_MMCONF_BASE_ADDRESS=0xe0000000 CONFIG_HAVE_INTEL_FIRMWARE=y # CONFIG_POST_DEVICE is not set -CONFIG_DRIVERS_UART_8250IO=y +# CONFIG_DRIVERS_UART_8250IO is not set # CONFIG_VBOOT is not set CONFIG_DIMM_MAX=2 CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00 -CONFIG_TTYS0_LCS=3 CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="Darter Pro" CONFIG_IFD_BIN_PATH="system76/$(VARIANT_DIR)/descriptor" CONFIG_ME_BIN_PATH="system76/$(VARIANT_DIR)/me" @@ -183,7 +180,6 @@ CONFIG_SYSTEM_TYPE_LAPTOP=y # CONFIG_CPU_SPECIFIC_OPTIONS=y CONFIG_HEAP_SIZE=0x8000 -CONFIG_SERIRQ_CONTINUOUS_MODE=y CONFIG_SMM_TSEG_SIZE=0x800000 CONFIG_SMM_RESERVED_SIZE=0x200000 CONFIG_SMM_MODULE_STACK_SIZE=0x400 @@ -218,7 +214,6 @@ CONFIG_IED_REGION_SIZE=0x400000 CONFIG_PCIEXP_ASPM=y CONFIG_PCIEXP_COMMON_CLOCK=y CONFIG_PCIEXP_CLK_PM=y -CONFIG_TTYS0_BASE=0x3e8 CONFIG_SOC_INTEL_CANNONLAKE=y CONFIG_SOC_INTEL_COMMON_CANNONLAKE_BASE=y # CONFIG_SOC_INTEL_COFFEELAKE is not set @@ -226,7 +221,6 @@ CONFIG_SOC_INTEL_WHISKEYLAKE=y # CONFIG_SOC_INTEL_CANNONLAKE_PCH_H is not set # CONFIG_NHLT_MAX98373 is not set CONFIG_MAX_ROOT_PORTS=16 -CONFIG_EXCLUDE_EMMC_INTERFACE=y # CONFIG_USE_CANNONLAKE_CAR_NEM_ENHANCED is not set CONFIG_USE_CANNONLAKE_FSP_CAR=y CONFIG_CONSOLE_CBMEM=y @@ -267,7 +261,6 @@ CONFIG_SOC_INTEL_COMMON_BLOCK_HDA_VERB=y CONFIG_SOC_INTEL_COMMON_BLOCK_I2C=y CONFIG_SOC_INTEL_COMMON_BLOCK_ITSS=y CONFIG_SOC_INTEL_COMMON_BLOCK_LPC=y -# CONFIG_SOC_INTEL_COMMON_BLOCK_LPC_COMB_ENABLE is not set CONFIG_SOC_INTEL_COMMON_BLOCK_LPSS=y CONFIG_SOC_INTEL_COMMON_BLOCK_P2SB=y CONFIG_SOC_INTEL_COMMON_BLOCK_PCIE=y @@ -417,7 +410,6 @@ CONFIG_EC_BASE_ACPI_COMMAND=0x934 CONFIG_EC_BASE_HOST_DATA=0x940 CONFIG_EC_BASE_HOST_COMMAND=0x944 CONFIG_EC_BASE_PACKET=0x950 -CONFIG_SEABIOS_PS2_TIMEOUT=1000 # # Intel Firmware @@ -596,8 +588,6 @@ CONFIG_SPI_FLASH_WINBOND=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_DRIVERS_UART_8250IO_SKIP_INIT is not set # CONFIG_NO_UART_ON_SUPERIO is not set # CONFIG_UART_OVERRIDE_INPUT_CLOCK_DIVIDER is not set # CONFIG_UART_OVERRIDE_REFCLK is not set @@ -694,27 +684,10 @@ CONFIG_RTC=y CONFIG_BOOTBLOCK_CONSOLE=y CONFIG_POSTCAR_CONSOLE=y CONFIG_SQUELCH_EARLY_SMP=y -CONFIG_CONSOLE_SERIAL=y - -# -# I/O mapped, 8250-compatible -# - -# -# Serial port base address = 0x3e8 -# -# 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_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 @@ -765,25 +738,12 @@ CONFIG_GENERATE_SMBIOS_TABLES=y # CONFIG_PAYLOAD_FILO is not set # CONFIG_PAYLOAD_GRUB2 is not set # CONFIG_PAYLOAD_LINUXBOOT is not set -CONFIG_PAYLOAD_SEABIOS=y +# CONFIG_PAYLOAD_SEABIOS is not set # CONFIG_PAYLOAD_UBOOT is not set # CONFIG_PAYLOAD_YABITS is not set # CONFIG_PAYLOAD_LINUX is not set -# CONFIG_PAYLOAD_TIANOCORE is not set -CONFIG_PAYLOAD_FILE="payloads/external/SeaBIOS/seabios/out/bios.bin.elf" -CONFIG_SEABIOS_STABLE=y -# CONFIG_SEABIOS_MASTER is not set -# CONFIG_SEABIOS_REVISION is not set -CONFIG_SEABIOS_THREAD_OPTIONROMS=y -CONFIG_SEABIOS_VGA_COREBOOT=y -CONFIG_SEABIOS_BOOTORDER_FILE="" -# CONFIG_SEABIOS_ADD_SERCON_PORT_FILE is not set -CONFIG_PAYLOAD_VGABIOS_FILE="payloads/external/SeaBIOS/seabios/out/vgabios.bin" -CONFIG_SEABIOS_DEBUG_LEVEL=-1 - -# -# Using default SeaBIOS log level -# +CONFIG_PAYLOAD_TIANOCORE=y +CONFIG_PAYLOAD_FILE="payloads/external/tianocore/tianocore/Build/UEFIPAYLOAD.fd" CONFIG_PAYLOAD_OPTIONS="" CONFIG_PXE=y @@ -794,6 +754,13 @@ CONFIG_PXE_ROM=y # CONFIG_BUILD_IPXE is not set CONFIG_PXE_ROM_FILE="system76/$(VARIANT_DIR)/pxe" # CONFIG_PXE_SERIAL_CONSOLE is not set +CONFIG_TIANOCORE_STABLE=y +# CONFIG_TIANOCORE_REVISION is not set +# CONFIG_TIANOCORE_TARGET_IA32 is not set +CONFIG_TIANOCORE_TARGET_X64=y +# CONFIG_TIANOCORE_DEBUG is not set +CONFIG_TIANOCORE_RELEASE=y +CONFIG_TIANOCORE_USE_8254_TIMER=y CONFIG_COMPRESSED_PAYLOAD_LZMA=y # CONFIG_COMPRESSED_PAYLOAD_LZ4 is not set # CONFIG_PAYLOAD_IS_FLAT_BINARY is not set @@ -822,7 +789,6 @@ 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/system76/galp3-c/config b/system76/galp3-c/config index 46fd63c0eb..b5da03a61b 100644 --- a/system76/galp3-c/config +++ b/system76/galp3-c/config @@ -88,8 +88,6 @@ 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_PAYLOAD_CONFIGFILE="" CONFIG_MAINBOARD_VENDOR="System76" CONFIG_VGA_BIOS_ID="8086,3ea0" CONFIG_ONBOARD_VGA_IS_PRIMARY=y @@ -115,11 +113,10 @@ CONFIG_DCACHE_BSP_STACK_SIZE=0x4000 CONFIG_MMCONF_BASE_ADDRESS=0xe0000000 CONFIG_HAVE_INTEL_FIRMWARE=y # CONFIG_POST_DEVICE is not set -CONFIG_DRIVERS_UART_8250IO=y +# CONFIG_DRIVERS_UART_8250IO is not set # CONFIG_VBOOT is not set CONFIG_DIMM_MAX=2 CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00 -CONFIG_TTYS0_LCS=3 CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="Galago Pro" CONFIG_IFD_BIN_PATH="system76/$(VARIANT_DIR)/descriptor" CONFIG_ME_BIN_PATH="system76/$(VARIANT_DIR)/me" @@ -183,7 +180,6 @@ CONFIG_SYSTEM_TYPE_LAPTOP=y # CONFIG_CPU_SPECIFIC_OPTIONS=y CONFIG_HEAP_SIZE=0x8000 -CONFIG_SERIRQ_CONTINUOUS_MODE=y CONFIG_SMM_TSEG_SIZE=0x800000 CONFIG_SMM_RESERVED_SIZE=0x200000 CONFIG_SMM_MODULE_STACK_SIZE=0x400 @@ -218,7 +214,6 @@ CONFIG_IED_REGION_SIZE=0x400000 CONFIG_PCIEXP_ASPM=y CONFIG_PCIEXP_COMMON_CLOCK=y CONFIG_PCIEXP_CLK_PM=y -CONFIG_TTYS0_BASE=0x3e8 CONFIG_SOC_INTEL_CANNONLAKE=y CONFIG_SOC_INTEL_COMMON_CANNONLAKE_BASE=y # CONFIG_SOC_INTEL_COFFEELAKE is not set @@ -226,7 +221,6 @@ CONFIG_SOC_INTEL_WHISKEYLAKE=y # CONFIG_SOC_INTEL_CANNONLAKE_PCH_H is not set # CONFIG_NHLT_MAX98373 is not set CONFIG_MAX_ROOT_PORTS=16 -CONFIG_EXCLUDE_EMMC_INTERFACE=y # CONFIG_USE_CANNONLAKE_CAR_NEM_ENHANCED is not set CONFIG_USE_CANNONLAKE_FSP_CAR=y CONFIG_CONSOLE_CBMEM=y @@ -267,7 +261,6 @@ CONFIG_SOC_INTEL_COMMON_BLOCK_HDA_VERB=y CONFIG_SOC_INTEL_COMMON_BLOCK_I2C=y CONFIG_SOC_INTEL_COMMON_BLOCK_ITSS=y CONFIG_SOC_INTEL_COMMON_BLOCK_LPC=y -# CONFIG_SOC_INTEL_COMMON_BLOCK_LPC_COMB_ENABLE is not set CONFIG_SOC_INTEL_COMMON_BLOCK_LPSS=y CONFIG_SOC_INTEL_COMMON_BLOCK_P2SB=y CONFIG_SOC_INTEL_COMMON_BLOCK_PCIE=y @@ -417,7 +410,6 @@ CONFIG_EC_BASE_ACPI_COMMAND=0x934 CONFIG_EC_BASE_HOST_DATA=0x940 CONFIG_EC_BASE_HOST_COMMAND=0x944 CONFIG_EC_BASE_PACKET=0x950 -CONFIG_SEABIOS_PS2_TIMEOUT=1000 # # Intel Firmware @@ -596,8 +588,6 @@ CONFIG_SPI_FLASH_WINBOND=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_DRIVERS_UART_8250IO_SKIP_INIT is not set # CONFIG_NO_UART_ON_SUPERIO is not set # CONFIG_UART_OVERRIDE_INPUT_CLOCK_DIVIDER is not set # CONFIG_UART_OVERRIDE_REFCLK is not set @@ -694,27 +684,10 @@ CONFIG_RTC=y CONFIG_BOOTBLOCK_CONSOLE=y CONFIG_POSTCAR_CONSOLE=y CONFIG_SQUELCH_EARLY_SMP=y -CONFIG_CONSOLE_SERIAL=y - -# -# I/O mapped, 8250-compatible -# - -# -# Serial port base address = 0x3e8 -# -# 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_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 @@ -765,25 +738,12 @@ CONFIG_GENERATE_SMBIOS_TABLES=y # CONFIG_PAYLOAD_FILO is not set # CONFIG_PAYLOAD_GRUB2 is not set # CONFIG_PAYLOAD_LINUXBOOT is not set -CONFIG_PAYLOAD_SEABIOS=y +# CONFIG_PAYLOAD_SEABIOS is not set # CONFIG_PAYLOAD_UBOOT is not set # CONFIG_PAYLOAD_YABITS is not set # CONFIG_PAYLOAD_LINUX is not set -# CONFIG_PAYLOAD_TIANOCORE is not set -CONFIG_PAYLOAD_FILE="payloads/external/SeaBIOS/seabios/out/bios.bin.elf" -CONFIG_SEABIOS_STABLE=y -# CONFIG_SEABIOS_MASTER is not set -# CONFIG_SEABIOS_REVISION is not set -CONFIG_SEABIOS_THREAD_OPTIONROMS=y -CONFIG_SEABIOS_VGA_COREBOOT=y -CONFIG_SEABIOS_BOOTORDER_FILE="" -# CONFIG_SEABIOS_ADD_SERCON_PORT_FILE is not set -CONFIG_PAYLOAD_VGABIOS_FILE="payloads/external/SeaBIOS/seabios/out/vgabios.bin" -CONFIG_SEABIOS_DEBUG_LEVEL=-1 - -# -# Using default SeaBIOS log level -# +CONFIG_PAYLOAD_TIANOCORE=y +CONFIG_PAYLOAD_FILE="payloads/external/tianocore/tianocore/Build/UEFIPAYLOAD.fd" CONFIG_PAYLOAD_OPTIONS="" CONFIG_PXE=y @@ -794,6 +754,13 @@ CONFIG_PXE_ROM=y # CONFIG_BUILD_IPXE is not set CONFIG_PXE_ROM_FILE="system76/$(VARIANT_DIR)/pxe" # CONFIG_PXE_SERIAL_CONSOLE is not set +CONFIG_TIANOCORE_STABLE=y +# CONFIG_TIANOCORE_REVISION is not set +# CONFIG_TIANOCORE_TARGET_IA32 is not set +CONFIG_TIANOCORE_TARGET_X64=y +# CONFIG_TIANOCORE_DEBUG is not set +CONFIG_TIANOCORE_RELEASE=y +CONFIG_TIANOCORE_USE_8254_TIMER=y CONFIG_COMPRESSED_PAYLOAD_LZMA=y # CONFIG_COMPRESSED_PAYLOAD_LZ4 is not set # CONFIG_PAYLOAD_IS_FLAT_BINARY is not set @@ -822,7 +789,6 @@ 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