diff options
| author | Tom Rini <trini@konsulko.com> | 2018-11-14 11:30:07 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2018-11-14 11:30:07 -0500 |
| commit | 208ecbad2ea83333e8f3c9933213867addf16f4a (patch) | |
| tree | 7af7000318ac1987179fc398a267caf1cac13af8 /include | |
| parent | 0157013f4a4945bbdb70bb4d98d680e0845fd784 (diff) | |
| parent | 9e2a90280939fd896eb7af5db49c0410d5bd8420 (diff) | |
Merge branch 'next'
This brings in the u-boot-net PR from Joe.
Diffstat (limited to 'include')
| -rw-r--r-- | include/configs/ti_armv7_keystone2.h | 1 | ||||
| -rw-r--r-- | include/netdev.h | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/include/configs/ti_armv7_keystone2.h b/include/configs/ti_armv7_keystone2.h index cc823c5146..5e504f6d3d 100644 --- a/include/configs/ti_armv7_keystone2.h +++ b/include/configs/ti_armv7_keystone2.h @@ -128,7 +128,6 @@ #define CONFIG_KSNAV_NETCP_PDMA_TX_SND_QUEUE KS2_NETCP_PDMA_TX_SND_QUEUE /* Keystone net */ -#define CONFIG_DRIVER_TI_KEYSTONE_NET #define CONFIG_KSNET_MAC_ID_BASE KS2_MAC_ID_BASE_ADDR #define CONFIG_KSNET_NETCP_BASE KS2_NETCP_BASE #define CONFIG_KSNET_SERDES_SGMII_BASE KS2_SGMII_SERDES_BASE diff --git a/include/netdev.h b/include/netdev.h index 55001625fb..0a1a3a2d8d 100644 --- a/include/netdev.h +++ b/include/netdev.h @@ -43,7 +43,6 @@ int ethoc_initialize(u8 dev_num, int base_addr); int fec_initialize (bd_t *bis); int fecmxc_initialize(bd_t *bis); int fecmxc_initialize_multi(bd_t *bis, int dev_id, int phy_id, uint32_t addr); -int ftgmac100_initialize(bd_t *bits); int ftmac100_initialize(bd_t *bits); int ftmac110_initialize(bd_t *bits); void gt6426x_eth_initialize(bd_t *bis); |