diff --git a/plat/nvidia/tegra/common/tegra_bl31_setup.c b/plat/nvidia/tegra/common/tegra_bl31_setup.c
index 142839c81adf5818ccd76265191ad863ec7b7bf7..5be9a998fd13dcb21f6c0b370def5bf62f015cea 100644
--- a/plat/nvidia/tegra/common/tegra_bl31_setup.c
+++ b/plat/nvidia/tegra/common/tegra_bl31_setup.c
@@ -171,6 +171,12 @@ void bl31_early_platform_setup(bl31_params_t *from_bl2,
 	/* Initialise crash console */
 	plat_crash_console_init();
 
+	/*
+	 * Do initial security configuration to allow DRAM/device access.
+	 */
+	tegra_memctrl_tzdram_setup(plat_bl31_params_from_bl2.tzdram_base,
+			plat_bl31_params_from_bl2.tzdram_size);
+
 	/* Early platform setup for Tegra SoCs */
 	plat_early_platform_setup();
 
@@ -203,12 +209,6 @@ void bl31_platform_setup(void)
 	 */
 	tegra_memctrl_setup();
 
-	/*
-	 * Do initial security configuration to allow DRAM/device access.
-	 */
-	tegra_memctrl_tzdram_setup(plat_bl31_params_from_bl2.tzdram_base,
-			plat_bl31_params_from_bl2.tzdram_size);
-
 	/*
 	 * Set up the TZRAM memory aperture to allow only secure world
 	 * access