]> git.ipfire.org Git - people/ms/u-boot.git/commitdiff
api: Disable api_net when DM is used
authorMichal Simek <michal.simek@xilinx.com>
Mon, 6 Jun 2016 08:58:40 +0000 (10:58 +0200)
committerMichal Simek <michal.simek@xilinx.com>
Fri, 22 Jul 2016 12:03:43 +0000 (14:03 +0200)
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>
api/api_net.c

index 04e4f4a44eff9ce9d6e4688a978e1179b7599c66..67c291682a655a4bc545a4cd86cf2b52eb29808d 100644 (file)
@@ -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)
 {