From: Adam Ford <aford173@gmail.com>
To: u-boot@lists.denx.de
Cc: lukma@denx.de, pavel@ucw.cz, pali@kernel.org, lokeshvutla@ti.com,
aford@beaconembedded.com, Adam Ford <aford173@gmail.com>
Subject: [PATCH V2 1/3] arm: omap3: Make try_unlock_memory() static
Date: Fri, 25 Jun 2021 14:23:06 -0500 [thread overview]
Message-ID: <20210625192308.277136-2-aford173@gmail.com> (raw)
In-Reply-To: <20210625192308.277136-1-aford173@gmail.com>
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>
diff --git a/arch/arm/include/asm/arch-omap3/sys_proto.h b/arch/arm/include/asm/arch-omap3/sys_proto.h
index 32ac033515..656f848a73 100644
--- a/arch/arm/include/asm/arch-omap3/sys_proto.h
+++ b/arch/arm/include/asm/arch-omap3/sys_proto.h
@@ -60,7 +60,6 @@ u32 is_running_in_sram(void);
u32 is_running_in_flash(void);
u32 get_device_type(void);
void secureworld_exit(void);
-void try_unlock_memory(void);
u32 get_boot_type(void);
void invalidate_dcache(u32);
u32 wait_on_value(u32, u32, void *, u32);
diff --git a/arch/arm/mach-omap2/omap3/board.c b/arch/arm/mach-omap2/omap3/board.c
index 029bd54595..ef4fa80c7b 100644
--- a/arch/arm/mach-omap2/omap3/board.c
+++ b/arch/arm/mach-omap2/omap3/board.c
@@ -140,12 +140,20 @@ 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
* general use.
*****************************************************************************/
-void try_unlock_memory(void)
+static void try_unlock_memory(void)
{
int mode;
int in_sdram = is_running_in_sdram();
@@ -174,13 +182,6 @@ void try_unlock_memory(void)
return;
}
-void early_system_init(void)
-{
- hw_data_init();
-}
-
-#if !defined(CONFIG_SKIP_LOWLEVEL_INIT) && \
- !defined(CONFIG_SKIP_LOWLEVEL_INIT_ONLY)
/******************************************************************************
* Routine: s_init
* Description: Does early system init of muxing and clocks.
--
2.25.1
next prev parent reply other threads:[~2021-06-25 19:23 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-25 19:23 [PATCH V2 0/3] Make omap3 board functions static Adam Ford
2021-06-25 19:23 ` Adam Ford [this message]
2021-06-25 19:23 ` [PATCH V2 2/3] arm: omap3: Make secureworld_exit() static Adam Ford
2021-06-25 19:23 ` [PATCH V2 3/3] arm: omap3: Make secure_unlock_mem() static Adam Ford
2021-07-14 6:52 ` [PATCH V2 0/3] Make omap3 board functions static Lokesh Vutla
-- strict thread matches above, loose matches on Subject: below --
2021-03-18 12:40 [PATCH V2 0/3] arm: omap3: Make functions static when possible Adam Ford
2021-03-18 12:40 ` [PATCH V2 1/3] arm: omap3: Make try_unlock_memory() static Adam Ford
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210625192308.277136-2-aford173@gmail.com \
--to=aford173@gmail.com \
--cc=aford@beaconembedded.com \
--cc=lokeshvutla@ti.com \
--cc=lukma@denx.de \
--cc=pali@kernel.org \
--cc=pavel@ucw.cz \
--cc=u-boot@lists.denx.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox