diff options
Diffstat (limited to 'env')
| -rw-r--r-- | env/Kconfig | 2 | ||||
| -rw-r--r-- | env/attr.c | 4 | ||||
| -rw-r--r-- | env/callback.c | 1 | ||||
| -rw-r--r-- | env/common.c | 1 | ||||
| -rw-r--r-- | env/eeprom.c | 1 | ||||
| -rw-r--r-- | env/env.c | 2 | ||||
| -rw-r--r-- | env/ext4.c | 1 | ||||
| -rw-r--r-- | env/fat.c | 1 | ||||
| -rw-r--r-- | env/flags.c | 4 | ||||
| -rw-r--r-- | env/flash.c | 1 | ||||
| -rw-r--r-- | env/mmc.c | 1 | ||||
| -rw-r--r-- | env/nand.c | 1 | ||||
| -rw-r--r-- | env/nowhere.c | 1 | ||||
| -rw-r--r-- | env/nvram.c | 1 | ||||
| -rw-r--r-- | env/onenand.c | 1 | ||||
| -rw-r--r-- | env/remote.c | 2 | ||||
| -rw-r--r-- | env/sf.c | 1 | ||||
| -rw-r--r-- | env/ubi.c | 1 |
18 files changed, 7 insertions, 20 deletions
diff --git a/env/Kconfig b/env/Kconfig index 1f8e90af55..9641abe371 100644 --- a/env/Kconfig +++ b/env/Kconfig @@ -312,7 +312,7 @@ config ENV_IS_IN_NVRAM config ENV_IS_IN_ONENAND bool "Environment is in OneNAND" - depends on !CHAIN_OF_TRUST + depends on !CHAIN_OF_TRUST && CMD_ONENAND help Define this if you want to put your local device's environment in OneNAND. diff --git a/env/attr.c b/env/attr.c index a958c71482..fed5b212e2 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 98ddba035e..b7cbccd117 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 48a565107c..d8c276dddf 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 7ce7e9972b..b290b1013e 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> @@ -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 da26705b8d..eb16568bd4 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> @@ -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 e2866361df..233fd460d8 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 1e75f8c004..1bd6e7003d 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> @@ -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 df300b1317..fef5697ec3 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 9ebc357dbd..326f27db2e 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 229c34f536..d49cd0f337 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 1faa2cb62a..8c349ef5ce 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 166bebf52b..0cc383c236 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> @@ -8,7 +8,6 @@ * * (C) Copyright 2008 Atmel Corporation */ -#include <common.h> #include <dm.h> #include <env.h> #include <env_internal.h> @@ -4,7 +4,6 @@ * Joe Hershberger <joe.hershberger@ni.com> */ -#include <common.h> #include <asm/global_data.h> #include <command.h> |