From 80388b0fc955ee24eb948f45ee94fce4cd0a5550 Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Thu, 26 Sep 2019 15:07:53 -0600 Subject: [PATCH] Update repos --- coreboot | 2 +- edk2 | 2 +- models/galp3-c/coreboot.config | 64 +++++++++++----------------------- scripts/remotes.sh | 1 + 4 files changed, 24 insertions(+), 45 deletions(-) diff --git a/coreboot b/coreboot index bc09219..00b6224 160000 --- a/coreboot +++ b/coreboot @@ -1 +1 @@ -Subproject commit bc09219912c8097104997ca07597edbd3f43ec6d +Subproject commit 00b6224b65f2c400bce984f2135a1400100d6c87 diff --git a/edk2 b/edk2 index 01f9e47..b00aea4 160000 --- a/edk2 +++ b/edk2 @@ -1 +1 @@ -Subproject commit 01f9e4702c3eb1cf00532837e6262f738ce8254d +Subproject commit b00aea47b451307f1a3a4d36c794a0a5f960d35a diff --git a/models/galp3-c/coreboot.config b/models/galp3-c/coreboot.config index b14107d..d374e1e 100644 --- a/models/galp3-c/coreboot.config +++ b/models/galp3-c/coreboot.config @@ -74,6 +74,7 @@ CONFIG_TSEG_STAGE_CACHE=y # CONFIG_VENDOR_PCENGINES is not set # CONFIG_VENDOR_PORTWELL is not set # CONFIG_VENDOR_PURISM is not set +# CONFIG_VENDOR_RAZER is not set # CONFIG_VENDOR_RODA is not set # CONFIG_VENDOR_SAMSUNG is not set # CONFIG_VENDOR_SAPPHIRE is not set @@ -111,7 +112,7 @@ CONFIG_MAX_REBOOT_CNT=3 CONFIG_OVERRIDE_DEVICETREE="" CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=0 CONFIG_FMDFILE="" -CONFIG_DCACHE_BSP_STACK_SIZE=0x4000 +CONFIG_DCACHE_BSP_STACK_SIZE=0x20000 CONFIG_MMCONF_BASE_ADDRESS=0xe0000000 CONFIG_HAVE_INTEL_FIRMWARE=y # CONFIG_POST_DEVICE is not set @@ -120,8 +121,8 @@ CONFIG_CPU_MICROCODE_CBFS_LOC=0x0 CONFIG_MRC_SETTINGS_CACHE_SIZE=0x10000 CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y CONFIG_SPI_FLASH_WINBOND=y -# CONFIG_DRIVERS_UART_8250IO is not set # CONFIG_VBOOT is not set +# CONFIG_DRIVERS_UART_8250IO is not set CONFIG_DIMM_MAX=2 CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="Galago Pro" CONFIG_IFD_BIN_PATH="$(FIRMWARE_OPEN_MODEL_DIR)/fd.rom" @@ -132,7 +133,6 @@ CONFIG_FSP_M_FILE="$(obj)/Fsp_M.fd" CONFIG_FSP_S_FILE="$(obj)/Fsp_S.fd" CONFIG_FSP_S_CBFS="fsps.bin" CONFIG_FSP_M_CBFS="fspm.bin" -CONFIG_CPU_ADDR_BITS=36 CONFIG_DEFAULT_CONSOLE_LOGLEVEL=7 CONFIG_MAINBOARD_VERSION="galp3-c" # CONFIG_DRIVERS_PS2_KEYBOARD is not set @@ -140,6 +140,8 @@ CONFIG_DRIVERS_INTEL_WIFI=y CONFIG_PCIEXP_L1_SUB_STATE=y CONFIG_SMBIOS_ENCLOSURE_TYPE=0x09 CONFIG_HEAP_SIZE=0x8000 +CONFIG_SUBSYSTEM_VENDOR_ID=0x0000 +CONFIG_CONSOLE_POST=y # CONFIG_BOARD_SYSTEM76_GAZE14_1650_15 is not set # CONFIG_BOARD_SYSTEM76_GAZE14_1650_17 is not set # CONFIG_BOARD_SYSTEM76_GAZE14_1660TI_15 is not set @@ -154,10 +156,8 @@ 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_CONSOLE_POST=y CONFIG_PXE_ROM_ID="10ec,8168" CONFIG_FSP_M_XIP=y -CONFIG_SUBSYSTEM_VENDOR_ID=0x0000 CONFIG_SUBSYSTEM_DEVICE_ID=0x0000 CONFIG_BOARD_ROMSIZE_KB_16384=y # CONFIG_COREBOOT_ROMSIZE_KB_64 is not set @@ -198,6 +198,7 @@ CONFIG_SYSTEM_TYPE_LAPTOP=y # CONFIG_CPU_SPECIFIC_OPTIONS=y CONFIG_HAVE_BOOTBLOCK=y +CONFIG_CPU_ADDR_BITS=36 CONFIG_SMM_TSEG_SIZE=0x800000 CONFIG_SMM_RESERVED_SIZE=0x200000 CONFIG_SMM_MODULE_STACK_SIZE=0x800 @@ -234,6 +235,7 @@ CONFIG_IED_REGION_SIZE=0x400000 CONFIG_SOC_INTEL_CANNONLAKE_BASE=y CONFIG_SOC_INTEL_CANNONLAKE_ALTERNATE_HEADERS=y CONFIG_SOC_INTEL_WHISKEYLAKE=y +CONFIG_FSP_TEMP_RAM_SIZE=0x10000 # CONFIG_NHLT_MAX98373 is not set CONFIG_MAX_ROOT_PORTS=16 CONFIG_MAX_PCIE_CLOCKS=6 @@ -241,7 +243,7 @@ CONFIG_MAX_PCIE_CLOCKS=6 # CONFIG_USE_CANNONLAKE_CAR_NEM_ENHANCED is not set CONFIG_USE_CANNONLAKE_FSP_CAR=y CONFIG_SOC_INTEL_CANNONLAKE_DEBUG_CONSENT=0 -CONFIG_CONSOLE_CBMEM=y +CONFIG_INTEL_TXT_BIOSACM_ALIGNMENT=0x40000 CONFIG_UART_PCI_ADDR=0x0 CONFIG_CPU_INTEL_NUM_FIT_ENTRIES=4 CONFIG_SOC_INTEL_COMMON=y @@ -278,6 +280,7 @@ CONFIG_SOC_INTEL_COMMON_BLOCK_GSPI_VERSION_2=y CONFIG_SOC_INTEL_COMMON_BLOCK_HDA=y CONFIG_SOC_INTEL_COMMON_BLOCK_HDA_VERB=y CONFIG_SOC_INTEL_COMMON_BLOCK_I2C=y +# CONFIG_SOC_INTEL_COMMON_BLOCK_IMC is not set CONFIG_SOC_INTEL_COMMON_BLOCK_ITSS=y CONFIG_SOC_INTEL_COMMON_BLOCK_LPC=y CONFIG_SOC_INTEL_COMMON_BLOCK_LPSS=y @@ -292,6 +295,7 @@ CONFIG_SOC_INTEL_COMMON_BLOCK_SATA=y CONFIG_SOC_AHCI_PORT_IMPLEMENTED_INVERT=y CONFIG_SOC_INTEL_COMMON_BLOCK_SCS=y # CONFIG_SOC_INTEL_COMMON_EARLY_MMC_WAKE is not set +# CONFIG_SOC_INTEL_COMMON_MMC_OVERRIDE is not set # CONFIG_SOC_INTEL_COMMON_BLOCK_SGX is not set CONFIG_SOC_INTEL_COMMON_BLOCK_SMBUS=y CONFIG_SOC_INTEL_COMMON_BLOCK_TCO=y @@ -324,7 +328,6 @@ CONFIG_PCH_SPECIFIC_OPTIONS=y # # Intel SoC Common coreboot stages # -# CONFIG_DISPLAY_SMM_MEMORY_MAP is not set CONFIG_SOC_INTEL_COMMON_RESET=y CONFIG_SOC_INTEL_COMMON_ACPI_WAKE_SOURCE=y # CONFIG_ACPI_CONSOLE is not set @@ -384,8 +387,7 @@ CONFIG_SMM_STUB_STACK_SIZE=0x400 # CONFIG_X86_AMD_INIT_SIPI is not set # CONFIG_MIRROR_PAYLOAD_TO_RAM_BEFORE_LOADING is not set # CONFIG_SOC_SETS_MSRS is not set -CONFIG_CACHE_AS_RAM=y -CONFIG_NO_CAR_GLOBAL_MIGRATION=y +# CONFIG_CAR_GLOBAL_MIGRATION is not set CONFIG_SMP=y CONFIG_SSE=y CONFIG_SUPPORT_CPU_UCODE_IN_CBFS=y @@ -453,37 +455,7 @@ CONFIG_UDK_2015_VERSION=2015 CONFIG_UDK_2017_VERSION=2017 CONFIG_UDK_VERSION=2017 # CONFIG_USE_SIEMENS_HWILIB is not set -# CONFIG_ARCH_ARM is not set -# CONFIG_ARCH_BOOTBLOCK_ARM is not set -# CONFIG_ARCH_VERSTAGE_ARM is not set -# CONFIG_ARCH_ROMSTAGE_ARM is not set -# CONFIG_ARCH_RAMSTAGE_ARM is not set -# CONFIG_ARCH_BOOTBLOCK_ARMV4 is not set -# CONFIG_ARCH_VERSTAGE_ARMV4 is not set -# CONFIG_ARCH_ROMSTAGE_ARMV4 is not set -# CONFIG_ARCH_RAMSTAGE_ARMV4 is not set -# CONFIG_ARCH_BOOTBLOCK_ARMV7 is not set -# CONFIG_ARCH_VERSTAGE_ARMV7 is not set -# CONFIG_ARCH_ROMSTAGE_ARMV7 is not set -# CONFIG_ARCH_RAMSTAGE_ARMV7 is not set -# CONFIG_ARCH_BOOTBLOCK_ARMV7_M is not set -# CONFIG_ARCH_VERSTAGE_ARMV7_M is not set -# CONFIG_ARCH_BOOTBLOCK_ARMV7_R is not set -# CONFIG_ARCH_VERSTAGE_ARMV7_R is not set -# CONFIG_ARCH_ROMSTAGE_ARMV7_R is not set -# CONFIG_ARCH_RAMSTAGE_ARMV7_R is not set # CONFIG_ARM_LPAE is not set -# CONFIG_ARCH_ARM64 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_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_USE_ARCH_TIMER is not set -# CONFIG_ARM64_A53_ERRATUM_843419 is not set CONFIG_ARCH_X86=y CONFIG_ARCH_BOOTBLOCK_X86_32=y CONFIG_ARCH_VERSTAGE_X86_32=y @@ -540,6 +512,7 @@ CONFIG_RUN_FSP_GOP=y # CONFIG_GENERIC_LINEAR_FRAMEBUFFER=y CONFIG_LINEAR_FRAMEBUFFER=y +# CONFIG_BOOTSPLASH is not set # CONFIG_SMBUS_HAS_AUX_CHANNELS is not set CONFIG_PCI=y # CONFIG_NO_MMCONF_SUPPORT is not set @@ -635,7 +608,7 @@ CONFIG_FSP_T_CBFS="fspt.bin" CONFIG_FSP_T_FILE="$(obj)/Fsp_T.fd" CONFIG_FSP_CAR=y CONFIG_FSP_T_XIP=y -# CONFIG_FSP_USES_CB_STACK is not set +CONFIG_FSP_USES_CB_STACK=y # CONFIG_VERIFY_HOBS is not set CONFIG_DISPLAY_FSP_VERSION_INFO=y # CONFIG_INTEL_DDI is not set @@ -685,6 +658,10 @@ CONFIG_USER_NO_TPM=y # CONFIG_PLATFORM_HAS_DRAM_CLEAR=y # CONFIG_SECURITY_CLEAR_DRAM_ON_REGULAR_BOOT is not set + +# +# Intel +# # CONFIG_ACPI_SATA_GENERATOR is not set CONFIG_ACPI_INTEL_HARDWARE_SLEEP_VALUES=y # CONFIG_ACPI_AMD_HARDWARE_SLEEP_VALUES is not set @@ -702,6 +679,7 @@ CONFIG_POSTCAR_CONSOLE=y CONFIG_SQUELCH_EARLY_SMP=y # 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 @@ -719,7 +697,6 @@ CONFIG_DEFAULT_CONSOLE_LOGLEVEL_7=y # CONFIG_NO_EARLY_BOOTBLOCK_POSTCODES is not set CONFIG_HWBASE_DEBUG_CB=y CONFIG_HAVE_ACPI_RESUME=y -# CONFIG_ACPI_HUGE_LOWMEM_BACKUP is not set CONFIG_RESUME_PATH_SAME_AS_BOOT=y # CONFIG_HAVE_ROMSTAGE_CONSOLE_SPINLOCK is not set # CONFIG_HAVE_ROMSTAGE_NVRAM_CBFS_SPINLOCK is not set @@ -760,8 +737,9 @@ CONFIG_PAYLOAD_TIANOCORE=y CONFIG_PAYLOAD_FILE="$(FIRMWARE_OPEN_UEFIPAYLOAD)" CONFIG_PAYLOAD_OPTIONS="" # CONFIG_PXE is not set -CONFIG_TIANOCORE_STABLE=y -# CONFIG_TIANOCORE_REVISION is not set +CONFIG_TIANOCORE_COREBOOTPAYLOAD=y +# CONFIG_TIANOCORE_UEFIPAYLOAD is not set +CONFIG_TIANOCORE_REVISION_ID="" # CONFIG_TIANOCORE_TARGET_IA32 is not set CONFIG_TIANOCORE_TARGET_X64=y # CONFIG_TIANOCORE_DEBUG is not set diff --git a/scripts/remotes.sh b/scripts/remotes.sh index 5655deb..f7d873b 100755 --- a/scripts/remotes.sh +++ b/scripts/remotes.sh @@ -3,6 +3,7 @@ REMOTES=( "coreboot upstream https://github.com/coreboot/coreboot.git" "edk2 upstream https://github.com/tianocore/edk2.git" + "edk2 mrchromebox https://github.com/MrChromebox/edk2.git" "edk2-platforms upstream https://github.com/tianocore/edk2-platforms.git" )