diff options
| author | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2014-10-11 01:20:55 +0200 |
|---|---|---|
| committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2014-10-11 01:20:55 +0200 |
| commit | 3d420cbd355a5f09e4f113eb10579a264a8ef138 (patch) | |
| tree | cf99998722135c5c74584c390bfce73a7c954e4b | |
| parent | 790af815436bc6a93e4c581840be2419897f23b1 (diff) | |
| parent | 5a1d0ad3ee1ba98ca273c4b35c68618f107ccadd (diff) | |
| download | u-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'
| -rw-r--r-- | MAINTAINERS | 7 | ||||
| -rw-r--r-- | include/configs/socfpga_cyclone5.h | 2 |
2 files changed, 8 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index aafa061..fd346c9 100644 --- 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 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 |