[coreboot-gerrit] New patch to review for coreboot: 4bad3b0 DO NOT MERGE: Sklrvp configuration file

Thu May 28 03:41:06 CEST 2015

Leroy P Leahy (leroy.p.leahy at intel.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/10345

-gerrit

commit 4bad3b0ff3f77d2435b410c038132d82c8e3f0ec
Author: Lee Leahy <leroy.p.leahy at intel.com>
Date:   Tue May 12 18:30:06 2015 -0700

    DO NOT MERGE: Sklrvp configuration file
    
    Add .config file to build sklrvp
    
    BRANCH=none
    BUG=None
    TEST=Build and run on sklrvp
    
    Change-Id: I3706c36e652c72f2a1b15dcc00c91856cccdaf33
    Signed-off-by: Lee Leahy <leroy.p.leahy at intel.com>
---
 .config | 146 ++++++++++++++++++++++++++--------------------------------------
 1 file changed, 58 insertions(+), 88 deletions(-)

diff --git a/.config b/.config
index fc5afab..e04a088 100644
--- a/.config
+++ b/.config
@@ -66,12 +66,12 @@ CONFIG_BOOTBLOCK_SOURCE="bootblock_simple.c"
 # CONFIG_VENDOR_GETAC is not set
 # CONFIG_VENDOR_GIGABYTE is not set
 # CONFIG_VENDOR_GIZMOSPHERE is not set
-CONFIG_VENDOR_GOOGLE=y
+# CONFIG_VENDOR_GOOGLE is not set
 # CONFIG_VENDOR_HP is not set
 # CONFIG_VENDOR_IBASE is not set
 # CONFIG_VENDOR_IBM is not set
 # CONFIG_VENDOR_IEI is not set
-# CONFIG_VENDOR_INTEL is not set
+CONFIG_VENDOR_INTEL=y
 # CONFIG_VENDOR_IWAVE is not set
 # CONFIG_VENDOR_IWILL is not set
 # CONFIG_VENDOR_JETWAY is not set
@@ -104,11 +104,12 @@ CONFIG_VENDOR_GOOGLE=y
 # CONFIG_VENDOR_WINENT is not set
 # CONFIG_VENDOR_WYSE is not set
 CONFIG_BOARD_SPECIFIC_OPTIONS=y
-CONFIG_MAINBOARD_DIR="google/cyan"
-CONFIG_MAINBOARD_PART_NUMBER="Cyan"
-CONFIG_MAINBOARD_VENDOR="Google"
-CONFIG_MAX_CPUS=4
-CONFIG_VGA_BIOS_ID="8086,22b0"
+CONFIG_MAINBOARD_DIR="intel/sklrvp"
+CONFIG_MAINBOARD_PART_NUMBER="Skylake RVP3"
+CONFIG_IRQ_SLOT_COUNT=18
+CONFIG_MAINBOARD_VENDOR="Intel"
+CONFIG_MAX_CPUS=8
+CONFIG_VGA_BIOS_ID="8086,0406"
 # CONFIG_ONBOARD_VGA_IS_PRIMARY is not set
 # CONFIG_VGA_BIOS is not set
 # CONFIG_UDELAY_IO is not set
@@ -118,55 +119,34 @@ CONFIG_HEAP_SIZE=0x4000
 CONFIG_RAMBASE=0x100000
 CONFIG_DCACHE_RAM_BASE=0xfef00000
 CONFIG_DCACHE_RAM_SIZE=0x4000
-CONFIG_VGA_BIOS_FILE="3rdparty/mainboard/intel/strago/vgabios.bin"
 CONFIG_MMCONF_BASE_ADDRESS=0xe0000000
-CONFIG_MAINBOARD_SMBIOS_MANUFACTURER="Google"
+CONFIG_MAINBOARD_SMBIOS_MANUFACTURER="Intel"
 # CONFIG_PCI_64BIT_PREF_MEM is not set
 CONFIG_UART_FOR_CONSOLE=0
 CONFIG_ID_SECTION_OFFSET=0x80
 CONFIG_HAVE_IFD_BIN=y
 CONFIG_HAVE_ME_BIN=y
-# CONFIG_BOARD_GOOGLE_BOLT is not set
-# CONFIG_BOARD_GOOGLE_BUTTERFLY is not set
-# CONFIG_BOARD_GOOGLE_COSMOS is not set
-CONFIG_BOARD_GOOGLE_CYAN=y
-# CONFIG_BOARD_GOOGLE_DAISY is not set
-# CONFIG_BOARD_GOOGLE_FALCO is not set
-# CONFIG_BOARD_GOOGLE_LINK is not set
-# CONFIG_BOARD_GOOGLE_NYAN_BIG is not set
-# CONFIG_BOARD_GOOGLE_NYAN_BLAZE is not set
-# CONFIG_BOARD_GOOGLE_NYAN is not set
-# CONFIG_BOARD_GOOGLE_PANTHER is not set
-# CONFIG_BOARD_GOOGLE_PARROT is not set
-# CONFIG_BOARD_GOOGLE_PEACH_PIT is not set
-# CONFIG_BOARD_GOOGLE_PEPPY is not set
-# CONFIG_BOARD_GOOGLE_PURIN is not set
-# CONFIG_BOARD_GOOGLE_RAMBI is not set
-# CONFIG_BOARD_GOOGLE_RUSH is not set
-# CONFIG_BOARD_GOOGLE_RUSH_RYU is not set
-# CONFIG_BOARD_GOOGLE_SAMUS is not set
-# CONFIG_BOARD_GOOGLE_SLIPPY is not set
-# CONFIG_BOARD_GOOGLE_STORM is not set
-# CONFIG_BOARD_GOOGLE_STOUT is not set
-# CONFIG_BOARD_GOOGLE_URARA is not set
-# CONFIG_BOARD_GOOGLE_VEYRON_BRAIN is not set
-# CONFIG_BOARD_GOOGLE_VEYRON_DANGER is not set
-# CONFIG_BOARD_GOOGLE_VEYRON_JERRY is not set
-# CONFIG_BOARD_GOOGLE_VEYRON_MIGHTY is not set
-# CONFIG_BOARD_GOOGLE_VEYRON_PINKY is not set
-# CONFIG_BOARD_GOOGLE_VEYRON_RIALTO is not set
-# CONFIG_BOARD_GOOGLE_VEYRON_SPEEDY is not set
 CONFIG_BOOT_MEDIA_SPI_BUS=0
-# CONFIG_DISPLAY_SPD_DATA is not set
-# CONFIG_DYNAMIC_VNN_SUPPORT is not set
-CONFIG_VBOOT_RAMSTAGE_INDEX=0x2
-CONFIG_VBOOT_REFCODE_INDEX=0x3
+CONFIG_VBOOT_RAMSTAGE_INDEX=0x3
 CONFIG_TTYS0_LCS=3
-# CONFIG_LOCK_MANAGEMENT_ENGINE is not set
+# CONFIG_BOARD_INTEL_BAKERSPORT_FSP is not set
+# CONFIG_BOARD_INTEL_BASKING_RIDGE is not set
+# CONFIG_BOARD_INTEL_BAYLEYBAY_FSP is not set
+# CONFIG_BOARD_INTEL_COUGAR_CANYON2 is not set
+# CONFIG_BOARD_INTEL_D810E2CB is not set
+# CONFIG_BOARD_INTEL_D945GCLF is not set
+# CONFIG_BOARD_INTEL_EAGLEHEIGHTS is not set
+# CONFIG_BOARD_INTEL_EMERALDLAKE2 is not set
+# CONFIG_BOARD_INTEL_MINNOWMAX is not set
+# CONFIG_BOARD_INTEL_MOHONPEAK is not set
+# CONFIG_BOARD_INTEL_MTARVON is not set
+CONFIG_BOARD_INTEL_SKLRVP=y
+# CONFIG_BOARD_INTEL_STRAGO is not set
+# CONFIG_BOARD_INTEL_TRUXTON is not set
+# CONFIG_BOARD_INTEL_WTM2 is not set
 CONFIG_CACHE_ROM_SIZE_OVERRIDE=0x100000
-CONFIG_FSP_FILE="3rdparty/mainboard/$(MAINBOARDDIR)/fsp/BSWFSP.fd"
-CONFIG_CBFS_SIZE=0x100000
-CONFIG_VIRTUAL_ROM_SIZE=0x800000
+CONFIG_FSP_FILE="3rdparty/mainboard/$(MAINBOARDDIR)/fsp/FSP.fd"
+CONFIG_CBFS_SIZE=0x200000
 CONFIG_POST_IO=y
 CONFIG_POST_DEVICE=y
 CONFIG_SEABIOS_MALLOC_UPPERMEMORY=y
@@ -174,7 +154,7 @@ CONFIG_CPU_ADDR_BITS=36
 CONFIG_DEFAULT_CONSOLE_LOGLEVEL=8
 CONFIG_MAINBOARD_VERSION="1.0"
 CONFIG_DRIVERS_PS2_KEYBOARD=y
-CONFIG_BOARD_ROMSIZE_KB_8192=y
+CONFIG_BOARD_ROMSIZE_KB_16384=y
 # CONFIG_COREBOOT_ROMSIZE_KB_64 is not set
 # CONFIG_COREBOOT_ROMSIZE_KB_128 is not set
 # CONFIG_COREBOOT_ROMSIZE_KB_256 is not set
@@ -182,11 +162,11 @@ CONFIG_BOARD_ROMSIZE_KB_8192=y
 # CONFIG_COREBOOT_ROMSIZE_KB_1024 is not set
 # CONFIG_COREBOOT_ROMSIZE_KB_2048 is not set
 # CONFIG_COREBOOT_ROMSIZE_KB_4096 is not set
-CONFIG_COREBOOT_ROMSIZE_KB_8192=y
+# CONFIG_COREBOOT_ROMSIZE_KB_8192 is not set
 # CONFIG_COREBOOT_ROMSIZE_KB_12288 is not set
-# CONFIG_COREBOOT_ROMSIZE_KB_16384 is not set
-CONFIG_COREBOOT_ROMSIZE_KB=8192
-CONFIG_ROM_SIZE=0x800000
+CONFIG_COREBOOT_ROMSIZE_KB_16384=y
+CONFIG_COREBOOT_ROMSIZE_KB=16384
+CONFIG_ROM_SIZE=0x1000000
 # CONFIG_ARCH_ARM64 is not set
 # CONFIG_ARCH_BOOTBLOCK_ARM64 is not set
 # CONFIG_ARCH_VERSTAGE_ARM64 is not set
@@ -236,7 +216,10 @@ CONFIG_NUM_IPI_STARTS=2
 # CONFIG_ROMCC is not set
 # CONFIG_LATE_CBMEM_INIT is not set
 CONFIG_PC80_SYSTEM=y
+CONFIG_BOOTBLOCK_NORTHBRIDGE_INIT="soc/intel/skylake/bootblock/systemagent.c"
+CONFIG_BOOTBLOCK_RESETS="soc/intel/common/reset.c"
 # CONFIG_HAVE_CMOS_DEFAULT is not set
+CONFIG_BOOTBLOCK_SOUTHBRIDGE_INIT="soc/intel/skylake/bootblock/pch.c"
 CONFIG_IOAPIC_INTERRUPTS_ON_FSB=y
 # CONFIG_IOAPIC_INTERRUPTS_ON_APIC_SERIAL_BUS is not set
 CONFIG_HPET_ADDRESS=0xfed00000
@@ -257,20 +240,22 @@ CONFIG_XIP_ROM_SIZE=0x10000
 # CONFIG_CPU_AMD_AGESA is not set
 # CONFIG_CPU_AMD_PI is not set
 # CONFIG_CPU_ARMLTD_CORTEX_A9 is not set
-CONFIG_BOOTBLOCK_CPU_INIT="soc/intel/braswell/bootblock/bootblock.c"
+CONFIG_BOOTBLOCK_CPU_INIT="soc/intel/skylake/bootblock/cpu.c"
 CONFIG_SMM_TSEG_SIZE=0x800000
-CONFIG_CPU_MICROCODE_CBFS_LOC=0xFFF4C000
+CONFIG_CPU_MICROCODE_CBFS_LOC=0xFFE115A0
+CONFIG_MICROCODE_INCLUDE_PATH="src/soc/intel/skylake/microcode"
 CONFIG_IED_REGION_SIZE=0x400000
 CONFIG_SMM_RESERVED_SIZE=0x100000
 CONFIG_SSE2=y
-# CONFIG_CPU_INTEL_FIRMWARE_INTERFACE_TABLE is not set
-CONFIG_CPU_INTEL_TURBO_NOT_PACKAGE_SCOPED=y
+CONFIG_CPU_INTEL_FIRMWARE_INTERFACE_TABLE=y
+CONFIG_CPU_INTEL_NUM_FIT_ENTRIES=4
+# CONFIG_CPU_INTEL_TURBO_NOT_PACKAGE_SCOPED is not set
 # CONFIG_CPU_TI_AM335X is not set
 # CONFIG_PARALLEL_CPU_INIT is not set
 # CONFIG_UDELAY_LAPIC is not set
 CONFIG_UDELAY_TSC=y
 CONFIG_TSC_CONSTANT_RATE=y
-CONFIG_TSC_MONOTONIC_TIMER=y
+# CONFIG_TSC_MONOTONIC_TIMER is not set
 # CONFIG_UDELAY_TIMER2 is not set
 # CONFIG_TSC_CALIBRATE_WITH_IO is not set
 # CONFIG_TSC_SYNC_LFENCE is not set
@@ -301,9 +286,8 @@ CONFIG_CPU_MICROCODE_CBFS_GENERATE=y
 # CONFIG_NORTHBRIDGE_AMD_CIMX_RD890 is not set
 CONFIG_VIDEO_MB=0
 # CONFIG_NORTHBRIDGE_AMD_PI is not set
-CONFIG_FSP_LOC=0xFFF6E000
-CONFIG_MRC_CACHE_SIZE=0x10000
-CONFIG_DCACHE_RAM_ROMSTAGE_STACK_SIZE=0x800
+CONFIG_FSP_LOC=0xffee0000
+CONFIG_PRE_GRAPHICS_DELAY=0
 CONFIG_MAX_PIRQ_LINKS=4
 
 #
@@ -312,6 +296,7 @@ CONFIG_MAX_PIRQ_LINKS=4
 # CONFIG_AMD_SB_CIMX is not set
 # CONFIG_SOUTHBRIDGE_AMD_CIMX_SB800 is not set
 # CONFIG_SOUTHBRIDGE_AMD_CIMX_SB900 is not set
+CONFIG_SERIRQ_CONTINUOUS_MODE=y
 # CONFIG_BUILD_WITH_FAKE_IFD is not set
 CONFIG_IFD_BIN_PATH="3rdparty/mainboard/$(MAINBOARDDIR)/descriptor.bin"
 CONFIG_ME_BIN_PATH="3rdparty/mainboard/$(MAINBOARDDIR)/me.bin"
@@ -329,10 +314,10 @@ CONFIG_ME_BIN_PATH="3rdparty/mainboard/$(MAINBOARDDIR)/me.bin"
 # SoC
 #
 # CONFIG_SOC_BROADCOM_CYGNUS is not set
-CONFIG_ENABLE_BUILTIN_COM1=y
-CONFIG_SOC_INTEL_BRASWELL=y
-CONFIG_CACHE_MRC_SETTINGS=y
-CONFIG_TTYS0_BASE=0x3f8
+# CONFIG_SERIAL_CPU_INIT is not set
+CONFIG_INTEL_PCH_UART_CONSOLE=y
+CONFIG_INTEL_PCH_UART_CONSOLE_NUMBER=0x0
+CONFIG_TTYS0_BASE=0xd6000000
 CONFIG_SOC_INTEL_COMMON=y
 CONFIG_CHIPSET_RESERVED_MEM_BYTES=0x0
 CONFIG_FSP_CACHE_SIZE=0x00080000
@@ -342,6 +327,9 @@ CONFIG_SOC_INTEL_COMMON_RESET=y
 CONFIG_SOC_INTEL_COMMON_STACK=y
 CONFIG_SOC_INTEL_COMMON_STAGE_CACHE=y
 CONFIG_ROMSTAGE_RAM_STACK_SIZE=0x5000
+CONFIG_SOC_INTEL_SKYLAKE=y
+CONFIG_EXTRA_MICROCODE_INCLUDE_PATH=""
+CONFIG_MONOTONIC_TIMER_MSR=y
 # CONFIG_SOC_MARVELL_BG4CD is not set
 # CONFIG_SOC_NVIDIA_TEGRA124 is not set
 # CONFIG_SOC_NVIDIA_TEGRA132 is not set
@@ -351,8 +339,7 @@ CONFIG_ROMSTAGE_RAM_STACK_SIZE=0x5000
 # CONFIG_CPU_SAMSUNG_EXYNOS5420 is not set
 # CONFIG_SOC_UCB_RISCV is not set
 CONFIG_HAVE_FSP_BIN=y
-CONFIG_ENABLE_MRC_CACHE=y
-CONFIG_MRC_CACHE_LOC=0xfff50000
+# CONFIG_ENABLE_MRC_CACHE is not set
 CONFIG_USE_GENERIC_FSP_CAR_INC=y
 # CONFIG_FSP_USES_UPD is not set
 
@@ -373,7 +360,7 @@ CONFIG_CARDBUS_PLUGIN_SUPPORT=y
 # CONFIG_AZALIA_PLUGIN_SUPPORT is not set
 CONFIG_PCIEXP_COMMON_CLOCK=y
 CONFIG_PCIEXP_ASPM=y
-# CONFIG_PCIEXP_CLK_PM is not set
+CONFIG_PCIEXP_CLK_PM=y
 # CONFIG_EARLY_PCI_BRIDGE is not set
 # CONFIG_PCIEXP_L1_SUB_STATE is not set
 CONFIG_SUBSYSTEM_VENDOR_ID=0x0000
@@ -385,7 +372,6 @@ CONFIG_SUBSYSTEM_DEVICE_ID=0x0000
 # Generic Drivers
 #
 # CONFIG_DRIVERS_AS3722_RTC is not set
-# CONFIG_ELOG is not set
 # CONFIG_GIC is not set
 # CONFIG_DRIVERS_I2C_RTD2132 is not set
 
@@ -418,22 +404,7 @@ CONFIG_DRIVERS_MC146818=y
 # CONFIG_MAINBOARD_HAS_LPC_TPM is not set
 # CONFIG_DRIVERS_RICOH_RCE822 is not set
 # CONFIG_DRIVERS_SIL_3114 is not set
-CONFIG_SPI_FLASH=y
-CONFIG_SPI_ATOMIC_SEQUENCING=y
-CONFIG_SPI_FLASH_MEMORY_MAPPED=y
-# CONFIG_SPI_FLASH_SMM is not set
-# CONFIG_SPI_FLASH_NO_FAST_READ is not set
-CONFIG_SPI_FLASH_ADESTO=y
-CONFIG_SPI_FLASH_AMIC=y
-CONFIG_SPI_FLASH_ATMEL=y
-CONFIG_SPI_FLASH_EON=y
-CONFIG_SPI_FLASH_GIGADEVICE=y
-CONFIG_SPI_FLASH_MACRONIX=y
-CONFIG_SPI_FLASH_SPANSION=y
-CONFIG_SPI_FLASH_SST=y
-CONFIG_SPI_FLASH_STMICRO=y
-CONFIG_SPI_FLASH_WINBOND=y
-# CONFIG_SPI_FLASH_FAST_READ_DUAL_OUTPUT_3B is not set
+# CONFIG_SPI_FLASH is not set
 # CONFIG_DRIVER_TI_TPS65090 is not set
 # CONFIG_DRIVERS_TI_TPS65913 is not set
 # CONFIG_DRIVERS_TI_TPS65913_RTC is not set
@@ -490,7 +461,7 @@ CONFIG_POST_DEVICE_NONE=y
 # CONFIG_POST_DEVICE_LPC is not set
 # CONFIG_POST_DEVICE_PCI_PCIE is not set
 CONFIG_POST_IO_PORT=0x80
-CONFIG_HAVE_ACPI_RESUME=y
+# CONFIG_HAVE_ACPI_RESUME is not set
 CONFIG_HAVE_HARD_RESET=y
 CONFIG_HAVE_MONOTONIC_TIMER=y
 # CONFIG_GENERIC_UDELAY is not set
@@ -499,7 +470,7 @@ CONFIG_HAVE_OPTION_TABLE=y
 # CONFIG_PIRQ_ROUTE is not set
 CONFIG_HAVE_SMI_HANDLER=y
 # CONFIG_PCI_IO_CFG_EXT is not set
-# CONFIG_IOAPIC is not set
+CONFIG_IOAPIC=y
 # CONFIG_USE_WATCHDOG_ON_BOOT is not set
 CONFIG_VGA=y
 # CONFIG_GFXUMA is not set
@@ -512,7 +483,7 @@ CONFIG_HAVE_ACPI_TABLES=y
 # CONFIG_GENERATE_MP_TABLE is not set
 # CONFIG_GENERATE_PIRQ_TABLE is not set
 CONFIG_GENERATE_SMBIOS_TABLES=y
-CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="Cyan"
+CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="Skylake RVP3"
 
 #
 # Payload
@@ -543,7 +514,6 @@ CONFIG_COMPRESSED_PAYLOAD_LZMA=y
 # CONFIG_DEBUG_SMM_RELOCATION is not set
 # CONFIG_DEBUG_MALLOC is not set
 # CONFIG_DEBUG_ACPI is not set
-# CONFIG_DEBUG_SPI_FLASH is not set
 # CONFIG_TRACE is not set
 # CONFIG_ENABLE_APIC_EXT_ID is not set
 CONFIG_WARNINGS_ARE_ERRORS=y

