diff options
| author | Tom Rini <trini@konsulko.com> | 2021-02-15 08:19:40 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2021-02-15 10:16:45 -0500 |
| commit | 2ae80437fbe0181184ae4b188b89629b902702c6 (patch) | |
| tree | 846f70a5df9c80ef76284c39f0da58b8c3eba96f /env | |
| parent | 76b7936e6f781c86b0d3159f67f1506d01c196ce (diff) | |
| parent | 401d1c4f5d2d29c4bc4beaec95402ca23eb63295 (diff) | |
| download | u-boot-2ae80437fbe0181184ae4b188b89629b902702c6.tar.gz | |
Merge branch '2021-02-02-drop-asm_global_data-when-unused'
- Merge the patch to take <asm/global_data.h> out of <common.h>
Diffstat (limited to 'env')
| -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 | 1 | ||||
| -rw-r--r-- | env/ext4.c | 1 | ||||
| -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 | 1 | ||||
| -rw-r--r-- | env/sf.c | 1 | ||||
| -rw-r--r-- | env/ubi.c | 1 |
14 files changed, 14 insertions, 0 deletions
diff --git a/env/callback.c b/env/callback.c index 4054b9ef58b..638a02b28f7 100644 --- a/env/callback.c +++ b/env/callback.c @@ -7,6 +7,7 @@ #include <common.h> #include <env.h> #include <env_internal.h> +#include <asm/global_data.h> #if defined(CONFIG_NEEDS_MANUAL_RELOC) DECLARE_GLOBAL_DATA_PTR; diff --git a/env/common.c b/env/common.c index 6c32a9b4796..2ee423beb5c 100644 --- a/env/common.c +++ b/env/common.c @@ -14,6 +14,7 @@ #include <env_internal.h> #include <log.h> #include <sort.h> +#include <asm/global_data.h> #include <linux/stddef.h> #include <search.h> #include <errno.h> diff --git a/env/eeprom.c b/env/eeprom.c index e300470ad0f..ba168014e24 100644 --- a/env/eeprom.c +++ b/env/eeprom.c @@ -12,6 +12,7 @@ #include <eeprom.h> #include <env.h> #include <env_internal.h> +#include <asm/global_data.h> #include <linux/stddef.h> #include <u-boot/crc.h> #if defined(CONFIG_I2C_ENV_EEPROM_BUS) diff --git a/env/env.c b/env/env.c index 37b4b54cb75..caefa33e1d4 100644 --- a/env/env.c +++ b/env/env.c @@ -8,6 +8,7 @@ #include <env.h> #include <env_internal.h> #include <log.h> +#include <asm/global_data.h> #include <linux/bitops.h> #include <linux/bug.h> diff --git a/env/ext4.c b/env/ext4.c index e666f7b9455..ec643f2226a 100644 --- a/env/ext4.c +++ b/env/ext4.c @@ -31,6 +31,7 @@ #include <errno.h> #include <ext4fs.h> #include <mmc.h> +#include <asm/global_data.h> DECLARE_GLOBAL_DATA_PTR; diff --git a/env/flash.c b/env/flash.c index 722d5adf8b6..ebee9069e4e 100644 --- a/env/flash.c +++ b/env/flash.c @@ -15,6 +15,7 @@ #include <env_internal.h> #include <flash.h> #include <log.h> +#include <asm/global_data.h> #include <linux/stddef.h> #include <malloc.h> #include <search.h> diff --git a/env/mmc.c b/env/mmc.c index ee376c3e0c3..9b226be1d5b 100644 --- a/env/mmc.c +++ b/env/mmc.c @@ -6,6 +6,7 @@ /* #define DEBUG */ #include <common.h> +#include <asm/global_data.h> #include <command.h> #include <env.h> diff --git a/env/nand.c b/env/nand.c index 0d7ee19bc23..be82e97d69c 100644 --- a/env/nand.c +++ b/env/nand.c @@ -17,6 +17,7 @@ #include <command.h> #include <env.h> #include <env_internal.h> +#include <asm/global_data.h> #include <linux/stddef.h> #include <malloc.h> #include <memalign.h> diff --git a/env/nowhere.c b/env/nowhere.c index d43a2d6b513..41557f5ce44 100644 --- a/env/nowhere.c +++ b/env/nowhere.c @@ -11,6 +11,7 @@ #include <command.h> #include <env.h> #include <env_internal.h> +#include <asm/global_data.h> #include <linux/stddef.h> DECLARE_GLOBAL_DATA_PTR; diff --git a/env/nvram.c b/env/nvram.c index 7c8ea26f968..f4126858b5b 100644 --- a/env/nvram.c +++ b/env/nvram.c @@ -27,6 +27,7 @@ #include <command.h> #include <env.h> #include <env_internal.h> +#include <asm/global_data.h> #include <linux/stddef.h> #include <search.h> #include <errno.h> diff --git a/env/onenand.c b/env/onenand.c index a2477cef9be..c8da3ff8114 100644 --- a/env/onenand.c +++ b/env/onenand.c @@ -10,6 +10,7 @@ #include <common.h> #include <command.h> #include <env_internal.h> +#include <asm/global_data.h> #include <linux/stddef.h> #include <malloc.h> #include <search.h> diff --git a/env/remote.c b/env/remote.c index d93a137376e..166bebf52b5 100644 --- a/env/remote.c +++ b/env/remote.c @@ -8,6 +8,7 @@ #include <common.h> #include <command.h> #include <env_internal.h> +#include <asm/global_data.h> #include <linux/stddef.h> #include <u-boot/crc.h> @@ -20,6 +20,7 @@ #include <errno.h> #include <uuid.h> #include <asm/cache.h> +#include <asm/global_data.h> #include <dm/device-internal.h> #include <u-boot/crc.h> diff --git a/env/ubi.c b/env/ubi.c index 5502efe28b6..eb21c4f38b4 100644 --- a/env/ubi.c +++ b/env/ubi.c @@ -5,6 +5,7 @@ */ #include <common.h> +#include <asm/global_data.h> #include <command.h> #include <env.h> |