summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorAnish Trivedi <anish@freescale.com>2011-10-28 10:33:17 -0500
committerJustin Waters <justin.waters@timesys.com>2012-09-05 14:57:53 -0400
commite8f6c8ec0aff7e5a03573a51aee7befc0ec069d1 (patch)
treee789bcfe3d2cc36856dd68314902257d503ef76b /drivers
parenta9f3ca5a54eb0c7ced54ec70b47869be9a884975 (diff)
ENGR00161004 MX6Q Uboot Rename sabreauto to arm2 board
Sabreauto is an inaccurate name for the Armadillo2 board that this code is actually meant for. So, replaced "sabreauto" in folder names, file names, configs, and code with "arm2". Created a new machine id for ARM2 board. Signed-off-by: Anish Trivedi <anish@freescale.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/mxc_fec.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/mxc_fec.c b/drivers/net/mxc_fec.c
index 093b4e42fa..4f9f34de5d 100644
--- a/drivers/net/mxc_fec.c
+++ b/drivers/net/mxc_fec.c
@@ -79,7 +79,7 @@
#if defined (CONFIG_MX6Q)
extern int mx6_rgmii_rework(char *devname, int phy_addr);
#endif
-#ifdef CONFIG_MX6Q_SABREAUTO
+#ifdef CONFIG_MX6Q_ARM2
#define PHY_MIPSCR_LINK_UP (0x1 << 10)
#define PHY_MIPSCR_SPEED_MASK (0x3 << 14)
#define PHY_MIPSCR_1000M (0x2 << 14)
@@ -339,7 +339,7 @@ static void setFecDuplexSpeed(volatile fec_t *fecp, unsigned char addr,
}
/* for AR8031 PHY */
-#ifdef CONFIG_MX6Q_SABREAUTO
+#ifdef CONFIG_MX6Q_ARM2
ret = 100;
/* set default mode to 100M full duplex */
dup_spd = _100BASET | (FULL << 16);