* [U-Boot] [PATCH v3] zmx25: Fix build warning due to 'get_reset_cause' defined but not used
@ 2011-09-23 15:13 Fabio Estevam
2011-09-23 15:25 ` Stefano Babic
0 siblings, 1 reply; 2+ messages in thread
From: Fabio Estevam @ 2011-09-23 15:13 UTC (permalink / raw)
To: u-boot
When building the zmx25 target we get:
Configuring for zmx25 board...
generic.c:108: warning: 'get_reset_cause' defined but not used
Fix this warning by defining get_reset_cause only if CONFIG_DISPLAY_CPUINFO is defined.
Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
---
Changes since v2:
- Move the location of get_reset_cause
Changes since v1:
- Only define get_reset_cause when CONFIG_DISPLAY_CPUINFO is defined.
arch/arm/cpu/arm926ejs/mx25/generic.c | 46 ++++++++++++++++----------------
1 files changed, 23 insertions(+), 23 deletions(-)
diff --git a/arch/arm/cpu/arm926ejs/mx25/generic.c b/arch/arm/cpu/arm926ejs/mx25/generic.c
index 1261640..8e60a26 100644
--- a/arch/arm/cpu/arm926ejs/mx25/generic.c
+++ b/arch/arm/cpu/arm926ejs/mx25/generic.c
@@ -105,29 +105,6 @@ ulong imx_get_perclk (int clk)
return lldiv (fref, div);
}
-static char *get_reset_cause(void)
-{
- /* read RCSR register from CCM module */
- struct ccm_regs *ccm =
- (struct ccm_regs *)IMX_CCM_BASE;
-
- u32 cause = readl(&ccm->rcsr) & 0x0f;
-
- if (cause == 0)
- return "POR";
- else if (cause == 1)
- return "RST";
- else if ((cause & 2) == 2)
- return "WDOG";
- else if ((cause & 4) == 4)
- return "SW RESET";
- else if ((cause & 8) == 8)
- return "JTAG";
- else
- return "unknown reset";
-
-}
-
u32 get_cpu_rev(void)
{
u32 srev;
@@ -153,6 +130,29 @@ u32 get_cpu_rev(void)
}
#if defined(CONFIG_DISPLAY_CPUINFO)
+static char *get_reset_cause(void)
+{
+ /* read RCSR register from CCM module */
+ struct ccm_regs *ccm =
+ (struct ccm_regs *)IMX_CCM_BASE;
+
+ u32 cause = readl(&ccm->rcsr) & 0x0f;
+
+ if (cause == 0)
+ return "POR";
+ else if (cause == 1)
+ return "RST";
+ else if ((cause & 2) == 2)
+ return "WDOG";
+ else if ((cause & 4) == 4)
+ return "SW RESET";
+ else if ((cause & 8) == 8)
+ return "JTAG";
+ else
+ return "unknown reset";
+
+}
+
int print_cpuinfo (void)
{
char buf[32];
--
1.6.0.4
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [U-Boot] [PATCH v3] zmx25: Fix build warning due to 'get_reset_cause' defined but not used
2011-09-23 15:13 [U-Boot] [PATCH v3] zmx25: Fix build warning due to 'get_reset_cause' defined but not used Fabio Estevam
@ 2011-09-23 15:25 ` Stefano Babic
0 siblings, 0 replies; 2+ messages in thread
From: Stefano Babic @ 2011-09-23 15:25 UTC (permalink / raw)
To: u-boot
On 09/23/2011 05:13 PM, Fabio Estevam wrote:
> When building the zmx25 target we get:
>
> Configuring for zmx25 board...
> generic.c:108: warning: 'get_reset_cause' defined but not used
>
> Fix this warning by defining get_reset_cause only if CONFIG_DISPLAY_CPUINFO is defined.
>
> Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
> ---
> Changes since v2:
> - Move the location of get_reset_cause
> Changes since v1:
> - Only define get_reset_cause when CONFIG_DISPLAY_CPUINFO is defined.
> arch/arm/cpu/arm926ejs/mx25/generic.c | 46 ++++++++++++++++----------------
> 1 files changed, 23 insertions(+), 23 deletions(-)
>
> diff --git a/arch/arm/cpu/arm926ejs/mx25/generic.c b/arch/arm/cpu/arm926ejs/mx25/generic.c
> index 1261640..8e60a26 100644
> --- a/arch/arm/cpu/arm926ejs/mx25/generic.c
> +++ b/arch/arm/cpu/arm926ejs/mx25/generic.c
> @@ -105,29 +105,6 @@ ulong imx_get_perclk (int clk)
> return lldiv (fref, div);
> }
>
> -static char *get_reset_cause(void)
> -{
> - /* read RCSR register from CCM module */
> - struct ccm_regs *ccm =
> - (struct ccm_regs *)IMX_CCM_BASE;
> -
> - u32 cause = readl(&ccm->rcsr) & 0x0f;
> -
> - if (cause == 0)
> - return "POR";
> - else if (cause == 1)
> - return "RST";
> - else if ((cause & 2) == 2)
> - return "WDOG";
> - else if ((cause & 4) == 4)
> - return "SW RESET";
> - else if ((cause & 8) == 8)
> - return "JTAG";
> - else
> - return "unknown reset";
> -
> -}
> -
> u32 get_cpu_rev(void)
> {
> u32 srev;
> @@ -153,6 +130,29 @@ u32 get_cpu_rev(void)
> }
>
> #if defined(CONFIG_DISPLAY_CPUINFO)
> +static char *get_reset_cause(void)
> +{
> + /* read RCSR register from CCM module */
> + struct ccm_regs *ccm =
> + (struct ccm_regs *)IMX_CCM_BASE;
> +
> + u32 cause = readl(&ccm->rcsr) & 0x0f;
> +
> + if (cause == 0)
> + return "POR";
> + else if (cause == 1)
> + return "RST";
> + else if ((cause & 2) == 2)
> + return "WDOG";
> + else if ((cause & 4) == 4)
> + return "SW RESET";
> + else if ((cause & 8) == 8)
> + return "JTAG";
> + else
> + return "unknown reset";
> +
> +}
> +
> int print_cpuinfo (void)
> {
> char buf[32];
Acked-by: Stefano Babic <sbabic@denx.de>
Best regards,
Stefano Babic
--
=====================================================================
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-0 Fax: +49-8142-66989-80 Email: office at denx.de
=====================================================================
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2011-09-23 15:25 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-09-23 15:13 [U-Boot] [PATCH v3] zmx25: Fix build warning due to 'get_reset_cause' defined but not used Fabio Estevam
2011-09-23 15:25 ` Stefano Babic
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.