diff options
| author | Tom Rini <trini@konsulko.com> | 2023-05-03 09:23:21 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2023-05-03 09:23:21 -0400 |
| commit | 1807c0c70a73c7697f32c04cad20ea9cd11b248e (patch) | |
| tree | 258d2fa7d274ed5048640ceef121841d49494784 /arch/arm/mach-k3/common.c | |
| parent | 021e303492ccfdf58425bedb13c1621367cc5cc7 (diff) | |
| parent | 8144210e750d42941eb8028fdfc4e027ef043d8f (diff) | |
Merge branch '2023-05-02-assorted-platform-updates-and-additions'
- Updates for starqltechn and other qualcomm platforms, hi3798mv200,
Broadcom Northstar, and mediatek platforms
- Drop omap5_uevm, and assorted TI platform updates
- Add MAX14526
Diffstat (limited to 'arch/arm/mach-k3/common.c')
| -rw-r--r-- | arch/arm/mach-k3/common.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/arch/arm/mach-k3/common.c b/arch/arm/mach-k3/common.c index 7baab7d1a5f..3c85caee579 100644 --- a/arch/arm/mach-k3/common.c +++ b/arch/arm/mach-k3/common.c @@ -580,7 +580,10 @@ void remove_fwl_configs(struct fwl_data *fwl_data, size_t fwl_data_size) fwl_ops->get_fwl_region(ti_sci, ®ion); - if (region.control != 0) { + /* Don't disable the background regions */ + if (region.control != 0 && + ((region.control & K3_BACKGROUND_FIREWALL_BIT) == + 0)) { pr_debug("Attempting to disable firewall %5d (%25s)\n", region.fwl_id, fwl_data[i].name); region.control = 0; @@ -641,8 +644,8 @@ int misc_init_r(void) printf("Failed to probe am65_cpsw_nuss driver\n"); } - /* Default FIT boot on non-GP devices */ - if (get_device_type() != K3_DEVICE_TYPE_GP) + /* Default FIT boot on HS-SE devices */ + if (get_device_type() == K3_DEVICE_TYPE_HS_SE) env_set("boot_fit", "1"); return 0; |