diff --git a/3rdparty/arm-trusted-firmware b/3rdparty/arm-trusted-firmware
index bfd925139f..236c27d21f 160000
--- a/3rdparty/arm-trusted-firmware
+++ b/3rdparty/arm-trusted-firmware
@@ -1 +1 @@
-Subproject commit bfd925139fdbc2e87979849907b34843aa326994
+Subproject commit 236c27d21f52ad8f0a998e54774e3d8a4b59129d
diff --git a/src/soc/rockchip/rk3399/Makefile.inc b/src/soc/rockchip/rk3399/Makefile.inc
index ceec7bc29f..8448ff242e 100644
--- a/src/soc/rockchip/rk3399/Makefile.inc
+++ b/src/soc/rockchip/rk3399/Makefile.inc
@@ -76,7 +76,7 @@ ramstage-$(CONFIG_MAINBOARD_DO_NATIVE_VGA_INIT) += ../common/vop.c
 ramstage-y += usb.c
 
 ramstage-y += bl31_plat_params.c
-BL31_MAKEARGS += PLAT=rk3399
+BL31_MAKEARGS += PLAT=rk3399 M0_CROSS_COMPILE="$(CROSS_COMPILE_arm)"
 ################################################################################
 
 CPPFLAGS_common += -Isrc/soc/rockchip/rk3399/include