diff mbox

[U-Boot,2/2] mxs: Use correct function name to initialize dram

Message ID 1345332492-3273-2-git-send-email-festevam@gmail.com
State Accepted
Commit c55068e5b86b2fac47a20d8d4ab2c877d9702bda
Delegated to: Stefano Babic
Headers show

Commit Message

Fabio Estevam Aug. 18, 2012, 11:28 p.m. UTC
From: Fabio Estevam <fabio.estevam@freescale.com>

commit d92591a (mxs: Convert sys_proto.h prefixes to 'mxs') introduced
a mxs_dram_init() function, which is not used anywhere.

Fix it, so that the following warning goes away:

mx28evk.c: In function ‘dram_init’:
mx28evk.c:67:2: warning: implicit declaration of function ‘mx28_dram_init’ [-Wimplicit-function-declaration]

Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
---
 arch/arm/include/asm/arch-mxs/sys_proto.h |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Marek Vasut Aug. 18, 2012, 11:43 p.m. UTC | #1
Dear Fabio Estevam,

> From: Fabio Estevam <fabio.estevam@freescale.com>
> 
> commit d92591a (mxs: Convert sys_proto.h prefixes to 'mxs') introduced
> a mxs_dram_init() function, which is not used anywhere.
> 
> Fix it, so that the following warning goes away:
> 
> mx28evk.c: In function ‘dram_init’:
> mx28evk.c:67:2: warning: implicit declaration of function ‘mx28_dram_init’
> [-Wimplicit-function-declaration]
> 
> Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
> ---
>  arch/arm/include/asm/arch-mxs/sys_proto.h |    2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/arch/arm/include/asm/arch-mxs/sys_proto.h
> b/arch/arm/include/asm/arch-mxs/sys_proto.h index 9d1e599..4610363 100644
> --- a/arch/arm/include/asm/arch-mxs/sys_proto.h
> +++ b/arch/arm/include/asm/arch-mxs/sys_proto.h
> @@ -69,6 +69,6 @@ struct mxs_spl_data {
>  	uint32_t	mem_dram_size;
>  };
> 
> -int mxs_dram_init(void);
> +int mx28_dram_init(void);
> 
>  #endif	/* __SYS_PROTO_H__ */

Acked-by: Marek Vasut <marex@denx.de>

Best regards,
Marek Vasut
Otavio Salvador Aug. 19, 2012, 1:46 p.m. UTC | #2
On Sat, Aug 18, 2012 at 8:28 PM, Fabio Estevam <festevam@gmail.com> wrote:
> From: Fabio Estevam <fabio.estevam@freescale.com>
>
> commit d92591a (mxs: Convert sys_proto.h prefixes to 'mxs') introduced
> a mxs_dram_init() function, which is not used anywhere.
>
> Fix it, so that the following warning goes away:
>
> mx28evk.c: In function ‘dram_init’:
> mx28evk.c:67:2: warning: implicit declaration of function ‘mx28_dram_init’ [-Wimplicit-function-declaration]
>
> Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>

Acked-by: Otavio Salvador <otavio@ossystems.com.br>
Fabio Estevam Aug. 19, 2012, 3:33 p.m. UTC | #3
Hi Stefano,

On Sat, Aug 18, 2012 at 8:28 PM, Fabio Estevam <festevam@gmail.com> wrote:
> From: Fabio Estevam <fabio.estevam@freescale.com>
>
> commit d92591a (mxs: Convert sys_proto.h prefixes to 'mxs') introduced
> a mxs_dram_init() function, which is not used anywhere.
>
> Fix it, so that the following warning goes away:
>
> mx28evk.c: In function ‘dram_init’:
> mx28evk.c:67:2: warning: implicit declaration of function ‘mx28_dram_init’ [-Wimplicit-function-declaration]
>
> Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>

Please discard this patch.

Otavio fixed it in another patch related to mx23 series.

Regards,

Fabio Estevam
Fabio Estevam Aug. 19, 2012, 3:36 p.m. UTC | #4
On Sun, Aug 19, 2012 at 12:33 PM, Fabio Estevam <festevam@gmail.com> wrote:

> Please discard this patch.
>
> Otavio fixed it in another patch related to mx23 series.

Ops, sorry. Otavio based his patch on top of mine, so this one needs
to be applied.

Thanks,

Fabio Estevam
Otavio Salvador Aug. 19, 2012, 3:39 p.m. UTC | #5
On Sun, Aug 19, 2012 at 12:36 PM, Fabio Estevam <festevam@gmail.com> wrote:
> On Sun, Aug 19, 2012 at 12:33 PM, Fabio Estevam <festevam@gmail.com> wrote:
>
>> Please discard this patch.
>>
>> Otavio fixed it in another patch related to mx23 series.
>
> Ops, sorry. Otavio based his patch on top of mine, so this one needs
> to be applied.

It shouldn't  matter; GIT will do a 3way merge and apply I think.
Stefano Babic Aug. 20, 2012, 8:02 a.m. UTC | #6
On 19/08/2012 01:28, Fabio Estevam wrote:
> From: Fabio Estevam <fabio.estevam@freescale.com>
> 
> commit d92591a (mxs: Convert sys_proto.h prefixes to 'mxs') introduced
> a mxs_dram_init() function, which is not used anywhere.
> 
> Fix it, so that the following warning goes away:
> 
> mx28evk.c: In function ‘dram_init’:
> mx28evk.c:67:2: warning: implicit declaration of function ‘mx28_dram_init’ [-Wimplicit-function-declaration]
> 
> Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
> ---
>  arch/arm/include/asm/arch-mxs/sys_proto.h |    2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/arch/arm/include/asm/arch-mxs/sys_proto.h b/arch/arm/include/asm/arch-mxs/sys_proto.h
> index 9d1e599..4610363 100644
> --- a/arch/arm/include/asm/arch-mxs/sys_proto.h
> +++ b/arch/arm/include/asm/arch-mxs/sys_proto.h
> @@ -69,6 +69,6 @@ struct mxs_spl_data {
>  	uint32_t	mem_dram_size;
>  };
>  
> -int mxs_dram_init(void);
> +int mx28_dram_init(void);
>  
>  #endif	/* __SYS_PROTO_H__ */
> 

Applied to u-boot-imx, thanks.

Best regards,
Stefano Babic
diff mbox

Patch

diff --git a/arch/arm/include/asm/arch-mxs/sys_proto.h b/arch/arm/include/asm/arch-mxs/sys_proto.h
index 9d1e599..4610363 100644
--- a/arch/arm/include/asm/arch-mxs/sys_proto.h
+++ b/arch/arm/include/asm/arch-mxs/sys_proto.h
@@ -69,6 +69,6 @@  struct mxs_spl_data {
 	uint32_t	mem_dram_size;
 };
 
-int mxs_dram_init(void);
+int mx28_dram_init(void);
 
 #endif	/* __SYS_PROTO_H__ */