mirrors/u-boot
1
0
Fork 0
mirror of https://source.denx.de/u-boot/u-boot.git synced 2025-11-29 06:31:28 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

arm: socfpga: misc: Probe ethernet GMAC from OF

Browse Source 
The GMAC can now be probed from OF, so enable DM ethernet and remove the
old ad-hoc designware_initialize() invocation.

Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Dinh Nguyen <dinguyen@opensource.altera.com>
Cc: Joe Hershberger <joe.hershberger@ni.com>
This commit is contained in:
Marek Vasut 2015-07-25 18:47:02 +02:00
parent 9ec7414e29
commit e14d3f7928
5 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arch/arm/mach-socfpga/misc.c
View File

@ -82,9 +82,7 @@ int cpu_eth_init(bd_t *bis)
/* Release the EMAC controller from reset */ /* Release the EMAC controller from reset */
socfpga_per_reset(reset, 0); socfpga_per_reset(reset, 0);
/* initialize and register the emac */ return 0;
return designware_initialize(CONFIG_EMAC_BASE,
CONFIG_PHY_INTERFACE_MODE);
} }
#endif #endif

1
configs/socfpga_cyclone5_defconfig
View File

@ -7,6 +7,7 @@ CONFIG_SPL=y
# CONFIG_CMD_FLASH is not set # CONFIG_CMD_FLASH is not set
CONFIG_OF_CONTROL=y CONFIG_OF_CONTROL=y
CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH=y
CONFIG_DM_ETH=y
CONFIG_NETDEVICES=y CONFIG_NETDEVICES=y
CONFIG_ETH_DESIGNWARE=y CONFIG_ETH_DESIGNWARE=y
CONFIG_SPL_DM=y CONFIG_SPL_DM=y

1
configs/socfpga_socrates_defconfig
View File

@ -7,6 +7,7 @@ CONFIG_SPL=y
# CONFIG_CMD_FLASH is not set # CONFIG_CMD_FLASH is not set
CONFIG_OF_CONTROL=y CONFIG_OF_CONTROL=y
CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH=y
CONFIG_DM_ETH=y
CONFIG_NETDEVICES=y CONFIG_NETDEVICES=y
CONFIG_ETH_DESIGNWARE=y CONFIG_ETH_DESIGNWARE=y
CONFIG_SPL_DM=y CONFIG_SPL_DM=y

1
include/configs/socfpga_arria5.h
View File

@ -49,7 +49,6 @@
/* Ethernet on SoC (EMAC) */ /* Ethernet on SoC (EMAC) */
#if defined(CONFIG_CMD_NET) #if defined(CONFIG_CMD_NET)
#define CONFIG_EMAC_BASE SOCFPGA_EMAC1_ADDRESS #define CONFIG_EMAC_BASE SOCFPGA_EMAC1_ADDRESS
#define CONFIG_PHY_INTERFACE_MODE PHY_INTERFACE_MODE_RGMII
/* PHY */ /* PHY */
#define CONFIG_PHY_MICREL #define CONFIG_PHY_MICREL

1
include/configs/socfpga_cyclone5.h
View File

@ -49,7 +49,6 @@
/* Ethernet on SoC (EMAC) */ /* Ethernet on SoC (EMAC) */
#if defined(CONFIG_CMD_NET) #if defined(CONFIG_CMD_NET)
#define CONFIG_EMAC_BASE SOCFPGA_EMAC1_ADDRESS #define CONFIG_EMAC_BASE SOCFPGA_EMAC1_ADDRESS
#define CONFIG_PHY_INTERFACE_MODE PHY_INTERFACE_MODE_RGMII
/* PHY */ /* PHY */
#define CONFIG_PHY_MICREL #define CONFIG_PHY_MICREL