diff --git a/Makefile b/Makefile
index 41a64f9..16b4ccc 100644
--- a/Makefile
+++ b/Makefile
@@ -454,14 +454,20 @@
 # registers associated to it are also saved and restored. Not doing it would
 # leak the value of the key used by EL3 to EL1 and S-EL1.
 ifeq ($(ENABLE_PAUTH),1)
-    ifeq ($(CTX_INCLUDE_PAUTH_REGS),0)
+    ifneq ($(ARCH),aarch64)
+        $(error ENABLE_PAUTH=1 requires AArch64)
+    else ifeq ($(CTX_INCLUDE_PAUTH_REGS),0)
         $(error ENABLE_PAUTH=1 requires CTX_INCLUDE_PAUTH_REGS=1)
     else
         $(info ENABLE_PAUTH and CTX_INCLUDE_PAUTH_REGS are experimental features)
     endif
 else
     ifeq ($(CTX_INCLUDE_PAUTH_REGS),1)
-        $(info CTX_INCLUDE_PAUTH_REGS is an experimental feature)
+        ifneq ($(ARCH),aarch64)
+            $(error CTX_INCLUDE_PAUTH_REGS=1 requires AArch64)
+        else
+            $(info CTX_INCLUDE_PAUTH_REGS is an experimental feature)
+        endif
     endif
 endif
 
diff --git a/maintainers.rst b/maintainers.rst
index 4bee64c..0fa909f 100644
--- a/maintainers.rst
+++ b/maintainers.rst
@@ -28,8 +28,8 @@
 
 Amlogic Meson S905 (GXBB) platform port
 ---------------------------------------
-:M: Antonio Niño Díaz <antonio.ninodiaz@arm.com>
-:G: `antonio-nino-diaz-arm`_
+:M: Andre Przywara <andre.przywara@arm.com>
+:G: `Andre-ARM`_
 :F: docs/plat/meson-gxbb.rst
 :F: drivers/meson/
 :F: plat/meson/gxbb/
@@ -183,8 +183,6 @@
 
 Raspberry Pi 3 platform port
 ----------------------------
-:M: Antonio Niño Díaz <antonio.ninodiaz@arm.com>
-:G: `antonio-nino-diaz-arm`_
 :M: Ying-Chun Liu (PaulLiu) <paul.liu@linaro.org>
 :G: `grandpaul`_
 :F: docs/plat/rpi3.rst
@@ -264,7 +262,6 @@
 
 .. _Andre-ARM: https://github.com/Andre-ARM
 .. _Anson-Huang: https://github.com/Anson-Huang
-.. _antonio-nino-diaz-arm: https://github.com/antonio-nino-diaz-arm
 .. _bryanodonoghue: https://github.com/bryanodonoghue
 .. _b49020: https://github.com/b49020
 .. _danh-arm: https://github.com/danh-arm
diff --git a/plat/imx/common/imx_sip_handler.c b/plat/imx/common/imx_sip_handler.c
index 4eabda7..89771cd 100644
--- a/plat/imx/common/imx_sip_handler.c
+++ b/plat/imx/common/imx_sip_handler.c
@@ -14,6 +14,8 @@
 #include <imx_sip_svc.h>
 #include <sci/sci.h>
 
+#if defined(PLAT_IMX8QM) || defined(PLAT_IMX8QX)
+
 #ifdef PLAT_IMX8QM
 const static int ap_cluster_index[PLATFORM_CLUSTER_COUNT] = {
 	SC_R_A53, SC_R_A72,
@@ -139,6 +141,8 @@
 	return sc_misc_set_temp(ipc_handle, x1, x2, x3, x4);
 }
 
+#endif /* defined(PLAT_IMX8QM) || defined(PLAT_IMX8QX) */
+
 static uint64_t imx_get_commit_hash(u_register_t x2,
 		    u_register_t x3,
 		    u_register_t x4)
diff --git a/plat/imx/common/include/imx_sip_svc.h b/plat/imx/common/include/imx_sip_svc.h
index 648be37..afe62d4 100644
--- a/plat/imx/common/include/imx_sip_svc.h
+++ b/plat/imx/common/include/imx_sip_svc.h
@@ -38,9 +38,9 @@
 int imx_misc_set_temp_handler(uint32_t smc_fid, u_register_t x1,
 			      u_register_t x2, u_register_t x3,
 			      u_register_t x4);
+#endif
 uint64_t imx_buildinfo_handler(uint32_t smc_fid, u_register_t x1,
 			       u_register_t x2, u_register_t x3,
 			       u_register_t x4);
-#endif
 
 #endif /* __IMX_SIP_SVC_H__ */
diff --git a/plat/imx/imx8m/imx8mm/platform.mk b/plat/imx/imx8m/imx8mm/platform.mk
index d87624e..9f9ba92 100644
--- a/plat/imx/imx8m/imx8mm/platform.mk
+++ b/plat/imx/imx8m/imx8mm/platform.mk
@@ -24,6 +24,8 @@
 				plat/imx/imx8m/imx8mm/imx8mm_psci.c		\
 				plat/imx/imx8m/imx8mm/gpc.c			\
 				plat/imx/common/imx8_topology.c			\
+				plat/imx/common/imx_sip_handler.c		\
+				plat/imx/common/imx_sip_svc.c			\
 				plat/imx/common/imx_uart_console.S		\
 				lib/xlat_tables/aarch64/xlat_tables.c		\
 				lib/xlat_tables/xlat_tables_common.c		\
diff --git a/plat/imx/imx8m/imx8mq/platform.mk b/plat/imx/imx8m/imx8mq/platform.mk
index 89c2da0..3152c72 100644
--- a/plat/imx/imx8m/imx8mq/platform.mk
+++ b/plat/imx/imx8m/imx8mq/platform.mk
@@ -24,6 +24,8 @@
 				plat/imx/imx8m/imx8m_psci_common.c		\
 				plat/imx/imx8m/imx8mq/gpc.c			\
 				plat/imx/common/imx8_topology.c			\
+				plat/imx/common/imx_sip_handler.c		\
+				plat/imx/common/imx_sip_svc.c			\
 				plat/imx/common/imx_uart_console.S		\
 				lib/xlat_tables/aarch64/xlat_tables.c		\
 				lib/xlat_tables/xlat_tables_common.c		\