summaryrefslogtreecommitdiff
path: root/board/freescale
diff options
context:
space:
mode:
authorClaudiu Manoil <claudiu.manoil@freescale.com>2014-09-05 13:52:36 +0800
committerYork Sun <yorksun@freescale.com>2014-09-08 10:30:33 -0700
commit93f26f130eede8db0cb47afcaf66016987b91731 (patch)
tree1a9acbbcb9b5bae1ae6c96a210ef087f5ecbda93 /board/freescale
parentdf0a5b880d6e53b62ea05b483243dd8675cf4648 (diff)
downloadu-boot-imx-93f26f130eede8db0cb47afcaf66016987b91731.zip
u-boot-imx-93f26f130eede8db0cb47afcaf66016987b91731.tar.gz
u-boot-imx-93f26f130eede8db0cb47afcaf66016987b91731.tar.bz2
net: Merge asm/fsl_enet.h into fsl_mdio.h
fsl_enet.h defines the mapping of the usual MII management registers, which are included in the MDIO register block common to Freescale ethernet controllers. So it shouldn't depend on the CPU architecture but it should be actually part of the arch independent fsl_mdio.h. To remove the arch dependency, merge the content of asm/fsl_enet.h into fsl_mdio.h. Some files (like fm_eth.h) were simply including fsl_enet.h only for phy.h. These were updated to include phy.h instead. Signed-off-by: Claudiu Manoil <claudiu.manoil@freescale.com>
Diffstat (limited to 'board/freescale')
-rw-r--r--board/freescale/mpc8360emds/mpc8360emds.c2
-rw-r--r--board/freescale/mpc837xemds/mpc837xemds.c1
2 files changed, 1 insertions, 2 deletions
diff --git a/board/freescale/mpc8360emds/mpc8360emds.c b/board/freescale/mpc8360emds/mpc8360emds.c
index ac96163..5ff9dff 100644
--- a/board/freescale/mpc8360emds/mpc8360emds.c
+++ b/board/freescale/mpc8360emds/mpc8360emds.c
@@ -11,13 +11,13 @@
#include <i2c.h>
#include <miiphy.h>
#include <phy.h>
+#include <fsl_mdio.h>
#if defined(CONFIG_PCI)
#include <pci.h>
#endif
#include <spd_sdram.h>
#include <asm/mmu.h>
#include <asm/io.h>
-#include <asm/fsl_enet.h>
#include <asm/mmu.h>
#if defined(CONFIG_OF_LIBFDT)
#include <libfdt.h>
diff --git a/board/freescale/mpc837xemds/mpc837xemds.c b/board/freescale/mpc837xemds/mpc837xemds.c
index 0a3c972..c749e55 100644
--- a/board/freescale/mpc837xemds/mpc837xemds.c
+++ b/board/freescale/mpc837xemds/mpc837xemds.c
@@ -10,7 +10,6 @@
#include <i2c.h>
#include <asm/io.h>
#include <asm/fsl_mpc83xx_serdes.h>
-#include <asm/fsl_enet.h>
#include <spd_sdram.h>
#include <tsec.h>
#include <libfdt.h>