diff options
author | Simon Glass <sjg@chromium.org> | 2019-11-14 12:57:16 -0700 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2019-12-02 18:23:08 -0500 |
commit | 3db7110857524cf1b7d0a374c1ebcde8a2680de0 (patch) | |
tree | 050b7a36ff3a6fe08b1a5d30e00daf88c4ca5094 /env | |
parent | b2ea91ba57a2c3d57ec3d681b4058b115a0d3e51 (diff) |
crc32: Use the crc.h header for crc functions
Drop inclusion of crc.h in common.h and use the correct header directly
instead.
With this we can drop the conflicting definition in fw_env.h and rely on
the crc.h header, which is already included.
Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'env')
-rw-r--r-- | env/common.c | 1 | ||||
-rw-r--r-- | env/eeprom.c | 1 | ||||
-rw-r--r-- | env/flash.c | 1 | ||||
-rw-r--r-- | env/nand.c | 1 | ||||
-rw-r--r-- | env/nvram.c | 1 | ||||
-rw-r--r-- | env/remote.c | 1 | ||||
-rw-r--r-- | env/sf.c | 1 |
7 files changed, 7 insertions, 0 deletions
diff --git a/env/common.c b/env/common.c index 4daaa6faea..0edb6fb04c 100644 --- a/env/common.c +++ b/env/common.c @@ -15,6 +15,7 @@ #include <search.h> #include <errno.h> #include <malloc.h> +#include <u-boot/crc.h> DECLARE_GLOBAL_DATA_PTR; diff --git a/env/eeprom.c b/env/eeprom.c index cb04d2ac88..f0bdf2a141 100644 --- a/env/eeprom.c +++ b/env/eeprom.c @@ -12,6 +12,7 @@ #include <env.h> #include <env_internal.h> #include <linux/stddef.h> +#include <u-boot/crc.h> #if defined(CONFIG_I2C_ENV_EEPROM_BUS) #include <i2c.h> #endif diff --git a/env/flash.c b/env/flash.c index b94ed2b04f..b487e6701e 100644 --- a/env/flash.c +++ b/env/flash.c @@ -17,6 +17,7 @@ #include <malloc.h> #include <search.h> #include <errno.h> +#include <u-boot/crc.h> DECLARE_GLOBAL_DATA_PTR; diff --git a/env/nand.c b/env/nand.c index e631bf2fda..8b0027d304 100644 --- a/env/nand.c +++ b/env/nand.c @@ -23,6 +23,7 @@ #include <nand.h> #include <search.h> #include <errno.h> +#include <u-boot/crc.h> #if defined(CONFIG_CMD_SAVEENV) && defined(CONFIG_CMD_NAND) && \ !defined(CONFIG_SPL_BUILD) diff --git a/env/nvram.c b/env/nvram.c index 79201bd788..a78db21623 100644 --- a/env/nvram.c +++ b/env/nvram.c @@ -30,6 +30,7 @@ #include <linux/stddef.h> #include <search.h> #include <errno.h> +#include <u-boot/crc.h> DECLARE_GLOBAL_DATA_PTR; diff --git a/env/remote.c b/env/remote.c index 55faa1e5d0..50d77b8dfe 100644 --- a/env/remote.c +++ b/env/remote.c @@ -9,6 +9,7 @@ #include <command.h> #include <env_internal.h> #include <linux/stddef.h> +#include <u-boot/crc.h> #ifdef ENV_IS_EMBEDDED env_t *env_ptr = &environment; @@ -18,6 +18,7 @@ #include <search.h> #include <errno.h> #include <dm/device-internal.h> +#include <u-boot/crc.h> #ifndef CONFIG_SPL_BUILD #define CMD_SAVEENV |