Update coreboot and linux configs for Librem 13 v2

config/coreboot-librem13v2.config

@@ -7,7 +7,7 @@
 # General setup
 #
 CONFIG_COREBOOT_BUILD=y
-CONFIG_LOCALVERSION="4.7-Purism-1"
+CONFIG_LOCALVERSION="4.7-Purism-3"
 CONFIG_CBFS_PREFIX="fallback"
 CONFIG_COMPILER_GCC=y
 # CONFIG_COMPILER_LLVM_CLANG is not set
@@ -24,8 +24,7 @@ CONFIG_USE_BLOBS=y
 CONFIG_RELOCATABLE_RAMSTAGE=y
 CONFIG_CACHE_RELOCATED_RAMSTAGE_OUTSIDE_CBMEM=y
 # CONFIG_UPDATE_IMAGE is not set
-CONFIG_BOOTSPLASH_IMAGE=y
-CONFIG_BOOTSPLASH_FILE="bootsplash.jpg"
+# CONFIG_BOOTSPLASH_IMAGE is not set
 CONFIG_MEASURED_BOOT=y
 
 #
@@ -117,11 +116,10 @@ CONFIG_UART_FOR_CONSOLE=0
 CONFIG_VGA_BIOS_ID="8086,1916"
 # CONFIG_ONBOARD_VGA_IS_PRIMARY is not set
 CONFIG_DIMM_SPD_SIZE=512
-CONFIG_VGA_BIOS=y
+# CONFIG_VGA_BIOS is not set
 CONFIG_MAINBOARD_SERIAL_NUMBER="Unknown Serial Number"
 CONFIG_DCACHE_RAM_BASE=0xfef00000
 CONFIG_DCACHE_RAM_SIZE=0x40000
-CONFIG_VGA_BIOS_FILE="3rdparty/blobs/mainboard/$(MAINBOARDDIR)/vgabios.bin"
 CONFIG_MAINBOARD_SMBIOS_MANUFACTURER="Purism"
 CONFIG_HAVE_IFD_BIN=y
 CONFIG_HAVE_ME_BIN=y
@@ -141,12 +139,12 @@ CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=0
 CONFIG_FMDFILE=""
 CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00
 # CONFIG_DRIVERS_UART_8250IO is not set
-CONFIG_IFD_BIN_PATH="3rdparty/blobs/mainboard/$(MAINBOARDDIR)/descriptor.bin"
-CONFIG_ME_BIN_PATH="3rdparty/blobs/mainboard/$(MAINBOARDDIR)/me.bin"
+CONFIG_IFD_BIN_PATH="../../blobs/librem_skl/descriptor.bin"
+CONFIG_ME_BIN_PATH="../../blobs/librem_skl/me.bin"
 CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="Librem 13 v2"
 CONFIG_ADD_FSP_BINARIES=y
-CONFIG_FSP_M_FILE="3rdparty/blobs/mainboard/$(MAINBOARDDIR)/fspm.bin"
-CONFIG_FSP_S_FILE="3rdparty/blobs/mainboard/$(MAINBOARDDIR)/fsps.bin"
+CONFIG_FSP_M_FILE="../../blobs/librem_skl/fspm.bin"
+CONFIG_FSP_S_FILE="../../blobs/librem_skl/fsps.bin"
 CONFIG_FSP_S_CBFS="fsps.bin"
 CONFIG_FSP_M_CBFS="fspm.bin"
 CONFIG_CPU_ADDR_BITS=36
@@ -154,16 +152,13 @@ CONFIG_DEFAULT_CONSOLE_LOGLEVEL=8
 CONFIG_MAINBOARD_VERSION="2.0"
 # CONFIG_DRIVERS_PS2_KEYBOARD is not set
 # CONFIG_BOARD_PURISM_LIBREM13_V1 is not set
-# CONFIG_BOARD_PURISM_LIBREM15_V2 is not set
-# CONFIG_BOARD_PURISM_LIBREM_NANO_7100 is not set
 CONFIG_BOARD_PURISM_LIBREM13_V2=y
 # CONFIG_BOARD_PURISM_LIBREM15_V3 is not set
 CONFIG_PCIEXP_L1_SUB_STATE=y
 # CONFIG_NO_POST is not set
-# CONFIG_BOARD_PURISM_BASEBOARD_LIBREM_KBL_NANO is not set
+CONFIG_BOARD_PURISM_BASEBOARD_LIBREM_SKL=y
 CONFIG_CPU_MICROCODE_CBFS_LEN=0x18000
 CONFIG_CPU_MICROCODE_CBFS_LOC=0xFFE115A0
-CONFIG_BOARD_PURISM_BASEBOARD_LIBREM_SKL=y
 CONFIG_BOARD_ROMSIZE_KB_16384=y
 # CONFIG_COREBOOT_ROMSIZE_KB_64 is not set
 # CONFIG_COREBOOT_ROMSIZE_KB_128 is not set
@@ -372,7 +367,7 @@ CONFIG_CPU_MICROCODE_CBFS_GENERATE=y
 # CONFIG_CPU_MICROCODE_CBFS_EXTERNAL_HEADER is not set
 # CONFIG_CPU_MICROCODE_CBFS_NONE is not set
 # CONFIG_CPU_MICROCODE_MULTIPLE_FILES is not set
-CONFIG_CPU_UCODE_BINARIES="3rdparty/blobs/mainboard/$(MAINBOARDDIR)/cpu_microcode_blob.bin"
+CONFIG_CPU_UCODE_BINARIES="../../blobs/librem_skl/cpu_microcode_blob.bin"
 
 #
 # Northbridge
@@ -499,20 +494,13 @@ CONFIG_BOOTBLOCK_SOURCE="bootblock_simple.c"
 #
 # Devices
 #
-CONFIG_HAVE_LINEAR_FRAMEBUFFER=y
 CONFIG_HAVE_FSP_GOP=y
 # CONFIG_MAINBOARD_HAS_NATIVE_VGA_INIT is not set
 # CONFIG_MAINBOARD_HAS_LIBGFXINIT is not set
-CONFIG_RUN_FSP_GOP=y
+# CONFIG_RUN_FSP_GOP is not set
 # CONFIG_VGA_ROM_RUN is not set
-# CONFIG_NO_GFX_INIT is not set
+CONFIG_NO_GFX_INIT=y
 # CONFIG_MULTIPLE_VGA_ADAPTERS is not set
-
-#
-# Display
-#
-CONFIG_GENERIC_LINEAR_FRAMEBUFFER=y
-CONFIG_LINEAR_FRAMEBUFFER=y
 # CONFIG_SMBUS_HAS_AUX_CHANNELS is not set
 CONFIG_PCI=y
 CONFIG_MMCONF_SUPPORT=y
@@ -524,8 +512,7 @@ CONFIG_PCIEXP_PLUGIN_SUPPORT=y
 # CONFIG_EARLY_PCI_BRIDGE is not set
 CONFIG_SUBSYSTEM_VENDOR_ID=0x0000
 CONFIG_SUBSYSTEM_DEVICE_ID=0x0000
-CONFIG_INTEL_GMA_ADD_VBT_DATA_FILE=y
-CONFIG_INTEL_GMA_VBT_FILE="3rdparty/blobs/mainboard/$(MAINBOARDDIR)/vbt.bin"
+# CONFIG_INTEL_GMA_ADD_VBT_DATA_FILE is not set
 # CONFIG_SOFTWARE_I2C is not set
 
 #
@@ -574,6 +561,7 @@ CONFIG_DRIVERS_I2C_DESIGNWARE=y
 # CONFIG_DRIVERS_I2C_RT5663 is not set
 # CONFIG_DRIVERS_I2C_RTD2132 is not set
 # CONFIG_DRIVERS_I2C_RX6110SA is not set
+# CONFIG_I2C_TPM is not set
 # CONFIG_MAINBOARD_HAS_I2C_TPM_ATMEL is not set
 # CONFIG_MAINBOARD_HAS_I2C_TPM_CR50 is not set
 # CONFIG_DISPLAY_HOBS is not set
@@ -588,7 +576,7 @@ CONFIG_FSP_M_XIP=y
 # CONFIG_FSP2_0_USES_TPM_MRC_HASH is not set
 # CONFIG_INTEL_DDI is not set
 # CONFIG_INTEL_EDID is not set
-CONFIG_INTEL_INT15=y
+# CONFIG_INTEL_INT15 is not set
 # CONFIG_INTEL_GMA_ACPI is not set
 # CONFIG_INTEL_GMA_SSC_ALTERNATE_REF is not set
 # CONFIG_DRIVER_INTEL_I210 is not set
@@ -632,7 +620,7 @@ CONFIG_BOOT_DEVICE_SPI_FLASH=y
 CONFIG_BOOT_DEVICE_MEMORY_MAPPED=y
 CONFIG_BOOT_DEVICE_SUPPORTS_WRITES=y
 CONFIG_RTC=y
-# CONFIG_TPM is not set
+CONFIG_TPM=y
 # CONFIG_MAINBOARD_HAS_TPM_CR50 is not set
 
 #
@@ -645,8 +633,7 @@ CONFIG_SQUELCH_EARLY_SMP=y
 # 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=y
-CONFIG_CONSOLE_SPI_FLASH_BUFFER_SIZE=0x20000
+# CONFIG_CONSOLE_SPI_FLASH is not set
 CONFIG_DEFAULT_CONSOLE_LOGLEVEL_8=y
 # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_7 is not set
 # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_6 is not set
@@ -700,11 +687,11 @@ CONFIG_GENERATE_SMBIOS_TABLES=y
 # CONFIG_PAYLOAD_UBOOT is not set
 CONFIG_PAYLOAD_LINUX=y
 # CONFIG_PAYLOAD_TIANOCORE is not set
-CONFIG_PAYLOAD_FILE="payloads/heads/bzImage"
+CONFIG_PAYLOAD_FILE="../../build/librem13v2/bzImage"
 CONFIG_PAYLOAD_OPTIONS=""
 # CONFIG_PXE is not set
 CONFIG_LINUX_COMMAND_LINE="intel_iommu=igfx_off"
-CONFIG_LINUX_INITRD="payloads/heads/initrd.cpio.xz"
+CONFIG_LINUX_INITRD="../../build/librem13v2/initrd.cpio.xz"
 # CONFIG_PAYLOAD_IS_FLAT_BINARY is not set
 
 #
@@ -729,6 +716,7 @@ CONFIG_MEMTEST_STABLE=y
 # CONFIG_DEBUG_SMM_RELOCATION is not set
 # CONFIG_DEBUG_MALLOC is not set
 # CONFIG_DEBUG_ACPI is not set
+# CONFIG_DEBUG_TPM is not set
 # CONFIG_DEBUG_SPI_FLASH is not set
 # CONFIG_TRACE is not set
 # CONFIG_DEBUG_BOOT_STATE is not set

config/linux-librem13v2.config

@@ -1482,10 +1482,12 @@ CONFIG_MFD_SYSCON=y
 # Graphics support
 #
 # CONFIG_AGP is not set
+CONFIG_INTEL_GTT=y
 CONFIG_VGA_ARB=y
 CONFIG_VGA_ARB_MAX_GPUS=16
 # CONFIG_VGA_SWITCHEROO is not set
 CONFIG_DRM=y
+CONFIG_DRM_MIPI_DSI=y
 # CONFIG_DRM_DP_AUX_CHARDEV is not set
 CONFIG_DRM_KMS_HELPER=y
 CONFIG_DRM_KMS_FB_HELPER=y
@@ -1505,7 +1507,16 @@ CONFIG_DRM_FBDEV_EMULATION=y
 # ACP (Audio CoProcessor) Configuration
 #
 # CONFIG_DRM_NOUVEAU is not set
-# CONFIG_DRM_I915 is not set
+CONFIG_DRM_I915=y
+CONFIG_DRM_I915_PRELIMINARY_HW_SUPPORT=y
+CONFIG_DRM_I915_USERPTR=y
+# CONFIG_DRM_I915_GVT is not set
+
+#
+# drm/i915 Debugging
+#
+# CONFIG_DRM_I915_WERROR is not set
+# CONFIG_DRM_I915_DEBUG is not set
 # CONFIG_DRM_VGEM is not set
 # CONFIG_DRM_VMWGFX is not set
 # CONFIG_DRM_GMA500 is not set
@@ -1515,6 +1526,11 @@ CONFIG_DRM_FBDEV_EMULATION=y
 # CONFIG_DRM_CIRRUS_QEMU is not set
 # CONFIG_DRM_QXL is not set
 # CONFIG_DRM_BOCHS is not set
+CONFIG_DRM_PANEL=y
+
+#
+# Display Panels
+#
 CONFIG_DRM_BRIDGE=y
 
 #
@@ -2642,6 +2658,7 @@ CONFIG_DECOMPRESS_XZ=y
 CONFIG_GENERIC_ALLOCATOR=y
 CONFIG_REED_SOLOMON=y
 CONFIG_REED_SOLOMON_DEC8=y
+CONFIG_INTERVAL_TREE=y
 CONFIG_HAS_IOMEM=y
 CONFIG_HAS_IOPORT_MAP=y
 CONFIG_HAS_DMA=y