Merge branch 'u-boot-socfpga/topic/arm/socfpga-20141010' into 'u-boot-arm/master'

diff --git a/MAINTAINERS b/MAINTAINERS
index aafa061ed8bbb46c2818d63586d3d620a7359269..fd346c9fca6434ad476a7ce4789d17531202d1ca 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -65,6 +65,13 @@ S:   Maintained
 T:     git git://git.denx.de/u-boot-arm.git
 F:     arch/arm/
 
+ARM ALTERA SOCFPGA
+M:     Marek Vasut <marex@denx.de>
+S:     Maintainted
+T:     git git://git.denx.de/u-boot-socfpga.git
+F:     arch/arm/cpu/armv7/socfpga/
+F:     board/altera/socfpga/
+
 ARM ATMEL AT91
 M:     Andreas Bießmann <andreas.devel@googlemail.com>
 S:     Maintained

diff --git a/include/configs/socfpga_cyclone5.h b/include/configs/socfpga_cyclone5.h
index 8d54bf892daa268a5da56335a8ac5c887ab637b2..60d7e20e83b2678254e129127f221b5e6a74d0c4 100644 (file)
--- 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