summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBai Ping <ping.bai@nxp.com>2018-05-11 17:11:39 +0800
committerAbel Vesa <abel.vesa@nxp.com>2018-06-11 10:33:03 +0300
commita15a09e462c9a24e42084e3043aa992c59875d86 (patch)
tree5d9123c5498b872b242e52bd732388b16a39e6d2
parentc6bfdc70d29981ceef708c36fcb6e0e80891b818 (diff)
plat: imx8m: move hab file to common dir of imx8m
As the i.MX8MM and i.MX8MQ share the same hab file, move it to common/imx8m, make it reusable for all i.MX8M SOCs. Signed-off-by: Bai Ping <ping.bai@nxp.com>
-rw-r--r--plat/imx/common/imx8m/hab.c (renamed from plat/imx/imx8mq/hab.c)2
-rw-r--r--plat/imx/imx8mq/include/platform_def.h2
-rw-r--r--plat/imx/imx8mq/platform.mk2
3 files changed, 3 insertions, 3 deletions
diff --git a/plat/imx/imx8mq/hab.c b/plat/imx/common/imx8m/hab.c
index be5f81f8..412e0e42 100644
--- a/plat/imx/imx8mq/hab.c
+++ b/plat/imx/common/imx8m/hab.c
@@ -56,8 +56,6 @@ typedef enum hab_status hab_rvt_exit_t(void);
typedef void *hab_rvt_authenticate_image_t(uint8_t, long,
void **, size_t *, hab_loader_callback_f_t);
-#define HAB_RVT_BASE 0x00000880 /* HAB_RVT for i.MX8MQ */
-
#define HAB_RVT_ENTRY_ARM64 ((unsigned long)*(uint32_t *)(HAB_RVT_BASE + 0x08))
#define HAB_RVT_EXIT_ARM64 ((unsigned long)*(uint32_t *)(HAB_RVT_BASE + 0x10))
#define HAB_RVT_AUTHENTICATE_IMAGE_ARM64 ((unsigned long)*(uint32_t *)(HAB_RVT_BASE + 0x20))
diff --git a/plat/imx/imx8mq/include/platform_def.h b/plat/imx/imx8mq/include/platform_def.h
index 117e9015..7f3a2c82 100644
--- a/plat/imx/imx8mq/include/platform_def.h
+++ b/plat/imx/imx8mq/include/platform_def.h
@@ -40,6 +40,8 @@
#define MAX_XLAT_TABLES 4
#define MAX_MMAP_REGIONS 14
+#define HAB_RVT_BASE 0x00000880 /* HAB_RVT for i.MX8MQ */
+
#define IMX_BOOT_UART_BASE 0x30860000
#define IMX_BOOT_UART_CLK_IN_HZ 25000000 /* Select 25Mhz oscillator */
#define PLAT_CRASH_UART_BASE IMX_BOOT_UART_BASE
diff --git a/plat/imx/imx8mq/platform.mk b/plat/imx/imx8mq/platform.mk
index 936f5348..4065e452 100644
--- a/plat/imx/imx8mq/platform.mk
+++ b/plat/imx/imx8mq/platform.mk
@@ -18,7 +18,7 @@ BL31_SOURCES += plat/imx/common/imx8_helpers.S \
plat/imx/common/sip_svc.c \
plat/imx/imx8mq/imx8mq_bl31_setup.c \
plat/imx/imx8mq/src.c \
- plat/imx/imx8mq/hab.c \
+ plat/imx/common/imx8m/hab.c \
plat/imx/imx8mq/gpc.c \
plat/imx/imx8mq/imx8mq_psci.c \
plat/imx/imx8mq/imx_csu.c \