summaryrefslogtreecommitdiffstats
path: root/meta-agl-bsp
AgeCommit message (Collapse)AuthorFilesLines
2017-06-29Backport fix for CVE-2017-1000364 to linux-yocto-4.4Jan-Simon Möller4-0/+1010
Backport of upstream fixes from 4.4 kernel branch to linux-yocto: - https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git/commit/?h=linux-4.4.y&id=4b359430674caa2c98d0049a6941f157d2a33741 - https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git/commit/?h=linux-4.4.y&id=f41512c6acb71c63cf4e3bd50934365ae2a23891 - https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git/commit/?h=linux-4.4.y&id=1f2284fac2180d7a9442c796d9755e3ce7ab0bd9 Bug-AGL: SPEC-705 SPEC-706 Change-Id: I8f180d6d58d985ca7186638015a57d3d836a9a61 Signed-off-by: Jan-Simon Möller <jsmoeller@linuxfoundation.org> Reviewed-on: https://gerrit.automotivelinux.org/gerrit/9861 Tested-by: Jenkins Job builder account <agl-jobbuilder@automotivelinux.org> ci-image-build: Jenkins Job builder account <agl-jobbuilder@automotivelinux.org> ci-image-boot-test: Jenkins Job builder account <agl-jobbuilder@automotivelinux.org> Reviewed-by: Stéphane Desneux <stephane.desneux@iot.bzh>
2017-06-29Fix CVE-2017-1000364 for dragonboard-410c by backporting the patches from ↵Jan-Simon Möller4-0/+1010
upstream kernel v4.4 Backport of patches from upstream for 4.4 - https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git/commit/?h=v4.4.74&id=4b359430674caa2c98d0049a6941f157d2a33741 - https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git/commit/?h=v4.4.74&id=f41512c6acb71c63cf4e3bd50934365ae2a23891 - https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git/commit/?h=v4.4.74&id=1f2284fac2180d7a9442c796d9755e3ce7ab0bd9 Bug-AGL: SPEC-705 SPEC-706 Change-Id: If5d66cc7e7e501a5270ae82d56d362941df7dd07 Signed-off-by: Jan-Simon Möller <jsmoeller@linuxfoundation.org> Reviewed-on: https://gerrit.automotivelinux.org/gerrit/9915 Tested-by: Jenkins Job builder account <agl-jobbuilder@automotivelinux.org> ci-image-build: Jenkins Job builder account <agl-jobbuilder@automotivelinux.org> ci-image-boot-test: Jenkins Job builder account <agl-jobbuilder@automotivelinux.org> Reviewed-by: Kotaro Hashimoto <Hashimoto.Kotaro@ds.MitsubishiElectric.co.jp>
2017-06-29Fix CVE-2017-1000364 by backporting the patches for rpi3Jan-Simon Möller4-0/+1070
Backport of patches from upstream for 4.4 - https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git/commit/?h=v4.4.74&id=4b359430674caa2c98d0049a6941f157d2a33741 - https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git/commit/?h=v4.4.74&id=f41512c6acb71c63cf4e3bd50934365ae2a23891 - https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git/commit/?h=v4.4.74&id=1f2284fac2180d7a9442c796d9755e3ce7ab0bd9 Bug-AGL: SPEC-705 SPEC-706 Change-Id: I66fa6e271095c2319791480089a9e6f3392c51d3 Signed-off-by: Jan-Simon Möller <jsmoeller@linuxfoundation.org> Reviewed-on: https://gerrit.automotivelinux.org/gerrit/9875 Tested-by: Jenkins Job builder account <agl-jobbuilder@automotivelinux.org> ci-image-build: Jenkins Job builder account <agl-jobbuilder@automotivelinux.org> ci-image-boot-test: Jenkins Job builder account <agl-jobbuilder@automotivelinux.org> Reviewed-by: Leon Anavi <leon.anavi@konsulko.com>
2017-03-17Removed touchscreen fix on gen3chinook_3.0.3chinook/3.0.33.0.3Ronan Le Martret1-0/+1
* fix-touchscreen-crash.patch is already present in meta-rcar. * needs to be backport to CC Change-Id: I66dd246288c243c06f6ee022e07a95abeec10c37 Signed-off-by: Ronan Le Martret <ronan.lemartret@iot.bzh>
2017-03-02Pin linux-ti-staging for chinook 3.0.2chinook_3.0.2chinook/3.0.23.0.2Jan-Simon Möller1-0/+1
Change-Id: I6af70285504205a3f1221caad77239682438dd04 Signed-off-by: Jan-Simon Möller <jsmoeller@linuxfoundation.org>
2017-03-01These config fragments are already include through meta-intel-iot-security. ↵Nathan Illerbrun4-18/+4
Also fix HID config fragment. Change-Id: Ic14d0dffac93173e0b840294b0edeaee69be1ca7 Signed-off-by: Nathan Illerbrun <nillerbrun@gmail.com>
2017-03-01Append kernel recipe to support config fragments and add common kernel ↵Nathan Illerbrun7-0/+63
config fragments Add machine template for nitrogen6x Change-Id: I63df939008a36d125f80d74d461453c63386e24e Signed-off-by: Nathan Illerbrun <nathani@validmanufacturing.com>
2017-02-24weston: Set XDG_RUNTIME_DIR for qcomKotaro Hashimoto3-0/+40
Without this environment variable, Weston fails to start on Dragonboard * backport from master commit 0a34b88c4b661a91962dd0c04c3af7e582bafcbd Change-Id: I67ad6ec7cb2ad4cdcf0885e42d0b297d87ec43d3 Signed-off-by: Kotaro Hashimoto <Hashimoto.Kotaro@ds.MitsubishiElectric.co.jp>
2017-02-24Fix issue with bluetooth pairingKotaro Hashimoto5-0/+204
This patch is ported from meta-agl-extra. * backport from master commit 99804790f0954fc2cf0d20aa4d0a581361d3cfe6 Change-Id: I851783e83d37d161c83f87422df5b2d592d6dda3 Signed-off-by: Kotaro Hashimoto <Hashimoto.Kotaro@ds.MitsubishiElectric.co.jp>
2017-02-24Enable smack in linux-linaro-qcomlt kernelKotaro Hashimoto3-2/+14
This changes enables the smack feature in linux-linaro-qcomlt kernel by using configuration fragments. * backport from master commit 8360d714b7373386f4bebeb434dbc6f0a4a49b9d Change-Id: I304effa533bd802c987fe4efd2d3b17eb358ff6c Signed-off-by: Kotaro Hashimoto <Hashimoto.Kotaro@ds.MitsubishiElectric.co.jp>
2017-01-25Disable Weston DRM backend in QEMUchinook_3.0.1chinook/3.0.13.0.1Scott Murray1-1/+4
Since the Weston DRM backend does not work with the video card implementations in VirtualBox and VMWare player, and has some outstanding issues on QEMU that have resulted in GenIVI not enabling it[1], disable it for now. A comment has been added to the QEMU weston.ini indicating that the DRM backend can be re-enabled to potentially gain higher performance. Additionally, the common weston.service systemd unit has been modified to add the --tty option to weston-launch to start weston on /dev/tty1. This is now required to avoid console messages writing on top of the HomeScreen in QEMU, and is harmless to operation on the other platforms. [1]: https://github.com/GENIVI/meta-genivi-dev/pull/34 Bug-AGL: SPEC-405 Change-Id: Ic0c0adeb15baf392e3ffa0bbd26c62d060df1ef5 Signed-off-by: Scott Murray <scott.murray@konsulko.com>
2017-01-24rcar-gen2: linux-renesas: backport r820t tuner driver to fix SPEC-418Harunobu Kurokawa4-0/+118
Fix the issue that radio app using r820t tuner driver some times crash. Bug-AGL: SPEC-418 Change-Id: I1529ecba91c3988eea6b271d5f8ce6d2d8f1bb11 Signed-off-by: Harunobu Kurokawa <harunobu.kurokawa.dn@renesas.com>
2017-01-23Fix to get netboot activated also for renesas gen3Romain Forlot3-1/+6
Change-Id: I9b512a907398de9c96dc46111c74bed4059f7b8e Signed-off-by: Romain Forlot <romain.forlot@iot.bzh> (cherry picked from commit b0cb0935aef4ced9c82d7972ed61f636e9036055)
2017-01-14meta-oic: Hotfix to use tools from sysroot before system PATHPhilippe Coval2-0/+94
Prevent pkg-config not found issue This patch was in iotivity 1.1-rel branch, and (wrongly) removed in 1.2.0 So it needed to be reintroduced in upstream 1.2-rel and as a patch for 1.2.0, track upstream bug at: https://jira.iotivity.org/browse/IOT-1219 Bug-AGL: SPEC-158 Thanks-to: Alison Chaiken Change-Id: I6af59a590f8be489398623d29cf85c2f00000002 Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com> (cherry picked from commit 7dd5a4100ffb71337c59046120c3c41547cb7f2b)
2017-01-06Apply bluetooth/smack patches also to rpi kernelchinook_3.0.0chinook/3.0.03.0.0Jan-Simon Möller5-0/+208
This changeset patches the rpi with the needed changes to allow bluetooth to work together with smack. The patches were developed for porter and are a backport of patches submitted for 4.10+ . Bug-AGL: SPEC-293 Change-Id: I96d04a709de6ad7843840d9ae154f041173948a2 Signed-off-by: Jan-Simon Möller <jsmoeller@linuxfoundation.org>
2017-01-05dra7xx-evm: Fix issue with bluetooth pairingKarthik Ramanan5-1/+208
This patch is ported from meta-agl-extra Commit details below: commit c50805d25ba95473e8b4d1eb28d1203a328cd77a Author: José Bollo <jose.bollo@iot.bzh> Change-Id: I54a40935d6d2bbd9c267985c9e23a14bdffb7a3c Signed-off-by: Karthik Ramanan <a0393906@ti.com> (cherry picked from commit 554f8d394c626d3a151127e67caddc3196e3ffc1)
2017-01-02Add entry for official pi touchscreen over DSI portJan-Simon Möller1-0/+6
This change add support for the official touchscreen that is connected throught the DSI-1 port to the board. Change-Id: If85490ca69310922b8bf314681d1d8459995c61e Signed-off-by: Jan-Simon Möller <jsmoeller@linuxfoundation.org>
2016-12-30meta-oic: Hotfix to support aarch64 for DragonBoard-410cPhilippe Coval2-0/+50
Apply patch from iotivity-1.2.1: * [PATCH 081/341] yocto: Add aarch64 for DragonBoard-410c Bug-AGL: SPEC-158 Change-Id: I06f56ae860760002a6376866488e1f55624f50cc Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
2016-12-30linux-raspberrypi: add ENABLE_CMA options to kernel command lineMatt Ranostay1-0/+3
Add ENABLE_CMA setting that enables required kernel configuration to allow the dynamic CMA to function. Change-Id: I0b0ab0fd7fd64454ea3cc9a89344a98897838e11 Signed-off-by: Matt Ranostay <matt.ranostay@konsulko.com> (cherry picked from commit fefb358dca0ac89b970c77671b2efda2a8cf99c0)
2016-12-30rpi-config: add configurable CMA low and high water marksMatt Ranostay1-0/+8
For dynamically allocating of CMA blocks the low and high water marks settings determine when the GPU requests or releases memory from the CPU. Change-Id: Iad494c101fec0884bb687c5ea51c9657b7c17bd9 Signed-off-by: Matt Ranostay <matt.ranostay@konsulko.com> (cherry picked from commit 6bcd449f3b6f9705dfe940d2011fce6243bac7de)
2016-12-28meta-raspberrypi: disable debug loggingScott Murray1-1/+1
Set CMDLINE_DEBUG in linux-raspberrypi_4.4.bbappend to disable the debug logging by the kernel and systemd that was spamming the console. As a side benefit, this noticeably speeds up booting. Change-Id: Ic99b1626ea20a27d3d157bcb952ec30cd50baeb2 Signed-off-by: Scott Murray <scott.murray@konsulko.com>
2016-12-28meta-ti: weston: remove unneeded ivi shell patches and use standard ↵Matt Porter13-1859/+1
ivi-controller The meta-arago layer included a number of ivi shell patches that are not needed in AGL. One multi screen patch conflicts with another bbappend causing build issues as it's already included by a less specific layer. Further, the added "simple TI layout controller", autolaunch, and screenshooter features are all unneeded in AGL. These are removed to reduce the amount of non-essential patches we carry within AGL. As a result of this, all weston.ini directives which use the "simple TI layout controller" directives are removed and weston.ini is switched to use the standard ivi-controller so that WindowManager may run and access the ILM API. The end result is that WindowManager and HomeScreen may now be launched after boot successfully. Change-Id: I8d777fbd4c02acbf9d3ccaeb215b651a8562d5bb Signed-off-by: Matt Porter <mporter@konsulko.com>
2016-12-24meta-intel: Fix for the sdk build failure for Intel platformsKien Dinh1-3/+2
Removed linux-firmware-ibt since it is only necessary for the Joule platform. Change-Id: Ia4916fbc777299df4a094874ad1585a43a46d39b Signed-off-by: Kien Dinh <kien.t.dinh@intel.com>
2016-12-22dra7xx-evm: weston: Align orientation with psplashKarthik Ramanan1-1/+1
The psplash is oriented 180 degrees rotated compared with the HomeScreen application, this change will ensure that they are in sync Change-Id: Ic2a588ff3a061ff500d4050a6915fe5c899a1e7e Signed-off-by: Karthik Ramanan <a0393906@ti.com>
2016-12-22meta-oic: Hotfix to pull gdbus-codegen from glib-2.0-nativePhilippe Coval1-0/+1
It was discovered while building iotivity-1.2.0 using Intel BSP Bug-AGL: SPEC-158 Change-Id: I4c735a276d3a484a330ef1ea8611105e6a84e35a Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
2016-12-22dra7xx-evm: u-boot: Change default supported display to OSDKarthik Ramanan1-1/+1
The latest dra7xx-evm purchased from ti.com comes with the OSD display, this change will allow the AGL nightly images to work on the latest dra7xx-evm by default. If the user has an older EVM, then the uEnv.txt should be modified to match the connected displays. The complete list of supported LCDs can be found by checking the /boot folder of the the rootfs. Change-Id: I7f7ac06a49670eb8b7446a6b27854bee4b76ace6 Signed-off-by: Karthik Ramanan <a0393906@ti.com>
2016-12-22dra7xx-evm: make HomeScreen application fullscreenKarthik Ramanan1-0/+24
Tested and verified on the Rev H EVM with OSD display Should work on all other supported displays too. Change-Id: Ib8f210ebf84a0f36fbc87c4553d13ff984874051 Signed-off-by: Karthik Ramanan <a0393906@ti.com>
2016-12-22Revert "Disable SoC sound driver in porter board"Harunobu Kurokawa2-17/+0
The audio bug is fixed (SPEC-365), so that it should be revert this commit to enable sound driver. This reverts commit 1a70e5e8f48f17f604ab243dfb3ff01f7aa435f6. Change-Id: I362a900e86cdf7888e5726a6a0a56daeb0d33145 Signed-off-by: Harunobu Kurokawa <harunobu.kurokawa.dn@renesas.com>
2016-12-21Change kernel config to enable wifi of ralinkKazumasa Mitsunari4-2/+6
This enables wifi dongle of ralink, for example BUFFALO wifi dongle. Change-Id: Iab408fd5f54feecfadb4f25adab978b0df89d66d Signed-off-by: Kazumasa Mitsunari <kazumasa_mitsunari_za@mail.toyota.co.jp>
2016-12-21dra7xx-evm: weston.ini: remove stale test binaries/screens and add required ↵Matt Porter1-50/+2
modules Remove some launched applications that either don't exist or were used for basic BSP testing. Add drm-backend and ivi-input-controller modules. Fixes weston config so the HomeScreen can now be launched. Change-Id: I2c6e507ccd244c26e8b5f5cf0ad0f68ae9a18495 Signed-off-by: Matt Porter <mporter@konsulko.com>
2016-12-20Enabling build for Intel's Joule boardktdinh4-1/+41
This adds neccessary firmware to support the Joule board, including wifi and bluetooth. Change-Id: Ia6973415113119aaf60fff0dbb494027fba96fd5 Signed-off-by: Kien Dinh <kien.t.dinh@intel.com>
2016-12-17Disable SoC sound driver in porter boardNaoto Yamaguchi2-0/+17
The Porter board currently has a problem that pulseaudio can not be used due to the sound driver. I enabled USB Audio as a workaround, but we had to manually change the default sound device. As a further workaround, disable the SoC sound driver on the Porter board. Change-Id: Ie53b75ea0bc252b82910e518da62d2748147fc90 Signed-off-by: Naoto Yamaguchi <i33399_YAMAGUCHI@aisin-aw.co.jp>
2016-12-16bbappend to add Intel extra driversDominig ar Foll (Intel Open Source)1-0/+13
Change-Id: I11b245aea28b76f17cba3cdc8c964129bbaf906b Signed-off-by: Dominig ar Foll (Intel Open Source) <dominig.arfoll@fridu.net>
2016-12-16Enable USB Audio in porter boardNaoto Yamaguchi3-3/+26
This patch is to avoid the problem that pulseaudio can not be used in the Porter board. This patch does the following two correspondences. 1. Enable USB Audio config 2. Corresponding to problem of self-destruction by outputting a lot of printk Change-Id: I58682c0755e04e87ec198dd0494d6f9380ebe4ce Signed-off-by: Naoto Yamaguchi <i33399_YAMAGUCHI@aisin-aw.co.jp>
2016-12-15Disabling LVDS-1 outputTadao Tanikawa1-0/+5
If HDMI and LVDS were both enabled, parameters about screens become inconsistent on weston. As a workaround until root cause is fixed, disabling LVDS from weston.ini. Change-Id: I150c0ba5e9655974f7dc365c2168fe7e2d7d93ab Signed-off-by: Tadao Tanikawa <tanikawa.tadao@jp.panasonic.com>
2016-12-15weston-raspberrypi.ini: Add commented out mode for GeChic 1502iScott Murray1-0/+2
Add the commented out mode line for using the GeChic 1502i in 1080p so that it's easy to enable it for the CES demo setup. Signed-off-by: Scott Murray <scott.murray@konsulko.com> Change-Id: Idcdf25188d3391403ee29c5bda7568c652b4c730
2016-12-14new default weston.ini for IntelDominig ar Foll (Intel Open Source)2-0/+39
Change-Id: Id899777abafd84bc2c7eb9d3ba0a22906a45c7cb Signed-off-by: Dominig ar Foll (Intel Open Source) <dominig.arfoll@fridu.net>
2016-12-12correcting bbappend localisation for Intel USB wifi supportDominig ar Foll (Intel Open Source)1-13/+0
Change-Id: Ic60a3d8271a14729032f0757df8aa2f8108b7798 Signed-off-by: Dominig ar Foll (Intel Open Source) <dominig.arfoll@fridu.net>
2016-12-09Adding more drivers as modules for USB devices on IntelDominig ar Foll4-0/+187
Change-Id: Ie854777d28f455082bafdee07f36ab21c025dc68 Signed-off-by: Dominig ar Foll <dominig.arfoll@fridu.net>
2016-12-07Enabling HW acceleration for Intel with libva and correct libva incorrect ↵Dominig ar Foll (Intel Open Source)1-0/+4
runtime dependency with x11 Change-Id: I175b0d9900d61546cb0f116a1d698ee1f60b84b7 Signed-off-by: Dominig ar Foll (Intel Open Source) <dominig.arfoll@fridu.net> Correct libva incorrect runtime dependency with x11 Change-Id: Ic4231c217c8c63575a98d370c898b8cb04e3a980 Signed-off-by: Dominig ar Foll (Intel Open Source) <dominig.arfoll@fridu.net>
2016-12-06add namespace to config kernelRonan2-0/+8
* missing namespace into defconf Change-Id: I9f292f8186fb771f8eb8c82ad8e7e985c474e9ea Signed-off-by: Ronan <ronan.lemartret@iot.bzh>
2016-12-02optee-os depend on python-pycryptoRonan1-0/+2
* optee-os use python script to build so, We need to add: inherit pythonnative If not we use host python during the build. * During the build, optee-os use script: - scripts/pem_to_pub_c.py - scripts/sign.py Those script depend on python-pycrypto "from Crypto.PublicKey import RSA" So we need to add python-pycrypto native to recipes * The python-pycrypto recipes come from meta-security (out of AGL): https://layers.openembedded.org/layerindex/recipe/39101/ Change-Id: I64340544c9a23a8e9ef62aca348fc08722d3dcc2 Signed-off-by: Ronan <ronan.lemartret@iot.bzh>
2016-12-02Set rootfs size based on real size of rootfs imageAnton Gerasimov1-2/+18
ROOTFS_SIZE is recomputed for each image type based on total size of rootfs directory. If rootfs directory gets smaller between creation of rootfs image and SD image, it fill result in corrupted SD image. It should not happen in theory, but it happens occasionally for a reason I could not identify. Change-Id: I1c888c179fdcec32c3cacbbce7b2d34ec70bbb17 Signed-off-by: Anton Gerasimov <anton@advancedtelematic.com>
2016-12-01Add wl-shell-emulator.so to weston.ini to porter and QEMU as well.Anton Gerasimov2-2/+4
CES2017 demo depends on it. Change-Id: I9a01d106175fcfaba74195c9c6efe6e8f2bda4a5 Signed-off-by: Anton Gerasimov <anton@advancedtelematic.com>
2016-11-28weston-raspberrypi.ini: Fix Weston configurationsLeon Anavi1-1/+6
Fix Weston configurations for Raspberry Pi 2/3 and run it in IVI shell. Following these changes start_ALS2016_ivi-shell.sh works again. Bug-AGL: SPEC-268 Change-Id: Ief75dfc078a42aba65161783b2a7beef23115e33 Signed-off-by: Leon Anavi <leon.anavi@konsulko.com>
2016-11-25Use IVI-shell instead of desktop-shell as default in weston.iniBocklage, Jens3-15/+10
Using IVI-shell as default for following platforms: - QEMU - Renesas - Raspberry Pi The IVI-shell is needed to run the CES 2017 demo. Signed-off-by: Bocklage, Jens <Jens_Bocklage@mentor.com>
2016-11-24Fix file extension from *.bb to *.bbappendKotaro Hashimoto1-0/+0
linux-linaro-qcomlt%.bb was wrong file extension. I modify this file extension from *.bb to *.bbappend. Change-Id: Ib44d0496025d88faf7a34310cc3d208db668ca5a Signed-off-by: Kotaro Hashimoto <Hashimoto.Kotaro@ds.MitsubishiElectric.co.jp>
2016-11-23meta-rcar-gen3: autoload mmp modulesYannick Gicquel4-0/+4
Add KERNEL_MODULES_AUTOLOAD directive some to multimedia package drivers. Thus after bootup, multimedia framework is ready to use hw acceleration IP. Change-Id: I43a92fdf2dff1f546e5a532b13203efd4a6b829c Signed-off-by: Yannick Gicquel <yannick.gicquel@iot.bzh>
2016-11-22dra7xx-evm: weston: add changes for AGL home screenKarthik Ramanan23-0/+5859
This patch set contains three sets of changes: * Recipes and patches from meta-arago for weston bringup * Additional patches to support ivi-shell for dra7xx-evm * Configuration settings for applications/AGL home screen Change-Id: I925c1babdf2e825c0f68ec1d57107469f3abef09 Signed-off-by: Karthik Ramanan <a0393906@ti.com>
2016-11-22meta-agl-bsp: More CES 2017 demo hardware support for TI VayuScott Murray3-3/+14
Tweaked the rtl_sdr.cfg fragment for linux-ti-staging to add CONFIG_I2C_MUX, as it is required by the RTL28xx driver Kconfig in newer kernels. As well, added another fragment to linux-ti-staging to enable USB Bluetooth HCI devices so that USB Bluetooth adapters will work on Vayu. Change-Id: Ifd40f25e2159066fea4707a7915ba9b6dee52e0c Signed-off-by: Scott Murray <scott.murray@konsulko.com>