diff options
author | Tom Rini <trini@ti.com> | 2014-12-08 16:35:07 -0500 |
---|---|---|
committer | Tom Rini <trini@ti.com> | 2014-12-08 16:35:07 -0500 |
commit | 272a1acf1ef574356e5da51f7d6b3b07ab4e9b83 (patch) | |
tree | b65e7b532ac7beb91cfbf3b16f1df76a3a65d59d /include/fm_eth.h | |
parent | 98d2d5e8c473232dc718763dbec284b7349dcc05 (diff) | |
parent | af7219de2c66b64ddae0348b3d3fa5072d800dd2 (diff) | |
download | u-boot-imx-272a1acf1ef574356e5da51f7d6b3b07ab4e9b83.zip u-boot-imx-272a1acf1ef574356e5da51f7d6b3b07ab4e9b83.tar.gz u-boot-imx-272a1acf1ef574356e5da51f7d6b3b07ab4e9b83.tar.bz2 |
Merge git://git.denx.de/u-boot-mpc85xx
Diffstat (limited to 'include/fm_eth.h')
-rw-r--r-- | include/fm_eth.h | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/include/fm_eth.h b/include/fm_eth.h index e46a684..3e1b9f4 100644 --- a/include/fm_eth.h +++ b/include/fm_eth.h @@ -75,6 +75,20 @@ enum fm_eth_type { offsetof(struct ccsr_fman, memac[n-1]),\ } +#ifdef CONFIG_FSL_FM_10GEC_REGULAR_NOTATION +#define FM_TGEC_INFO_INITIALIZER(idx, n) \ +{ \ + FM_ETH_INFO_INITIALIZER(idx, CONFIG_SYS_FM1_TGEC_MDIO_ADDR) \ + .index = idx, \ + .num = n - 1, \ + .type = FM_ETH_10G_E, \ + .port = FM##idx##_10GEC##n, \ + .rx_port_id = RX_PORT_10G_BASE2 + n - 1, \ + .tx_port_id = TX_PORT_10G_BASE2 + n - 1, \ + .compat_offset = CONFIG_SYS_FSL_FM##idx##_OFFSET + \ + offsetof(struct ccsr_fman, memac[n-1]),\ +} +#else #define FM_TGEC_INFO_INITIALIZER(idx, n) \ { \ FM_ETH_INFO_INITIALIZER(idx, CONFIG_SYS_FM2_TGEC_MDIO_ADDR) \ @@ -87,6 +101,7 @@ enum fm_eth_type { .compat_offset = CONFIG_SYS_FSL_FM##idx##_OFFSET + \ offsetof(struct ccsr_fman, memac[n-1+8]),\ } +#endif #if (CONFIG_SYS_NUM_FM1_10GEC >= 3) #define FM_TGEC_INFO_INITIALIZER2(idx, n) \ |