aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile3
-rw-r--r--include/arch/aarch32/arch.h (renamed from include/lib/aarch32/arch.h)0
-rw-r--r--include/arch/aarch32/arch_helpers.h (renamed from include/lib/aarch32/arch_helpers.h)0
-rw-r--r--include/arch/aarch32/asm_macros.S (renamed from include/common/aarch32/asm_macros.S)0
-rw-r--r--include/arch/aarch32/assert_macros.S (renamed from include/common/aarch32/assert_macros.S)0
-rw-r--r--include/arch/aarch32/console_macros.S (renamed from include/common/aarch32/console_macros.S)0
-rw-r--r--include/arch/aarch32/el3_common_macros.S (renamed from include/common/aarch32/el3_common_macros.S)0
-rw-r--r--include/arch/aarch32/smccc_helpers.h (renamed from include/lib/aarch32/smccc_helpers.h)0
-rw-r--r--include/arch/aarch32/smccc_macros.S (renamed from include/lib/aarch32/smccc_macros.S)0
-rw-r--r--include/arch/aarch64/arch.h (renamed from include/lib/aarch64/arch.h)0
-rw-r--r--include/arch/aarch64/arch_helpers.h (renamed from include/lib/aarch64/arch_helpers.h)0
-rw-r--r--include/arch/aarch64/asm_macros.S (renamed from include/common/aarch64/asm_macros.S)0
-rw-r--r--include/arch/aarch64/assert_macros.S (renamed from include/common/aarch64/assert_macros.S)0
-rw-r--r--include/arch/aarch64/console_macros.S (renamed from include/common/aarch64/console_macros.S)0
-rw-r--r--include/arch/aarch64/el3_common_macros.S (renamed from include/common/aarch64/el3_common_macros.S)0
-rw-r--r--include/arch/aarch64/setjmp.h (renamed from include/lib/aarch64/setjmp.h)0
-rw-r--r--include/arch/aarch64/smccc_helpers.h (renamed from include/lib/aarch64/smccc_helpers.h)0
17 files changed, 1 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 1b48fe1eb..6b5b0803e 100644
--- a/Makefile
+++ b/Makefile
@@ -270,19 +270,18 @@ BL_COMMON_SOURCES += lib/${ARCH}/armclang_printf.S
endif
INCLUDES += -Iinclude \
+ -Iinclude/arch/${ARCH} \
-Iinclude/bl1 \
-Iinclude/bl2 \
-Iinclude/bl2u \
-Iinclude/bl31 \
-Iinclude/common \
- -Iinclude/common/${ARCH} \
-Iinclude/drivers \
-Iinclude/drivers/arm \
-Iinclude/drivers/auth \
-Iinclude/drivers/io \
-Iinclude/drivers/ti/uart \
-Iinclude/lib \
- -Iinclude/lib/${ARCH} \
-Iinclude/lib/cpus \
-Iinclude/lib/cpus/${ARCH} \
-Iinclude/lib/el3_runtime \
diff --git a/include/lib/aarch32/arch.h b/include/arch/aarch32/arch.h
index 8260c5491..8260c5491 100644
--- a/include/lib/aarch32/arch.h
+++ b/include/arch/aarch32/arch.h
diff --git a/include/lib/aarch32/arch_helpers.h b/include/arch/aarch32/arch_helpers.h
index a6fe14fb8..a6fe14fb8 100644
--- a/include/lib/aarch32/arch_helpers.h
+++ b/include/arch/aarch32/arch_helpers.h
diff --git a/include/common/aarch32/asm_macros.S b/include/arch/aarch32/asm_macros.S
index c54f75c2d..c54f75c2d 100644
--- a/include/common/aarch32/asm_macros.S
+++ b/include/arch/aarch32/asm_macros.S
diff --git a/include/common/aarch32/assert_macros.S b/include/arch/aarch32/assert_macros.S
index ab3a2ebb7..ab3a2ebb7 100644
--- a/include/common/aarch32/assert_macros.S
+++ b/include/arch/aarch32/assert_macros.S
diff --git a/include/common/aarch32/console_macros.S b/include/arch/aarch32/console_macros.S
index ba6e7d050..ba6e7d050 100644
--- a/include/common/aarch32/console_macros.S
+++ b/include/arch/aarch32/console_macros.S
diff --git a/include/common/aarch32/el3_common_macros.S b/include/arch/aarch32/el3_common_macros.S
index 048f16103..048f16103 100644
--- a/include/common/aarch32/el3_common_macros.S
+++ b/include/arch/aarch32/el3_common_macros.S
diff --git a/include/lib/aarch32/smccc_helpers.h b/include/arch/aarch32/smccc_helpers.h
index 67952ec50..67952ec50 100644
--- a/include/lib/aarch32/smccc_helpers.h
+++ b/include/arch/aarch32/smccc_helpers.h
diff --git a/include/lib/aarch32/smccc_macros.S b/include/arch/aarch32/smccc_macros.S
index 1fe6c64dc..1fe6c64dc 100644
--- a/include/lib/aarch32/smccc_macros.S
+++ b/include/arch/aarch32/smccc_macros.S
diff --git a/include/lib/aarch64/arch.h b/include/arch/aarch64/arch.h
index 72a14dcfa..72a14dcfa 100644
--- a/include/lib/aarch64/arch.h
+++ b/include/arch/aarch64/arch.h
diff --git a/include/lib/aarch64/arch_helpers.h b/include/arch/aarch64/arch_helpers.h
index 7222b9dc7..7222b9dc7 100644
--- a/include/lib/aarch64/arch_helpers.h
+++ b/include/arch/aarch64/arch_helpers.h
diff --git a/include/common/aarch64/asm_macros.S b/include/arch/aarch64/asm_macros.S
index dea302137..dea302137 100644
--- a/include/common/aarch64/asm_macros.S
+++ b/include/arch/aarch64/asm_macros.S
diff --git a/include/common/aarch64/assert_macros.S b/include/arch/aarch64/assert_macros.S
index 06371c420..06371c420 100644
--- a/include/common/aarch64/assert_macros.S
+++ b/include/arch/aarch64/assert_macros.S
diff --git a/include/common/aarch64/console_macros.S b/include/arch/aarch64/console_macros.S
index 5c88d4f22..5c88d4f22 100644
--- a/include/common/aarch64/console_macros.S
+++ b/include/arch/aarch64/console_macros.S
diff --git a/include/common/aarch64/el3_common_macros.S b/include/arch/aarch64/el3_common_macros.S
index 410aeab75..410aeab75 100644
--- a/include/common/aarch64/el3_common_macros.S
+++ b/include/arch/aarch64/el3_common_macros.S
diff --git a/include/lib/aarch64/setjmp.h b/include/arch/aarch64/setjmp.h
index bbfe1df43..bbfe1df43 100644
--- a/include/lib/aarch64/setjmp.h
+++ b/include/arch/aarch64/setjmp.h
diff --git a/include/lib/aarch64/smccc_helpers.h b/include/arch/aarch64/smccc_helpers.h
index efab18b0c..efab18b0c 100644
--- a/include/lib/aarch64/smccc_helpers.h
+++ b/include/arch/aarch64/smccc_helpers.h