From 13fb51eecf91fef290822c49848e6532003afac1 Mon Sep 17 00:00:00 2001
From: Stefan Kalkowski <stefan.kalkowski@genode-labs.com>
Date: Wed, 8 May 2019 12:36:57 +0200
Subject: [PATCH] hw: remove implicit SoC-specific include path

Fix #3336
---
 .../drivers/trustzone.h => drivers/defs/imx53_trustzone.h}      | 0
 .../base-hw/src/bootstrap/spec/imx53_qsb/platform_trustzone.cc  | 2 +-
 repos/base-hw/src/bootstrap/spec/usb_armory/platform.cc         | 2 +-
 .../base-hw/src/core/spec/imx53/trustzone/platform_services.cc  | 2 +-
 repos/os/src/server/tz_vmm/spec/imx53/main.cc                   | 2 +-
 5 files changed, 4 insertions(+), 4 deletions(-)
 rename repos/base-hw/include/{spec/imx53/drivers/trustzone.h => drivers/defs/imx53_trustzone.h} (100%)

diff --git a/repos/base-hw/include/spec/imx53/drivers/trustzone.h b/repos/base-hw/include/drivers/defs/imx53_trustzone.h
similarity index 100%
rename from repos/base-hw/include/spec/imx53/drivers/trustzone.h
rename to repos/base-hw/include/drivers/defs/imx53_trustzone.h
diff --git a/repos/base-hw/src/bootstrap/spec/imx53_qsb/platform_trustzone.cc b/repos/base-hw/src/bootstrap/spec/imx53_qsb/platform_trustzone.cc
index 86ba27994..cbb532675 100644
--- a/repos/base-hw/src/bootstrap/spec/imx53_qsb/platform_trustzone.cc
+++ b/repos/base-hw/src/bootstrap/spec/imx53_qsb/platform_trustzone.cc
@@ -12,7 +12,7 @@
  */
 
 #include <platform.h>
-#include <spec/imx53/drivers/trustzone.h>
+#include <drivers/defs/imx53_trustzone.h>
 #include <spec/arm/imx_aipstz.h>
 #include <spec/arm/imx_csu.h>
 
diff --git a/repos/base-hw/src/bootstrap/spec/usb_armory/platform.cc b/repos/base-hw/src/bootstrap/spec/usb_armory/platform.cc
index 82fbbc8fc..5549141a3 100644
--- a/repos/base-hw/src/bootstrap/spec/usb_armory/platform.cc
+++ b/repos/base-hw/src/bootstrap/spec/usb_armory/platform.cc
@@ -12,7 +12,7 @@
  */
 
 #include <platform.h>
-#include <spec/imx53/drivers/trustzone.h>
+#include <drivers/defs/imx53_trustzone.h>
 #include <spec/arm/imx_aipstz.h>
 #include <spec/arm/imx_csu.h>
 
diff --git a/repos/base-hw/src/core/spec/imx53/trustzone/platform_services.cc b/repos/base-hw/src/core/spec/imx53/trustzone/platform_services.cc
index 5b1a5db06..b76e5972a 100644
--- a/repos/base-hw/src/core/spec/imx53/trustzone/platform_services.cc
+++ b/repos/base-hw/src/core/spec/imx53/trustzone/platform_services.cc
@@ -13,7 +13,7 @@
 
 /* Genode includes */
 #include <base/service.h>
-#include <drivers/trustzone.h>
+#include <drivers/defs/imx53_trustzone.h>
 
 /* Core includes */
 #include <platform.h>
diff --git a/repos/os/src/server/tz_vmm/spec/imx53/main.cc b/repos/os/src/server/tz_vmm/spec/imx53/main.cc
index b58bff289..55a013c0e 100644
--- a/repos/os/src/server/tz_vmm/spec/imx53/main.cc
+++ b/repos/os/src/server/tz_vmm/spec/imx53/main.cc
@@ -17,7 +17,7 @@
 #include <base/heap.h>
 #include <base/component.h>
 #include <drivers/defs/imx53.h>
-#include <drivers/trustzone.h>
+#include <drivers/defs/imx53_trustzone.h>
 
 /* local includes */
 #include <vm.h>