Remove <common.h> from all "env/" files and when needed add missing include files directly.
Signed-off-by: Tom Rini trini@konsulko.com --- env/attr.c | 4 ++-- env/callback.c | 1 - env/common.c | 1 - env/eeprom.c | 1 - env/env.c | 2 +- env/ext4.c | 1 - env/fat.c | 1 - env/flags.c | 4 ++-- env/flash.c | 1 - env/mmc.c | 1 - env/nand.c | 1 - env/nowhere.c | 1 - env/nvram.c | 1 - env/onenand.c | 1 - env/remote.c | 2 +- env/sf.c | 1 - env/ubi.c | 1 - include/env_callback.h | 1 + include/env_default.h | 1 + include/env_flags.h | 2 ++ 20 files changed, 10 insertions(+), 19 deletions(-)
diff --git a/env/attr.c b/env/attr.c index a958c7148283..fed5b212e2f9 100644 --- a/env/attr.c +++ b/env/attr.c @@ -4,13 +4,13 @@ * Joe Hershberger, National Instruments, joe.hershberger@ni.com */
+#include <stdio.h> #ifdef USE_HOSTCC /* Eliminate "ANSI does not permit..." warnings */ #include <stdint.h> -#include <stdio.h> #include <linux/linux_string.h> #else -#include <common.h> #include <slre.h> +#include <vsprintf.h> #endif
#include <env_attr.h> diff --git a/env/callback.c b/env/callback.c index 98ddba035ea7..b7cbccd1175f 100644 --- a/env/callback.c +++ b/env/callback.c @@ -4,7 +4,6 @@ * Joe Hershberger, National Instruments, joe.hershberger@ni.com */
-#include <common.h> #include <env.h> #include <env_internal.h> #include <asm/global_data.h> diff --git a/env/common.c b/env/common.c index 48a565107c11..d8c276dddfd9 100644 --- a/env/common.c +++ b/env/common.c @@ -7,7 +7,6 @@ * Andreas Heppel aheppel@sysgo.de */
-#include <common.h> #include <bootstage.h> #include <command.h> #include <env.h> diff --git a/env/eeprom.c b/env/eeprom.c index 7ce7e9972b29..b290b1013e1c 100644 --- a/env/eeprom.c +++ b/env/eeprom.c @@ -7,7 +7,6 @@ * Andreas Heppel aheppel@sysgo.de */
-#include <common.h> #include <command.h> #include <eeprom.h> #include <env.h> diff --git a/env/env.c b/env/env.c index bae3f6482aea..bcc189e14db7 100644 --- a/env/env.c +++ b/env/env.c @@ -4,13 +4,13 @@ * Written by Simon Glass sjg@chromium.org */
-#include <common.h> #include <env.h> #include <env_internal.h> #include <log.h> #include <asm/global_data.h> #include <linux/bitops.h> #include <linux/bug.h> +#include <linux/errno.h>
DECLARE_GLOBAL_DATA_PTR;
diff --git a/env/ext4.c b/env/ext4.c index da26705b8daf..eb16568bd463 100644 --- a/env/ext4.c +++ b/env/ext4.c @@ -18,7 +18,6 @@ * Manjunatha C Achar a.manjunatha@samsung.com */
-#include <common.h> #include <part.h>
#include <command.h> diff --git a/env/fat.c b/env/fat.c index 3172130d75d3..2a40f123936c 100644 --- a/env/fat.c +++ b/env/fat.c @@ -6,7 +6,6 @@ * Maximilian Schwerin mvs@tigris.de */
-#include <common.h> #include <command.h> #include <env.h> #include <env_internal.h> diff --git a/env/flags.c b/env/flags.c index e2866361dfe4..233fd460d842 100644 --- a/env/flags.c +++ b/env/flags.c @@ -8,9 +8,9 @@ #include <linux/string.h> #include <linux/ctype.h>
+#include <stdio.h> #ifdef USE_HOSTCC /* Eliminate "ANSI does not permit..." warnings */ #include <stdint.h> -#include <stdio.h> #include "fw_env_private.h" #include "fw_env.h" #include <env_attr.h> @@ -18,7 +18,7 @@ #define env_get fw_getenv #define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0])) #else -#include <common.h> +#include <linux/kernel.h> #include <env_internal.h> #endif
diff --git a/env/flash.c b/env/flash.c index 1e75f8c004ee..1bd6e7003d6e 100644 --- a/env/flash.c +++ b/env/flash.c @@ -9,7 +9,6 @@
/* #define DEBUG */
-#include <common.h> #include <command.h> #include <env.h> #include <env_internal.h> diff --git a/env/mmc.c b/env/mmc.c index 7afb733e890f..776df0786be5 100644 --- a/env/mmc.c +++ b/env/mmc.c @@ -5,7 +5,6 @@
/* #define DEBUG */
-#include <common.h> #include <asm/global_data.h>
#include <command.h> diff --git a/env/nand.c b/env/nand.c index df300b131793..fef5697ec39d 100644 --- a/env/nand.c +++ b/env/nand.c @@ -13,7 +13,6 @@ * Andreas Heppel aheppel@sysgo.de */
-#include <common.h> #include <command.h> #include <env.h> #include <env_internal.h> diff --git a/env/nowhere.c b/env/nowhere.c index 9ebc357dbd78..326f27db2e9c 100644 --- a/env/nowhere.c +++ b/env/nowhere.c @@ -7,7 +7,6 @@ * Andreas Heppel aheppel@sysgo.de */
-#include <common.h> #include <command.h> #include <env.h> #include <env_internal.h> diff --git a/env/nvram.c b/env/nvram.c index 229c34f5367c..d49cd0f337a0 100644 --- a/env/nvram.c +++ b/env/nvram.c @@ -7,7 +7,6 @@ * Andreas Heppel aheppel@sysgo.de */
-#include <common.h> #include <command.h> #include <env.h> #include <env_internal.h> diff --git a/env/onenand.c b/env/onenand.c index 1faa2cb62a34..8c349ef5ce6c 100644 --- a/env/onenand.c +++ b/env/onenand.c @@ -7,7 +7,6 @@ * Kyungmin Park kyungmin.park@samsung.com */
-#include <common.h> #include <command.h> #include <env_internal.h> #include <asm/global_data.h> diff --git a/env/remote.c b/env/remote.c index 166bebf52b5b..0cc383c23602 100644 --- a/env/remote.c +++ b/env/remote.c @@ -5,10 +5,10 @@
/* #define DEBUG */
-#include <common.h> #include <command.h> #include <env_internal.h> #include <asm/global_data.h> +#include <linux/errno.h> #include <linux/stddef.h> #include <u-boot/crc.h>
diff --git a/env/sf.c b/env/sf.c index 8f5c03b00d33..c747e175e31b 100644 --- a/env/sf.c +++ b/env/sf.c @@ -8,7 +8,6 @@ * * (C) Copyright 2008 Atmel Corporation */ -#include <common.h> #include <dm.h> #include <env.h> #include <env_internal.h> diff --git a/env/ubi.c b/env/ubi.c index 445d34fedb89..0c3e93c2bf2d 100644 --- a/env/ubi.c +++ b/env/ubi.c @@ -4,7 +4,6 @@ * Joe Hershberger joe.hershberger@ni.com */
-#include <common.h> #include <asm/global_data.h>
#include <command.h> diff --git a/include/env_callback.h b/include/env_callback.h index 23bc650c162d..8e500aaaf806 100644 --- a/include/env_callback.h +++ b/include/env_callback.h @@ -7,6 +7,7 @@ #ifndef __ENV_CALLBACK_H__ #define __ENV_CALLBACK_H__
+#include <config.h> #include <env_flags.h> #include <linker_lists.h> #include <search.h> diff --git a/include/env_default.h b/include/env_default.h index 8ee500d1709c..076ffdd44e9b 100644 --- a/include/env_default.h +++ b/include/env_default.h @@ -7,6 +7,7 @@ * Andreas Heppel aheppel@sysgo.de */
+#include <config.h> #include <env_callback.h> #include <linux/stringify.h>
diff --git a/include/env_flags.h b/include/env_flags.h index d785f87cdcbe..2476043b0e38 100644 --- a/include/env_flags.h +++ b/include/env_flags.h @@ -7,6 +7,8 @@ #ifndef __ENV_FLAGS_H__ #define __ENV_FLAGS_H__
+#include <config.h> + enum env_flags_vartype { env_flags_vartype_string, env_flags_vartype_decimal,