common: Drop net.h from common header
Move this header out of the common header. Network support is used in
quite a few places but it still does not warrant blanket inclusion.
Note that this net.h header itself has quite a lot in it. It could be
split into the driver-mode support, functions, structures, checksumming,
etc.
Signed-off-by: Simon Glass <sjg@chromium.org>
diff --git a/include/common.h b/include/common.h
index 1705d85..a900596 100644
--- a/include/common.h
+++ b/include/common.h
@@ -36,7 +36,6 @@
#include <init.h>
#include <display_options.h>
#include <vsprintf.h>
-#include <net.h>
#include <bootstage.h>
#endif /* __ASSEMBLY__ */
diff --git a/include/dwmmc.h b/include/dwmmc.h
index f06720d..58110aa 100644
--- a/include/dwmmc.h
+++ b/include/dwmmc.h
@@ -7,6 +7,7 @@
#ifndef __DWMMC_HW_H
#define __DWMMC_HW_H
+#include <asm/cache.h>
#include <asm/io.h>
#include <mmc.h>
diff --git a/include/log.h b/include/log.h
index cf32351..ffc739b 100644
--- a/include/log.h
+++ b/include/log.h
@@ -9,6 +9,7 @@
#ifndef __LOG_H
#define __LOG_H
+#include <stdio.h>
#include <command.h>
#include <dm/uclass-id.h>
#include <linux/list.h>
diff --git a/include/net.h b/include/net.h
index 774ae2d..3ef212d 100644
--- a/include/net.h
+++ b/include/net.h
@@ -12,6 +12,7 @@
#ifndef __NET_H__
#define __NET_H__
+#include <linux/types.h>
#include <asm/cache.h>
#include <asm/byteorder.h> /* for nton* / ntoh* stuff */
#include <env.h>
@@ -20,7 +21,9 @@
#include <linux/if_ether.h>
#include <rand.h>
+struct bd_info;
struct cmd_tbl_s;
+struct udevice;
#define DEBUG_LL_STATE 0 /* Link local state machine changes */
#define DEBUG_DEV_PKT 0 /* Packets or info directed to the device */
@@ -188,12 +191,12 @@
phys_addr_t iobase;
int state;
- int (*init)(struct eth_device *, bd_t *);
+ int (*init)(struct eth_device *eth, struct bd_info *bd);
int (*send)(struct eth_device *, void *packet, int length);
int (*recv)(struct eth_device *);
void (*halt)(struct eth_device *);
int (*mcast)(struct eth_device *, const u8 *enetaddr, int join);
- int (*write_hwaddr)(struct eth_device *);
+ int (*write_hwaddr)(struct eth_device *eth);
struct eth_device *next;
int index;
void *priv;
@@ -246,7 +249,7 @@
int eth_write_hwaddr(struct eth_device *dev, const char *base_name,
int eth_number);
-int usb_eth_initialize(bd_t *bi);
+int usb_eth_initialize(struct bd_info *bi);
#endif
int eth_initialize(void); /* Initialize network subsystem */
diff --git a/include/scsi.h b/include/scsi.h
index 61da958..96cb726 100644
--- a/include/scsi.h
+++ b/include/scsi.h
@@ -6,6 +6,7 @@
#ifndef _SCSI_H
#define _SCSI_H
+#include <asm/cache.h>
#include <linux/dma-direction.h>
struct scsi_cmd {