aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--plat/rpi/rpi3/aarch64/plat_helpers.S (renamed from plat/rpi3/aarch64/plat_helpers.S)0
-rw-r--r--plat/rpi/rpi3/aarch64/rpi3_bl2_mem_params_desc.c (renamed from plat/rpi3/aarch64/rpi3_bl2_mem_params_desc.c)0
-rw-r--r--plat/rpi/rpi3/include/plat_macros.S (renamed from plat/rpi3/include/plat_macros.S)0
-rw-r--r--plat/rpi/rpi3/include/platform_def.h (renamed from plat/rpi3/include/platform_def.h)0
-rw-r--r--plat/rpi/rpi3/platform.mk (renamed from plat/rpi3/platform.mk)42
-rw-r--r--plat/rpi/rpi3/rpi3_bl1_setup.c (renamed from plat/rpi3/rpi3_bl1_setup.c)0
-rw-r--r--plat/rpi/rpi3/rpi3_bl2_setup.c (renamed from plat/rpi3/rpi3_bl2_setup.c)0
-rw-r--r--plat/rpi/rpi3/rpi3_bl31_setup.c (renamed from plat/rpi3/rpi3_bl31_setup.c)0
-rw-r--r--plat/rpi/rpi3/rpi3_common.c (renamed from plat/rpi3/rpi3_common.c)0
-rw-r--r--plat/rpi/rpi3/rpi3_hw.h (renamed from plat/rpi3/rpi3_hw.h)0
-rw-r--r--plat/rpi/rpi3/rpi3_image_load.c (renamed from plat/rpi3/rpi3_image_load.c)0
-rw-r--r--plat/rpi/rpi3/rpi3_io_storage.c (renamed from plat/rpi3/rpi3_io_storage.c)0
-rw-r--r--plat/rpi/rpi3/rpi3_mbox.c (renamed from plat/rpi3/rpi3_mbox.c)0
-rw-r--r--plat/rpi/rpi3/rpi3_pm.c (renamed from plat/rpi3/rpi3_pm.c)0
-rw-r--r--plat/rpi/rpi3/rpi3_private.h (renamed from plat/rpi3/rpi3_private.h)0
-rw-r--r--plat/rpi/rpi3/rpi3_rng.c (renamed from plat/rpi3/rpi3_rng.c)0
-rw-r--r--plat/rpi/rpi3/rpi3_rotpk.S (renamed from plat/rpi3/rpi3_rotpk.S)0
-rw-r--r--plat/rpi/rpi3/rpi3_stack_protector.c (renamed from plat/rpi3/rpi3_stack_protector.c)0
-rw-r--r--plat/rpi/rpi3/rpi3_topology.c (renamed from plat/rpi3/rpi3_topology.c)0
-rw-r--r--plat/rpi/rpi3/rpi3_trusted_boot.c (renamed from plat/rpi3/rpi3_trusted_boot.c)0
20 files changed, 21 insertions, 21 deletions
diff --git a/plat/rpi3/aarch64/plat_helpers.S b/plat/rpi/rpi3/aarch64/plat_helpers.S
index 7974b602d..7974b602d 100644
--- a/plat/rpi3/aarch64/plat_helpers.S
+++ b/plat/rpi/rpi3/aarch64/plat_helpers.S
diff --git a/plat/rpi3/aarch64/rpi3_bl2_mem_params_desc.c b/plat/rpi/rpi3/aarch64/rpi3_bl2_mem_params_desc.c
index 715aec410..715aec410 100644
--- a/plat/rpi3/aarch64/rpi3_bl2_mem_params_desc.c
+++ b/plat/rpi/rpi3/aarch64/rpi3_bl2_mem_params_desc.c
diff --git a/plat/rpi3/include/plat_macros.S b/plat/rpi/rpi3/include/plat_macros.S
index c0c396791..c0c396791 100644
--- a/plat/rpi3/include/plat_macros.S
+++ b/plat/rpi/rpi3/include/plat_macros.S
diff --git a/plat/rpi3/include/platform_def.h b/plat/rpi/rpi3/include/platform_def.h
index 4d902225f..4d902225f 100644
--- a/plat/rpi3/include/platform_def.h
+++ b/plat/rpi/rpi3/include/platform_def.h
diff --git a/plat/rpi3/platform.mk b/plat/rpi/rpi3/platform.mk
index f238cd61d..c011c0a70 100644
--- a/plat/rpi3/platform.mk
+++ b/plat/rpi/rpi3/platform.mk
@@ -7,10 +7,10 @@
include lib/libfdt/libfdt.mk
include lib/xlat_tables_v2/xlat_tables.mk
-PLAT_INCLUDES := -Iplat/rpi3/include
+PLAT_INCLUDES := -Iplat/rpi/rpi3/include
PLAT_BL_COMMON_SOURCES := drivers/ti/uart/aarch64/16550_console.S \
- plat/rpi3/rpi3_common.c \
+ plat/rpi/rpi3/rpi3_common.c \
${XLAT_TABLES_LIB_SRCS}
BL1_SOURCES += drivers/io/io_fip.c \
@@ -18,10 +18,10 @@ BL1_SOURCES += drivers/io/io_fip.c \
drivers/io/io_storage.c \
lib/cpus/aarch64/cortex_a53.S \
plat/common/aarch64/platform_mp_stack.S \
- plat/rpi3/aarch64/plat_helpers.S \
- plat/rpi3/rpi3_bl1_setup.c \
- plat/rpi3/rpi3_io_storage.c \
- plat/rpi3/rpi3_mbox.c
+ plat/rpi/rpi3/aarch64/plat_helpers.S \
+ plat/rpi/rpi3/rpi3_bl1_setup.c \
+ plat/rpi/rpi3/rpi3_io_storage.c \
+ plat/rpi/rpi3/rpi3_mbox.c
BL2_SOURCES += common/desc_image_load.c \
drivers/io/io_fip.c \
@@ -35,18 +35,18 @@ BL2_SOURCES += common/desc_image_load.c \
drivers/mmc/mmc.c \
drivers/rpi3/sdhost/rpi3_sdhost.c \
plat/common/aarch64/platform_mp_stack.S \
- plat/rpi3/aarch64/plat_helpers.S \
- plat/rpi3/aarch64/rpi3_bl2_mem_params_desc.c \
- plat/rpi3/rpi3_bl2_setup.c \
- plat/rpi3/rpi3_image_load.c \
- plat/rpi3/rpi3_io_storage.c
+ plat/rpi/rpi3/aarch64/plat_helpers.S \
+ plat/rpi/rpi3/aarch64/rpi3_bl2_mem_params_desc.c \
+ plat/rpi/rpi3/rpi3_bl2_setup.c \
+ plat/rpi/rpi3/rpi3_image_load.c \
+ plat/rpi/rpi3/rpi3_io_storage.c
BL31_SOURCES += lib/cpus/aarch64/cortex_a53.S \
plat/common/plat_psci_common.c \
- plat/rpi3/aarch64/plat_helpers.S \
- plat/rpi3/rpi3_bl31_setup.c \
- plat/rpi3/rpi3_pm.c \
- plat/rpi3/rpi3_topology.c \
+ plat/rpi/rpi3/aarch64/plat_helpers.S \
+ plat/rpi/rpi3/rpi3_bl31_setup.c \
+ plat/rpi/rpi3/rpi3_pm.c \
+ plat/rpi/rpi3/rpi3_topology.c \
${LIBFDT_SRCS}
# Tune compiler for Cortex-A53
@@ -158,8 +158,8 @@ ifeq (${ARCH},aarch32)
endif
ifneq ($(ENABLE_STACK_PROTECTOR), 0)
-PLAT_BL_COMMON_SOURCES += plat/rpi3/rpi3_rng.c \
- plat/rpi3/rpi3_stack_protector.c
+PLAT_BL_COMMON_SOURCES += plat/rpi/rpi3/rpi3_rng.c \
+ plat/rpi/rpi3/rpi3_stack_protector.c
endif
ifeq (${SPD},opteed)
@@ -189,13 +189,13 @@ ifneq (${TRUSTED_BOARD_BOOT},0)
BL1_SOURCES += ${AUTH_SOURCES} \
bl1/tbbr/tbbr_img_desc.c \
plat/common/tbbr/plat_tbbr.c \
- plat/rpi3/rpi3_trusted_boot.c \
- plat/rpi3/rpi3_rotpk.S
+ plat/rpi/rpi3/rpi3_trusted_boot.c \
+ plat/rpi/rpi3/rpi3_rotpk.S
BL2_SOURCES += ${AUTH_SOURCES} \
plat/common/tbbr/plat_tbbr.c \
- plat/rpi3/rpi3_trusted_boot.c \
- plat/rpi3/rpi3_rotpk.S
+ plat/rpi/rpi3/rpi3_trusted_boot.c \
+ plat/rpi/rpi3/rpi3_rotpk.S
ROT_KEY = $(BUILD_PLAT)/rot_key.pem
ROTPK_HASH = $(BUILD_PLAT)/rotpk_sha256.bin
diff --git a/plat/rpi3/rpi3_bl1_setup.c b/plat/rpi/rpi3/rpi3_bl1_setup.c
index b869e9da8..b869e9da8 100644
--- a/plat/rpi3/rpi3_bl1_setup.c
+++ b/plat/rpi/rpi3/rpi3_bl1_setup.c
diff --git a/plat/rpi3/rpi3_bl2_setup.c b/plat/rpi/rpi3/rpi3_bl2_setup.c
index b5e58352a..b5e58352a 100644
--- a/plat/rpi3/rpi3_bl2_setup.c
+++ b/plat/rpi/rpi3/rpi3_bl2_setup.c
diff --git a/plat/rpi3/rpi3_bl31_setup.c b/plat/rpi/rpi3/rpi3_bl31_setup.c
index 2f1bc6493..2f1bc6493 100644
--- a/plat/rpi3/rpi3_bl31_setup.c
+++ b/plat/rpi/rpi3/rpi3_bl31_setup.c
diff --git a/plat/rpi3/rpi3_common.c b/plat/rpi/rpi3/rpi3_common.c
index 9b10974ad..9b10974ad 100644
--- a/plat/rpi3/rpi3_common.c
+++ b/plat/rpi/rpi3/rpi3_common.c
diff --git a/plat/rpi3/rpi3_hw.h b/plat/rpi/rpi3/rpi3_hw.h
index 1a86835b3..1a86835b3 100644
--- a/plat/rpi3/rpi3_hw.h
+++ b/plat/rpi/rpi3/rpi3_hw.h
diff --git a/plat/rpi3/rpi3_image_load.c b/plat/rpi/rpi3/rpi3_image_load.c
index 5394c6f7c..5394c6f7c 100644
--- a/plat/rpi3/rpi3_image_load.c
+++ b/plat/rpi/rpi3/rpi3_image_load.c
diff --git a/plat/rpi3/rpi3_io_storage.c b/plat/rpi/rpi3/rpi3_io_storage.c
index 49c6a760c..49c6a760c 100644
--- a/plat/rpi3/rpi3_io_storage.c
+++ b/plat/rpi/rpi3/rpi3_io_storage.c
diff --git a/plat/rpi3/rpi3_mbox.c b/plat/rpi/rpi3/rpi3_mbox.c
index 2db605edf..2db605edf 100644
--- a/plat/rpi3/rpi3_mbox.c
+++ b/plat/rpi/rpi3/rpi3_mbox.c
diff --git a/plat/rpi3/rpi3_pm.c b/plat/rpi/rpi3/rpi3_pm.c
index 4f586b514..4f586b514 100644
--- a/plat/rpi3/rpi3_pm.c
+++ b/plat/rpi/rpi3/rpi3_pm.c
diff --git a/plat/rpi3/rpi3_private.h b/plat/rpi/rpi3/rpi3_private.h
index 53078f8e9..53078f8e9 100644
--- a/plat/rpi3/rpi3_private.h
+++ b/plat/rpi/rpi3/rpi3_private.h
diff --git a/plat/rpi3/rpi3_rng.c b/plat/rpi/rpi3/rpi3_rng.c
index fd69adbf3..fd69adbf3 100644
--- a/plat/rpi3/rpi3_rng.c
+++ b/plat/rpi/rpi3/rpi3_rng.c
diff --git a/plat/rpi3/rpi3_rotpk.S b/plat/rpi/rpi3/rpi3_rotpk.S
index 1c17b2141..1c17b2141 100644
--- a/plat/rpi3/rpi3_rotpk.S
+++ b/plat/rpi/rpi3/rpi3_rotpk.S
diff --git a/plat/rpi3/rpi3_stack_protector.c b/plat/rpi/rpi3/rpi3_stack_protector.c
index 6f49f617b..6f49f617b 100644
--- a/plat/rpi3/rpi3_stack_protector.c
+++ b/plat/rpi/rpi3/rpi3_stack_protector.c
diff --git a/plat/rpi3/rpi3_topology.c b/plat/rpi/rpi3/rpi3_topology.c
index 200d41dd1..200d41dd1 100644
--- a/plat/rpi3/rpi3_topology.c
+++ b/plat/rpi/rpi3/rpi3_topology.c
diff --git a/plat/rpi3/rpi3_trusted_boot.c b/plat/rpi/rpi3/rpi3_trusted_boot.c
index f6c669fad..f6c669fad 100644
--- a/plat/rpi3/rpi3_trusted_boot.c
+++ b/plat/rpi/rpi3/rpi3_trusted_boot.c