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.estevam@freescale.com
Changes since v5:
- Allow the MAC vendor to be overriden
Changes since v4:
- No changes
Change since v3:
- Add a note about the first two MAC addresses being from Freescale vendor.
arch/arm/cpu/arm926ejs/mx28/mx28.c | 44 ++++++++++++++++++++++++++++++++++++ board/denx/m28evk/m28evk.c | 35 ---------------------------- 2 files changed, 44 insertions(+), 35 deletions(-)
diff --git a/arch/arm/cpu/arm926ejs/mx28/mx28.c b/arch/arm/cpu/arm926ejs/mx28/mx28.c index 088c019..a25814e 100644 --- a/arch/arm/cpu/arm926ejs/mx28/mx28.c +++ b/arch/arm/cpu/arm926ejs/mx28/mx28.c @@ -214,6 +214,50 @@ int cpu_eth_init(bd_t *bis) } #endif
+static void __set_mac_vendor(char *mac) +{
- mac[0] = 0x00;
- mac[1] = 0x04; /* Use FSL vendor MAC address by default */
+}
+void set_mac_vendor(char *mac)
- __attribute__((weak, alias("__set_mac_vendor")));
+#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)) {printf("MXS FEC: Can't get MAC from OCOTP\n");return;- }
- data = readl(&ocotp_regs->hw_ocotp_cust0);
- mac[2] = (data >> 24) & 0xff;
- mac[3] = (data >> 16) & 0xff;
- mac[4] = (data >> 8) & 0xff;
- mac[5] = data & 0xff;
- set_mac_vendor(mac);
+} +#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/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
It's good, but why not make it completely generic -- like mx28_adjust_mac() -- so the users can for example change the last bit of the mac depending on the NIC that's used (FEC0 or FEC1). I think I proposed that. It's only a matter of adding a parameter (nic #) and renaming it :)
M