env: Remove <common.h> and add needed includes

Remove <common.h> from all "env/" files and when needed add
missing include files directly.

Signed-off-by: Tom Rini <trini@konsulko.com>

diff --git a/env/attr.c b/env/attr.c
index a958c714828315ad069b831a84992d152abe1a9f..fed5b212e2f93e5e6a55b034804b1aba42576f66 100644 (file)
--- 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 98ddba035ea74cf47ab68c31d02c366fb6418784..b7cbccd1175f7df8f2da78dc2186d1a5a7e88aa3 100644 (file)
--- 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 48a565107c1107d62ebe69e3242bc4e4c40a7587..d8c276dddfd9e2d0ae88d63ee7ec20d5ae406212 100644 (file)
--- 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 7ce7e9972b294c4a866fc020f21bfceb1ff22ae3..b290b1013e1c71906772446c9981c76443238e81 100644 (file)
--- 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 bae3f6482aea6a9abf41591d939ee2989c79a234..bcc189e14db71bf178951205410b060ae9ff5da6 100644 (file)
--- 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 da26705b8dafbb9a5343b3d55da0ace6783d5be3..eb16568bd463d61dd570d318e972015f1597cb14 100644 (file)
--- 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 3172130d75d3d639f730d20b3c5aa39a6b3d46b5..2a40f123936caba4d15c1520f46a9d1ae58e5bdc 100644 (file)
--- 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 e2866361dfe4f22b009a77b06f43fd2be9433dc0..233fd460d84215224e1934e5c34085a4b50a58d8 100644 (file)
--- 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 1e75f8c004ee79d0bbac218c0a6284f0a6b89c85..1bd6e7003d6ec86fd21e79e78a7a6143ba35f226 100644 (file)
--- 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 7afb733e890f953b858f763d5ee84665e36a7675..776df0786be55b43d917b7c69a91934a32e6daf5 100644 (file)
--- 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 df300b13179312babc6ee3c47e2cba1d165c30fb..fef5697ec39d13b3dad263c7b03bde2302d477d3 100644 (file)
--- 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 9ebc357dbd785e7b9390e315f0d21319a7b0d92d..326f27db2e9c5ddb64de637cbfb00ef1771942c5 100644 (file)
--- 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 229c34f5367c636cb295526e1e5069f9c2746868..d49cd0f337a05d5700f20e6de54971f29f799683 100644 (file)
--- 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 1faa2cb62a34ac99d2dd4ca048e5e2083b879d20..8c349ef5ce6cc0d92425bf97628c52c4962e0dc7 100644 (file)
--- 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 166bebf52b5b577c7b8f2310b610e886199b4557..0cc383c23602e3fdf353a47c77bf1ee752988da6 100644 (file)
--- 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 8f5c03b00d338108b18454e8cbf82dcbc509a0cf..c747e175e31bd908b996060d72db14214ac370ac 100644 (file)
--- 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 445d34fedb893e9b447cb5c23b01567e599ee827..0c3e93c2bf2d6397c1a7fac4c7672c4f2b548c2d 100644 (file)
--- 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 23bc650c162de4bd22813406ec1321dff3c204e7..8e500aaaf806d7b95d5242c0e72c258a2da0f621 100644 (file)
--- 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 8ee500d1709c15526dfb277c8be0d86d7a74e317..076ffdd44e9bc8c5c30e57aed3bca0e00b897f19 100644 (file)
--- 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 d785f87cdcbe11f342a24206b6dc2c0bc74a2d16..2476043b0e38abdb94662f34a45a31a3f1e4cbfb 100644 (file)
--- 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,