Skip to content
Snippets Groups Projects
Commit 3d420cbd authored by Albert ARIBAUD's avatar Albert ARIBAUD
Browse files

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

parents 790af815 5a1d0ad3
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
MAINTAINERS
+ 7
− 0
View file @ 3d420cbd
...@@ -65,6 +65,13 @@ S: Maintained ...@@ -65,6 +65,13 @@ S: Maintained
T: git git://git.denx.de/u-boot-arm.git T: git git://git.denx.de/u-boot-arm.git
F: arch/arm/ 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 ARM ATMEL AT91
M: Andreas Bießmann <andreas.devel@googlemail.com> M: Andreas Bießmann <andreas.devel@googlemail.com>
S: Maintained S: Maintained
......
include/configs/socfpga_cyclone5.h
+ 1
− 1
View file @ 3d420cbd
...@@ -53,7 +53,7 @@ ...@@ -53,7 +53,7 @@
/* Ethernet on SoC (EMAC) */ /* Ethernet on SoC (EMAC) */
#if defined(CONFIG_CMD_NET) #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_PHY_INTERFACE_MODE PHY_INTERFACE_MODE_RGMII
#define CONFIG_EPHY0_PHY_ADDR 0 #define CONFIG_EPHY0_PHY_ADDR 0
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment