arm: omap3: Make try_unlock_memory() static

try_unlock_memory() is only used in one file, so make it static
in that file,remove it from the sys_proto header file, and relocate
it into the #ifdef section that call it. This will make it only built
under the conditions when it is called, and it may help with some
further optimization in the future.

Signed-off-by: Adam Ford <aford173@gmail.com>
Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com>
Link: https://lore.kernel.org/r/20210625192308.277136-2-aford173@gmail.com
This commit is contained in:
Adam Ford 2021-06-25 14:23:06 -05:00 committed by Lokesh Vutla
parent 81b98c6627
commit 1ddd0ed34a
2 changed files with 9 additions and 9 deletions

View file

@ -60,7 +60,6 @@ u32 is_running_in_sram(void);
u32 is_running_in_flash(void); u32 is_running_in_flash(void);
u32 get_device_type(void); u32 get_device_type(void);
void secureworld_exit(void); void secureworld_exit(void);
void try_unlock_memory(void);
u32 get_boot_type(void); u32 get_boot_type(void);
void invalidate_dcache(u32); void invalidate_dcache(u32);
u32 wait_on_value(u32, u32, void *, u32); u32 wait_on_value(u32, u32, void *, u32);

View file

@ -140,12 +140,20 @@ void secureworld_exit(void)
__asm__ __volatile__("mcr p15, 0, %0, c1, c1, 0":"=r"(i)); __asm__ __volatile__("mcr p15, 0, %0, c1, c1, 0":"=r"(i));
} }
void early_system_init(void)
{
hw_data_init();
}
#if !defined(CONFIG_SKIP_LOWLEVEL_INIT) && \
!defined(CONFIG_SKIP_LOWLEVEL_INIT_ONLY)
/****************************************************************************** /******************************************************************************
* Routine: try_unlock_sram() * Routine: try_unlock_sram()
* Description: If chip is GP/EMU(special) type, unlock the SRAM for * Description: If chip is GP/EMU(special) type, unlock the SRAM for
* general use. * general use.
*****************************************************************************/ *****************************************************************************/
void try_unlock_memory(void) static void try_unlock_memory(void)
{ {
int mode; int mode;
int in_sdram = is_running_in_sdram(); int in_sdram = is_running_in_sdram();
@ -174,13 +182,6 @@ void try_unlock_memory(void)
return; return;
} }
void early_system_init(void)
{
hw_data_init();
}
#if !defined(CONFIG_SKIP_LOWLEVEL_INIT) && \
!defined(CONFIG_SKIP_LOWLEVEL_INIT_ONLY)
/****************************************************************************** /******************************************************************************
* Routine: s_init * Routine: s_init
* Description: Does early system init of muxing and clocks. * Description: Does early system init of muxing and clocks.