From ad856cbcbd8b9cf11a23ad1ca0343c69066482f7 Mon Sep 17 00:00:00 2001 From: Mahesh Mahadevan Date: Thu, 3 Nov 2011 08:22:55 -0500 Subject: ENGR00161373 Move the MAC address read from fuse code to MX6 SoC file Move the code to read the mac address from the fuse to SoC file and out of the board file Signed-off-by: Mahesh Mahadevan --- board/freescale/mx6q_arm2/mx6q_arm2.c | 29 ------------------------- board/freescale/mx6q_sabrelite/mx6q_sabrelite.c | 28 ------------------------ 2 files changed, 57 deletions(-) (limited to 'board/freescale') diff --git a/board/freescale/mx6q_arm2/mx6q_arm2.c b/board/freescale/mx6q_arm2/mx6q_arm2.c index d48601e..bbc5ea8 100644 --- a/board/freescale/mx6q_arm2/mx6q_arm2.c +++ b/board/freescale/mx6q_arm2/mx6q_arm2.c @@ -53,10 +53,6 @@ #include #endif -#ifdef CONFIG_GET_FEC_MAC_ADDR_FROM_IIM -#include -#endif - #ifdef CONFIG_CMD_CLOCK #include #endif @@ -456,31 +452,6 @@ int setup_gpmi_nand(void) } #endif - -#define HW_OCOTP_MACn(n) (0x00000620 + (n) * 0x10) - -#ifdef CONFIG_MXC_FEC -#ifdef CONFIG_GET_FEC_MAC_ADDR_FROM_IIM - -int fec_get_mac_addr(unsigned char *mac) -{ - unsigned int value; - - value = readl(OCOTP_BASE_ADDR + HW_OCOTP_MACn(0)); - mac[0] = value & 0xff; - mac[1] = (value >> 8) & 0xff; - mac[2] = (value >> 16) & 0xff; - mac[3] = (value >> 24) & 0xff; - value = readl(OCOTP_BASE_ADDR + HW_OCOTP_MACn(1)); - mac[4] = value & 0xff; - mac[5] = (value >> 8) & 0xff; - - return 0; -} - -#endif -#endif - #ifdef CONFIG_NET_MULTI int board_eth_init(bd_t *bis) { diff --git a/board/freescale/mx6q_sabrelite/mx6q_sabrelite.c b/board/freescale/mx6q_sabrelite/mx6q_sabrelite.c index 9f499e7..dc87502 100644 --- a/board/freescale/mx6q_sabrelite/mx6q_sabrelite.c +++ b/board/freescale/mx6q_sabrelite/mx6q_sabrelite.c @@ -41,10 +41,6 @@ #include #endif -#ifdef CONFIG_GET_FEC_MAC_ADDR_FROM_IIM -#include -#endif - #ifdef CONFIG_CMD_CLOCK #include #endif @@ -295,30 +291,6 @@ void spi_io_init(struct imx_spi_dev_t *dev) } #endif -#define HW_OCOTP_MACn(n) (0x00000620 + (n) * 0x10) - -#ifdef CONFIG_MXC_FEC -#ifdef CONFIG_GET_FEC_MAC_ADDR_FROM_IIM - -int fec_get_mac_addr(unsigned char *mac) -{ - unsigned int value; - - value = readl(OCOTP_BASE_ADDR + HW_OCOTP_MACn(0)); - mac[0] = value & 0xff; - mac[1] = (value >> 8) & 0xff; - mac[2] = (value >> 16) & 0xff; - mac[3] = (value >> 24) & 0xff; - value = readl(OCOTP_BASE_ADDR + HW_OCOTP_MACn(1)); - mac[4] = value & 0xff; - mac[5] = (value >> 8) & 0xff; - - return 0; -} - -#endif -#endif - #ifdef CONFIG_NET_MULTI int board_eth_init(bd_t *bis) { -- cgit v1.1