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 ---
Changes in v3: None Changes in v2: None
api/api.c | 1 + arch/arm/mach-meson/board-common.c | 1 + arch/arm/mach-rockchip/misc.c | 1 + board/CZ.NIC/turris_omnia/turris_omnia.c | 1 + board/corscience/tricorder/tricorder-eeprom.c | 1 + board/freescale/common/sys_eeprom.c | 1 + board/freescale/mpc8323erdb/mpc8323erdb.c | 1 + board/gardena/smart-gateway-mt7688/board.c | 1 + board/gdsys/a38x/hre.c | 1 + board/gdsys/p1022/controlcenterd-id.c | 1 + board/sunxi/board.c | 1 + board/theobroma-systems/puma_rk3399/puma-rk3399.c | 1 + board/varisys/common/sys_eeprom.c | 1 + cmd/i2c.c | 1 + cmd/nvedit.c | 1 + common/android_ab.c | 1 + common/bloblist.c | 1 + common/board_r.c | 1 + common/hash.c | 1 + common/image-fit.c | 1 + common/image.c | 1 + common/iotrace.c | 1 + common/spl/spl.c | 1 + disk/part_efi.c | 1 + drivers/misc/atsha204a-i2c.c | 1 + drivers/mtd/ubi/attach.c | 1 + drivers/mtd/ubi/crc32.c | 1 + drivers/mtd/ubi/eba.c | 1 + drivers/mtd/ubi/fastmap.c | 1 + drivers/mtd/ubi/io.c | 1 + drivers/mtd/ubi/vtbl.c | 1 + drivers/mtd/ubispl/ubispl.c | 1 + drivers/net/fm/fdt.c | 1 + drivers/net/fm/fm.c | 1 + drivers/qe/qe.c | 1 + env/common.c | 1 + env/eeprom.c | 1 + env/flash.c | 1 + env/nand.c | 1 + env/nvram.c | 1 + env/remote.c | 1 + env/sf.c | 1 + examples/api/glue.c | 1 + fs/jffs2/jffs2_1pass.c | 1 + fs/ubifs/io.c | 1 + fs/ubifs/recovery.c | 1 + fs/ubifs/tnc.c | 1 + include/common.h | 3 --- lib/crc32.c | 1 + lib/efi_loader/efi_boottime.c | 1 + lib/efi_loader/efi_runtime.c | 1 + lib/efi_loader/efi_variable.c | 1 + lib/efi_selftest/efi_selftest_config_table.c | 1 + lib/efi_selftest/efi_selftest_crc32.c | 1 + lib/gunzip.c | 1 + lib/zlib/deflate.c | 1 + tools/default_image.c | 1 + tools/env/fw_env.c | 1 + tools/env/fw_env.h | 2 -- tools/envcrc.c | 1 + tools/mkenvimage.c | 1 + tools/mxsimage.c | 1 + tools/pbl_crc32.c | 1 + tools/pblimage.c | 1 + tools/socfpgaimage.c | 1 + 65 files changed, 63 insertions(+), 5 deletions(-)
diff --git a/api/api.c b/api/api.c index 71fa03804e..4fc451a83d 100644 --- a/api/api.c +++ b/api/api.c @@ -13,6 +13,7 @@ #include <env_internal.h> #include <linux/types.h> #include <api_public.h> +#include <u-boot/crc.h>
#include "api_private.h"
diff --git a/arch/arm/mach-meson/board-common.c b/arch/arm/mach-meson/board-common.c index d261b4ea33..6c77e37966 100644 --- a/arch/arm/mach-meson/board-common.c +++ b/arch/arm/mach-meson/board-common.c @@ -13,6 +13,7 @@ #include <asm/armv8/mmu.h> #include <asm/unaligned.h> #include <efi_loader.h> +#include <u-boot/crc.h>
#if CONFIG_IS_ENABLED(FASTBOOT) #include <asm/psci.h> diff --git a/arch/arm/mach-rockchip/misc.c b/arch/arm/mach-rockchip/misc.c index c0e4fdbc00..186ea84d77 100644 --- a/arch/arm/mach-rockchip/misc.c +++ b/arch/arm/mach-rockchip/misc.c @@ -14,6 +14,7 @@ #include <dm.h> #include <dm/uclass-internal.h> #include <misc.h> +#include <u-boot/crc.h> #include <u-boot/sha256.h>
#include <asm/arch-rockchip/misc.h> diff --git a/board/CZ.NIC/turris_omnia/turris_omnia.c b/board/CZ.NIC/turris_omnia/turris_omnia.c index 1d8d08a847..4d21e62e73 100644 --- a/board/CZ.NIC/turris_omnia/turris_omnia.c +++ b/board/CZ.NIC/turris_omnia/turris_omnia.c @@ -18,6 +18,7 @@ #include <dm/uclass.h> #include <fdt_support.h> #include <time.h> +#include <u-boot/crc.h> # include <atsha204a-i2c.h>
#include "../drivers/ddr/marvell/a38x/ddr3_init.h" diff --git a/board/corscience/tricorder/tricorder-eeprom.c b/board/corscience/tricorder/tricorder-eeprom.c index 16bceea7ba..b28189dafd 100644 --- a/board/corscience/tricorder/tricorder-eeprom.c +++ b/board/corscience/tricorder/tricorder-eeprom.c @@ -6,6 +6,7 @@ */ #include <common.h> #include <i2c.h> +#include <u-boot/crc.h>
#include "tricorder-eeprom.h"
diff --git a/board/freescale/common/sys_eeprom.c b/board/freescale/common/sys_eeprom.c index bb655ca744..6f151b0f71 100644 --- a/board/freescale/common/sys_eeprom.c +++ b/board/freescale/common/sys_eeprom.c @@ -11,6 +11,7 @@ #include <env.h> #include <i2c.h> #include <linux/ctype.h> +#include <u-boot/crc.h>
#ifdef CONFIG_SYS_I2C_EEPROM_CCID #include "../common/eeprom.h" diff --git a/board/freescale/mpc8323erdb/mpc8323erdb.c b/board/freescale/mpc8323erdb/mpc8323erdb.c index e5aecc4e1f..003e95cb6b 100644 --- a/board/freescale/mpc8323erdb/mpc8323erdb.c +++ b/board/freescale/mpc8323erdb/mpc8323erdb.c @@ -17,6 +17,7 @@ #include <miiphy.h> #include <command.h> #include <linux/libfdt.h> +#include <u-boot/crc.h> #if defined(CONFIG_PCI) #include <pci.h> #endif diff --git a/board/gardena/smart-gateway-mt7688/board.c b/board/gardena/smart-gateway-mt7688/board.c index bd494c84fc..1a59839569 100644 --- a/board/gardena/smart-gateway-mt7688/board.c +++ b/board/gardena/smart-gateway-mt7688/board.c @@ -10,6 +10,7 @@ #include <net.h> #include <spi.h> #include <spi_flash.h> +#include <u-boot/crc.h> #include <uuid.h> #include <linux/ctype.h> #include <linux/io.h> diff --git a/board/gdsys/a38x/hre.c b/board/gdsys/a38x/hre.c index 82b84284ef..027ad1f57e 100644 --- a/board/gdsys/a38x/hre.c +++ b/board/gdsys/a38x/hre.c @@ -10,6 +10,7 @@ #include <i2c.h> #include <mmc.h> #include <tpm-v1.h> +#include <u-boot/crc.h> #include <u-boot/sha1.h> #include <asm/byteorder.h> #include <asm/unaligned.h> diff --git a/board/gdsys/p1022/controlcenterd-id.c b/board/gdsys/p1022/controlcenterd-id.c index 43f5404231..d6798bd338 100644 --- a/board/gdsys/p1022/controlcenterd-id.c +++ b/board/gdsys/p1022/controlcenterd-id.c @@ -18,6 +18,7 @@ #include <i2c.h> #include <mmc.h> #include <tpm-v1.h> +#include <u-boot/crc.h> #include <u-boot/sha1.h> #include <asm/byteorder.h> #include <asm/unaligned.h> diff --git a/board/sunxi/board.c b/board/sunxi/board.c index e3b2d13892..b9450a0e36 100644 --- a/board/sunxi/board.c +++ b/board/sunxi/board.c @@ -24,6 +24,7 @@ #include <asm/arch/gpio.h> #include <asm/arch/mmc.h> #include <asm/arch/spl.h> +#include <u-boot/crc.h> #ifndef CONFIG_ARM64 #include <asm/armv7.h> #endif diff --git a/board/theobroma-systems/puma_rk3399/puma-rk3399.c b/board/theobroma-systems/puma_rk3399/puma-rk3399.c index 47259b7149..9887d20207 100644 --- a/board/theobroma-systems/puma_rk3399/puma-rk3399.c +++ b/board/theobroma-systems/puma_rk3399/puma-rk3399.c @@ -9,6 +9,7 @@ #include <misc.h> #include <spl.h> #include <syscon.h> +#include <u-boot/crc.h> #include <usb.h> #include <dm/pinctrl.h> #include <dm/uclass-internal.h> diff --git a/board/varisys/common/sys_eeprom.c b/board/varisys/common/sys_eeprom.c index 77772a6923..4c025087db 100644 --- a/board/varisys/common/sys_eeprom.c +++ b/board/varisys/common/sys_eeprom.c @@ -15,6 +15,7 @@ #include <env.h> #include <i2c.h> #include <linux/ctype.h> +#include <u-boot/crc.h>
#include "eeprom.h"
diff --git a/cmd/i2c.c b/cmd/i2c.c index 038f97c261..43a76299b3 100644 --- a/cmd/i2c.c +++ b/cmd/i2c.c @@ -76,6 +76,7 @@ #include <malloc.h> #include <asm/byteorder.h> #include <linux/compiler.h> +#include <u-boot/crc.h>
/* Display values from last command. * Memory modify remembered values are different from display memory. diff --git a/cmd/nvedit.c b/cmd/nvedit.c index 99a3bc57b1..b5da375913 100644 --- a/cmd/nvedit.c +++ b/cmd/nvedit.c @@ -33,6 +33,7 @@ #include <errno.h> #include <malloc.h> #include <mapmem.h> +#include <u-boot/crc.h> #include <watchdog.h> #include <linux/stddef.h> #include <asm/byteorder.h> diff --git a/common/android_ab.c b/common/android_ab.c index 05ffc6f4e5..6c4df419b2 100644 --- a/common/android_ab.c +++ b/common/android_ab.c @@ -8,6 +8,7 @@ #include <linux/err.h> #include <memalign.h> #include <u-boot/crc.h> +#include <u-boot/crc.h>
/** * Compute the CRC-32 of the bootloader control struct. diff --git a/common/bloblist.c b/common/bloblist.c index b4cf169b05..ccf5e4b6f6 100644 --- a/common/bloblist.c +++ b/common/bloblist.c @@ -9,6 +9,7 @@ #include <log.h> #include <mapmem.h> #include <spl.h> +#include <u-boot/crc.h>
DECLARE_GLOBAL_DATA_PTR;
diff --git a/common/board_r.c b/common/board_r.c index 79ee21e968..05e08212b4 100644 --- a/common/board_r.c +++ b/common/board_r.c @@ -11,6 +11,7 @@
#include <common.h> #include <api.h> +#include <u-boot/crc.h> /* TODO: can we just include all these headers whether needed or not? */ #if defined(CONFIG_CMD_BEDBUG) #include <bedbug/type.h> diff --git a/common/hash.c b/common/hash.c index d0d825e389..ff4986a619 100644 --- a/common/hash.c +++ b/common/hash.c @@ -18,6 +18,7 @@ #include <hw_sha.h> #include <asm/io.h> #include <linux/errno.h> +#include <u-boot/crc.h> #else #include "mkimage.h" #include <time.h> diff --git a/common/image-fit.c b/common/image-fit.c index 5c63c769de..c52f945120 100644 --- a/common/image-fit.c +++ b/common/image-fit.c @@ -11,6 +11,7 @@ #ifdef USE_HOSTCC #include "mkimage.h" #include <time.h> +#include <u-boot/crc.h> #else #include <linux/compiler.h> #include <linux/kconfig.h> diff --git a/common/image.c b/common/image.c index f17fa40c49..992ebbad51 100644 --- a/common/image.c +++ b/common/image.c @@ -9,6 +9,7 @@ #ifndef USE_HOSTCC #include <common.h> #include <env.h> +#include <u-boot/crc.h> #include <watchdog.h>
#ifdef CONFIG_SHOW_BOOT_PROGRESS diff --git a/common/iotrace.c b/common/iotrace.c index 5b92fabc76..ba955afc94 100644 --- a/common/iotrace.c +++ b/common/iotrace.c @@ -8,6 +8,7 @@ #include <common.h> #include <mapmem.h> #include <asm/io.h> +#include <u-boot/crc.h>
DECLARE_GLOBAL_DATA_PTR;
diff --git a/common/spl/spl.c b/common/spl/spl.c index f1ad8dc9da..cc5507f757 100644 --- a/common/spl/spl.c +++ b/common/spl/spl.c @@ -15,6 +15,7 @@ #include <asm/u-boot.h> #include <nand.h> #include <fat.h> +#include <u-boot/crc.h> #include <version.h> #include <image.h> #include <malloc.h> diff --git a/disk/part_efi.c b/disk/part_efi.c index 51fa4a74ab..b2e157d9c1 100644 --- a/disk/part_efi.c +++ b/disk/part_efi.c @@ -19,6 +19,7 @@ #include <part_efi.h> #include <linux/compiler.h> #include <linux/ctype.h> +#include <u-boot/crc.h>
DECLARE_GLOBAL_DATA_PTR;
diff --git a/drivers/misc/atsha204a-i2c.c b/drivers/misc/atsha204a-i2c.c index 934ba5e6b8..116c0661e7 100644 --- a/drivers/misc/atsha204a-i2c.c +++ b/drivers/misc/atsha204a-i2c.c @@ -15,6 +15,7 @@ #include <i2c.h> #include <errno.h> #include <atsha204a-i2c.h> +#include <u-boot/crc.h>
#define ATSHA204A_TWLO 60 #define ATSHA204A_TRANSACTION_TIMEOUT 100000 diff --git a/drivers/mtd/ubi/attach.c b/drivers/mtd/ubi/attach.c index b4ba339c80..19defd8831 100644 --- a/drivers/mtd/ubi/attach.c +++ b/drivers/mtd/ubi/attach.c @@ -74,6 +74,7 @@ #include <linux/slab.h> #include <linux/crc32.h> #include <linux/random.h> +#include <u-boot/crc.h> #else #include <div64.h> #include <linux/err.h> diff --git a/drivers/mtd/ubi/crc32.c b/drivers/mtd/ubi/crc32.c index 9c54ea4db0..9ce061c861 100644 --- a/drivers/mtd/ubi/crc32.c +++ b/drivers/mtd/ubi/crc32.c @@ -25,6 +25,7 @@ #include <linux/kernel.h> #include <linux/module.h> #include <linux/compiler.h> +#include <u-boot/crc.h> #endif #include <linux/types.h>
diff --git a/drivers/mtd/ubi/eba.c b/drivers/mtd/ubi/eba.c index 809782b372..0c8b998e7e 100644 --- a/drivers/mtd/ubi/eba.c +++ b/drivers/mtd/ubi/eba.c @@ -31,6 +31,7 @@ #ifndef __UBOOT__ #include <linux/slab.h> #include <linux/crc32.h> +#include <u-boot/crc.h> #else #include <ubi_uboot.h> #endif diff --git a/drivers/mtd/ubi/fastmap.c b/drivers/mtd/ubi/fastmap.c index 14368f9738..646c778e87 100644 --- a/drivers/mtd/ubi/fastmap.c +++ b/drivers/mtd/ubi/fastmap.c @@ -8,6 +8,7 @@
#ifndef __UBOOT__ #include <linux/crc32.h> +#include <u-boot/crc.h> #else #include <div64.h> #include <malloc.h> diff --git a/drivers/mtd/ubi/io.c b/drivers/mtd/ubi/io.c index 688fb509d2..608dede492 100644 --- a/drivers/mtd/ubi/io.c +++ b/drivers/mtd/ubi/io.c @@ -77,6 +77,7 @@ #include <linux/crc32.h> #include <linux/err.h> #include <linux/slab.h> +#include <u-boot/crc.h> #else #include <hexdump.h> #include <ubi_uboot.h> diff --git a/drivers/mtd/ubi/vtbl.c b/drivers/mtd/ubi/vtbl.c index fb535c1a87..9c46ef6695 100644 --- a/drivers/mtd/ubi/vtbl.c +++ b/drivers/mtd/ubi/vtbl.c @@ -50,6 +50,7 @@ #include <linux/err.h> #include <linux/slab.h> #include <asm/div64.h> +#include <u-boot/crc.h> #else #include <ubi_uboot.h> #endif diff --git a/drivers/mtd/ubispl/ubispl.c b/drivers/mtd/ubispl/ubispl.c index 3f3b9b4367..00102fcf74 100644 --- a/drivers/mtd/ubispl/ubispl.c +++ b/drivers/mtd/ubispl/ubispl.c @@ -9,6 +9,7 @@
#include <common.h> #include <errno.h> +#include <u-boot/crc.h> #include <ubispl.h>
#include <linux/crc32.h> diff --git a/drivers/net/fm/fdt.c b/drivers/net/fm/fdt.c index 72d1294751..a6b0d87415 100644 --- a/drivers/net/fm/fdt.c +++ b/drivers/net/fm/fdt.c @@ -5,6 +5,7 @@ #include <asm/io.h> #include <env.h> #include <fsl_qe.h> /* For struct qe_firmware */ +#include <u-boot/crc.h>
#ifdef CONFIG_SYS_DPAA_FMAN /** diff --git a/drivers/net/fm/fm.c b/drivers/net/fm/fm.c index 4c9dce8dc5..926cf81a07 100644 --- a/drivers/net/fm/fm.c +++ b/drivers/net/fm/fm.c @@ -8,6 +8,7 @@ #include <malloc.h> #include <asm/io.h> #include <linux/errno.h> +#include <u-boot/crc.h>
#include "fm.h" #include <fsl_qe.h> /* For struct qe_firmware */ diff --git a/drivers/qe/qe.c b/drivers/qe/qe.c index 6e4d732a07..24549ece65 100644 --- a/drivers/qe/qe.c +++ b/drivers/qe/qe.c @@ -14,6 +14,7 @@ #include <linux/immap_qe.h> #include <fsl_qe.h> #include <mmc.h> +#include <u-boot/crc.h>
#ifdef CONFIG_ARCH_LS1021A #include <asm/arch/immap_ls102xa.h> 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 231a5fdf24..97e0024572 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 9f3dc635cf..4dce234c22 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 02531f427b..7cdc61a514 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; diff --git a/env/sf.c b/env/sf.c index 590d0cedd8..5b55ee51ad 100644 --- a/env/sf.c +++ b/env/sf.c @@ -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 diff --git a/examples/api/glue.c b/examples/api/glue.c index 4086616a94..91d13157a1 100644 --- a/examples/api/glue.c +++ b/examples/api/glue.c @@ -7,6 +7,7 @@ #include <env.h> #include <linux/types.h> #include <api_public.h> +#include <u-boot/crc.h>
#include "glue.h"
diff --git a/fs/jffs2/jffs2_1pass.c b/fs/jffs2/jffs2_1pass.c index 6bf1943958..5912cde838 100644 --- a/fs/jffs2/jffs2_1pass.c +++ b/fs/jffs2/jffs2_1pass.c @@ -118,6 +118,7 @@ #include <linux/compiler.h> #include <linux/stat.h> #include <linux/time.h> +#include <u-boot/crc.h> #include <watchdog.h> #include <jffs2/jffs2.h> #include <jffs2/jffs2_1pass.h> diff --git a/fs/ubifs/io.c b/fs/ubifs/io.c index 8d7f8feebb..7fe94e1093 100644 --- a/fs/ubifs/io.c +++ b/fs/ubifs/io.c @@ -61,6 +61,7 @@ #ifndef __UBOOT__ #include <linux/crc32.h> #include <linux/slab.h> +#include <u-boot/crc.h> #else #include <linux/compat.h> #include <linux/err.h> diff --git a/fs/ubifs/recovery.c b/fs/ubifs/recovery.c index 621804c6fd..b568012fec 100644 --- a/fs/ubifs/recovery.c +++ b/fs/ubifs/recovery.c @@ -38,6 +38,7 @@ #ifndef __UBOOT__ #include <linux/crc32.h> #include <linux/slab.h> +#include <u-boot/crc.h> #else #include <linux/err.h> #endif diff --git a/fs/ubifs/tnc.c b/fs/ubifs/tnc.c index 86774f8fa2..8afc08ad7d 100644 --- a/fs/ubifs/tnc.c +++ b/fs/ubifs/tnc.c @@ -21,6 +21,7 @@ #ifndef __UBOOT__ #include <linux/crc32.h> #include <linux/slab.h> +#include <u-boot/crc.h> #else #include <linux/compat.h> #include <linux/err.h> diff --git a/include/common.h b/include/common.h index b09c7aeddd..9c454fb1c8 100644 --- a/include/common.h +++ b/include/common.h @@ -322,9 +322,6 @@ int strcmp_compar(const void *, const void *); /* lib/strmhz.c */ char * strmhz(char *buf, unsigned long hz);
-/* lib/crc32.c */ -#include <u-boot/crc.h> - /* * STDIO based functions (can always be used) */ diff --git a/lib/crc32.c b/lib/crc32.c index dc7e183f18..e9be3bf386 100644 --- a/lib/crc32.c +++ b/lib/crc32.c @@ -10,6 +10,7 @@
#ifdef USE_HOSTCC #include <arpa/inet.h> +#include <u-boot/crc.h> #else #include <common.h> #include <efi_loader.h> diff --git a/lib/efi_loader/efi_boottime.c b/lib/efi_loader/efi_boottime.c index 493d906c64..ea52b9539d 100644 --- a/lib/efi_loader/efi_boottime.c +++ b/lib/efi_loader/efi_boottime.c @@ -13,6 +13,7 @@ #include <u-boot/crc.h> #include <bootm.h> #include <pe.h> +#include <u-boot/crc.h> #include <watchdog.h>
DECLARE_GLOBAL_DATA_PTR; diff --git a/lib/efi_loader/efi_runtime.c b/lib/efi_loader/efi_runtime.c index ced00516f7..72555f07fc 100644 --- a/lib/efi_loader/efi_runtime.c +++ b/lib/efi_loader/efi_runtime.c @@ -11,6 +11,7 @@ #include <elf.h> #include <efi_loader.h> #include <rtc.h> +#include <u-boot/crc.h>
/* For manual relocation support */ DECLARE_GLOBAL_DATA_PTR; diff --git a/lib/efi_loader/efi_variable.c b/lib/efi_loader/efi_variable.c index 46f35bc60b..c316bdfec0 100644 --- a/lib/efi_loader/efi_variable.c +++ b/lib/efi_loader/efi_variable.c @@ -11,6 +11,7 @@ #include <hexdump.h> #include <malloc.h> #include <search.h> +#include <u-boot/crc.h>
#define READ_ONLY BIT(31)
diff --git a/lib/efi_selftest/efi_selftest_config_table.c b/lib/efi_selftest/efi_selftest_config_table.c index 4467f492ac..2bf12b5bb6 100644 --- a/lib/efi_selftest/efi_selftest_config_table.c +++ b/lib/efi_selftest/efi_selftest_config_table.c @@ -9,6 +9,7 @@ */
#include <efi_selftest.h> +#include <u-boot/crc.h>
static const struct efi_system_table *sys_table; static struct efi_boot_services *boottime; diff --git a/lib/efi_selftest/efi_selftest_crc32.c b/lib/efi_selftest/efi_selftest_crc32.c index 4881e8ac6f..19153c759a 100644 --- a/lib/efi_selftest/efi_selftest_crc32.c +++ b/lib/efi_selftest/efi_selftest_crc32.c @@ -10,6 +10,7 @@ */
#include <efi_selftest.h> +#include <u-boot/crc.h>
const struct efi_system_table *st; efi_status_t (EFIAPI *bs_crc32)(const void *data, efi_uintn_t data_size, diff --git a/lib/gunzip.c b/lib/gunzip.c index 1d65616c13..9e6ccd692a 100644 --- a/lib/gunzip.c +++ b/lib/gunzip.c @@ -12,6 +12,7 @@ #include <image.h> #include <malloc.h> #include <memalign.h> +#include <u-boot/crc.h> #include <watchdog.h> #include <u-boot/zlib.h>
diff --git a/lib/zlib/deflate.c b/lib/zlib/deflate.c index 9a20b70344..1fe58d5da6 100644 --- a/lib/zlib/deflate.c +++ b/lib/zlib/deflate.c @@ -50,6 +50,7 @@ /* @(#) $Id$ */
#include "deflate.h" +#include <u-boot/crc.h>
const char deflate_copyright[] = " deflate 1.2.5 Copyright 1995-2010 Jean-loup Gailly and Mark Adler "; diff --git a/tools/default_image.c b/tools/default_image.c index f7990e28c0..e164c0c27d 100644 --- a/tools/default_image.c +++ b/tools/default_image.c @@ -15,6 +15,7 @@
#include "imagetool.h" #include "mkimage.h" +#include <u-boot/crc.h>
#include <image.h> #include <tee/optee.h> diff --git a/tools/env/fw_env.c b/tools/env/fw_env.c index e2801f595f..30b5a190ab 100644 --- a/tools/env/fw_env.c +++ b/tools/env/fw_env.c @@ -25,6 +25,7 @@ #include <sys/types.h> #include <sys/ioctl.h> #include <sys/stat.h> +#include <u-boot/crc.h> #include <unistd.h> #include <dirent.h>
diff --git a/tools/env/fw_env.h b/tools/env/fw_env.h index 3d2b457b31..b60fbfc8f8 100644 --- a/tools/env/fw_env.h +++ b/tools/env/fw_env.h @@ -160,5 +160,3 @@ int fw_env_close(struct env_opts *opts); * version string of the library */ char *fw_env_version(void); - -unsigned long crc32(unsigned long, const unsigned char *, unsigned); diff --git a/tools/envcrc.c b/tools/envcrc.c index 09b49b49f9..037b6e8bec 100644 --- a/tools/envcrc.c +++ b/tools/envcrc.c @@ -9,6 +9,7 @@ #include <stdint.h> #include <stdlib.h> #include <string.h> +#include <u-boot/crc.h> #include <unistd.h>
#include <linux/kconfig.h> diff --git a/tools/mkenvimage.c b/tools/mkenvimage.c index a8eebab6c3..b05f83415f 100644 --- a/tools/mkenvimage.c +++ b/tools/mkenvimage.c @@ -14,6 +14,7 @@ #include <stdlib.h> #include <stdint.h> #include <string.h> +#include <u-boot/crc.h> #include <unistd.h> #include <libgen.h> #include <sys/types.h> diff --git a/tools/mxsimage.c b/tools/mxsimage.c index 0bb5c6aa6b..002f4b525a 100644 --- a/tools/mxsimage.c +++ b/tools/mxsimage.c @@ -11,6 +11,7 @@ #include <fcntl.h> #include <stdio.h> #include <string.h> +#include <u-boot/crc.h> #include <unistd.h> #include <limits.h>
diff --git a/tools/pbl_crc32.c b/tools/pbl_crc32.c index 06da1d92ff..9b1ca55348 100644 --- a/tools/pbl_crc32.c +++ b/tools/pbl_crc32.c @@ -5,6 +5,7 @@ * Cleaned up and refactored by Charles Manning. */ #include "pblimage.h" +#include <u-boot/crc.h>
static uint32_t crc_table[256]; static int crc_table_valid; diff --git a/tools/pblimage.c b/tools/pblimage.c index d11f9afe24..3c823e96cf 100644 --- a/tools/pblimage.c +++ b/tools/pblimage.c @@ -6,6 +6,7 @@ #include <image.h> #include "pblimage.h" #include "pbl_crc32.h" +#include <u-boot/crc.h>
#define roundup(x, y) ((((x) + ((y) - 1)) / (y)) * (y)) #define PBL_ACS_CONT_CMD 0x81000000 diff --git a/tools/socfpgaimage.c b/tools/socfpgaimage.c index 72d8b96f54..8fa098338b 100644 --- a/tools/socfpgaimage.c +++ b/tools/socfpgaimage.c @@ -55,6 +55,7 @@ #include "pbl_crc32.h" #include "imagetool.h" #include "mkimage.h" +#include <u-boot/crc.h>
#include <image.h>