summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichal Simek <michal.simek@xilinx.com>2016-06-06 10:58:40 +0200
committerMichal Simek <michal.simek@xilinx.com>2016-07-22 14:03:43 +0200
commit211815784c0e35a274e13054a7966b21098f8a14 (patch)
tree003831819534888612163e9f660b72c1d765e205
parent72d8d5d773b1882508e0db0fa6d516ced170c923 (diff)
downloadu-boot-imx-211815784c0e35a274e13054a7966b21098f8a14.zip
u-boot-imx-211815784c0e35a274e13054a7966b21098f8a14.tar.gz
u-boot-imx-211815784c0e35a274e13054a7966b21098f8a14.tar.bz2
api: Disable api_net when DM is used
When CONFIG_API is selected with DM_ETH this error is present: api/api_net.c: In function 'dev_enum_net': api/api_net.c:61:35: warning: initialization from incompatible pointer type struct eth_device *eth_current = eth_get_dev(); ^ api/api_net.c:68:39: error: dereferencing pointer to incomplete type memcpy(di->di_net.hwaddr, eth_current->enetaddr, 6); ^ Disable api_net functions when ETH_DM is selected. Signed-off-by: Chris Johns <chrisj@rtems.org> Signed-off-by: Michal Simek <michal.simek@xilinx.com>
-rw-r--r--api/api_net.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/api/api_net.c b/api/api_net.c
index 04e4f4a..67c2916 100644
--- a/api/api_net.c
+++ b/api/api_net.c
@@ -25,7 +25,7 @@ DECLARE_GLOBAL_DATA_PTR;
#define errf(fmt, args...) do { printf("ERROR @ %s(): ", __func__); printf(fmt, ##args); } while (0)
-#ifdef CONFIG_CMD_NET
+#if defined(CONFIG_CMD_NET) && !defined(CONFIG_DM_ETH)
static int dev_valid_net(void *cookie)
{