x230: nonfree: update coreboot and add a bootsplash image

an out-of-tree change is not needed anymore. coreboot upstream includes the
latest microcode updates we need.

the bootsplash image is added to the build.

see #21

common/config_and_make.sh

@@ -34,6 +34,13 @@ function configAndMake() {
     cp "$DOCKER_SCRIPT_DIR/pci8086,0166.rom" "$DOCKER_COREBOOT_DIR/pci8086,0166.rom"
   fi
 
+  ###############################
+  ##  Copy in bootsplash image ##
+  ###############################
+  if [ -f "$DOCKER_SCRIPT_DIR/bootsplash.jpg" ]; then
+    cp "$DOCKER_SCRIPT_DIR/bootsplash.jpg" "$DOCKER_COREBOOT_DIR/bootsplash.jpg"
+  fi
+
   ##############
   ##   make   ##
   ##############

common/download_coreboot.sh

@@ -27,11 +27,6 @@ function gitUpdate() {
     cd "$DOCKER_COREBOOT_DIR/3rdparty/blobs/" || exit
     git fetch --all --tags --prune
   fi
-
-  # update the blobs repo to include the microcode update we need
-  # cd "$DOCKER_COREBOOT_DIR/3rdparty/blobs/" || exit
-  cd "$DOCKER_COREBOOT_DIR" || exit
-  git pull https://review.coreboot.org/coreboot refs/changes/08/30308/1
 }
 ################################################################################
 

x230/nonfree-config-2ca2acc51f → x230/nonfree-config-bbd237702a0

@@ -28,7 +28,8 @@ CONFIG_USE_BLOBS=y
 CONFIG_RELOCATABLE_RAMSTAGE=y
 CONFIG_CACHE_RELOCATED_RAMSTAGE_OUTSIDE_CBMEM=y
 # CONFIG_UPDATE_IMAGE is not set
-# CONFIG_BOOTSPLASH_IMAGE is not set
+CONFIG_BOOTSPLASH_IMAGE=y
+CONFIG_BOOTSPLASH_FILE="bootsplash.jpg"
 
 #
 # Mainboard
@@ -96,6 +97,7 @@ CONFIG_VGA_BIOS_ID="8086,0166"
 CONFIG_DIMM_SPD_SIZE=256
 CONFIG_VGA_BIOS=y
 CONFIG_VGA_BIOS_FILE="pci8086,0166.rom"
+CONFIG_C_ENV_BOOTBLOCK_SIZE=0x10000
 CONFIG_MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID=0x17aa
 CONFIG_MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID=0x21fa
 CONFIG_DRAM_RESET_GATE_GPIO=10
@@ -106,14 +108,13 @@ CONFIG_DCACHE_RAM_BASE=0xfefe0000
 CONFIG_DCACHE_RAM_SIZE=0x20000
 CONFIG_MAX_REBOOT_CNT=3
 CONFIG_USBDEBUG_HCD_INDEX=2
+CONFIG_OVERRIDE_DEVICETREE=""
 CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=0
 CONFIG_FMDFILE=""
-CONFIG_C_ENV_BOOTBLOCK_SIZE=0x10000
 CONFIG_MMCONF_BASE_ADDRESS=0xf0000000
 CONFIG_HAVE_INTEL_FIRMWARE=y
 # CONFIG_DRIVERS_UART_8250IO is not set
 # CONFIG_VBOOT is not set
-CONFIG_OVERRIDE_DEVICETREE=""
 CONFIG_TPM_PIRQ=0x0
 CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00
 # CONFIG_HAVE_IFD_BIN is not set
@@ -169,6 +170,12 @@ CONFIG_COREBOOT_ROMSIZE_KB_12288=y
 # CONFIG_COREBOOT_ROMSIZE_KB_65536 is not set
 CONFIG_COREBOOT_ROMSIZE_KB=12288
 CONFIG_ROM_SIZE=0xc00000
+CONFIG_HAVE_POWER_STATE_AFTER_FAILURE=y
+CONFIG_HAVE_POWER_STATE_PREVIOUS_AFTER_FAILURE=y
+CONFIG_POWER_STATE_OFF_AFTER_FAILURE=y
+# CONFIG_POWER_STATE_ON_AFTER_FAILURE is not set
+# CONFIG_POWER_STATE_PREVIOUS_AFTER_FAILURE is not set
+CONFIG_MAINBOARD_POWER_FAILURE_STATE=0
 CONFIG_SYSTEM_TYPE_LAPTOP=y
 # CONFIG_CBFS_AUTOGEN_ATTRIBUTES is not set
 
@@ -241,7 +248,7 @@ CONFIG_CPU_INTEL_SOCKET_RPGA989=y
 # CONFIG_CPU_INTEL_TURBO_NOT_PACKAGE_SCOPED is not set
 CONFIG_CPU_INTEL_COMMON=y
 CONFIG_ENABLE_VMX=y
-CONFIG_SET_VMX_LOCK_BIT=y
+CONFIG_SET_IA32_FC_LOCK_BIT=y
 # CONFIG_CPU_TI_AM335X is not set
 # CONFIG_PARALLEL_CPU_INIT is not set
 # CONFIG_PARALLEL_MP is not set
@@ -267,16 +274,15 @@ CONFIG_SMM_STUB_STACK_SIZE=0x400
 CONFIG_CACHE_AS_RAM=y
 CONFIG_NO_CAR_GLOBAL_MIGRATION=y
 CONFIG_SMP=y
-CONFIG_AP_SIPI_VECTOR=0xfffff000
 CONFIG_MMX=y
 CONFIG_SSE=y
 CONFIG_SUPPORT_CPU_UCODE_IN_CBFS=y
 # CONFIG_USES_MICROCODE_HEADER_FILES is not set
-CONFIG_CPU_MICROCODE_CBFS_GENERATE=y
+CONFIG_USE_CPU_MICROCODE_CBFS_BINS=y
+CONFIG_CPU_MICROCODE_CBFS_DEFAULT_BINS=y
+# CONFIG_CPU_MICROCODE_CBFS_EXTERNAL_BINS is not set
 # 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=""
 
 #
 # Northbridge
@@ -343,6 +349,7 @@ CONFIG_EC_LENOVO_PMH7=y
 #
 # Intel Firmware
 #
+# CONFIG_MAINBOARD_USES_IFD_EC_REGION is not set
 # CONFIG_CAVIUM_BDK is not set
 # CONFIG_MAINBOARD_HAS_CHROMEOS is not set
 # CONFIG_GOOGLE_SMBIOS_MAINBOARD_VERSION is not set
@@ -418,7 +425,6 @@ CONFIG_ARCH_RAMSTAGE_X86_32=y
 CONFIG_RAMBASE=0xe00000
 CONFIG_RAMTOP=0x1000000
 # CONFIG_CBMEM_TOP_BACKUP is not set
-# CONFIG_LATE_CBMEM_INIT is not set
 # CONFIG_EARLY_EBDA_INIT is not set
 CONFIG_PC80_SYSTEM=y
 # CONFIG_BOOTBLOCK_DEBUG_SPINLOOP is not set
@@ -446,6 +452,7 @@ CONFIG_HAVE_CF9_RESET=y
 # Devices
 #
 CONFIG_HAVE_VGA_TEXT_FRAMEBUFFER=y
+CONFIG_HAVE_VBE_LINEAR_FRAMEBUFFER=y
 CONFIG_MAINBOARD_HAS_NATIVE_VGA_INIT=y
 # CONFIG_MAINBOARD_FORCE_NATIVE_VGA_INIT is not set
 CONFIG_MAINBOARD_HAS_LIBGFXINIT=y
@@ -465,8 +472,41 @@ CONFIG_YABEL_VIRTMEM_LOCATION=0x1000000
 #
 # Display
 #
-# CONFIG_FRAMEBUFFER_SET_VESA_MODE is not set
-CONFIG_VGA_TEXT_FRAMEBUFFER=y
+CONFIG_FRAMEBUFFER_SET_VESA_MODE=y
+# CONFIG_FRAMEBUFFER_VESA_MODE_100 is not set
+# CONFIG_FRAMEBUFFER_VESA_MODE_101 is not set
+# CONFIG_FRAMEBUFFER_VESA_MODE_102 is not set
+# CONFIG_FRAMEBUFFER_VESA_MODE_103 is not set
+# CONFIG_FRAMEBUFFER_VESA_MODE_104 is not set
+# CONFIG_FRAMEBUFFER_VESA_MODE_105 is not set
+# CONFIG_FRAMEBUFFER_VESA_MODE_106 is not set
+# CONFIG_FRAMEBUFFER_VESA_MODE_107 is not set
+# CONFIG_FRAMEBUFFER_VESA_MODE_108 is not set
+# CONFIG_FRAMEBUFFER_VESA_MODE_109 is not set
+# CONFIG_FRAMEBUFFER_VESA_MODE_10A is not set
+# CONFIG_FRAMEBUFFER_VESA_MODE_10B is not set
+# CONFIG_FRAMEBUFFER_VESA_MODE_10C is not set
+# CONFIG_FRAMEBUFFER_VESA_MODE_10D is not set
+# CONFIG_FRAMEBUFFER_VESA_MODE_10E is not set
+# CONFIG_FRAMEBUFFER_VESA_MODE_10F is not set
+# CONFIG_FRAMEBUFFER_VESA_MODE_110 is not set
+# CONFIG_FRAMEBUFFER_VESA_MODE_111 is not set
+# CONFIG_FRAMEBUFFER_VESA_MODE_112 is not set
+# CONFIG_FRAMEBUFFER_VESA_MODE_113 is not set
+# CONFIG_FRAMEBUFFER_VESA_MODE_114 is not set
+# CONFIG_FRAMEBUFFER_VESA_MODE_115 is not set
+# CONFIG_FRAMEBUFFER_VESA_MODE_116 is not set
+CONFIG_FRAMEBUFFER_VESA_MODE_117=y
+# CONFIG_FRAMEBUFFER_VESA_MODE_118 is not set
+# CONFIG_FRAMEBUFFER_VESA_MODE_119 is not set
+# CONFIG_FRAMEBUFFER_VESA_MODE_11A is not set
+# CONFIG_FRAMEBUFFER_VESA_MODE_11B is not set
+# CONFIG_FRAMEBUFFER_VESA_MODE_USER is not set
+CONFIG_FRAMEBUFFER_VESA_MODE=0x117
+CONFIG_BOOTSPLASH=y
+# CONFIG_VGA_TEXT_FRAMEBUFFER is not set
+CONFIG_VBE_LINEAR_FRAMEBUFFER=y
+CONFIG_LINEAR_FRAMEBUFFER=y
 # CONFIG_SMBUS_HAS_AUX_CHANNELS is not set
 CONFIG_PCI=y
 # CONFIG_NO_MMCONF_SUPPORT is not set
@@ -717,6 +757,7 @@ CONFIG_HAVE_DEBUG_SMBUS=y
 # CONFIG_DEBUG_SMI is not set
 # CONFIG_DEBUG_MALLOC is not set
 # CONFIG_DEBUG_ACPI is not set
+# CONFIG_DEBUG_CONSOLE_INIT is not set
 # CONFIG_X86EMU_DEBUG is not set
 # CONFIG_DEBUG_SPI_FLASH is not set
 # CONFIG_TRACE is not set
@@ -735,7 +776,6 @@ CONFIG_WARNINGS_ARE_ERRORS=y
 # CONFIG_CREATE_BOARD_CHECKLIST is not set
 # CONFIG_MAKE_CHECKLIST_PUBLIC is not set
 # CONFIG_NO_XIP_EARLY_STAGES is not set
-CONFIG_EARLY_CBMEM_INIT=y
 # CONFIG_EARLY_CBMEM_LIST is not set
 CONFIG_RELOCATABLE_MODULES=y
 CONFIG_BOOTBLOCK_CUSTOM=y