linux-intel/4.9: update to v4.9.146

Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com>
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>

conf/machine/intel-core2-32.conf

@@ -31,5 +31,5 @@ SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS1 115200;ttyPCH0"
 APPEND += "rootwait console=ttyS0,115200 console=ttyPCH0,115200 console=tty0"
 
 IMAGE_FSTYPES += "wic"
-WKS_FILE ?= "${@bb.utils.contains_any("EFI_PROVIDER", "systemd-boot rmc-boot", "systemd-bootdisk-microcode.wks", "mkefidisk.wks", d)}"
+WKS_FILE ?= "${@bb.utils.contains_any("EFI_PROVIDER", "systemd-boot rmc-boot", "systemd-bootdisk-microcode.wks", "grub-bootdisk-microcode.wks", d)}"
 WKS_FILE_DEPENDS_append = " intel-microcode"

conf/machine/intel-corei7-64.conf

@@ -40,5 +40,5 @@ SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS1 115200;ttyS2"
 APPEND += "rootwait console=ttyS0,115200 console=tty0"
 
 IMAGE_FSTYPES += "wic"
-WKS_FILE ?= "${@bb.utils.contains_any("EFI_PROVIDER", "systemd-boot rmc-boot", "systemd-bootdisk-microcode.wks", "mkefidisk.wks", d)}"
+WKS_FILE ?= "${@bb.utils.contains_any("EFI_PROVIDER", "systemd-boot rmc-boot", "systemd-bootdisk-microcode.wks", "grub-bootdisk-microcode.wks", d)}"
 WKS_FILE_DEPENDS_append = " intel-microcode"

recipes-core/images/core-image-minimal-initramfs.bbappend

@@ -1,6 +1,2 @@
-# Use initramfs-framework instead of initramfs-live*
-PACKAGE_INSTALL_remove_intel-x86-common = "initramfs-live-boot initramfs-live-install initramfs-live-install-efi"
-PACKAGE_INSTALL_append_intel-x86-common = " initramfs-framework-base initramfs-module-udev initramfs-module-setup-live initramfs-module-install initramfs-module-install-efi"
-
 # Add i915 graphics firmware
 PACKAGE_INSTALL_append_intel-x86-common = " linux-firmware-i915"

recipes-core/microcode/files/Intel-Microcode-License

@@ -0,0 +1,123 @@
+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. 

recipes-core/microcode/intel-microcode_20180807.bb

@@ -11,11 +11,14 @@ DESCRIPTION = "The microcode data file contains the latest microcode\
  if the file is placed in the /etc/firmware directory of the Linux system."
 
 LICENSE = "Intel-Microcode-License"
-LIC_FILES_CHKSUM = "file://microcode.dat;endline=33;md5=57d3c3c310f8debda2b0ca5baba67298"
+LIC_FILES_CHKSUM = "file://Intel-Microcode-License;md5=9052c0dbf7250dc0bef70bd8212b0573"
 
-SRC_URI = "https://downloadmirror.intel.com/27591/eng/microcode-${PV}.tgz"
-SRC_URI[md5sum] = "be315cd99a7ca392a2f917ceacbe14f2"
-SRC_URI[sha256sum] = "0b381face2df1b0a829dc4fa8fa93f47f39e11b1c9c22ebd44f8614657c1e779"
+SRC_URI = "https://downloadmirror.intel.com/28039/eng/microcode-${PV}.tgz \
+           file://Intel-Microcode-License \
+           "
+
+SRC_URI[md5sum] = "49f534f1079d3c5bc178a150c1c105aa"
+SRC_URI[sha256sum] = "29f9e8dc27e6c9b6488cecd7fe2394030307799e511db2d197d9e6553a7f9e40"
 DEPENDS = "iucode-tool-native"
 S = "${WORKDIR}"
 
@@ -29,18 +32,18 @@ inherit deploy
 UCODE_FILTER_PARAMETERS ?= ""
 
 do_compile() {
-	mkdir -p ${WORKDIR}/ucode/kernel/x86/microcode
+	rm -f ${WORKDIR}/intel-ucode/list
 	${STAGING_DIR_NATIVE}${sbindir_native}/iucode_tool \
 		${UCODE_FILTER_PARAMETERS} \
 		--overwrite \
 		--write-to=${WORKDIR}/microcode_${PV}.bin \
-		${WORKDIR}/microcode.dat
+		${WORKDIR}/intel-ucode/*
 
 	${STAGING_DIR_NATIVE}${sbindir_native}/iucode_tool \
 		${UCODE_FILTER_PARAMETERS} \
 		--overwrite \
 		--write-earlyfw=${WORKDIR}/microcode_${PV}.cpio \
-		${WORKDIR}/microcode.dat
+		${WORKDIR}/intel-ucode/*
 }
 
 do_install() {

recipes-kernel/linux/linux-intel-rt_4.14.bb

@@ -17,8 +17,8 @@ SRC_URI_append = " file://0001-perf-x86-32-explicitly-include-errno.h.patch"
 
 DEPENDS += "elfutils-native openssl-native util-linux-native"
 
-LINUX_VERSION ?= "4.14.40"
-SRCREV_machine ?= "9e7ff06e56a4938e43c09273107876c22eed1398"
-SRCREV_meta ?= "245d701df6c3691a078a268eff54009959beb842"
+LINUX_VERSION ?= "4.14.68"
+SRCREV_machine ?= "ae6a7612f31365704726d3015bf9035632dd630d"
+SRCREV_meta ?= "0936b18ed8d58257f8f1d79c085adbf6d4362530"
 
 LINUX_KERNEL_TYPE = "preempt-rt"

recipes-kernel/linux/linux-intel.inc

@@ -7,7 +7,6 @@ KERNEL_CONFIG_URI ?= "git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;n
 
 SRC_URI = " \
            git://github.com/intel/linux-intel-lts.git;protocol=https;name=machine;branch=${KBRANCH}; \
-           file://0001-menuconfig-check-lxdiaglog.sh-Allow-specification-of.patch \
            ${KERNEL_CONFIG_URI} \
 	  "
 

recipes-kernel/linux/linux-intel_4.14.bb

@@ -4,13 +4,15 @@ KBRANCH = "4.14/base"
 KMETA_BRANCH = "yocto-4.14"
 
 # Fix for 32-bit perf issue. Remove when patch is backported to 4.14.
-SRC_URI_append = " file://0001-perf-x86-32-explicitly-include-errno.h.patch"
+SRC_URI_append = " file://0001-perf-x86-32-explicitly-include-errno.h.patch \
+                   file://0001-menuconfig-check-lxdiaglog.sh-Allow-specification-of.patch \
+                   "
 
 DEPENDS += "elfutils-native openssl-native util-linux-native"
 
-LINUX_VERSION ?= "4.14.40"
-SRCREV_machine ?= "de459f4df74cd7d586fc1560bb4249507490be5d"
-SRCREV_meta ?= "245d701df6c3691a078a268eff54009959beb842"
+LINUX_VERSION ?= "4.14.92"
+SRCREV_machine ?= "f68d0bb395dc74b42e8ca9fda1ce31a58631eaf9"
+SRCREV_meta ?= "bc35d5bd224ab031440a69f9806d839db382f05c"
 
 # For Crystalforest and Romley
 KERNEL_MODULE_AUTOLOAD_append_core2-32-intel-common = " uio"

recipes-kernel/linux/linux-intel_4.9.bb

@@ -4,9 +4,13 @@ require linux-intel.inc
 KBRANCH = "4.9/yocto/base"
 KMETA_BRANCH = "yocto-4.9"
 
-LINUX_VERSION ?= "4.9.99"
-SRCREV_machine ?= "13ee9d9ef164b9a74f22bc97d1e504afe491134c"
-SRCREV_meta ?= "a2dfb1610d9dad34652a3c27c6c9d8751ed67af6"
+SRC_URI_append = " \
+                   file://0001-menuconfig-check-lxdiaglog.sh-Allow-specification-of.patch \
+                   "
+
+LINUX_VERSION ?= "4.9.146"
+SRCREV_machine ?= "0411ffc9047ee2b127991663660d2514ba451ef3"
+SRCREV_meta ?= "f9e90afd4e47920e990dacb73cd6508917ca5422"
 
 # For Crystalforest and Romley
 KERNEL_MODULE_AUTOLOAD_append_core2-32-intel-common = " uio"

recipes-rt/images/core-image-rt-sdk.bb

@@ -11,7 +11,7 @@ python () {
 DESCRIPTION = "Small image capable of booting a device with a test suite and \
 tools for real-time use. It includes the full meta-toolchain, development \
 headers and libraries to form a standalone SDK."
-DEPENDS = "linux-intel-rt"
+DEPENDS += "linux-intel-rt"
 
 IMAGE_FEATURES += "dev-pkgs tools-sdk tools-debug eclipse-debug tools-profile tools-testapps debug-tweaks"
 

recipes-rt/images/core-image-rt.bb

@@ -10,7 +10,7 @@ python () {
 
 DESCRIPTION = "A small image just capable of allowing a device to boot plus a \
 real-time test suite and tools appropriate for real-time use."
-DEPENDS = "linux-intel-rt"
+DEPENDS += "linux-intel-rt"
 
 IMAGE_INSTALL += "rt-tests hwlatdetect"
 

wic/grub-bootdisk-microcode.wks

@@ -0,0 +1,12 @@
+# short-description: Create an EFI disk image with grub-efi
+# long-description: Creates a partitioned EFI disk image that the user
+# can directly dd to boot media. The selected bootloader is grub-efi.
+# It also includes intel-microcode as an initrd for early update support.
+
+part /boot --source bootimg-efi --sourceparams="loader=grub-efi,initrd=microcode.cpio" --ondisk sda --label msdos --active --align 1024 --use-uuid
+
+part / --source rootfs --ondisk sda --fstype=ext4 --label platform --align 1024 --use-uuid
+
+part swap --ondisk sda --size 44 --label swap1 --fstype=swap --use-uuid
+
+bootloader --ptable gpt --timeout=5 --append="rootwait rootfstype=ext4 console=ttyS0,115200 console=tty0"