mirror of
https://git.codelinaro.org/clo/qsdk/oss/boot/u-boot-2016.git
synced 2026-03-14 21:10:27 +01:00
Merge branch 'u-boot-socfpga/topic/arm/socfpga-20141010' into 'u-boot-arm/master'
This commit is contained in:
commit
3d420cbd35
2 changed files with 8 additions and 1 deletions
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue