From 50ac543759615dca87095b78c034152017caab35 Mon Sep 17 00:00:00 2001
From: Martin Kepplinger <martink@posteo.de>
Date: Mon, 14 Jan 2019 20:24:57 +0100
Subject: [PATCH] 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                     |   7 ++
 common/download_coreboot.sh                   |   5 --
 x230/bootsplash.jpg                           | Bin 0 -> 12616 bytes
 ...-2ca2acc51f => nonfree-config-bbd237702a0} |  64 ++++++++++++++----
 4 files changed, 59 insertions(+), 17 deletions(-)
 create mode 100644 x230/bootsplash.jpg
 rename x230/{nonfree-config-2ca2acc51f => nonfree-config-bbd237702a0} (91%)

diff --git a/common/config_and_make.sh b/common/config_and_make.sh
index 0373d4b..07a6b1f 100755
--- a/common/config_and_make.sh
+++ b/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   ##
   ##############
diff --git a/common/download_coreboot.sh b/common/download_coreboot.sh
index 8f1d3e5..7e06c45 100755
--- a/common/download_coreboot.sh
+++ b/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
 }
 ################################################################################
 
diff --git a/x230/bootsplash.jpg b/x230/bootsplash.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..b8303292b0f72aab37a25248c6bf7ce2ba0df5cb
GIT binary patch
literal 12616
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
GhW`hnZaRYi

literal 0
HcmV?d00001

diff --git a/x230/nonfree-config-2ca2acc51f b/x230/nonfree-config-bbd237702a0
similarity index 91%
rename from x230/nonfree-config-2ca2acc51f
rename to x230/nonfree-config-bbd237702a0
index 801da53..a32c743 100644
--- a/x230/nonfree-config-2ca2acc51f
+++ b/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