From fc5adf7d1b48c9cdb47229bfed680aec7be6999b Mon Sep 17 00:00:00 2001 From: Varun Wadekar Date: Wed, 29 Nov 2017 17:14:24 -0800 Subject: [PATCH] Tegra: memctrl_v2: remove usage of ENABLE_SMMU_DEVICE config This patch removes the usage of this platform config, as it is always enabled by all the supported platforms. Change-Id: Ie7adb641adeb3604b177b6960b797722d60addfa Signed-off-by: Varun Wadekar --- plat/nvidia/tegra/common/drivers/memctrl/memctrl_v2.c | 3 +-- plat/nvidia/tegra/soc/t186/platform_t186.mk | 3 --- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/plat/nvidia/tegra/common/drivers/memctrl/memctrl_v2.c b/plat/nvidia/tegra/common/drivers/memctrl/memctrl_v2.c index 15314e722..a3ef5e131 100644 --- a/plat/nvidia/tegra/common/drivers/memctrl/memctrl_v2.c +++ b/plat/nvidia/tegra/common/drivers/memctrl/memctrl_v2.c @@ -51,10 +51,9 @@ void tegra_memctrl_setup(void) INFO("Tegra Memory Controller (v2)\n"); -#if ENABLE_SMMU_DEVICE /* Program the SMMU pagesize */ tegra_smmu_init(); -#endif + /* Get the settings from the platform */ assert(plat_mc_settings != NULL); mc_streamid_override_regs = plat_mc_settings->streamid_override_cfg; diff --git a/plat/nvidia/tegra/soc/t186/platform_t186.mk b/plat/nvidia/tegra/soc/t186/platform_t186.mk index 643443529..d486af2d5 100644 --- a/plat/nvidia/tegra/soc/t186/platform_t186.mk +++ b/plat/nvidia/tegra/soc/t186/platform_t186.mk @@ -17,9 +17,6 @@ $(eval $(call add_define,RELOCATE_TO_BL31_BASE)) ENABLE_CHIP_VERIFICATION_HARNESS := 0 $(eval $(call add_define,ENABLE_CHIP_VERIFICATION_HARNESS)) -ENABLE_SMMU_DEVICE := 1 -$(eval $(call add_define,ENABLE_SMMU_DEVICE)) - RESET_TO_BL31 := 1 PROGRAMMABLE_RESET_ADDRESS := 1