public inbox for u-boot@lists.denx.de
 help / color / mirror / Atom feed
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 3/3] arm: omap3: Make secure_unlock_mem() static
Date: Fri, 25 Jun 2021 14:23:08 -0500	[thread overview]
Message-ID: <20210625192308.277136-4-aford173@gmail.com> (raw)
In-Reply-To: <20210625192308.277136-1-aford173@gmail.com>

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
-- 
2.25.1


  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 ` [PATCH V2 1/3] arm: omap3: Make try_unlock_memory() static Adam Ford
2021-06-25 19:23 ` [PATCH V2 2/3] arm: omap3: Make secureworld_exit() static Adam Ford
2021-06-25 19:23 ` Adam Ford [this message]
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 3/3] arm: omap3: Make secure_unlock_mem() 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-4-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