diff options
| author | Andrew Davis | 2022-07-15 11:21:27 -0500 |
|---|---|---|
| committer | Tom Rini | 2022-07-25 14:57:27 -0400 |
| commit | 080fe39b8cede93691b1988c7b6173a9c06e8219 (patch) | |
| tree | e603a2818d98d677af3b4dc43fb1f0dd27ba0fc0 /arch/arm | |
| parent | f673b4670de6006b068dad7c2312cadb09cf2c02 (diff) | |
arm: mach-k3: Remove ROM firewalls on GP devices
This isn't strictly needed as these firewalls should all be disabled on
GP, but it also doesn't hurt, so do this unconditionally to remove this
use of CONFIG_TI_SECURE_DEVICE.
Signed-off-by: Andrew Davis <afd@ti.com>
Reviewed-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/mach-k3/am654_init.c | 4 | ||||
| -rw-r--r-- | arch/arm/mach-k3/j721e_init.c | 4 |
2 files changed, 0 insertions, 8 deletions
diff --git a/arch/arm/mach-k3/am654_init.c b/arch/arm/mach-k3/am654_init.c index 6e833a6641a..768fdd69602 100644 --- a/arch/arm/mach-k3/am654_init.c +++ b/arch/arm/mach-k3/am654_init.c @@ -27,7 +27,6 @@ DECLARE_GLOBAL_DATA_PTR; #ifdef CONFIG_K3_LOAD_SYSFW -#ifdef CONFIG_TI_SECURE_DEVICE struct fwl_data main_cbass_fwls[] = { { "MMCSD1_CFG", 2057, 1 }, { "MMCSD0_CFG", 2058, 1 }, @@ -44,7 +43,6 @@ struct fwl_data main_cbass_fwls[] = { { "MCU_CPSW0", 1220, 1 }, }; #endif -#endif static void ctrl_mmr_unlock(void) { @@ -237,10 +235,8 @@ void board_init_f(ulong dummy) preloader_console_init(); /* Disable ROM configured firewalls right after loading sysfw */ -#ifdef CONFIG_TI_SECURE_DEVICE remove_fwl_configs(main_cbass_fwls, ARRAY_SIZE(main_cbass_fwls)); remove_fwl_configs(mcu_cbass_fwls, ARRAY_SIZE(mcu_cbass_fwls)); -#endif #else /* Prepare console output */ preloader_console_init(); diff --git a/arch/arm/mach-k3/j721e_init.c b/arch/arm/mach-k3/j721e_init.c index cb9f7eebec1..1bea05aa513 100644 --- a/arch/arm/mach-k3/j721e_init.c +++ b/arch/arm/mach-k3/j721e_init.c @@ -25,7 +25,6 @@ #include <remoteproc.h> #ifdef CONFIG_K3_LOAD_SYSFW -#ifdef CONFIG_TI_SECURE_DEVICE struct fwl_data cbass_hc_cfg0_fwls[] = { { "PCIE0_CFG", 2560, 8 }, { "PCIE1_CFG", 2561, 8 }, @@ -63,7 +62,6 @@ struct fwl_data cbass_hc_cfg0_fwls[] = { { "WKUP_CTRL_MMR0", 131, 16 }, }; #endif -#endif static void ctrl_mmr_unlock(void) { @@ -254,7 +252,6 @@ void board_init_f(ulong dummy) preloader_console_init(); /* Disable ROM configured firewalls right after loading sysfw */ -#ifdef CONFIG_TI_SECURE_DEVICE remove_fwl_configs(cbass_hc_cfg0_fwls, ARRAY_SIZE(cbass_hc_cfg0_fwls)); remove_fwl_configs(cbass_hc0_fwls, ARRAY_SIZE(cbass_hc0_fwls)); remove_fwl_configs(cbass_rc_cfg0_fwls, ARRAY_SIZE(cbass_rc_cfg0_fwls)); @@ -262,7 +259,6 @@ void board_init_f(ulong dummy) remove_fwl_configs(infra_cbass0_fwls, ARRAY_SIZE(infra_cbass0_fwls)); remove_fwl_configs(mcu_cbass0_fwls, ARRAY_SIZE(mcu_cbass0_fwls)); remove_fwl_configs(wkup_cbass0_fwls, ARRAY_SIZE(wkup_cbass0_fwls)); -#endif #else /* Prepare console output */ preloader_console_init(); |