plat/arm: Remove board/ directory
The board/ directory does not actually bring any benefit. There's no
need to separate the board level from any other level. Thus, this
patch flattens the Arm platform tree like so:
plat/arm/
|- common
|- fvp
|- juno
|- sgi
| |- common
| |- sgi575
Change-Id: I10e4af7594bb555d912222a881d95eae9864637e
Signed-off-by: Sandrine Bailleux <sandrine.bailleux@arm.com>
diff --git a/plat/arm/board/fvp/platform.mk b/plat/arm/board/fvp/platform.mk
deleted file mode 100644
index eed9913..0000000
--- a/plat/arm/board/fvp/platform.mk
+++ /dev/null
@@ -1,26 +0,0 @@
-#
-# Copyright (c) 2018, Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
-
-PLAT_INCLUDES := -Iplat/arm/board/fvp/include/
-
-PLAT_SOURCES := drivers/arm/gic/arm_gic_v2v3.c \
- drivers/arm/gic/gic_v2.c \
- drivers/arm/gic/gic_v3.c \
- drivers/arm/sp805/sp805.c \
- drivers/arm/timer/private_timer.c \
- drivers/arm/timer/system_timer.c \
- plat/arm/board/fvp/${ARCH}/plat_helpers.S \
- plat/arm/board/fvp/fvp_pwr_state.c \
- plat/arm/board/fvp/fvp_topology.c \
- plat/arm/board/fvp/fvp_mem_prot.c \
- plat/arm/board/fvp/plat_setup.c
-
-CACTUS_SOURCES += plat/arm/board/fvp/${ARCH}/plat_helpers.S
-
-# Firmware update is implemented on FVP.
-FIRMWARE_UPDATE := 1
-
-include plat/arm/common/arm_common.mk
diff --git a/plat/arm/board/sgi/sgi575/platform.mk b/plat/arm/board/sgi/sgi575/platform.mk
deleted file mode 100644
index b5eb8b4..0000000
--- a/plat/arm/board/sgi/sgi575/platform.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-#
-# Copyright (c) 2018, Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
-
-include plat/arm/sgi/common/sgi_common.mk
-
-PLAT_INCLUDES += -Iplat/arm/board/sgi/sgi575/include/
-
-PLAT_SOURCES += plat/arm/board/sgi/sgi575/sgi575_topology.c
-
-PLAT_TESTS_SKIP_LIST := plat/arm/board/sgi/sgi575/tests_to_skip.txt
diff --git a/plat/arm/board/fvp/aarch32/plat_helpers.S b/plat/arm/fvp/aarch32/plat_helpers.S
similarity index 100%
rename from plat/arm/board/fvp/aarch32/plat_helpers.S
rename to plat/arm/fvp/aarch32/plat_helpers.S
diff --git a/plat/arm/board/fvp/aarch64/plat_helpers.S b/plat/arm/fvp/aarch64/plat_helpers.S
similarity index 100%
rename from plat/arm/board/fvp/aarch64/plat_helpers.S
rename to plat/arm/fvp/aarch64/plat_helpers.S
diff --git a/plat/arm/board/fvp/fvp_def.h b/plat/arm/fvp/fvp_def.h
similarity index 100%
rename from plat/arm/board/fvp/fvp_def.h
rename to plat/arm/fvp/fvp_def.h
diff --git a/plat/arm/board/fvp/fvp_mem_prot.c b/plat/arm/fvp/fvp_mem_prot.c
similarity index 100%
rename from plat/arm/board/fvp/fvp_mem_prot.c
rename to plat/arm/fvp/fvp_mem_prot.c
diff --git a/plat/arm/board/fvp/fvp_pwr_state.c b/plat/arm/fvp/fvp_pwr_state.c
similarity index 100%
rename from plat/arm/board/fvp/fvp_pwr_state.c
rename to plat/arm/fvp/fvp_pwr_state.c
diff --git a/plat/arm/board/fvp/fvp_topology.c b/plat/arm/fvp/fvp_topology.c
similarity index 100%
rename from plat/arm/board/fvp/fvp_topology.c
rename to plat/arm/fvp/fvp_topology.c
diff --git a/plat/arm/board/fvp/include/platform_def.h b/plat/arm/fvp/include/platform_def.h
similarity index 100%
rename from plat/arm/board/fvp/include/platform_def.h
rename to plat/arm/fvp/include/platform_def.h
diff --git a/plat/arm/board/fvp/plat_setup.c b/plat/arm/fvp/plat_setup.c
similarity index 100%
rename from plat/arm/board/fvp/plat_setup.c
rename to plat/arm/fvp/plat_setup.c
diff --git a/plat/arm/fvp/platform.mk b/plat/arm/fvp/platform.mk
new file mode 100644
index 0000000..0230124
--- /dev/null
+++ b/plat/arm/fvp/platform.mk
@@ -0,0 +1,26 @@
+#
+# Copyright (c) 2018, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
+PLAT_INCLUDES := -Iplat/arm/fvp/include/
+
+PLAT_SOURCES := drivers/arm/gic/arm_gic_v2v3.c \
+ drivers/arm/gic/gic_v2.c \
+ drivers/arm/gic/gic_v3.c \
+ drivers/arm/sp805/sp805.c \
+ drivers/arm/timer/private_timer.c \
+ drivers/arm/timer/system_timer.c \
+ plat/arm/fvp/${ARCH}/plat_helpers.S \
+ plat/arm/fvp/fvp_pwr_state.c \
+ plat/arm/fvp/fvp_topology.c \
+ plat/arm/fvp/fvp_mem_prot.c \
+ plat/arm/fvp/plat_setup.c
+
+CACTUS_SOURCES += plat/arm/fvp/${ARCH}/plat_helpers.S
+
+# Firmware update is implemented on FVP.
+FIRMWARE_UPDATE := 1
+
+include plat/arm/common/arm_common.mk
diff --git a/plat/arm/board/juno/aarch32/plat_helpers.S b/plat/arm/juno/aarch32/plat_helpers.S
similarity index 100%
rename from plat/arm/board/juno/aarch32/plat_helpers.S
rename to plat/arm/juno/aarch32/plat_helpers.S
diff --git a/plat/arm/board/juno/aarch64/plat_helpers.S b/plat/arm/juno/aarch64/plat_helpers.S
similarity index 100%
rename from plat/arm/board/juno/aarch64/plat_helpers.S
rename to plat/arm/juno/aarch64/plat_helpers.S
diff --git a/plat/arm/board/juno/include/platform_def.h b/plat/arm/juno/include/platform_def.h
similarity index 100%
rename from plat/arm/board/juno/include/platform_def.h
rename to plat/arm/juno/include/platform_def.h
diff --git a/plat/arm/board/juno/juno32_tests_to_skip.txt b/plat/arm/juno/juno32_tests_to_skip.txt
similarity index 100%
rename from plat/arm/board/juno/juno32_tests_to_skip.txt
rename to plat/arm/juno/juno32_tests_to_skip.txt
diff --git a/plat/arm/board/juno/juno_def.h b/plat/arm/juno/juno_def.h
similarity index 100%
rename from plat/arm/board/juno/juno_def.h
rename to plat/arm/juno/juno_def.h
diff --git a/plat/arm/board/juno/juno_mem_prot.c b/plat/arm/juno/juno_mem_prot.c
similarity index 100%
rename from plat/arm/board/juno/juno_mem_prot.c
rename to plat/arm/juno/juno_mem_prot.c
diff --git a/plat/arm/board/juno/juno_pwr_state.c b/plat/arm/juno/juno_pwr_state.c
similarity index 100%
rename from plat/arm/board/juno/juno_pwr_state.c
rename to plat/arm/juno/juno_pwr_state.c
diff --git a/plat/arm/board/juno/juno_timers.c b/plat/arm/juno/juno_timers.c
similarity index 100%
rename from plat/arm/board/juno/juno_timers.c
rename to plat/arm/juno/juno_timers.c
diff --git a/plat/arm/board/juno/juno_topology.c b/plat/arm/juno/juno_topology.c
similarity index 100%
rename from plat/arm/board/juno/juno_topology.c
rename to plat/arm/juno/juno_topology.c
diff --git a/plat/arm/board/juno/plat_setup.c b/plat/arm/juno/plat_setup.c
similarity index 100%
rename from plat/arm/board/juno/plat_setup.c
rename to plat/arm/juno/plat_setup.c
diff --git a/plat/arm/board/juno/platform.mk b/plat/arm/juno/platform.mk
similarity index 66%
rename from plat/arm/board/juno/platform.mk
rename to plat/arm/juno/platform.mk
index f75ac43..9c92536 100644
--- a/plat/arm/board/juno/platform.mk
+++ b/plat/arm/juno/platform.mk
@@ -4,23 +4,23 @@
# SPDX-License-Identifier: BSD-3-Clause
#
-PLAT_INCLUDES := -Iplat/arm/board/juno/include/
+PLAT_INCLUDES := -Iplat/arm/juno/include/
PLAT_SOURCES := drivers/arm/gic/arm_gic_v2.c \
drivers/arm/gic/gic_v2.c \
drivers/arm/sp805/sp805.c \
drivers/arm/timer/private_timer.c \
drivers/arm/timer/sp804.c \
- plat/arm/board/juno/${ARCH}/plat_helpers.S \
- plat/arm/board/juno/juno_pwr_state.c \
- plat/arm/board/juno/juno_timers.c \
- plat/arm/board/juno/juno_topology.c \
- plat/arm/board/juno/juno_mem_prot.c \
- plat/arm/board/juno/plat_setup.c
+ plat/arm/juno/${ARCH}/plat_helpers.S \
+ plat/arm/juno/juno_pwr_state.c \
+ plat/arm/juno/juno_timers.c \
+ plat/arm/juno/juno_topology.c \
+ plat/arm/juno/juno_mem_prot.c \
+ plat/arm/juno/plat_setup.c
# Some tests are not supported on Juno AArch32.
ifeq (${ARCH},aarch32)
-PLAT_TESTS_SKIP_LIST := plat/arm/board/juno/juno32_tests_to_skip.txt
+PLAT_TESTS_SKIP_LIST := plat/arm/juno/juno32_tests_to_skip.txt
endif
PLAT_SUPPORTS_NS_RESET := 1
diff --git a/plat/arm/board/sgi/sgi575/include/platform_def.h b/plat/arm/sgi/sgi575/include/platform_def.h
similarity index 100%
rename from plat/arm/board/sgi/sgi575/include/platform_def.h
rename to plat/arm/sgi/sgi575/include/platform_def.h
diff --git a/plat/arm/sgi/sgi575/platform.mk b/plat/arm/sgi/sgi575/platform.mk
new file mode 100644
index 0000000..8472d7e
--- /dev/null
+++ b/plat/arm/sgi/sgi575/platform.mk
@@ -0,0 +1,13 @@
+#
+# Copyright (c) 2018, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
+include plat/arm/sgi/common/sgi_common.mk
+
+PLAT_INCLUDES += -Iplat/arm/sgi/sgi575/include/
+
+PLAT_SOURCES += plat/arm/sgi/sgi575/sgi575_topology.c
+
+PLAT_TESTS_SKIP_LIST := plat/arm/sgi/sgi575/tests_to_skip.txt
diff --git a/plat/arm/board/sgi/sgi575/sgi575_topology.c b/plat/arm/sgi/sgi575/sgi575_topology.c
similarity index 100%
rename from plat/arm/board/sgi/sgi575/sgi575_topology.c
rename to plat/arm/sgi/sgi575/sgi575_topology.c
diff --git a/plat/arm/board/sgi/sgi575/tests_to_skip.txt b/plat/arm/sgi/sgi575/tests_to_skip.txt
similarity index 100%
rename from plat/arm/board/sgi/sgi575/tests_to_skip.txt
rename to plat/arm/sgi/sgi575/tests_to_skip.txt