diff --git a/plat/imx/imx8mq/hab.c b/plat/imx/common/imx8m/hab.c
similarity index 97%
rename from plat/imx/imx8mq/hab.c
rename to plat/imx/common/imx8m/hab.c
index de36396..1bb7992 100644
--- a/plat/imx/imx8mq/hab.c
+++ b/plat/imx/common/imx8m/hab.c
@@ -55,8 +55,6 @@
 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 b24072f..8cbae37 100644
--- a/plat/imx/imx8mq/include/platform_def.h
+++ b/plat/imx/imx8mq/include/platform_def.h
@@ -41,6 +41,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 6090bb5..1332f7d 100644
--- a/plat/imx/imx8mq/platform.mk
+++ b/plat/imx/imx8mq/platform.mk
@@ -17,7 +17,7 @@
 				plat/imx/common/mxcuart_console.S	\
 				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/common/imx8_sip_svc.c		\
 				plat/imx/common/misc.c			\