diff options
| -rw-r--r-- | README | 13 | ||||
| -rw-r--r-- | lib/oeqa/runtime/cases/microcode.py | 36 | ||||
| -rw-r--r-- | recipes-core/microcode/intel-microcode_20191115.bb (renamed from recipes-core/microcode/intel-microcode_20190618.bb) | 14 | ||||
| -rw-r--r-- | recipes-kernel/linux/linux-intel-rt_4.14.bb | 8 | ||||
| -rw-r--r-- | recipes-kernel/linux/linux-intel-rt_4.19.bb | 8 | ||||
| -rw-r--r-- | recipes-kernel/linux/linux-intel_4.14.bb | 6 | ||||
| -rw-r--r-- | recipes-kernel/linux/linux-intel_4.19.bb | 6 |
7 files changed, 70 insertions, 21 deletions
@@ -151,6 +151,17 @@ a BSP tarball at the top level of your yocto build tree, you can equivalently check out the appropriate branch from the meta-intel repository at the same location. +intel-mediasdk +++++++++++++++ +Intel® Media SDK docs and sample test files are currently hosted +using git-lfs. The git-lfs setup is required in order to build +the intel-mediasdk package successfully. To setup git-lfs, information +can be found at https://github.com/git-lfs/git-lfs/wiki/Installation +Once git-lfs setup is done. Add below to local.conf file: + + HOSTTOOLS_NONFATAL += "git-lfs" + + b. Booting the intel-common BSP images -------------------------------------- @@ -379,7 +390,7 @@ V. Guidelines for submitting patches ==================================== Please submit any patches against meta-intel BSPs to the meta-intel -mailing list (meta-intel@yoctoproject.org). Also, if your patches are +mailing list (meta-intel@lists.yoctoproject.org). Also, if your patches are available via a public git repository, please also include a URL to the repo and branch containing your patches as that makes it easier for maintainers to grab and test your patches. diff --git a/lib/oeqa/runtime/cases/microcode.py b/lib/oeqa/runtime/cases/microcode.py new file mode 100644 index 00000000..6ce36a6f --- /dev/null +++ b/lib/oeqa/runtime/cases/microcode.py @@ -0,0 +1,36 @@ +from oeqa.runtime.case import OERuntimeTestCase +from oeqa.runtime.decorator.package import OEHasPackage +import re + +class MicrocodeTest(OERuntimeTestCase): + + def get_revision_from_microcode_string_list(self, microcode_string_list, re_pattern): + re_compile = re.compile(re_pattern) + rev_list = [] + for s in microcode_string_list: + matched_revs = re_compile.findall(s) + if matched_revs: + for mr in matched_revs: + rev_list.append(int(mr, 16)) + return rev_list + + @OEHasPackage(["iucode-tool"]) + def test_microcode_update(self): + (status, output) = self.target.run('iucode_tool /lib/firmware/intel-ucode/ -tb -lS | grep rev') + if status: + self.skipTest("The iucode_tool detected no microcode for update.") + + selected_microcodes = output.splitlines() + selected_rev_list = self.get_revision_from_microcode_string_list(selected_microcodes, "rev (\w*)") + self.assertTrue(selected_rev_list, msg="Could not find any rev from iucode_tool selected microcode.") + + (status, output) = self.target.run('dmesg | grep microcode') + self.assertEqual(status, 0, msg='status and output: %s and %s' % (status, output)) + + updated_microcodes = output.splitlines() + updated_rev_list = self.get_revision_from_microcode_string_list(updated_microcodes, "revision=(\w*)") + self.assertTrue(updated_rev_list, msg="Could not find any updated revision from microcode dmesg.") + + for ul in updated_rev_list: + self.assertTrue(ul in selected_rev_list, msg="Updated revision, %s, not in selected revision list (%s)" % + (ul, selected_rev_list)) diff --git a/recipes-core/microcode/intel-microcode_20190618.bb b/recipes-core/microcode/intel-microcode_20191115.bb index 65b8036a..f0e542d8 100644 --- a/recipes-core/microcode/intel-microcode_20190618.bb +++ b/recipes-core/microcode/intel-microcode_20191115.bb @@ -16,7 +16,7 @@ LIC_FILES_CHKSUM = "file://license;md5=99b296eb12723fd1eeb52e24971eed84" SRC_URI = "git://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files.git;protocol=https \ " -SRCREV = "940d904b7272edd689a5f0eef9dee09c13746748" +SRCREV = "33b7b2f3817e362111cd91910026ab8907f21710" DEPENDS = "iucode-tool-native" S = "${WORKDIR}/git" @@ -45,10 +45,10 @@ do_compile() { } do_install() { - install -d ${D}${base_libdir}/firmware/intel-ucode/ - install ${WORKDIR}/microcode_${PV}.bin ${D}${base_libdir}/firmware/intel-ucode/ - cd ${D}${base_libdir}/firmware/intel-ucode/ - ln -sf microcode_${PV}.bin microcode.bin + install -d ${D}${nonarch_base_libdir}/firmware/intel-ucode/ + ${STAGING_DIR_NATIVE}${sbindir_native}/iucode_tool \ + --write-firmware=${D}${nonarch_base_libdir}/firmware/intel-ucode \ + ${S}/intel-ucode/* ${S}/intel-ucode-with-caveats/* } do_deploy() { @@ -63,4 +63,6 @@ addtask deploy before do_build after do_compile PACKAGES = "${PN}" -FILES_${PN} = "${base_libdir}" +FILES_${PN} = "${nonarch_base_libdir}" + +UPSTREAM_CHECK_GITTAGREGEX = "^microcode-(?P<pver>(\d+)[a-z])$" diff --git a/recipes-kernel/linux/linux-intel-rt_4.14.bb b/recipes-kernel/linux/linux-intel-rt_4.14.bb index cae40019..83d6201f 100644 --- a/recipes-kernel/linux/linux-intel-rt_4.14.bb +++ b/recipes-kernel/linux/linux-intel-rt_4.14.bb @@ -5,7 +5,7 @@ require linux-intel.inc # to build multiple virtual/kernel providers, e.g. as dependency of # core-image-rt-sdk, core-image-rt. python () { - if d.getVar("PREFERRED_PROVIDER_virtual/kernel") != "linux-intel-rt": + if d.getVar("KERNEL_PACKAGE_NAME", True) == "kernel" and d.getVar("PREFERRED_PROVIDER_virtual/kernel") != "linux-intel-rt": raise bb.parse.SkipPackage("Set PREFERRED_PROVIDER_virtual/kernel to linux-intel-rt to enable it") } @@ -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.115" -SRCREV_machine ?= "ab4155a2f9a055b4004d7c8608ef1937dfff093a" -SRCREV_meta ?= "bc35d5bd224ab031440a69f9806d839db382f05c" +LINUX_VERSION ?= "4.14.146" +SRCREV_machine ?= "f8e35039bf37038f1cba7b125e3c4fa49745072b" +SRCREV_meta ?= "c8f030fdbf6046dede4b7ce6c94b5b24221c250e" LINUX_KERNEL_TYPE = "preempt-rt" diff --git a/recipes-kernel/linux/linux-intel-rt_4.19.bb b/recipes-kernel/linux/linux-intel-rt_4.19.bb index 3b51b280..a38ac388 100644 --- a/recipes-kernel/linux/linux-intel-rt_4.19.bb +++ b/recipes-kernel/linux/linux-intel-rt_4.19.bb @@ -5,7 +5,7 @@ require linux-intel.inc # to build multiple virtual/kernel providers, e.g. as dependency of # core-image-rt-sdk, core-image-rt. python () { - if d.getVar("PREFERRED_PROVIDER_virtual/kernel") != "linux-intel-rt": + if d.getVar("KERNEL_PACKAGE_NAME", True) == "kernel" and d.getVar("PREFERRED_PROVIDER_virtual/kernel") != "linux-intel-rt": raise bb.parse.SkipPackage("Set PREFERRED_PROVIDER_virtual/kernel to linux-intel-rt to enable it") } @@ -17,8 +17,8 @@ KMETA_BRANCH = "yocto-4.19" DEPENDS += "elfutils-native openssl-native util-linux-native" -LINUX_VERSION ?= "4.19.37" -SRCREV_machine ?= "3ffd2c05a9ed730e2d92338807859c8ec52a2137" -SRCREV_meta ?= "d85f07e03c980eca5ffd5ba058985d6ed3a83801" +LINUX_VERSION ?= "4.19.72" +SRCREV_machine ?= "cf2e1ceb823576067ce01f02f1750a45c35adae5" +SRCREV_meta ?= "ad6f8b357720ca8167a090713b7746230cf4b314" LINUX_KERNEL_TYPE = "preempt-rt" diff --git a/recipes-kernel/linux/linux-intel_4.14.bb b/recipes-kernel/linux/linux-intel_4.14.bb index a421614a..9acb75fa 100644 --- a/recipes-kernel/linux/linux-intel_4.14.bb +++ b/recipes-kernel/linux/linux-intel_4.14.bb @@ -10,9 +10,9 @@ 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.127" -SRCREV_machine ?= "25b00bbd0aeadd37904459016f1e3653130ee386" -SRCREV_meta ?= "bc35d5bd224ab031440a69f9806d839db382f05c" +LINUX_VERSION ?= "4.14.152" +SRCREV_machine ?= "f500fab13d11290921fc16c0e8b08c671819ad43" +SRCREV_meta ?= "c8f030fdbf6046dede4b7ce6c94b5b24221c250e" # For Crystalforest and Romley KERNEL_MODULE_AUTOLOAD_append_core2-32-intel-common = " uio" diff --git a/recipes-kernel/linux/linux-intel_4.19.bb b/recipes-kernel/linux/linux-intel_4.19.bb index 7ab28c7c..79727f91 100644 --- a/recipes-kernel/linux/linux-intel_4.19.bb +++ b/recipes-kernel/linux/linux-intel_4.19.bb @@ -9,9 +9,9 @@ SRC_URI_append = " file://0001-menuconfig-mconf-cfg-Allow-specification-of-ncurs DEPENDS += "elfutils-native openssl-native util-linux-native" -LINUX_VERSION ?= "4.19.55" -SRCREV_machine ?= "3347a3790f0a2e332180e353909cbd262dabd70e" -SRCREV_meta ?= "ad235db461bf4595c668700ca8a909c322009cc1" +LINUX_VERSION ?= "4.19.80" +SRCREV_machine ?= "6570cbed7b20741a3433c3192ed93ac0fea6c554" +SRCREV_meta ?= "a7cb57afb9fb9787079c28a1028d797632105e56" # For Crystalforest and Romley KERNEL_MODULE_AUTOLOAD_append_core2-32-intel-common = " uio" |