Patchwork [U-Boot] i.mx: i.mx5: update imx_get_mac_from_fuse function

login
register
mail settings
Submitter Jason Liu
Date Jan. 31, 2012, 12:07 p.m.
Message ID <1328011649-14230-1-git-send-email-jason.hui@linaro.org>
Download mbox | patch
Permalink /patch/138761/
State Accepted
Commit 0d8a749950e9db6b9c82baa39e68302f69b71eb7
Delegated to: Stefano Babic
Headers show

Comments

Jason Liu - Jan. 31, 2012, 12:07 p.m.
FEC does not work on the i.mx51/53evk board, it will hangup
In:    serial
Out:   serial
Err:   serial
Net:

After bisect, it due to the following commit:
be252b6 net: imx: Add multi-FEC support for imx_get_mac_from_fuse
has change the imx_get_mac_from_fuse fucntion prototype, but fail
to update i.mx5, here it does it.

After apply this patch, u-boot works again on i.mx51/53 evk boards.

Signed-off-by: Jason Liu <jason.hui@linaro.org>
Cc: Stefano Babic <sbabic@denx.de>
---
 arch/arm/cpu/armv7/mx5/soc.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
Fabio Estevam - Jan. 31, 2012, 12:23 p.m.
On 1/31/12, Jason Liu <jason.hui@linaro.org> wrote:
> FEC does not work on the i.mx51/53evk board, it will hangup
> In:    serial
> Out:   serial
> Err:   serial
> Net:
>
> After bisect, it due to the following commit:
> be252b6 net: imx: Add multi-FEC support for imx_get_mac_from_fuse
> has change the imx_get_mac_from_fuse fucntion prototype, but fail
> to update i.mx5, here it does it.
>
> After apply this patch, u-boot works again on i.mx51/53 evk boards.
>
> Signed-off-by: Jason Liu <jason.hui@linaro.org>
> Cc: Stefano Babic <sbabic@denx.de>

Acked-by: Fabio Estevam <fabio.estevam@freescale.com>
Stefano Babic - Jan. 31, 2012, 1:08 p.m.
On 31/01/2012 13:07, Jason Liu wrote:
> FEC does not work on the i.mx51/53evk board, it will hangup
> In:    serial
> Out:   serial
> Err:   serial
> Net:
> 
> After bisect, it due to the following commit:
> be252b6 net: imx: Add multi-FEC support for imx_get_mac_from_fuse
> has change the imx_get_mac_from_fuse fucntion prototype, but fail
> to update i.mx5, here it does it.
> 
> After apply this patch, u-boot works again on i.mx51/53 evk boards.
> 
> Signed-off-by: Jason Liu <jason.hui@linaro.org>
> Cc: Stefano Babic <sbabic@denx.de>
> ---

Acked-by: Stefano Babic <sbabic@denx.de>

Thanks for fixing !

Best regards,
Stefano Babic
Stefano Babic - Feb. 1, 2012, 11:53 a.m.
On 31/01/2012 13:07, Jason Liu wrote:
> FEC does not work on the i.mx51/53evk board, it will hangup
> In:    serial
> Out:   serial
> Err:   serial
> Net:
> 

Applied to u-boot-imx, thanks.

Best regards,
Stefano Babic

Patch

diff --git a/arch/arm/cpu/armv7/mx5/soc.c b/arch/arm/cpu/armv7/mx5/soc.c
index 1533dd8..3f5a4f7 100644
--- a/arch/arm/cpu/armv7/mx5/soc.c
+++ b/arch/arm/cpu/armv7/mx5/soc.c
@@ -72,7 +72,7 @@  u32 get_cpu_rev(void)
 }
 
 #if defined(CONFIG_FEC_MXC)
-void imx_get_mac_from_fuse(unsigned char *mac)
+void imx_get_mac_from_fuse(int dev_id, unsigned char *mac)
 {
 	int i;
 	struct iim_regs *iim = (struct iim_regs *)IMX_IIM_BASE;