secure_unlock_mem() is only used in one file, so make it static in that file.
Signed-off-by: Adam Ford aford173@gmail.com --- V2: Move secure_unlock_mem into area encompassed by ifdef to only define it when potentially used to avoid errors.
diff --git a/arch/arm/mach-omap2/omap3/board.c b/arch/arm/mach-omap2/omap3/board.c index 41d0d3ef69..363af52845 100644 --- a/arch/arm/mach-omap2/omap3/board.c +++ b/arch/arm/mach-omap2/omap3/board.c @@ -71,12 +71,20 @@ const struct gpio_bank *const omap_gpio_bank = gpio_bank_34xx;
#endif
+void early_system_init(void) +{ + hw_data_init(); +} + +#if !defined(CONFIG_SKIP_LOWLEVEL_INIT) && \ + !defined(CONFIG_SKIP_LOWLEVEL_INIT_ONLY) + /****************************************************************************** * Routine: secure_unlock * Description: Setup security registers for access * (GP Device only) *****************************************************************************/ -void secure_unlock_mem(void) +static void secure_unlock_mem(void) { struct pm *pm_rt_ape_base = (struct pm *)PM_RT_APE_BASE_ADDR_ARM; struct pm *pm_gpmc_base = (struct pm *)PM_GPMC_BASE_ADDR_ARM; @@ -140,14 +148,6 @@ static void secureworld_exit(void) __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() * Description: If chip is GP/EMU(special) type, unlock the SRAM for