summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorAlbert ARIBAUD <albert.u.boot@aribaud.net>2014-10-11 01:20:55 +0200
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>2014-10-11 01:20:55 +0200
commit3d420cbd355a5f09e4f113eb10579a264a8ef138 (patch)
treecf99998722135c5c74584c390bfce73a7c954e4b /include
parent790af815436bc6a93e4c581840be2419897f23b1 (diff)
parent5a1d0ad3ee1ba98ca273c4b35c68618f107ccadd (diff)
downloadu-boot-imx-3d420cbd355a5f09e4f113eb10579a264a8ef138.zip
u-boot-imx-3d420cbd355a5f09e4f113eb10579a264a8ef138.tar.gz
u-boot-imx-3d420cbd355a5f09e4f113eb10579a264a8ef138.tar.bz2
Merge branch 'u-boot-socfpga/topic/arm/socfpga-20141010' into 'u-boot-arm/master'
Diffstat (limited to 'include')
-rw-r--r--include/configs/socfpga_cyclone5.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/configs/socfpga_cyclone5.h b/include/configs/socfpga_cyclone5.h
index 8d54bf8..60d7e20 100644
--- a/include/configs/socfpga_cyclone5.h
+++ b/include/configs/socfpga_cyclone5.h
@@ -53,7 +53,7 @@
/* Ethernet on SoC (EMAC) */
#if defined(CONFIG_CMD_NET)
-#define CONFIG_EMAC_BASE SOCFPGA_EMAC0_ADDRESS
+#define CONFIG_EMAC_BASE SOCFPGA_EMAC1_ADDRESS
#define CONFIG_PHY_INTERFACE_MODE PHY_INTERFACE_MODE_RGMII
#define CONFIG_EPHY0_PHY_ADDR 0