diff options
Diffstat (limited to 'env')
| -rw-r--r-- | env/Kconfig | 8 | ||||
| -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, 10 insertions, 23 deletions
diff --git a/env/Kconfig b/env/Kconfig index 1f8e90af55e..451bab45ea7 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. @@ -570,7 +570,7 @@ config ENV_OFFSET default 0xF0000 if ARCH_SUNXI default 0xE0000 if ARCH_ZYNQ default 0x1E00000 if ARCH_ZYNQMP - default 0x7F40000 if ARCH_VERSAL || ARCH_VERSAL_NET + default 0x7F40000 if ARCH_VERSAL || ARCH_VERSAL_NET || ARCH_VERSAL2 default 0x0 if ARC default 0x140000 if ARCH_AT91 default 0x260000 if ARCH_OMAP2PLUS @@ -605,7 +605,7 @@ config ENV_SIZE default 0x10000 if ARCH_SUNXI default 0x8000 if ARCH_ROCKCHIP && ENV_IS_IN_MMC default 0x2000 if ARCH_ROCKCHIP && ENV_IS_IN_SPI_FLASH - default 0x8000 if ARCH_ZYNQMP || ARCH_VERSAL || ARCH_VERSAL_NET + default 0x8000 if ARCH_ZYNQMP || ARCH_VERSAL || ARCH_VERSAL_NET || ARCH_VERSAL2 default 0x4000 if ARC default 0x1f000 help @@ -615,7 +615,7 @@ config ENV_SECT_SIZE hex "Environment Sector-Size" depends on ENV_IS_IN_FLASH || ENV_IS_IN_SPI_FLASH default 0x2000 if ARCH_ROCKCHIP - default 0x40000 if ARCH_ZYNQMP || ARCH_VERSAL || ARCH_VERSAL_NET + default 0x40000 if ARCH_ZYNQMP || ARCH_VERSAL || ARCH_VERSAL_NET || ARCH_VERSAL2 default 0x20000 if ARCH_ZYNQ || ARCH_OMAP2PLUS || ARCH_AT91 default 0x20000 if MICROBLAZE && ENV_IS_IN_SPI_FLASH default 0x10000 if ARCH_SUNXI && ENV_IS_IN_SPI_FLASH diff --git a/env/attr.c b/env/attr.c index a958c714828..fed5b212e2f 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 98ddba035ea..b7cbccd1175 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 48a565107c1..d8c276dddfd 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 7ce7e9972b2..b290b1013e1 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 bae3f6482ae..bcc189e14db 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 f21939186f0..d92c844ea6c 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 d87a47b1001..f3f8b7301ee 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 e2866361dfe..233fd460d84 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 1e75f8c004e..1bd6e7003d6 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 7afb733e890..776df0786be 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 df300b13179..fef5697ec39 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 9ebc357dbd7..326f27db2e9 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 229c34f5367..d49cd0f337a 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 1faa2cb62a3..8c349ef5ce6 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 166bebf52b5..0cc383c2360 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> diff --git a/env/ubi.c b/env/ubi.c index 445d34fedb8..0c3e93c2bf2 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> |