Skip to contentSkip to conversation

arm: mach-k3: Remove ROM firewalls on GP devices

PATCH In review Andrew Davis 2 participants 3 messages Jul 15, 2022 – Jul 25, 2022

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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.

---
 arch/arm/mach-k3/am6_init.c   | 4 ----
 arch/arm/mach-k3/j721e_init.c | 4 ----
 2 files changed, 8 deletions(-)
arch/arm/mach-k3/am6_init.c +0 -4
index 7992918adc..ded034140f 100644
@@ -28,7 +28,6 @@ DECLARE_GLOBAL_DATA_PTR;
 
 #ifdef CONFIG_SPL_BUILD
 #ifdef CONFIG_K3_LOAD_SYSFW
-#ifdef CONFIG_TI_SECURE_DEVICE
 struct fwl_data main_cbass_fwls[] = {
 	{ "MMCSD1_CFG", 2057, 1 },
 	{ "MMCSD0_CFG", 2058, 1 },
@@ -45,7 +44,6 @@ struct fwl_data main_cbass_fwls[] = {
 	{ "MCU_CPSW0", 1220, 1 },
 };
 #endif
-#endif
 
 static void ctrl_mmr_unlock(void)
 {
@@ -238,10 +236,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();
arch/arm/mach-k3/j721e_init.c +0 -4
index e56ca6d0f5..2000e8e29c 100644
@@ -26,7 +26,6 @@
 
 #ifdef CONFIG_SPL_BUILD
 #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 },
@@ -64,7 +63,6 @@ struct fwl_data cbass_hc_cfg0_fwls[] = {
 	{ "WKUP_CTRL_MMR0", 131, 16 },
 };
 #endif
-#endif
 
 static void ctrl_mmr_unlock(void)
 {
@@ -255,7 +253,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));
@@ -263,7 +260,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();
Signature · 1 line
2.36.1