aboutsummaryrefslogtreecommitdiff
path: root/fwu
diff options
context:
space:
mode:
Diffstat (limited to 'fwu')
-rw-r--r--fwu/ns_bl1u/ns_bl1u.mk4
-rw-r--r--fwu/ns_bl1u/ns_bl1u_main.c2
-rw-r--r--fwu/ns_bl1u/ns_bl1u_tests.c2
-rw-r--r--fwu/ns_bl2u/ns_bl2u.mk4
4 files changed, 4 insertions, 8 deletions
diff --git a/fwu/ns_bl1u/ns_bl1u.mk b/fwu/ns_bl1u/ns_bl1u.mk
index d5c78069e..edc77bef5 100644
--- a/fwu/ns_bl1u/ns_bl1u.mk
+++ b/fwu/ns_bl1u/ns_bl1u.mk
@@ -10,11 +10,9 @@ include lib/compiler-rt/compiler-rt.mk
NS_BL1U_INCLUDES := \
-I${AUTOGEN_DIR} \
-Itftf/framework/include \
+ -Iinclude \
-Iinclude/common \
-Iinclude/common/${ARCH} \
- -Iinclude/drivers \
- -Iinclude/drivers/arm \
- -Iinclude/drivers/io \
-Iinclude/lib \
-Iinclude/lib/${ARCH} \
-Iinclude/lib/stdlib \
diff --git a/fwu/ns_bl1u/ns_bl1u_main.c b/fwu/ns_bl1u/ns_bl1u_main.c
index 4a15e8606..55cea903c 100644
--- a/fwu/ns_bl1u/ns_bl1u_main.c
+++ b/fwu/ns_bl1u/ns_bl1u_main.c
@@ -8,9 +8,9 @@
#include <assert.h>
#include <bl1.h>
#include <debug.h>
+#include <drivers/io/io_fip.h>
#include <errno.h>
#include <image_loader.h>
-#include <io_fip.h>
#include <io_storage.h>
#include <mmio.h>
#include <nvm.h>
diff --git a/fwu/ns_bl1u/ns_bl1u_tests.c b/fwu/ns_bl1u/ns_bl1u_tests.c
index 16ae2591a..c5e18378f 100644
--- a/fwu/ns_bl1u/ns_bl1u_tests.c
+++ b/fwu/ns_bl1u/ns_bl1u_tests.c
@@ -11,8 +11,8 @@
#include <bl1.h>
#include <debug.h>
+#include <drivers/io/io_fip.h>
#include <errno.h>
-#include <io_fip.h>
#include <platform_def.h>
#include <smccc.h>
#include <status.h>
diff --git a/fwu/ns_bl2u/ns_bl2u.mk b/fwu/ns_bl2u/ns_bl2u.mk
index abd5ac555..8c3924d30 100644
--- a/fwu/ns_bl2u/ns_bl2u.mk
+++ b/fwu/ns_bl2u/ns_bl2u.mk
@@ -10,11 +10,9 @@ include lib/compiler-rt/compiler-rt.mk
NS_BL2U_INCLUDES := \
-I${AUTOGEN_DIR} \
-Itftf/framework/include \
+ -Iinclude \
-Iinclude/common \
-Iinclude/common/${ARCH} \
- -Iinclude/drivers \
- -Iinclude/drivers/arm \
- -Iinclude/drivers/io \
-Iinclude/lib \
-Iinclude/lib/${ARCH} \
-Iinclude/lib/stdlib \