Tegra186: memctrl_v2: remove APE overrides for chip verification

This patch reverts the APE overrides added for chip verification.

Change-Id: Ib85560934d63f6e41e95ef6898a341f24761a517
Signed-off-by: Vivek Aseeja <vaseeja@nvidia.com>
Signed-off-by: Varun Wadekar <vwadekar@nvidia.com>

diff --git a/plat/nvidia/tegra/common/drivers/memctrl/memctrl_v2.c b/plat/nvidia/tegra/common/drivers/memctrl/memctrl_v2.c
index 3b662a699e26a0ef6c419bd52e591e3c50c3c7d7..a2474a03b18e93e5ded96b9b156c4328c8e47f0f 100644 (file)
--- a/plat/nvidia/tegra/common/drivers/memctrl/memctrl_v2.c
+++ b/plat/nvidia/tegra/common/drivers/memctrl/memctrl_v2.c
@@ -195,17 +195,10 @@ const static mc_streamid_security_cfg_t sec_cfgs[] = {
        mc_make_sec_cfg(TSECSWRB, NON_SECURE, NO_OVERRIDE, ENABLE),
        mc_make_sec_cfg(ISPWB, NON_SECURE, OVERRIDE, ENABLE),
        mc_make_sec_cfg(GPUSRD2, SECURE, NO_OVERRIDE, DISABLE),
-#if ENABLE_CHIP_VERIFICATION_HARNESS
-       mc_make_sec_cfg(APEDMAW, NON_SECURE, OVERRIDE, ENABLE),
-       mc_make_sec_cfg(APER, NON_SECURE, OVERRIDE, ENABLE),
-       mc_make_sec_cfg(APEW, NON_SECURE, OVERRIDE, ENABLE),
-       mc_make_sec_cfg(APEDMAR, NON_SECURE, OVERRIDE, ENABLE),
-#else
        mc_make_sec_cfg(APEDMAW, NON_SECURE, NO_OVERRIDE, ENABLE),
        mc_make_sec_cfg(APER, NON_SECURE, NO_OVERRIDE, ENABLE),
        mc_make_sec_cfg(APEW, NON_SECURE, NO_OVERRIDE, ENABLE),
        mc_make_sec_cfg(APEDMAR, NON_SECURE, NO_OVERRIDE, ENABLE),
-#endif
 };
 
 const static mc_txn_override_cfg_t mc_override_cfgs[] = {