> Let imx_get_mac_from_fuse function be a common function, so that other
> mx28 boards can reuse it.
>
> Signed-off-by: Fabio Estevam <fabio.este...@freescale.com>
> ---
> Changes since v4:
> - No changes
> Change since v3:
> - Add a note about the first two MAC addresses being from Freescale vendor.
What changes are in V5? Also, mark resubmissions with "RESEND" or "V3 RESEND"
or
something ... like "[PATCH V3 RESEND]" ... though you don't need to resend
stuff
here.
>
> arch/arm/cpu/arm926ejs/mx28/mx28.c | 41
> ++++++++++++++++++++++++++++ arch/arm/include/asm/arch-mx28/sys_proto.h |
> 2 +
> board/denx/m28evk/m28evk.c | 35 -----------------------
> 3 files changed, 43 insertions(+), 35 deletions(-)
>
> diff --git a/arch/arm/cpu/arm926ejs/mx28/mx28.c
> b/arch/arm/cpu/arm926ejs/mx28/mx28.c index 088c019..d82bb01 100644
> --- a/arch/arm/cpu/arm926ejs/mx28/mx28.c
> +++ b/arch/arm/cpu/arm926ejs/mx28/mx28.c
> @@ -214,6 +214,47 @@ int cpu_eth_init(bd_t *bis)
> }
> #endif
>
> +#ifdef CONFIG_MX28_FEC_MAC_IN_OCOTP
> +
> +#define MXS_OCOTP_MAX_TIMEOUT 1000000
> +void imx_get_mac_from_fuse(char *mac)
> +{
> + struct mx28_ocotp_regs *ocotp_regs =
> + (struct mx28_ocotp_regs *)MXS_OCOTP_BASE;
> + uint32_t data;
> +
> + memset(mac, 0, 6);
> +
> + writel(OCOTP_CTRL_RD_BANK_OPEN, &ocotp_regs->hw_ocotp_ctrl_set);
> +
> + if (mx28_wait_mask_clr(&ocotp_regs->hw_ocotp_ctrl_reg, OCOTP_CTRL_BUSY,
> + MXS_OCOTP_MAX_TIMEOUT)) {
> + puts("MXS FEC: Can't get MAC from OCOTP\n");
> + return;
> + }
> +
> + data = readl(&ocotp_regs->hw_ocotp_cust0);
> +
/* Freescale MAC vendor prefix: 00:04:xx:xx:xx:xx */ ... or something
It's shorter and it should be above the code.
> + mac[0] = 0x00;
> + mac[1] = 0x04;
> + /*
> + * Note:
> + *
> + * These first two bytes are Freescale's vendor MAC prefix.
> + *
> + */
> + mac[2] = (data >> 24) & 0xff;
> + mac[3] = (data >> 16) & 0xff;
> + mac[4] = (data >> 8) & 0xff;
> + mac[5] = data & 0xff;
> +}
> +#else
> +void imx_get_mac_from_fuse(char *mac)
> +{
> + memset(mac, 0, 6);
> +}
> +#endif
> +
> U_BOOT_CMD(
> clocks, CONFIG_SYS_MAXARGS, 1, do_mx28_showclocks,
> "display clocks",
> diff --git a/arch/arm/include/asm/arch-mx28/sys_proto.h
> b/arch/arm/include/asm/arch-mx28/sys_proto.h index be1f7db..cf5ab16 100644
> --- a/arch/arm/include/asm/arch-mx28/sys_proto.h
> +++ b/arch/arm/include/asm/arch-mx28/sys_proto.h
> @@ -35,4 +35,6 @@ void mx28_common_spl_init(const iomux_cfg_t *iomux_setup,
> const unsigned int iomux_size);
> #endif
>
> +void imx_get_mac_from_fuse(char *mac);
> +
> #endif /* __MX28_H__ */
> diff --git a/board/denx/m28evk/m28evk.c b/board/denx/m28evk/m28evk.c
> index fcee046..005446a 100644
> --- a/board/denx/m28evk/m28evk.c
> +++ b/board/denx/m28evk/m28evk.c
> @@ -178,39 +178,4 @@ int board_eth_init(bd_t *bis)
> return ret;
> }
>
> -#ifdef CONFIG_M28_FEC_MAC_IN_OCOTP
> -
> -#define MXS_OCOTP_MAX_TIMEOUT 1000000
> -void imx_get_mac_from_fuse(char *mac)
> -{
> - struct mx28_ocotp_regs *ocotp_regs =
> - (struct mx28_ocotp_regs *)MXS_OCOTP_BASE;
> - uint32_t data;
> -
> - memset(mac, 0, 6);
> -
> - writel(OCOTP_CTRL_RD_BANK_OPEN, &ocotp_regs->hw_ocotp_ctrl_set);
> -
> - if (mx28_wait_mask_clr(&ocotp_regs->hw_ocotp_ctrl_reg, OCOTP_CTRL_BUSY,
> - MXS_OCOTP_MAX_TIMEOUT)) {
> - printf("MXS FEC: Can't get MAC from OCOTP\n");
> - return;
> - }
> -
> - data = readl(&ocotp_regs->hw_ocotp_cust0);
> -
> - mac[0] = 0x00;
> - mac[1] = 0x04;
> - mac[2] = (data >> 24) & 0xff;
> - mac[3] = (data >> 16) & 0xff;
> - mac[4] = (data >> 8) & 0xff;
> - mac[5] = data & 0xff;
> -}
> -#else
> -void imx_get_mac_from_fuse(char *mac)
> -{
> - memset(mac, 0, 6);
> -}
> -#endif
> -
> #endif
M
_______________________________________________
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
