summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorSimon Glass <sjg@chromium.org>2020-05-10 11:40:05 -0600
committerTom Rini <trini@konsulko.com>2020-05-18 21:19:18 -0400
commitf7ae49fc4f363a803dab3be078e93ead8e75a8e9 (patch)
treea40dc0c2d47875a8b069c8704808e2dc8f9db5fa /include
parent3c7dded8e179ee213c8267c892720b84a7a59fd5 (diff)
common: Drop log.h from common header
Move this header out of the common header. Signed-off-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'include')
-rw-r--r--include/common.h1
-rw-r--r--include/efi_loader.h1
-rw-r--r--include/i2c.h2
-rw-r--r--include/initcall.h1
-rw-r--r--include/spl.h1
-rw-r--r--include/wait_bit.h4
-rw-r--r--include/wdt.h1
7 files changed, 9 insertions, 2 deletions
diff --git a/include/common.h b/include/common.h
index d69cda339c..b698e35fec 100644
--- a/include/common.h
+++ b/include/common.h
@@ -28,7 +28,6 @@
#include <stdarg.h>
#include <stdio.h>
#include <linux/kernel.h>
-#include <log.h>
#include <asm/u-boot.h> /* boot information for Linux kernel */
#include <asm/global_data.h> /* global data used for startup functions */
#include <display_options.h>
diff --git a/include/efi_loader.h b/include/efi_loader.h
index 20f86c3a9f..4b48f99773 100644
--- a/include/efi_loader.h
+++ b/include/efi_loader.h
@@ -10,6 +10,7 @@
#include <common.h>
#include <blk.h>
+#include <log.h>
#include <part_efi.h>
#include <efi_api.h>
#include <image.h>
diff --git a/include/i2c.h b/include/i2c.h
index 059200115a..1d792db454 100644
--- a/include/i2c.h
+++ b/include/i2c.h
@@ -16,6 +16,8 @@
#ifndef _I2C_H_
#define _I2C_H_
+#include <linker_lists.h>
+
/*
* For now there are essentially two parts to this file - driver model
* here at the top, and the older code below (with CONFIG_SYS_I2C being
diff --git a/include/initcall.h b/include/initcall.h
index c871767e20..41b74dc52d 100644
--- a/include/initcall.h
+++ b/include/initcall.h
@@ -8,6 +8,7 @@
typedef int (*init_fnc_t)(void);
+#include <log.h>
#ifdef CONFIG_EFI_APP
#include <efi.h>
#endif
diff --git a/include/spl.h b/include/spl.h
index abd75c61cd..b31c9bb4ab 100644
--- a/include/spl.h
+++ b/include/spl.h
@@ -7,6 +7,7 @@
#define _SPL_H_
#include <binman_sym.h>
+#include <linker_lists.h>
/* Platform-specific defines */
#include <linux/compiler.h>
diff --git a/include/wait_bit.h b/include/wait_bit.h
index 79da0811fe..dc2ffeb2c2 100644
--- a/include/wait_bit.h
+++ b/include/wait_bit.h
@@ -8,9 +8,11 @@
#ifndef __WAIT_BIT_H
#define __WAIT_BIT_H
-#include <common.h>
#include <console.h>
+#include <log.h>
+#include <time.h>
#include <watchdog.h>
+#include <linux/delay.h>
#include <linux/errno.h>
#include <asm/io.h>
diff --git a/include/wdt.h b/include/wdt.h
index aea5abc768..d2ccfbc62e 100644
--- a/include/wdt.h
+++ b/include/wdt.h
@@ -7,6 +7,7 @@
#define _WDT_H_
#include <dm.h>
+#include <log.h>
#include <dm/read.h>
/*