diff options
| author | Tom Rini <trini@konsulko.com> | 2023-01-10 21:13:57 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2023-01-10 21:13:57 -0500 |
| commit | ee4f86cc042129abf1b16fcfbf4fc705b03375b6 (patch) | |
| tree | ca9cfbbf3da8c77a8728e674b7495e56b8bc813f /arch/arm/mach-k3/am62a7_init.c | |
| parent | 92bdaecf39a1c02c49bc940f06f5ac80daf1b2ad (diff) | |
| parent | 367c9e0614e85f1407115054d5cf56c08cc7a9ff (diff) | |
Merge branch '2023-01-10-platform-updates'
- Platform updates for TI, nuvoton pinctrl, starqltechn/sdm845 fixes,
and assorted platform CONFIG_BUILD_TARGET corrections
Diffstat (limited to 'arch/arm/mach-k3/am62a7_init.c')
| -rw-r--r-- | arch/arm/mach-k3/am62a7_init.c | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/arch/arm/mach-k3/am62a7_init.c b/arch/arm/mach-k3/am62a7_init.c index e9569f0d264..02da24a3d6f 100644 --- a/arch/arm/mach-k3/am62a7_init.c +++ b/arch/arm/mach-k3/am62a7_init.c @@ -25,8 +25,11 @@ static struct rom_extended_boot_data bootdata __section(".data"); static void store_boot_info_from_rom(void) { bootindex = *(u32 *)(CONFIG_SYS_K3_BOOT_PARAM_TABLE_INDEX); - memcpy(&bootdata, (uintptr_t *)ROM_ENTENDED_BOOT_DATA_INFO, - sizeof(struct rom_extended_boot_data)); + + if (IS_ENABLED(CONFIG_CPU_V7R)) { + memcpy(&bootdata, (uintptr_t *)ROM_ENTENDED_BOOT_DATA_INFO, + sizeof(struct rom_extended_boot_data)); + } } static void ctrl_mmr_unlock(void) @@ -123,6 +126,15 @@ void board_init_f(ulong dummy) k3_sysfw_loader(true, NULL, NULL); #endif +#if defined(CONFIG_CPU_V7R) + /* + * Relocate boot information to OCRAM (after TIFS has opend this + * region for us) so the next bootloader stages can keep access to + * primary vs backup bootmodes. + */ + writel(bootindex, K3_BOOT_PARAM_TABLE_INDEX_OCRAM); +#endif + /* * Force probe of clk_k3 driver here to ensure basic default clock * configuration is always done. |