From f5478dedf9e096d9539362b38ceb096b940ba3e2 Mon Sep 17 00:00:00 2001
From: Antonio Nino Diaz <antonio.ninodiaz@arm.com>
Date: Mon, 17 Dec 2018 17:20:57 +0000
Subject: [PATCH] Reorganize architecture-dependent header files
The architecture dependant header files in include/lib/${ARCH} and
include/common/${ARCH} have been moved to /include/arch/${ARCH}.
Change-Id: I96f30fdb80b191a51448ddf11b1d4a0624c03394
Signed-off-by: Antonio Nino Diaz <antonio.ninodiaz@arm.com>
---
Makefile | 3 +--
include/{lib => arch}/aarch32/arch.h | 0
include/{lib => arch}/aarch32/arch_helpers.h | 0
include/{common => arch}/aarch32/asm_macros.S | 0
include/{common => arch}/aarch32/assert_macros.S | 0
include/{common => arch}/aarch32/console_macros.S | 0
include/{common => arch}/aarch32/el3_common_macros.S | 0
include/{lib => arch}/aarch32/smccc_helpers.h | 0
include/{lib => arch}/aarch32/smccc_macros.S | 0
include/{lib => arch}/aarch64/arch.h | 0
include/{lib => arch}/aarch64/arch_helpers.h | 0
include/{common => arch}/aarch64/asm_macros.S | 0
include/{common => arch}/aarch64/assert_macros.S | 0
include/{common => arch}/aarch64/console_macros.S | 0
include/{common => arch}/aarch64/el3_common_macros.S | 0
include/{lib => arch}/aarch64/setjmp.h | 0
include/{lib => arch}/aarch64/smccc_helpers.h | 0
17 files changed, 1 insertion(+), 2 deletions(-)
rename include/{lib => arch}/aarch32/arch.h (100%)
rename include/{lib => arch}/aarch32/arch_helpers.h (100%)
rename include/{common => arch}/aarch32/asm_macros.S (100%)
rename include/{common => arch}/aarch32/assert_macros.S (100%)
rename include/{common => arch}/aarch32/console_macros.S (100%)
rename include/{common => arch}/aarch32/el3_common_macros.S (100%)
rename include/{lib => arch}/aarch32/smccc_helpers.h (100%)
rename include/{lib => arch}/aarch32/smccc_macros.S (100%)
rename include/{lib => arch}/aarch64/arch.h (100%)
rename include/{lib => arch}/aarch64/arch_helpers.h (100%)
rename include/{common => arch}/aarch64/asm_macros.S (100%)
rename include/{common => arch}/aarch64/assert_macros.S (100%)
rename include/{common => arch}/aarch64/console_macros.S (100%)
rename include/{common => arch}/aarch64/el3_common_macros.S (100%)
rename include/{lib => arch}/aarch64/setjmp.h (100%)
rename include/{lib => arch}/aarch64/smccc_helpers.h (100%)
diff --git a/Makefile b/Makefile
index 1b48fe1ebc..6b5b0803ef 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
similarity index 100%
rename from include/lib/aarch32/arch.h
rename to include/arch/aarch32/arch.h
diff --git a/include/lib/aarch32/arch_helpers.h b/include/arch/aarch32/arch_helpers.h
similarity index 100%
rename from include/lib/aarch32/arch_helpers.h
rename to include/arch/aarch32/arch_helpers.h
diff --git a/include/common/aarch32/asm_macros.S b/include/arch/aarch32/asm_macros.S
similarity index 100%
rename from include/common/aarch32/asm_macros.S
rename to include/arch/aarch32/asm_macros.S
diff --git a/include/common/aarch32/assert_macros.S b/include/arch/aarch32/assert_macros.S
similarity index 100%
rename from include/common/aarch32/assert_macros.S
rename to include/arch/aarch32/assert_macros.S
diff --git a/include/common/aarch32/console_macros.S b/include/arch/aarch32/console_macros.S
similarity index 100%
rename from include/common/aarch32/console_macros.S
rename to include/arch/aarch32/console_macros.S
diff --git a/include/common/aarch32/el3_common_macros.S b/include/arch/aarch32/el3_common_macros.S
similarity index 100%
rename from include/common/aarch32/el3_common_macros.S
rename to include/arch/aarch32/el3_common_macros.S
diff --git a/include/lib/aarch32/smccc_helpers.h b/include/arch/aarch32/smccc_helpers.h
similarity index 100%
rename from include/lib/aarch32/smccc_helpers.h
rename to include/arch/aarch32/smccc_helpers.h
diff --git a/include/lib/aarch32/smccc_macros.S b/include/arch/aarch32/smccc_macros.S
similarity index 100%
rename from include/lib/aarch32/smccc_macros.S
rename to include/arch/aarch32/smccc_macros.S
diff --git a/include/lib/aarch64/arch.h b/include/arch/aarch64/arch.h
similarity index 100%
rename from include/lib/aarch64/arch.h
rename to include/arch/aarch64/arch.h
diff --git a/include/lib/aarch64/arch_helpers.h b/include/arch/aarch64/arch_helpers.h
similarity index 100%
rename from include/lib/aarch64/arch_helpers.h
rename to include/arch/aarch64/arch_helpers.h
diff --git a/include/common/aarch64/asm_macros.S b/include/arch/aarch64/asm_macros.S
similarity index 100%
rename from include/common/aarch64/asm_macros.S
rename to include/arch/aarch64/asm_macros.S
diff --git a/include/common/aarch64/assert_macros.S b/include/arch/aarch64/assert_macros.S
similarity index 100%
rename from include/common/aarch64/assert_macros.S
rename to include/arch/aarch64/assert_macros.S
diff --git a/include/common/aarch64/console_macros.S b/include/arch/aarch64/console_macros.S
similarity index 100%
rename from include/common/aarch64/console_macros.S
rename to include/arch/aarch64/console_macros.S
diff --git a/include/common/aarch64/el3_common_macros.S b/include/arch/aarch64/el3_common_macros.S
similarity index 100%
rename from include/common/aarch64/el3_common_macros.S
rename to include/arch/aarch64/el3_common_macros.S
diff --git a/include/lib/aarch64/setjmp.h b/include/arch/aarch64/setjmp.h
similarity index 100%
rename from include/lib/aarch64/setjmp.h
rename to include/arch/aarch64/setjmp.h
diff --git a/include/lib/aarch64/smccc_helpers.h b/include/arch/aarch64/smccc_helpers.h
similarity index 100%
rename from include/lib/aarch64/smccc_helpers.h
rename to include/arch/aarch64/smccc_helpers.h
--
GitLab