summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2021-02-04Change manifest to use the koi branchJan-Simon Moeller1-1/+1
Update the manifest for Kooky Koi. Signed-off-by: Jan-Simon Moeller <jsmoeller@linuxfoundation.org> Change-Id: I12510c1590100f9145eedf9d19c068fd893c3301
2021-01-29Add gitreview file for Kooky Koi branchJan-Simon Möller1-1/+1
Update the .gitreview file. Bug-AGL: SPEC-3782 Signed-off-by: Jan-Simon Möller <jsmoeller@linuxfoundation.org> Change-Id: I4ac95b4d5170ce502daaff810ba5ce820d63daad
2021-01-29Add manifest file for KK M3koi_10.93.0koi/10.93.010.93.0Jan-Simon Möller1-0/+103
Bug-AGL: SPEC-3782 Change-Id: Idcf579e43b3183912e59e23d21a0187192a8664d Signed-off-by: Jan-Simon Möller <jsmoeller@linuxfoundation.org>
2021-01-16Add manifest for KK Milestone 2koi_10.92.0koi/10.92.010.92.0Jan-Simon Möller1-0/+103
Signed-off-by: Jan-Simon Möller <jsmoeller@linuxfoundation.org> Change-Id: Idb031b2e425e4e5495d629e74309efe3524a568c
2021-01-06Update meta-raspberrypi BSPPaul Barker1-1/+1
There have been several important fixes made in the meta-raspberrypi layer, including kernel updates to pull in fixes for the "Bleeding Tooth" bluetooth vulnerability. Bug-AGL: SPEC-3699 Signed-off-by: Paul Barker <pbarker@konsulko.com> Change-Id: Iabeaae30bd3843586097d1e5f9431527317347a8
2020-12-19Add manifest for Kooky Koi M1koi_10.91.0koi/10.91.010.91.0Jan-Simon Möller1-0/+103
This is the manifest for Kooky Koi M1 aka v10.91.0 Change-Id: I7afbb809e4c36d74ee3de921ff560d8c01fad357 Bug-AGL: SPEC-3737 Signed-off-by: Jan-Simon Möller <jsmoeller@linuxfoundation.org>
2020-12-17SPEC-3723 Rework layers in manifestJan-Simon Moeller2-6/+0
We move telematics-demo and cluster-demo inside the meta-agl-demo umbrella. This simplifies the folder setup and allows the demo code to be updated in one place. Bug-AGL: SPEC-3723 Signed-off-by: Jan-Simon Moeller <jsmoeller@linuxfoundation.org> Change-Id: I0772f306a18af9c3e77c5d104bece497a775df18
2020-12-17Update Sancloud BSP to dunfell-r2 releasePaul Barker1-1/+1
See https://github.com/SanCloudLtd/meta-sancloud/releases/tag/dunfell-r2 for release notes. Bug-AGL: SPEC-3733 Signed-off-by: Paul Barker <pbarker@konsulko.com> Change-Id: I22195b672531aca70e0239f1419913767d0efa8c
2020-12-17Update meta-rtlwifi & switch upstream branchPaul Barker2-2/+2
The meta-rtlwifi layer now has a 'dunfell' branch so we can follow this for stable updates in the floating repo manifest. Bug-AGL: SPEC-3733 Signed-off-by: Paul Barker <pbarker@konsulko.com> Change-Id: Iaa3be2385262203d8bd808f91b0ab67c696b7acb
2020-12-17Update TI BSP to 07.01.00.006 releasePaul Barker1-2/+2
Version 07.01.00.006 of the TI Yocto Project BSP (including meta-ti) was recently released so we can now update to this tag. We also need to update meta-arm to support these changes in the TI BSP. Bug-AGL: SPEC-3732 Signed-off-by: Paul Barker <pbarker@konsulko.com> Change-Id: Ia3ab646bd2a14c920ad0aa5041f2da2688070835
2020-12-14[RCAR] Update meta-rcar revisionronan1-1/+1
meta-racar: * f3ecbd1a - recipes-bsp: u-boot: Fix cpg_sd_div_table * 1e2ebf87 - recipes-kernel: linux-renesas: Use community RPC D2 clock patch * 8e02c259 - recipes-kernel: linux-renesas: Fix RPC driver compilation warning * 481d4a1b - conf: layer.conf: Set hostname to v3x on v3x rootfs * db286311 - conf: layer.conf: Re-enable surroundview and opencv-sdk for v3x * e9128141 - Revert "cr7: disable QoS on V3H" * 8840b80b - Cr7: udpate to match new compiler * 48c7d9f4 - Add tbench package to make dbench work. * f435690f - Add e2fsutils-resize packege to minimal image * d8b02601 - utest: Improve crop handling for buggy drivers * 0f4662ce - u-boot: Eagle: use proper SDHI driver. * c8c2e08a - v3msk: bblayer.conf: Remove meta-linaro as it is not used anymore * 46e3d54c - recipes-bsp: u-boot: Enable MMC on Condor by default * 73fdf549 - recipes-kernel: Enable all available V3x device trees * aca630b9 - V3x: Enable VIN/CSI and VSPD/DU/LVDS as Linux drivers by default * 1cd90ac4 - Add PID_IN_CONTEXTIDR * c9da6469 - Move CSI,VIN,ISP,VSP,DU,LVDS to generic-uio and set uio kernel modules load by default * 8a15bbae - v3x: setup common kernel Image for all v3x target and install all dtb files * 8ecb7673 - recipes-kernel: Re-enable installation of the IMR kernel header * 74ad6274 - recipes-kernel: linux-renesas: Add V3x updates from v4.1.0-release7 * aa88d53c - recipes-kernel: linux-renesas: Fix UB9x4 FDPLink OF property name. * 7930bef6 - recipes-kernel: linux-renesas: Fix R-Car DU probe defer * 0ae7b2d3 - recipes-kernel: linux-renesas: Merge IMR and VSP updates from v4.1.0-release7 * 90f83811 - recipes-kernel: linux-renesas: Workaround V3x hyperflash read issue * 842be5c2 - linux-renesas: disable "use 4K sectors" option to make QSPI NOR work * 9840ca11 - recipes-kernel: linux-renesas: V3x MTD updates from v4.1.0-release7 * d7002024 - recipes-kernel: linux-renesas: V3x updates from v4.1.0-release7 * 2c875f22 - kernel-module-cmemdrv: Fix initialization * 3d0f8522 - recipes-kernel: linux-renesas: A couple of R-Car DU fixes * c5fc1afb - recipes-kernel: linux-renesas: VIN updates from v4.1.0-release7 * b7583145 - recipes-kernel: linux-renesas: Add IMX219 camera support * c51e5232 - recipes-kernel: linux-renesas: Add OV5647 camera support * eb3155a4 - v3hsk: enable gmsl2 * 9013840e - RCAR_VIN: support raw8 formats: GREY, BGGR * 48012f8f - recipes-bsp: most-tools: Add kernel 5.4 support to MOST scripts * 747febb6 - recipes-bsp: most-tools: Fix tx1 sound channel * 1c84cd25 - recipes-kernel: linux-renesas: ulcb.cfg: Update MOST configuration * ad126750 - recipes-kernel: linux-renesas: rcar-gen3: Fix MLP IRQ order * a89ffac6 - recipes-kernel: linux-renesas: Fix mlp clock-speed property name * 6b3ec742 - recipes-bsp: u-boot: Fix rcar_i2c driver * a449d29e - correct patch 0082 since it was a typo * 2c12aed3 - RCAR-VIN groups registration workaround Bug-AGL: SPEC-3674 Signed-off-by: ronan <ronan.lemartret@iot.bzh> Change-Id: I71779b33c4b5d0a3dbe730c4ddea740807b1147a Signed-off-by: ronan <ronan.lemartret@iot.bzh>
2020-12-02default.xml: update to YP 3.1.4Jan-Simon Moeller1-10/+10
Update poky to 3.1.4 and also do uprev the other layers. Note that meta-ti/meta-sancloud and meta-arm are not uprev'd. These require more changes around their dependency on meta-arm. Note also that meta-raspberrypi is not uprev'd due to SPEC-3702. Bug-AGL: SPEC-3699 Signed-off-by: Jan-Simon Moeller <jsmoeller@linuxfoundation.org> Change-Id: I16c320fc15672b081cf6e23610f58e1fbdd32873
2020-11-19Add meta-agl-refhwScott Murray2-0/+2
Add meta-agl-refhw repo for AGL reference hardware BSP. Bug-AGL: SPEC-3658 Signed-off-by: Scott Murray <scott.murray@konsulko.com> Change-Id: I928a87ed0ed74f7dd14939e316463d78078ae1bb
2020-10-30[RCAR] Update Renesas RCAR BSP 4.1.0ronan2-3/+3
Change the layer branche of the meta-renesas BSP. meta-renesas: * ebacfd2 rcar-gen3: gstreamer: Update SRCREV to latest revision * b2a9c72 rcar-gen3: Remove redundant YYLOC global declaration meta-rcar: * b53f0832 conf: layer.conf: Update LAYERSERIES_COMPAT_rcar-gen3-adas * e10d6d4f recipes-kernel: linux-renesas: Minor patch subject clean-up * 8bbc1d1a ULCB-KF: add TDM support with pcm3168a * 1f6ac0e2 Add missed patch * 9f19dcdf recipes-kernel: linux-renesas: Enable Kingfisher sound devices Bug-AGL: SPEC-3674 Signed-off-by: ronan <ronan.lemartret@iot.bzh> Change-Id: Ia822ed78f7a67683df097c9a7e87ef805142d695
2020-10-19[RCAR] Update Renesas BSP to v4.1.0Ronan Le Martret2-4/+4
Bug-AGL: [SPEC-3617] Change-Id: Iadf91f0022680e658e930637eec33ef8665d6c72 Signed-off-by: Ronan Le Martret <ronan.lemartret@iot.bzh>
2020-10-14Add meta-codescanner repo to manifestJan-Simon Möller2-0/+6
Clone meta-codescanner for integration. As result of the workshop, do make the layer available. Requires meta-clang (already present). Bug-AGL: SPEC-3640 Signed-off-by: Jan-Simon Möller <jsmoeller@linuxfoundation.org> Change-Id: I7ee4b9db19f9a7acc40caae09a46fbc9b2482117
2020-10-13Update meta-spdxscanner versionJan-Simon Möller1-1/+1
This supports uploading to fossology.automotivelinux.org using the fossology_rest_phased.bbclass . You need to set: FOSSOLOGY_SERVER FOSSOLOGY_TOKEN FOSSOLOGY_FOLDER_ID then you can call: - bitbake --runall=spdxupload <image> - bitbake --runall=spdxwaitextracted <image> - bitbake --runall=spdxanalyse <image> - bitbake --runall=spdxreport <image> if you need control over the timing. Otherwise just run: - bitbake --runall spdxreport <image> Signed-off-by: Jan-Simon Möller <jsmoeller@linuxfoundation.org> Change-Id: Id94c4d5c30f8d5daeb37989388721a43d4f3b558
2020-09-12Upload manifest file for Jumping Jellyfish 9.99.4jellyfish_9.99.4jellyfish/9.99.49.99.4Jan-Simon Möller1-0/+102
Cut RC4. Change-Id: I35b0d2215c53c4974afb404836da68490be46778 Signed-off-by: Jan-Simon Möller <jsmoeller@linuxfoundation.org>
2020-08-26Update poky to latest dunfell commitScott Murray1-1/+1
Update poky to latest dunfell branch commit to pick up the 5.4.57 kernel with a fix for the ath9k driver issue in SPEC-3546 as well as an assortment of security fixes. Bug-AGL: SPEC-3546 Signed-off-by: Scott Murray <scott.murray@konsulko.com> Change-Id: I312ef2e7dfa74c1cb5420d2cdedfd3760eb21dc3
2020-08-21Add repo manifest for jellyfish 9.99.3jellyfish_9.99.3jellyfish/9.99.39.99.3Jan-Simon Möller1-0/+102
Signed-off-by: Jan-Simon Möller <jsmoeller@linuxfoundation.org> Change-Id: Ia9035f744bfc7e6c2c8357977725e609c747f50a
2020-08-21[RCAR] Update meta-renesas to 4.14Ronan Le Martret2-2/+2
Bug-AGL: SPEC-3516 Change-Id: I74b2e82cef095dd6fdddb456985d28d2ad31cd27 Signed-off-by: Ronan Le Martret <ronan.lemartret@iot.bzh>
2020-08-21[RCAR] Update layer meta-rcarRonan Le Martret2-2/+2
- The layer meta-rcar, from Cogent github, had changed the branch for Yocto dunfell and Renesas RCAR BSP v3.21.0. The new branch is named dunfell-Yocto-v3.21.0-v2. Bug-AGL: SPEC-3516 Change-Id: I029756ccdf9353febaf9f4a1bc2496258bcf1297 Signed-off-by: Ronan Le Martret <ronan.lemartret@iot.bzh>
2020-08-07Update to Yocto Project 3.1.2 releaseScott Murray2-15/+15
Changes: - Update various layers to latest dunfell branch revisions to match Yocto Project 3.1.2 release. Note that the poky commit used includes some security fixes after the tagged 3.1.2 commit. - meta-clang now has a dunfell branch, so its configuration has been updated to use it. - meta-ti has been left at its latest release tag (07.00.00.005) to avoid updating meta-arm and picking up its new (hopefully temporary) meta-arm-toolchain dependency. Bug-AGL: SPEC-3529 Signed-off-by: Scott Murray <scott.murray@konsulko.com> Change-Id: I662bba42bebf08d287e463c6f72b02cccde3e6ab
2020-07-24Add manifest for Jumping Jellyfish RC2jellyfish_9.99.2jellyfish/9.99.29.99.2Jan-Simon Möller1-0/+102
This adds the manifest for JJ v9.99.2 Signed-off-by: Jan-Simon Möller <jsmoeller@linuxfoundation.org> Change-Id: I9f8aa59c0e1a986634b12631756ce67a2acaaeef
2020-07-16Reenable meta-synopsys layer in BSPEvgeniy Didin1-0/+3
Lets bring back meta-synopsys layer in BSP as it is now dunfell compatible. Signed-off-by: Evgeniy Didin <didin@synopsys.com> Change-Id: Ie30599c395b1b2ae408593cdb72f1193213d3365
2020-07-14Update SanCloud BSP to dunfell-r1 releasePaul Barker1-4/+4
Update the meta-sancloud layer and its dependencies to the versions used and tested in our `dunfell-r1` BSP release. Bug-AGL: SPEC-3498 Change-Id: Id97edab930977670d32ae5e5e0b780cb61e54bdf Signed-off-by: Paul Barker <paul.barker@sancloud.co.uk>
2020-07-07Switch rcar to use upstream reposJan-Simon Möller2-2/+2
Thanks to the work done by Renesas and members of our community, we are able to switch to the upstream repo and use it directly. A shout-out goes to Kurokawa-san, Ronan and Stephane for the work on the layer! Any remaining adaptations are being worked on in meta-agl/meta-agl-bsp/meta-rcar-gen3 going forward. Bug-AGL: SPEC-3443 Signed-off-by: Jan-Simon Möller <jsmoeller@linuxfoundation.org> Change-Id: I367547ae8da2b690341e916ebe6c0ad488bf34b6
2020-07-01Update external and BSP layers for rc2 and remove deprecatedJan-Simon Möller2-30/+10
Update the layers to current state and remove deprecated layers. Change-Id: Iceb737b0e5c990b8c4d0164d2b5ef4fe7e363621 Bug-AGL: SPEC-3468 Signed-off-by: Jan-Simon Möller <jsmoeller@linuxfoundation.org>
2020-06-29Prepare AGL Jumping Jellyfish RC1jellyfish_9.99.1jellyfish/9.99.19.99.1Jan-Simon Möller1-0/+109
Update the repo manifestfile with the RC1 version (v9.99.1) of the upcoming AGL UCB 'Jumping Jellyfish' release (v10.0.0). Bug-AGL: SPEC-3460 Signed-off-by: Jan-Simon Möller <jsmoeller@linuxfoundation.org> Change-Id: I0a991113d38d2403d419137327051cba5e39d754
2020-06-24Update to Yocto Project 3.1.1 releaseScott Murray1-5/+5
Update poky to the 3.1.1 release tag, and bump the other git.yoctoproject.org hosted layers as well as meta-qt5 to their latest commits to match. Bug-AGL: SPEC-3445 Signed-off-by: Scott Murray <scott.murray@konsulko.com> Change-Id: Ia71d15dfd01988565c0f58e75eda63959bbf1f57
2020-06-24[RCAR] Update meta-rcar to yocto dunfellRonan Le Martret2-2/+2
Bug-AGL: SPEC-3380 Signed-off-by: Ronan Le Martret <ronan.lemartret@iot.bzh> Change-Id: Ib0dc9d664fe5084b3a488af0b6ee2e9670f0bfe1 Signed-off-by: Ronan Le Martret <ronan.lemartret@iot.bzh>
2020-06-19Remove meta-intel as it is not in useJan-Simon Möller2-8/+0
We merged the target into qemux86-64 and no longer need the layer. Bug-AGL: SPEC-2931 Signed-off-by: Jan-Simon Möller <jsmoeller@linuxfoundation.org> Change-Id: Iee7ccd91dd767b24f9c14498f51d7d4a18afd18d
2020-05-21More dunfell branch updatesScott Murray2-6/+6
Switch meta-arm and meta-qcom to their dunfell branches now that they are available. Also fixed typo in a recently added comment. Bug-AGL: SPEC-3302 Signed-off-by: Scott Murray <scott.murray@konsulko.com> Change-Id: I15cd4fa42035fd92f164fe90a8833a8f43ed5fa4
2020-05-12Update meta-freescaleScott Murray1-2/+2
Update meta-freescale to latest dunfell branch commit to pick up linux-fslc update to 5.4.39 and addition of community maintained linux-fslc-imx kernel which is stable 5.4.y plus NXP changes from linux-imx. Bug-AGL: SPEC-3258 Signed-off-by: Scott Murray <scott.murray@konsulko.com> Change-Id: I25512627268bb8336f7e2f26a86ff8c6a9f14268
2020-05-12Pull down meta-python2 in support of the chromium buildsJan-Simon Moeller2-0/+7
Although python2 is out of support, the chromium build still depends on it until upstream fixed their dependencies and a patch can be integrated. Thus as a stop-gap add the meta-python2 layer in the chromium build. Bug-AGL: SPEC-3354 Signed-off-by: Jan-Simon Moeller <jsmoeller@linuxfoundation.org> Change-Id: I0e7b8ba84b69aa3d72c67dd020efaec675096fd2
2020-05-12Update and re-enable meta-sancloudPaul Barker2-6/+2
The Sancloud BSP now has support for the Yocto Project dunfell branch. Bug-AGL: SPEC-3372 Signed-off-by: Paul Barker <paul.barker@sancloud.co.uk> Change-Id: I7891f5cb3f9a7bc1585101400a5023aaffa5e3e5
2020-05-12Update meta-armPaul Barker1-1/+1
Bug-AGL: SPEC-3372 Signed-off-by: Paul Barker <paul.barker@sancloud.co.uk> Change-Id: I2d2e2164e1bbe4dc885feda06f0811b683a1b098
2020-05-12Update meta-ti to ti2020.01.00 tagPaul Barker2-2/+2
Also switch the upstream tracking branch to dunfell. Bug-AGL: SPEC-3372 Signed-off-by: Paul Barker <paul.barker@sancloud.co.uk> Change-Id: Ib8eb80f1e2a9652082622a09d99bb0b25653fd2d
2020-05-07Add meta-iot-cloud repomaratsabitov2-0/+6
meta-iot-cloud layer provides support for cloud services Bug-AGL: SPEC-3345 Signed-off-by: maratsabitov <marat.sabitov@mera.com> Change-Id: I81254277e8bb0b29769dd0595ff03d93cab57e53
2020-04-28Merge branch 'next'Jan-Simon Möller2-44/+49
* next: Further dunfell updates Update default manifests to use more dunfell branches Update default manifests to use master/dunfell branches Change-Id: Ied2e11c0757a6daf68c991c90b7ba6740b3b551c
2020-04-27Further dunfell updatesScott Murray2-14/+16
Changes: - Switch meta-virtualiztion, meta-intel, and meta-freescale* to their new dunfell branches. - Add new upstream meta-arm repository that is now a requirement for meta-ti. - Update commit IDs in default.xml to latest on master/dunfell. The 3.1 dunfell release is final now; the poky commit used is a few past the tagged release commit, the extra changes are all release documentation fixes. Bug-AGL: SPEC-3302 Signed-off-by: Scott Murray <scott.murray@konsulko.com> Change-Id: I36260fc89b1a166aff1b4a20ca0fce80cb7a9c19
2020-04-27Update default manifests to use more dunfell branchesScott Murray2-22/+22
Update default.xml and default-floating.xml to use newly created dunfell branches in several repositories, and update the commit IDs in default.xml to latest to track upstream as it moves closer to dunfell final release in a few weeks. Bug-AGL: SPEC-3302 Signed-off-by: Scott Murray <scott.murray@konsulko.com> Change-Id: Ie91fc66c5138a829a17dbe21c5462ff9caf6a32b
2020-04-27Update default manifests to use master/dunfell branchesScott Murray2-46/+49
To facilitate migrating to the upcoming Yocto Project 3.1 aka dunfell release, update the default.xml and default-floating.xml manifest files to use the "next" branches of the meta-agl* repositories, and the current latest master or dunfell branches of third-party repositories. Third-party repositories that do not yet have dunfell support declared in their LAYERSERIES_COMPAT variables are commented out in the manifests. Further iteration will be required as more third-party repositories add dunfell branches in the run up to its release at the end of April 2020. Bug-AGL: SPEC-3302 Signed-off-by: Scott Murray <scott.murray@konsulko.com> Change-Id: I2851cac80d61ace9bafb3062964f2d687d5d7e5c
2020-04-22Also update meta-spdxscanner upstream in default-floating.xmlJan-Simon Möller1-1/+1
This was missing and stopped repo diffmanfests from working. Signed-off-by: Jan-Simon Möller <jsmoeller@linuxfoundation.org> Change-Id: I98e8dd0bfafe342528f579245e80ac25cd0a6d8a
2020-04-18default.xml: Update and enable meta-synopsys layerEvgeniy Didin2-6/+2
With this commit we update meta-synopsys layer to the latest zeus-compatible version. Changes since v1: -Updated hash to new commit, which adds "zeus" compatibility in layer.conf and removes others. Changes since v2: -Updated also default-floating.xml accordingly. (jsmoeller) Signed-off-by: Evgeniy Didin <didin@synopsys.com> Signed-off-by: Jan-Simon Möller <jsmoeller@linuxfoundation.org> Change-Id: I4432e24a47056135eddb6addb1dae7e0a5d53431
2020-04-16Update meta-spdxscanner to enable phased upload class for CIJan-Simon Moeller1-1/+1
This updates meta-spdxscanner to include the fossology-rest-phased.bbclass which allows the CI environment to sequentially execute the upload, analysis and report generation steps. Bug-AGL: SPEC-2960 Signed-off-by: Jan-Simon Moeller <jsmoeller@linuxfoundation.org> Change-Id: Idc421cd4ef28d8ebb9f4daf10cf178564dda1b75
2020-03-24Update meta-spdxscanner to yocto upstreamLi Xiaoming1-1/+1
This enable us to fetch the latest changes. Bug-AGL: SPEC-3065 Change-Id: I566741cfd9704ec89f84e419a1246f3f02f343fe Signed-off-by: Li Xiaoming <lixm.fnst@cn.fujitsu.com>
2020-03-18Update meta-ti and remove meta-boundaryScott Murray1-6/+1
Bump meta-ti revision to the ti-2020.00-rc3 level since final release is still a few weeks out and there have been bunch of new commits that it would be good to pick up for any testing in the interim. Also, meta-boundary has a zeus branch now, but inspection of meta-agl indicates that we no longer need it for any of the existing machine templates, so just remove it. Bug-AGL: SPEC-2932 Signed-off-by: Scott Murray <scott.murray@konsulko.com> Change-Id: Id8042a81a0f648b08813637022a6404912ac9c64
2020-03-17Add release branch manifests to master branchJan-Simon Möller6-0/+536
This helps if no branch is specified while cloning via repo. Change-Id: I7549ca66efa12deaca743b89aa894931283557d7 Bug-AGL: SPEC-3273 Bug-AGL: SPEC-3265 Signed-off-by: Jan-Simon Möller <jsmoeller@linuxfoundation.org>
2020-03-04Update meta-freescale to latest zeus revisionScott Murray1-1/+1
Pick up new linux-fslc 5.4 kernel by updating to latest zeus revision of meta-freescale. This greatly improves i.MX6 etnaviv performance over the previous 5.1 kernel. Bug-AGL: SPEC-2932 Signed-off-by: Scott Murray <scott.murray@konsulko.com> Change-Id: I8fe81b150a2075df8b83f04b6a12a85a4472192f