From cd6ec8211cebc502ef072ea8ebc0e03eab07f358 Mon Sep 17 00:00:00 2001
From: Willem Melching <willem.melching@gmail.com>
Date: Wed, 26 Aug 2020 17:18:05 +0200
Subject: [PATCH] larch64 modeld fixes (#2086)

---
 selfdrive/modeld/modeld    | 6 +++++-
 selfdrive/modeld/modeld.cc | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/selfdrive/modeld/modeld b/selfdrive/modeld/modeld
index 5369034dfe..a9d545e305 100755
--- a/selfdrive/modeld/modeld
+++ b/selfdrive/modeld/modeld
@@ -1,4 +1,8 @@
 #!/bin/sh
-export LD_LIBRARY_PATH="/data/pythonpath/phonelibs/snpe/aarch64/:$HOME/openpilot/phonelibs/snpe/larch64:$HOME/openpilot/phonelibs/snpe/x86_64-linux-clang:$LD_LIBRARY_PATH"
+if [ -d /system ]; then
+  export LD_LIBRARY_PATH="/data/pythonpath/phonelibs/snpe/aarch64/:$LD_LIBRARY_PATH"
+else
+  export LD_LIBRARY_PATH="/data/pythonpath/phonelibs/snpe/larch64:$HOME/openpilot/phonelibs/snpe/x86_64-linux-clang:$LD_LIBRARY_PATH"
+fi
 exec ./_modeld
 
diff --git a/selfdrive/modeld/modeld.cc b/selfdrive/modeld/modeld.cc
index 9411a0ec02..be47d1811a 100644
--- a/selfdrive/modeld/modeld.cc
+++ b/selfdrive/modeld/modeld.cc
@@ -98,7 +98,7 @@ int main(int argc, char **argv) {
   PubMaster pm({"model", "cameraOdometry"});
   SubMaster sm({"pathPlan", "frame"});
 
-#ifdef QCOM
+#if defined(QCOM) || defined(QCOM2)
   cl_device_type device_type = CL_DEVICE_TYPE_DEFAULT;
 #else
   cl_device_type device_type = CL_DEVICE_TYPE_CPU;