summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2022-02-15libqtappfw: Re-enable mediaplayer and other librariesScott Murray1-1/+1
Bump SRCREV to pick up: 0de8ac8 Re-enable telephony and radio stub libraries 3f384d3 Rework mediaplayer support to use mpd Bug-AGL: SPEC-4182 Signed-off-by: Scott Murray <scott.murray@konsulko.com> Change-Id: I70a3c8c8bfa344e39fd9f07958ae4bf568cf11f4
2022-02-15libqtappfw: enable building mpd based mediaplayer supportScott Murray1-1/+10
Update libqtappfw recipe to pull in libmpdclient dependency for building the reworked mediaplayer support, and also add a RRECOMMENDS definition that pulls in bluez5, connman, and mpd to make the relationship more explicit. The intent is to split the libqtappfw-X libraries into separate packages with some follow-on rework and have these dependencies be more fine-grained at that point. Bug-AGL: SPEC-4182 Signed-off-by: Scott Murray <scott.murray@konsulko.com> Change-Id: If7fcd57dab89a22dfee81017d0411854b1f16bda
2022-02-15Remove lightmediascannerScott Murray9-278/+0
Remove the lightmediascanner recipe. The upstream project is no longer maintained and our intent is to replace its usage with mpd (Media Player Daemon). Bug-AGL: SPEC-4255 Signed-off-by: Scott Murray <scott.murray@konsulko.com> Change-Id: I692406bec23b7fcf9642c1859e64e60e89c625ec
2022-02-15Add backports of mpd and related recipesScott Murray11-2/+1098
Backport the recipe for the latest (0.23.5) version of mpd (Music Player Daemon) from meta-openembedded's master branch. This provides a version with native PipeWire support, and should help make the upcoming upgrade to Yocto Project 3.5 (aka Kirkstone) easier. Additionally, the recipes for the related libmpdclient library and mpc utility are also backported to ensure compatibility. The provided bbappend for the mpd recipe tweaks the backport to build with the older version of meson in dunfell, and applies configuration to approximate the lightmediascanner set up with regards to media location and using /var/volatile for metadata storage for robustness. Bug-AGL: SPEC-4255 Signed-off-by: Scott Murray <scott.murray@konsulko.com> Change-Id: Ida58289a16079f48c3467d55aef4a608671ffc37
2022-02-15chromium: reduce verbosity on compilationJose Dapena Paz1-1/+1
Compilation of chromium is done invoking ninja with -v. This adds a lot of noise to compilation. This patch drops the flag. Bug-AGL: SPEC-4142 Change-Id: I0dd3700c1ebecab99776e24d79a98211ff8f592d Signed-off-by: Jose Dapena Paz <jdapena@igalia.com>
2022-02-15chromium, wam: update to chromium87 tree.Jose Dapena Paz4-16/+24
Update to chromium87 tree, and wam adapted to chromium87. This does not include yet the webOS OSE QtLess version, but the submission right before QtLess work. This is because in webOS OSE current chromium87 release, the only work after the submission we are using is QtLess, without adding any new functionality. Renamed the recipe and package name to be "chromium" instead of "chromium84" or "chromium87". Now we use PV to state the version of the upstream Chromium. The Chromium87 tree history has been heavily simplified to make it easier to rebase in next upgrades. Bug-AGL: SPEC-4142, SPEC-4225, SPEC-4227, SPEC-4228 Change-Id: I6caed396f758dd80291803266f6a59f1fec406c4 Signed-off-by: Jose Dapena Paz <jdapena@igalia.com>
2022-02-07Update inclusion in agl-demo-platform-crosssdk for openssh changemarlin_12.92.0marlin/12.92.012.92.0Jan-Simon Moeller2-4/+4
The sdk build did not catch the change to openssh as it used the wrong include file. Fix it by icluding the right file. Bug-AGL: SPEC-4243 Signed-off-by: Jan-Simon Moeller <jsmoeller@linuxfoundation.org> Change-Id: Ief802f0212f2a464157f9dfc962686a479170715
2022-02-01Add html5-hvac application.Jose Dapena Paz3-0/+50
Add back the html5-hvac application, adapting installation to the new application framework: - It provides a valid .desktop file. - It does not use the .wgt file, and just deployes to /usr/lib/wam_apps/html5-hvac the application files. Bug-AGL: SPEC-4224 Change-Id: Icee2d6bfdbd69265614581b731a76a6742036720 Signed-off-by: Jose Dapena Paz <jdapena@igalia.com>
2022-02-01chromium*, wam: fix systemd launching from systemdJose Dapena Paz9-315/+15
Instead of providing a SMACK aware system service for WAM per session instance, provide a systemd user service depending on the new services in Marlin. Update the chromium84 and wam heads to include the required changes. We also remove the patches applied from recipe, so they belong to the chromium tree now. chromium84: 3d6fd5dd0b..4a320225eb 4a320225eb [op][agl][wayland] Take into account wayland output transform 13d93f6dae [op][agl][wayland] Do not bind agl_shell by default. ca47b4fd0a [skia][build] fix skia no_sanitize build issues for gcc 3b7541e3cf GCC: supress invalid-offsetof warning 6cd04072fb Add a delay to agl ready event wam: 935be6b..8607609 8607609 [op][agl][wayland] UiSize should be system resolution. fcfeb67 [op][agl] Allow to run web applications in new application framework. Bug-AGL: SPEC-4223 Change-Id: Ie0bc3dd6878920a0ba1bfac4f32814a23e4d41e7 Signed-off-by: Jose Dapena Paz <jdapena@igalia.com>
2022-02-01chromium*: remove jumbo build optionsJose Dapena Paz2-11/+1
Jumbo build is not supported anymore in Chromium. This changeset removes all references in recipe to that mode. Bug-AGL: SPEC-4233 Change-Id: I7a667c9a36bd0b825fc3014520d1b23f53828b57 Signed-off-by: Jose Dapena Paz <jdapena@igalia.com>
2022-02-01chromium*: set by default debugging symbol level to 1Jose Dapena Paz1-20/+6
Instead of forcing symbol level to 0, that removes all debugging information from build, set the default level to 1. This change adds two new PACKAGECONFIG named "debug" (for setting the symbol level for the whole build to 2) and "debug-blink" (for setting the symbol level for blink part to 2). By default, if not present, symbol level will be set to 1. Symbol level is equivalent to the -g level (symbol_level=1 means -g1, symbol_level=2 means -g or -g2). This is copied from the webOS OSE web runtime Yocto recipe. Bug-AGL: SPEC-4233 Change-Id: I70a983a04497aefdf9fde7074bbf0cfdf0bb8eab Signed-off-by: Jose Dapena Paz <jdapena@igalia.com>
2022-02-01packagegroup-agl-demo-platform-html5: add default demo Qt UI.Jose Dapena Paz1-0/+31
First step for upgrading WAM to the new application framework is making it work for regular applications, without replacing the default demo launcher based on QT. Bug-AGL: SPEC-4223 Change-Id: I16ae6a9b5b591a6c364d9ce99e3bc6e567ef4d90 Signed-off-by: Jose Dapena Paz <jdapena@igalia.com>
2022-01-31libqtappfw: Re-enable network supportScott Murray1-2/+2
Bump SRCREV to pick up: 5ef90db Re-enable network support and also add connman-glib as a dependency in libqtappfw recipe, so that it can be used in the reworked network API implementation. Bug-AGL: SPEC-4182 Signed-off-by: Scott Murray <scott.murray@konsulko.com> Change-Id: Ie3db1930079a696afaaca00914f54bba6c04b59a
2022-01-31connman-glib: add recipeScott Murray1-0/+15
Add recipe for connman-glib library that has been refactored out of the agl-service-network binding from the old app framework. Bug-AGL: SPEC-4182 Signed-off-by: Scott Murray <scott.murray@konsulko.com> Change-Id: Id5cd5d2a4175e951f69589662eeecea5a0ced6a3
2022-01-31homescreen: restore libqtappfw dependencyScott Murray1-0/+2
Restore libqtappfw build and run-time dependency in homescreen app recipe to allow to re-enabling the commented out usage in it and regain Bluetooth and Wifi status support. Bug-AGL: SPEC-4182 Signed-off-by: Scott Murray <scott.murray@konsulko.com> Change-Id: I320853efe8130d34e5a1da5e9f0e2380a50e9f2c
2022-01-26Restore openssh as default in the IVI demoJan-Simon Möller2-2/+2
To support user sessions we need to use ssh-server-openssh. Bug-AGL: SPEC-4195 Signed-off-by: Jan-Simon Möller <jsmoeller@linuxfoundation.org> Change-Id: I14dca131d5c3f6c64a9623f9a1755c05e3f6dd27
2022-01-18bluez-glib: bump SRCREV to pick up fixScott Murray1-1/+1
Bump bluez-glib SRCREV to pick up: 0a7ac44 Avoid init delay without BT adapter present Bug-AGL: SPEC-4216 Signed-off-by: Scott Murray <scott.murray@konsulko.com> Change-Id: Ic8f941a310b0fcb786fc6bca5d5b010217e5e833
2021-12-22packagegroup-agl-graphical-weston: fix override syntaxScott Murray1-1/+1
Fix a use of the old override syntax that slipped by to aid "next" branch maintenance. Bug-AGL: SPEC-3819 Signed-off-by: Scott Murray <scott.murray@konsulko.com> Change-Id: Idc478b5d225a0f6558a6152cb239b1e20ed095ec
2021-12-22bluez-glib libqtappfw: fix S definitionsScott Murray2-4/+4
Bitbake in poky master now warns if the path in the S variable definition has a trailing '/', remove a couple of occurrences that were recently added by accident to reduce "next" branch maintenance. Bug-AGL: SPEC-3819 Signed-off-by: Scott Murray <scott.murray@konsulko.com> Change-Id: I038c6e4c821f331d458255b66660d46eb895c4b9
2021-12-22chromium: fix use of += with :appendScott Murray1-2/+2
Fix a couple of instances where += is used with a variable :append definition, this future-proofs for Kirkstone (it currently triggers a warning on poky master, as may soon be treated as an error). Bug-AGL: SPEC-3819 Signed-off-by: Scott Murray <scott.murray@konsulko.com> Change-Id: I1ff076e174d686226dc4507413ec11dcda2e77db
2021-12-21agl-users: removemarlin_12.91.0marlin/12.91.012.91.0Scott Murray1-24/+0
Remove unused agl-users recipe as attempting to use it now would conflict with the agl-driver user definition in the new agl-session recipe. Bug-AGL: SPEC-4161 Signed-off-by: Scott Murray <scott.murray@konsulko.com> Change-Id: Ifdded99fdec297379e0454bd26aaef8133f11d51
2021-12-21homescreen: import environment file on service startArnaud Ferraris1-0/+1
`homescreen` relies on `/etc/default/homescreen` to contain its environment variables, however this feature was lost when we switched to systemd services. This commit restores this feature by instructing systemd to source `/etc/default/homescreen` if it exists. Bug-AGL: SPEC-4161 Signed-off-by: Arnaud Ferraris <arnaud.ferraris@collabora.com> Change-Id: I62c8597eac7d14d9d5166f9c559a1538398cd0c8
2021-12-21Add updated demo applications backScott Murray9-12/+200
Add updated recipes for the dashboard, hvac, ondemandnavi, and settings Qt demo applications, as well as for the libqtappfw library they use and its new dependency bluez-glib. The applications are added back to the packagegroup-agl-demo-platform as they were before. Also remove a couple of leftover things in the packagegroup recipe to clean up. Bug-AGL: SPEC-4182 Signed-off-by: Scott Murray <scott.murray@konsulko.com> Change-Id: I0ea36c809d9126284c597cd79eded8ab031205da
2021-12-21qtquickcontrols2-agl-style: remove QT_QUICK_CONTROLS_STYLE settingScott Murray1-5/+0
QT_QUICK_CONTROLS_STYLE was being set with a mechanism specific to the old application framework, remove the now redundant snippet that was doing so. Setting the style will be handled by the applications that require it going forward. Bug-AGL: SPEC-4182 Signed-off-by: Scott Murray <scott.murray@konsulko.com> Change-Id: I3f4303c1d8bbb9df85071668db85d0c649f5bfc3
2021-12-21agl-demo-platform: add launcher and make it work with new App FWArnaud Ferraris2-2/+2
Through its dependencies, `launcher` pulls all necessary software, including `agl-session`, `homescreen`, `weston-ini-conf`... Make the `agl-demo-platform` packagegroup depend on it for using the new App FW. Moreover, make the `agl-graphical-weston` packagegroup depend on `agl-compositor-init` so we directly install the appfw-provided config and systemd services for `agl-compositor`. Bug-AGL: SPEC-4161 SPEC-4159 Signed-off-by: Arnaud Ferraris <arnaud.ferraris@collabora.com> Change-Id: Ifb84b021925e50a7ea977c25eb711ddf0c9b77bd
2021-12-21wayland: add .desktop file for weston-terminalArnaud Ferraris3-0/+32
weston-terminal is already installed as part of the weston installation. However, it doesn't provide a way to be easily discovered. This commit creates a .desktop file following the "Desktop entry specification" so this application can be discovered by a compliant application launcher. Bug-AGL: SPEC-4161 Signed-off-by: Arnaud Ferraris <arnaud.ferraris@collabora.com> Change-Id: I9c413645ed0bd4371c7d18977304ef6f1a5a2be7
2021-12-21recipes-demo: restore launcher applicationArnaud Ferraris2-0/+59
While launcher hasn't been merged into homescreen, we should restore it as a default application. Bug-AGL: SPEC-4159 Signed-off-by: Arnaud Ferraris <arnaud.ferraris@collabora.com> Change-Id: I772142beec717b0f244b1c1a9c128baf843827fd
2021-12-21homescreen: convert to using the new App FWArnaud Ferraris2-11/+11
Bug-AGL: SPEC-4161 Signed-off-by: Arnaud Ferraris <arnaud.ferraris@collabora.com> Change-Id: I3f53c4d9143baad15fee59110f5f9fbf64290d6c
2021-12-21templates: feature: ensure agl-demo uses agl-app-frameworkArnaud Ferraris2-1/+3
Also, due to changes in meta-agl-app-framework, `weston-init` now conflicts with `agl-compositor-init`, so remove it from the `agl-graphical-weston` package group dependencies so the demo images can build. Bug-AGL: SPEC-4161 Change-Id: I1dc9a60445fc3a97531449bfcc3496ce05357e36 Signed-off-by: Arnaud Ferraris <arnaud.ferraris@collabora.com>
2021-12-07web-runtime: bump chromium84 and wam SRCREVLorenzo Tilve2-4/+4
Update SRCREVs to new marlin branches removing the build dependencies with the appfw. Bug-AGL: SPEC-4121 Signed-off-by: Lorenzo Tilve <ltilve@igalia.com> Change-Id: I5cc9ffca3101b58f750c377dfa14355e2a1d1ce6
2021-12-07web-runtime: Add wam to agl-demo-platform-html5 imageLorenzo Tilve3-4/+3
Include wam dependency on agl-demo-platform-html5 target. Bug-AGL: SPEC-4121 Signed-off-by: Lorenzo Tilve <ltilve@igalia.com> Change-Id: I3355a0a96b906131fa1d2e11c4b29d3951879ad9
2021-11-10Add meta-python2 to agl-demo templateJan-Simon Moeller1-2/+4
The chromium/wam builds do still require meta-python2. Add it to back to the agl-demo template in support SPEC-4040. Bug-AGL: SPEC-4040 Signed-off-by: Jan-Simon Moeller <jsmoeller@linuxfoundation.org> Change-Id: I8cec874dfd69c70d175bf6291a2b4a3153059582
2021-11-04homescreen: update recipeScott Murray2-11/+29
Rework homescreen demo app recipe for building a version of it with the application framework usage removed. A simple systemd unit to start it has been added as a placeholder until the new application scheme has been added. This will at least produce something on screen for testing, and the HOMESCREEN_DEMO_CI environment variable can be defined via /etc/default/homescreen to potentially re-enable the CI startup test. Bug-AGL: SPEC-4121 Signed-off-by: Scott Murray <scott.murray@konsulko.com> Change-Id: I510873d428dc98286775722e23b34cd4a9862258
2021-11-04agl-image-ivi: define SYSTEMD_DEFAULT_TARGETScott Murray1-1/+5
Add SYSTEMD_DEFAULT_TARGET definition to agl-image-ivi to result in agl-compositor starting automatically in it and derivative images. This is required with the new weston-init behavior until we upgrade past 3.3/Hardknott, when "weston" in IMAGE_FEATURES can be used instead. Bug-AGL: SPEC-4121 Signed-off-by: Scott Murray <scott.murray@konsulko.com> Change-Id: I282953edce89220bca6b2a1b217dada9b685f023
2021-11-04agl-users: remove display userScott Murray1-3/+0
The "display" user has effectively been replaced with a "weston" user in the new weston-init support for running as non-root from upstream Yocto, so remove creation of it from the agl-users recipe. If the agl-users recipe will be retained in the new application scheme, this cleanup is required. Bug-AGL: SPEC-4121 Signed-off-by: Scott Murray <scott.murray@konsulko.com> Change-Id: Iafd7a08dfd7ba3514ef4264c68d697cfd9790047
2021-11-04The chromium recipe will need to be reworkedJan-Simon Möller1-1/+3
Meanwhile update it to allow CI to pass. Bug-AGL: SPEC-4121 Signed-off-by: Jan-Simon Möller <jsmoeller@linuxfoundation.org> Change-Id: I03f92e6c8bd6146d4a67ec447be5ab362b42f5bc
2021-11-03Prepare master for new framework integrationJan-Simon Möller257-6931/+184
During the last workshop the transition to the new framework was presented. This change essentially deprecates the SMACK-based application framework. To prepare the integration of it, we remove the deprecated components: - recipes-apis : all agl-service-* - recipes-demos: all demo apps but homescreen - non-essential configurations Todo: We need to bring-back the html5 image in a follow-up w/o ties into the old framework. v2: kept WAM + Chromium recipes for reference v3: rebased Bug-AGL: SPEC-4121 Signed-off-by: Jan-Simon Moeller <jsmoeller@linuxfoundation.org> Change-Id: I58075f5f1e477106a1aad3d2171a0904bf0cb16e
2021-11-03Update github.com git:// SRC_URIsmarlin_12.90.1marlin/12.90.112.90.1Scott Murray11-11/+11
GitHub is dropping unauthenticated git protocol access in January 2022, per: https://github.blog/2021-09-01-improving-git-protocol-security-github/#no-more-unauthenticated-git While a workaround in the BitBake git fetcher is forthcoming, not specifying protocol=https for github.com git:// SRC_URIs will start resulting in warnings in Yocto 3.5/Kirkstone. To ease our upgrade path, go ahead and update our affected SRC_URIs. Note that this has been done by running the scripts/contrib/convert-srcuri.py script from latest poky, which also makes git branch specification explicit since the git fetcher is likely to require that in the future due to widespread switches from master to main branches. Bug-AGL: SPEC-4126 Signed-off-by: Scott Murray <scott.murray@konsulko.com> Change-Id: Ibfa59ef83db75f95c4b47b28213b60d8cf19fba1
2021-10-07wam_git: Add protobuf dependency for WAMMarius Vlad1-1/+1
We're not currently using protobuf, but it would be of tremendous help if we are to be ready for the next integration phase which started to make use of it. Makes development much easier to do and it won't make such a big impact to have it early. Bug-AGL: SPEC-3967 Signed-off-by: Marius Vlad <marius.vlad@collabora.com> Change-Id: Ie35204a11a1f2e28c4fa3ce6566d17cc8c0421dd
2021-09-15osrm-backend: remove recipesScott Murray4-98/+0
Remove the osrm-backend recipe and the recipes for its dependencies osmium and protozero, as they do not build and nothing in AGL uses them. Bug-AGL: SPEC-3921 Signed-off-by: Scott Murray <scott.murray@konsulko.com> Change-Id: I615c555f3827488a43560da5d518a34c3ca1313f
2021-08-24lightmediascanner: Fix missed override syntax conversionScott Murray1-1/+1
One override got missed by the conversion script in the lightmediascanner recipe, update it. Bug-AGL: SPEC-4052 Signed-off-by: Scott Murray <scott.murray@konsulko.com> Change-Id: Ia0a87ad80885ec758c8271d2550327694e53525d
2021-08-20Convert to new override syntaxScott Murray176-402/+402
This is the result of running a slightly customized version of the convert-overrides.py script from poky with additional overrides added. The intent of these changes is to minimize the effort to keep the "next" branch that builds against poky master up to date and tested in preparation for the switch to the next Yocto LTS release in early 2022. Bug-AGL: SPEC-4052 Signed-off-by: Scott Murray <scott.murray@konsulko.com> Change-Id: I6eeadd2c985c008b04f8f9815bf0f6fb064bedac
2021-07-13packagegroup-agl-ivi-navigation: update agl-refhw-h3 usageScott Murray1-4/+1
The agl-refhw-h3 machine override has been replaced with a feature in AGL_FEATURES, update usage. Bug-AGL: SPEC-3916 Signed-off-by: Scott Murray <scott.murray@konsulko.com> Change-Id: I6e56fceb1d904f15f6fdd78ec708c6199d6c9475
2021-07-09alexa-viewer, cluster-demo, homescreen, launcher: the protocols are in ↵Marius Vlad4-13/+4
agl-compositor-dev Adds it to DEPENDS straight in without using _append. Bug-AGL: SPEC-4015 Signed-off-by: Marius Vlad <marius.vlad@collabora.com> Change-Id: Ief387323bada4e36df3d45e94a2bc296e46ccb0d
2021-07-07Add dependency to alexa-viewer, launcher, homescreen, cluster-receiverMarius Vlad4-0/+12
Add dependency for agl-compositor. FIXME: split agl-compositor-protocols into separate packages. Bug-AGL: SPEC-4015 Signed-off-by: Marius Vlad <marius.vlad@collabora.com> Change-Id: Ia05f4bf60338294cef25225c3e7e1e36643bfd5e
2021-06-29chromium84: Add a delay to agl ready eventmarlin_12.90.0marlin/12.90.012.90.0Roger Zanoni2-0/+71
Delay ready() to ensure that all the window and surfaces setup is done before notifying the compositor There's a work in progress for enabling wam to display multiple surfaces for a single widget, which would eliminate the chain loading that currently causes this issue. This change includes a temporary patch that should be removed once wam changes are integrated. Bug-AGL: SPEC-3799 Signed-off-by: Roger Zanoni <rzanoni@igalia.com> Change-Id: I9945af60077a79d56052c3fdb358e9fed44874e6
2021-06-27Add kernel configuration bbappendScott Murray18-0/+226
Add linux-%.bbappend and associated conditional .inc file to supply demo-related kernel configuration using the new AGL_KCONFIG_FRAGMENTS variable scheme that is being added in meta-agl-core. The moved configuration fragments are copies of the ones from meta-agl-core except for: - The configuration from the previously linux-yocto-specific hciuart.cfg has been rationalized with btusb.cfg and hid.cfg. - The actual CAN hardware device support from can-bus.cfg has been moved to a new can-devices.cfg here. - To simplify things, the disable_most.cfg configuration to ensure that the upstream kernel MOST driver is disabled to avoid conflicting with the externally built AGL version has been made generic instead of being specific to the Kingfisher support in meta-agl-bsp. It has also been updated a bit for newer kernels. Bug-AGL: SPEC-3983 Signed-off-by: Scott Murray <scott.murray@konsulko.com> Change-Id: I32e4da1ca53e9395239b47ab2191a88e3cd39d4c
2021-06-23chromium84: Fix externalsrc build/installRoger Zanoni1-21/+19
Bug-AGL: SPEC-3856 Signed-off-by: Roger Zanoni <rzanoni@igalia.com> Change-Id: I1be5b766072cfae162e4514b33b7b9fd3aab5476
2021-06-14Add kernel-modules package to demo imagesScott Murray1-0/+7
Add the kernel-modules meta package to demo images in the agl-demo.inc aglsetup.sh template. This change is to balance out a removal done in the base template in meta-agl and retain the build of all kernel modules into the demo platform images for developer convenience. Note that the inclusion is conditional on the virtual/kernel provider not being linux-dummy, as it is desirable to leave even the dummy kernel-modules package out of container images to avoid confusion. Bug-AGL: SPEC-3983 Signed-off-by: Scott Murray <scott.murray@konsulko.com> Change-Id: I3c4e3876c11d7fb3f1796841aad8a9a463d8e513
2021-06-07agl-demo: Use new AGL_META_FILESYSTEMS hooklamprey_11.92.0lamprey/11.92.011.92.0Scott Murray1-1/+2
Use the AGL_META_FILESYSTEMS hook added to meta-agl for agl-virt in the agl-demo feature here. This will allow potentially enabling both features without bblayers.conf errors. Bug-AGL: SPEC-3970 Signed-off-by: Scott Murray <scott.murray@konsulko.com> Change-Id: If176f8bc4c79c1f5a3af40690f3ee87303788652