update config and remove microcode from project

We'll better help bringing the latest microcode updates for Intel
to coreboot upstream than trying to include something special here.

Relevant current work is
https://review.coreboot.org/#/c/blobs/+/23315/
and
https://review.coreboot.org/#/c/blobs/+/23318/

and as soon as something like that gets merged, we'll do a release.

533ea7adb5_i5.config → 51a44a140b.config

@@ -33,9 +33,7 @@ CONFIG_RELOCATABLE_RAMSTAGE=y
 #
 # Important: Run 'make distclean' before switching boards
 #
-# CONFIG_VENDOR_A_TREND is not set
 # CONFIG_VENDOR_AAEON is not set
-# CONFIG_VENDOR_ABIT is not set
 # CONFIG_VENDOR_ADI is not set
 # CONFIG_VENDOR_ADLINK is not set
 # CONFIG_VENDOR_ADVANSUS is not set
@@ -46,18 +44,14 @@ CONFIG_RELOCATABLE_RAMSTAGE=y
 # CONFIG_VENDOR_ASROCK is not set
 # CONFIG_VENDOR_ASUS is not set
 # CONFIG_VENDOR_AVALUE is not set
-# CONFIG_VENDOR_AZZA is not set
 # CONFIG_VENDOR_BACHMANN is not set
 # CONFIG_VENDOR_BAP is not set
 # CONFIG_VENDOR_BCOM is not set
 # CONFIG_VENDOR_BIOSTAR is not set
 # CONFIG_VENDOR_BROADCOM is not set
-# CONFIG_VENDOR_COMPAQ is not set
 # CONFIG_VENDOR_COMPULAB is not set
 # CONFIG_VENDOR_CUBIETECH is not set
 # CONFIG_VENDOR_DIGITALLOGIC is not set
-# CONFIG_VENDOR_DMP is not set
-# CONFIG_VENDOR_ECS is not set
 # CONFIG_VENDOR_ELMEX is not set
 # CONFIG_VENDOR_EMULATION is not set
 # CONFIG_VENDOR_ESD is not set
@@ -70,40 +64,31 @@ CONFIG_RELOCATABLE_RAMSTAGE=y
 # CONFIG_VENDOR_IBASE is not set
 # CONFIG_VENDOR_IEI is not set
 # CONFIG_VENDOR_INTEL is not set
-# CONFIG_VENDOR_IWAVE is not set
 # CONFIG_VENDOR_IWILL is not set
 # CONFIG_VENDOR_JETWAY is not set
 # CONFIG_VENDOR_KONTRON is not set
-# CONFIG_VENDOR_LANNER is not set
 CONFIG_VENDOR_LENOVO=y
 # CONFIG_VENDOR_LINUTOP is not set
 # CONFIG_VENDOR_LIPPERT is not set
 # CONFIG_VENDOR_LOWRISC is not set
-# CONFIG_VENDOR_MITAC is not set
 # CONFIG_VENDOR_MSI is not set
-# CONFIG_VENDOR_NEC is not set
-# CONFIG_VENDOR_NOKIA is not set
 # CONFIG_VENDOR_NVIDIA is not set
 # CONFIG_VENDOR_PACKARDBELL is not set
 # CONFIG_VENDOR_PCENGINES is not set
 # CONFIG_VENDOR_PURISM is not set
-# CONFIG_VENDOR_RCA is not set
 # CONFIG_VENDOR_RODA is not set
 # CONFIG_VENDOR_SAMSUNG is not set
 # CONFIG_VENDOR_SAPPHIRE is not set
 # CONFIG_VENDOR_SIEMENS is not set
-# CONFIG_VENDOR_SOYO is not set
 # CONFIG_VENDOR_SUNW is not set
 # CONFIG_VENDOR_SUPERMICRO is not set
 # CONFIG_VENDOR_TECHNEXION is not set
-# CONFIG_VENDOR_THOMSON is not set
 # CONFIG_VENDOR_TI is not set
 # CONFIG_VENDOR_TRAVERSE is not set
 # CONFIG_VENDOR_TYAN is not set
 # CONFIG_VENDOR_VIA is not set
 # CONFIG_VENDOR_WINENT is not set
 # CONFIG_VENDOR_WINNET is not set
-# CONFIG_VENDOR_WYSE is not set
 CONFIG_BOARD_SPECIFIC_OPTIONS=y
 CONFIG_MAINBOARD_DIR="lenovo/x230"
 CONFIG_MAINBOARD_PART_NUMBER="ThinkPad X230"
@@ -124,12 +109,11 @@ CONFIG_MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID=0x21fa
 # CONFIG_HAVE_IFD_BIN is not set
 # CONFIG_HAVE_ME_BIN is not set
 CONFIG_DRAM_RESET_GATE_GPIO=10
-CONFIG_MMCONF_BASE_ADDRESS=0xf8000000
 CONFIG_POST_IO=y
 CONFIG_DEVICETREE="devicetree.cb"
 CONFIG_MAX_REBOOT_CNT=3
 CONFIG_USBDEBUG_HCD_INDEX=2
-CONFIG_ID_SECTION_OFFSET=0x80
+CONFIG_MMCONF_BASE_ADDRESS=0xf8000000
 CONFIG_POST_DEVICE=y
 CONFIG_IFD_BIOS_SECTION=""
 CONFIG_IFD_ME_SECTION=""
@@ -183,7 +167,6 @@ CONFIG_COREBOOT_ROMSIZE_KB_12288=y
 # CONFIG_COREBOOT_ROMSIZE_KB_65536 is not set
 CONFIG_COREBOOT_ROMSIZE_KB=12288
 CONFIG_ROM_SIZE=0xc00000
-# CONFIG_MAINBOARD_HAS_TPM2 is not set
 CONFIG_SYSTEM_TYPE_LAPTOP=y
 # CONFIG_CBFS_AUTOGEN_ATTRIBUTES is not set
 
@@ -222,7 +205,6 @@ CONFIG_CACHE_MRC_SIZE_KB=512
 CONFIG_STACK_SIZE=0x1000
 CONFIG_CONSOLE_CBMEM=y
 CONFIG_UART_PCI_ADDR=0x0
-CONFIG_HPET_MIN_TICKS=0x80
 # CONFIG_SOC_INTEL_KABYLAKE is not set
 # CONFIG_SOC_LOWRISC_LOWRISC is not set
 # CONFIG_SOC_MARVELL_MVMAP2315 is not set
@@ -288,7 +270,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="06-3a-09"
+CONFIG_CPU_UCODE_BINARIES=""
 
 #
 # Northbridge
@@ -306,6 +288,7 @@ CONFIG_USE_NATIVE_RAMINIT=y
 # CONFIG_NATIVE_RAMINIT_IGNORE_XMP_MAX_DIMMS is not set
 CONFIG_SANDYBRIDGE_IVYBRIDGE_LVDS=y
 CONFIG_HPET_ADDRESS=0xfed00000
+CONFIG_HPET_MIN_TICKS=0x80
 CONFIG_MAX_PIRQ_LINKS=4
 
 #
@@ -342,6 +325,7 @@ CONFIG_EC_LENOVO_H8=y
 CONFIG_SEABIOS_PS2_TIMEOUT=3000
 # CONFIG_H8_BEEP_ON_DEATH is not set
 CONFIG_H8_FLASH_LEDS_ON_DEATH=y
+# CONFIG_H8_SUPPORT_BT_ON_WIFI is not set
 CONFIG_EC_LENOVO_PMH7=y
 CONFIG_HAVE_INTEL_FIRMWARE=y
 
@@ -422,6 +406,7 @@ CONFIG_HAVE_CMOS_DEFAULT=y
 CONFIG_CMOS_DEFAULT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.default"
 CONFIG_IOAPIC_INTERRUPTS_ON_FSB=y
 # CONFIG_IOAPIC_INTERRUPTS_ON_APIC_SERIAL_BUS is not set
+CONFIG_ID_SECTION_OFFSET=0x80
 # CONFIG_POSTCAR_STAGE is not set
 # CONFIG_VERSTAGE_DEBUG_SPINLOOP is not set
 # CONFIG_ROMSTAGE_DEBUG_SPINLOOP is not set
@@ -509,6 +494,7 @@ CONFIG_HAVE_USBDEBUG=y
 CONFIG_HAVE_USBDEBUG_OPTIONS=y
 # CONFIG_DRIVERS_AMD_PI is not set
 CONFIG_SMBIOS_PROVIDED_BY_MOBO=y
+# CONFIG_DRIVERS_I2C_MAX98373 is not set
 # CONFIG_DRIVERS_I2C_MAX98927 is not set
 # CONFIG_DRIVERS_I2C_PCF8523 is not set
 # CONFIG_DRIVERS_I2C_RT5663 is not set
@@ -537,7 +523,6 @@ CONFIG_DRIVERS_INTEL_WIFI=y
 # CONFIG_DRIVER_PARADE_PS8625 is not set
 # CONFIG_DRIVER_PARADE_PS8640 is not set
 CONFIG_DRIVERS_MC146818=y
-CONFIG_MAINBOARD_HAS_LPC_TPM=y
 # CONFIG_LPC_TPM is not set
 CONFIG_VGA=y
 CONFIG_DRIVERS_RICOH_RCE822=y
@@ -558,6 +543,14 @@ CONFIG_DRIVERS_RICOH_RCE822=y
 #
 # Verified Boot (vboot)
 #
+
+#
+# Trusted Platform Module
+#
+# CONFIG_TPM is not set
+# CONFIG_MAINBOARD_HAS_TPM_CR50 is not set
+CONFIG_MAINBOARD_HAS_LPC_TPM=y
+# CONFIG_MAINBOARD_HAS_TPM2 is not set
 CONFIG_ACPI_SATA_GENERATOR=y
 CONFIG_ACPI_INTEL_HARDWARE_SLEEP_VALUES=y
 # CONFIG_ACPI_AMD_HARDWARE_SLEEP_VALUES is not set
@@ -566,8 +559,6 @@ CONFIG_BOOT_DEVICE_SPI_FLASH=y
 CONFIG_BOOT_DEVICE_MEMORY_MAPPED=y
 # CONFIG_BOOT_DEVICE_SUPPORTS_WRITES is not set
 CONFIG_RTC=y
-# CONFIG_TPM is not set
-# CONFIG_MAINBOARD_HAS_TPM_CR50 is not set
 
 #
 # Console
@@ -649,6 +640,7 @@ CONFIG_SEABIOS_DEBUG_LEVEL=-1
 CONFIG_PAYLOAD_OPTIONS=""
 # CONFIG_PXE is not set
 CONFIG_COMPRESSED_PAYLOAD_LZMA=y
+# CONFIG_COMPRESSED_PAYLOAD_LZ4 is not set
 # CONFIG_PAYLOAD_IS_FLAT_BINARY is not set
 
 #

intel-ucode.license

@@ -1,112 +0,0 @@
-The terms of the software license agreement included with any software you download will control your use of the software.
-INTEL SOFTWARE LICENSE AGREEMENT
-IMPORTANT - READ BEFORE COPYING, INSTALLING OR USING.
-Do not use or load this software and any associated materials (collectively,
-the "Software") until you have carefully read the following terms and
-conditions. By loading or using the Software, you agree to the terms of this
-Agreement. If you do not wish to so agree, do not install or use the Software.
-LICENSES: Please Note:
-- If you are a network administrator, the "Site License" below shall
-apply to you.
-- If you are an end user, the "Single User License" shall apply to you.
-- If you are an original equipment manufacturer (OEM), the "OEM License"
-shall apply to you.
-
-SITE LICENSE. You may copy the Software onto your organization's computers
-for your organization's use, and you may make a reasonable number of
-back-up copies of the Software, subject to these conditions:
-1. This Software is licensed for use only in conjunction with Intel
-component products. Use of the Software in conjunction with non-Intel
-component products is not licensed hereunder.
-2. You may not copy, modify, rent, sell, distribute or transfer any part
-of the Software except as provided in this Agreement, and you agree to
-prevent unauthorized copying of the Software.
-3. You may not reverse engineer, decompile, or disassemble the Software.
-4. You may not sublicense or permit simultaneous use of the Software by
-more than one user.
-5. The Software may include portions offered on terms in addition to those
-set out here, as set out in a license accompanying those portions.
-
-SINGLE USER LICENSE. You may copy the Software onto a single computer for
-your personal, noncommercial use, and you may make one back-up copy of the
-Software, subject to these conditions:
-1. This Software is licensed for use only in conjunction with Intel
-component products. Use of the Software in conjunction with non-Intel
-component products is not licensed hereunder.
-2. You may not copy, modify, rent, sell, distribute or transfer any part
-of the Software except as provided in this Agreement, and you agree to
-prevent unauthorized copying of the Software.
-3. You may not reverse engineer, decompile, or disassemble the Software.
-4. You may not sublicense or permit simultaneous use of the Software by
-more than one user.
-5. The Software may include portions offered on terms in addition to those
-set out here, as set out in a license accompanying those portions.
-
-OEM LICENSE: You may reproduce and distribute the Software only as an
-integral part of or incorporated in Your product or as a standalone
-Software maintenance update for existing end users of Your products,
-excluding any other standalone products, subject to these conditions:
-1. This Software is licensed for use only in conjunction with Intel
-component products. Use of the Software in conjunction with non-Intel
-component products is not licensed hereunder.
-2. You may not copy, modify, rent, sell, distribute or transfer any part
-of the Software except as provided in this Agreement, and you agree to
-prevent unauthorized copying of the Software.
-3. You may not reverse engineer, decompile, or disassemble the Software.
-4. You may only distribute the Software to your customers pursuant to a
-written license agreement. Such license agreement may be a "break-the-
-seal" license agreement. At a minimum such license shall safeguard
-Intel's ownership rights to the Software.
-5. The Software may include portions offered on terms in addition to those
-set out here, as set out in a license accompanying those portions.
-
-NO OTHER RIGHTS. No rights or licenses are granted by Intel to You, expressly
-or by implication, with respect to any proprietary information or patent,
-copyright, mask work, trademark, trade secret, or other intellectual property
-right owned or controlled by Intel, except as expressly provided in this
-Agreement.
-OWNERSHIP OF SOFTWARE AND COPYRIGHTS. Title to all copies of the Software
-remains with Intel or its suppliers. The Software is copyrighted and
-protected by the laws of the United States and other countries, and
-international treaty provisions. You may not remove any copyright notices
-from the Software. Intel may make changes to the Software, or to items
-referenced therein, at any time without notice, but is not obligated to
-support or update the Software. Except as otherwise expressly provided, Intel
-grants no express or implied right under Intel patents, copyrights,
-trademarks, or other intellectual property rights. You may transfer the
-Software only if the recipient agrees to be fully bound by these terms and if
-you retain no copies of the Software.
-LIMITED MEDIA WARRANTY. If the Software has been delivered by Intel on
-physical media, Intel warrants the media to be free from material physical
-defects for a period of ninety days after delivery by Intel. If such a defect
-is found, return the media to Intel for replacement or alternate delivery of
-the Software as Intel may select.
-EXCLUSION OF OTHER WARRANTIES. EXCEPT AS PROVIDED ABOVE, THE SOFTWARE IS
-PROVIDED "AS IS" WITHOUT ANY EXPRESS OR IMPLIED WARRANTY OF ANY KIND
-INCLUDING WARRANTIES OF MERCHANTABILITY, NONINFRINGEMENT, OR FITNESS FOR A
-PARTICULAR PURPOSE. Intel does not warrant or assume responsibility for the
-accuracy or completeness of any information, text, graphics, links or other
-items contained within the Software.
-LIMITATION OF LIABILITY. IN NO EVENT SHALL INTEL OR ITS SUPPLIERS BE LIABLE
-FOR ANY DAMAGES WHATSOEVER (INCLUDING, WITHOUT LIMITATION, LOST PROFITS,
-BUSINESS INTERRUPTION, OR LOST INFORMATION) ARISING OUT OF THE USE OF OR
-INABILITY TO USE THE SOFTWARE, EVEN IF INTEL HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES. SOME JURISDICTIONS PROHIBIT EXCLUSION OR
-LIMITATION OF LIABILITY FOR IMPLIED WARRANTIES OR CONSEQUENTIAL OR INCIDENTAL
-DAMAGES, SO THE ABOVE LIMITATION MAY NOT APPLY TO YOU. YOU MAY ALSO HAVE
-OTHER LEGAL RIGHTS THAT VARY FROM JURISDICTION TO JURISDICTION.
-TERMINATION OF THIS AGREEMENT. Intel may terminate this Agreement at any time
-if you violate its terms. Upon termination, you will immediately destroy the
-Software or return all copies of the Software to Intel.
-APPLICABLE LAWS. Claims arising under this Agreement shall be governed by the
-laws of California, excluding its principles of conflict of laws and the
-United Nations Convention on Contracts for the Sale of Goods. You may not
-export the Software in violation of applicable export laws and regulations.
-Intel is not obligated under any other agreements unless they are in writing
-and signed by an authorized representative of Intel.
-GOVERNMENT RESTRICTED RIGHTS. The Software is provided with "RESTRICTED
-RIGHTS." Use, duplication, or disclosure by the Government is subject to
-restrictions as set forth in FAR52.227-14 and DFAR252.227-7013 et seq. or its
-successor. Use of the Software by the Government constitutes acknowledgment
-of Intel's proprietary rights therein. Contractor or Manufacturer is Intel
-2200 Mission College Blvd., Santa Clara, CA 95052.