From 85135283f380ed377a33d89f77a3f41fce43b29d Mon Sep 17 00:00:00 2001
From: Dan Handley <dan.handley@arm.com>
Date: Mon, 27 Apr 2015 19:34:53 +0100
Subject: [PATCH] Move Juno port to plat/arm/board/juno

Move the Juno port from plat/juno to plat/arm/board/juno. Also rename
some of the files so they are consistently prefixed with juno_.
Update the platform makefiles accordingly.

Change-Id: I0af6cb52a5fee7ef209107a1188b76a3c33a2a9f
---
 .../board/juno/aarch64/juno_helpers.S}                      | 0
 plat/{ => arm/board}/juno/include/plat_macros.S             | 0
 plat/{ => arm/board}/juno/include/platform_def.h            | 0
 plat/{ => arm/board}/juno/include/platform_oid.h            | 0
 plat/{ => arm/board}/juno/juno_def.h                        | 0
 .../plat_security.c => arm/board/juno/juno_security.c}      | 0
 plat/{ => arm/board}/juno/platform.mk                       | 6 +++---
 plat/{ => arm/board}/juno/tsp/tsp-juno.mk                   | 0
 8 files changed, 3 insertions(+), 3 deletions(-)
 rename plat/{juno/aarch64/plat_helpers.S => arm/board/juno/aarch64/juno_helpers.S} (100%)
 rename plat/{ => arm/board}/juno/include/plat_macros.S (100%)
 rename plat/{ => arm/board}/juno/include/platform_def.h (100%)
 rename plat/{ => arm/board}/juno/include/platform_oid.h (100%)
 rename plat/{ => arm/board}/juno/juno_def.h (100%)
 rename plat/{juno/plat_security.c => arm/board/juno/juno_security.c} (100%)
 rename plat/{ => arm/board}/juno/platform.mk (92%)
 rename plat/{ => arm/board}/juno/tsp/tsp-juno.mk (100%)

diff --git a/plat/juno/aarch64/plat_helpers.S b/plat/arm/board/juno/aarch64/juno_helpers.S
similarity index 100%
rename from plat/juno/aarch64/plat_helpers.S
rename to plat/arm/board/juno/aarch64/juno_helpers.S
diff --git a/plat/juno/include/plat_macros.S b/plat/arm/board/juno/include/plat_macros.S
similarity index 100%
rename from plat/juno/include/plat_macros.S
rename to plat/arm/board/juno/include/plat_macros.S
diff --git a/plat/juno/include/platform_def.h b/plat/arm/board/juno/include/platform_def.h
similarity index 100%
rename from plat/juno/include/platform_def.h
rename to plat/arm/board/juno/include/platform_def.h
diff --git a/plat/juno/include/platform_oid.h b/plat/arm/board/juno/include/platform_oid.h
similarity index 100%
rename from plat/juno/include/platform_oid.h
rename to plat/arm/board/juno/include/platform_oid.h
diff --git a/plat/juno/juno_def.h b/plat/arm/board/juno/juno_def.h
similarity index 100%
rename from plat/juno/juno_def.h
rename to plat/arm/board/juno/juno_def.h
diff --git a/plat/juno/plat_security.c b/plat/arm/board/juno/juno_security.c
similarity index 100%
rename from plat/juno/plat_security.c
rename to plat/arm/board/juno/juno_security.c
diff --git a/plat/juno/platform.mk b/plat/arm/board/juno/platform.mk
similarity index 92%
rename from plat/juno/platform.mk
rename to plat/arm/board/juno/platform.mk
index 8399c0a90..d8d4f1450 100644
--- a/plat/juno/platform.mk
+++ b/plat/arm/board/juno/platform.mk
@@ -28,14 +28,14 @@
 # POSSIBILITY OF SUCH DAMAGE.
 #
 
-PLAT_INCLUDES		:=	-Iplat/juno/include
+PLAT_INCLUDES		:=	-Iplat/arm/board/juno/include
 
-PLAT_BL_COMMON_SOURCES	:=	plat/juno/aarch64/plat_helpers.S
+PLAT_BL_COMMON_SOURCES	:=	plat/arm/board/juno/aarch64/juno_helpers.S
 
 BL1_SOURCES		+=	lib/cpus/aarch64/cortex_a53.S		\
 				lib/cpus/aarch64/cortex_a57.S
 
-BL2_SOURCES		+=	plat/juno/plat_security.c		\
+BL2_SOURCES		+=	plat/arm/board/juno/juno_security.c	\
 
 BL31_SOURCES		+=	lib/cpus/aarch64/cortex_a53.S		\
 				lib/cpus/aarch64/cortex_a57.S
diff --git a/plat/juno/tsp/tsp-juno.mk b/plat/arm/board/juno/tsp/tsp-juno.mk
similarity index 100%
rename from plat/juno/tsp/tsp-juno.mk
rename to plat/arm/board/juno/tsp/tsp-juno.mk
-- 
GitLab