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>

diff --git a/api/api.c b/api/api.c
index 71fa03804e6f6459b7e2b7392ddcc14bf7f7db10..4fc451a83d1905a9f50faf0d767ce75ed8a19ca7 100644 (file)
--- 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 d261b4ea331c63995321a1baaf9285b5c787a408..6c77e379669644b83531894ae88fd180055482ff 100644 (file)
--- 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 bed4317f7ecee173538f8f56a19ac06a55d95d6c..f697e937c6240114745255d6d52352e92837eacd 100644 (file)
--- 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 1d8d08a847d9104356b3763248be95fd8beac2cf..4d21e62e7338ed1e64d417a3e0e385daab29f0b0 100644 (file)
--- 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 16bceea7ba7edc53d21990f21acc8728433d788e..b28189dafdcc5f91aa9cbdcd533482555dc0e59f 100644 (file)
--- 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 bb655ca7447ca9acf9f3f4bc5a548c1b83613cef..6f151b0f717b1116ddbb37bc110562361fac8bf0 100644 (file)
--- 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 e5aecc4e1f28b82f91f8e843412f5f832801d6a8..003e95cb6ba07ada6cdc8d87742d9f90dde9668e 100644 (file)
--- 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 e9ffd42a8a68319b5cdeaf13326f9d9ce14a4297..fea823b2d0dec140970f96779836a4f3799e032a 100644 (file)
--- 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 82b84284ef1ddc1e726d812507655ccfb95e9bb3..027ad1f57e001b0a0b4211f2ca09db73aa88257b 100644 (file)
--- 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 43f5404231f02e207aaedd29500b7de97a7e1df8..d6798bd33829bc9fb7a4b9e142ac8517d9420e20 100644 (file)
--- 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 e3b2d13892c89ad0c6292ac6b20185c0c4fcadd7..b9450a0e36b4e769c1313954dedddaa017b6f1a8 100644 (file)
--- 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 47259b714961add31b452e110968a2c78905359f..9887d2020717af06043d226d50d88d5cb73e70c3 100644 (file)
--- 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 77772a6923e4f80d2029bf06e883684f6c77e963..4c025087db0fb9aa0dcf54c28c9a70bd2dbbfb3e 100644 (file)
--- 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 038f97c261b14f0dae5f487b12981ce484c35b78..43a76299b3c82ad197ea466909f25153fc469ce2 100644 (file)
--- 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 99a3bc57b15feeb74c6f6d3cf41e1204b078831b..b5da37591336ff96e810ec2d50da2bc42fbf0591 100644 (file)
--- 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 05ffc6f4e503061d5757f2e9feadf40ebeff2016..6c4df419b29ac45e3db4b6ace36abb838c3d3e38 100644 (file)
--- 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 b4cf169b05a3d2ed9773df3dfb61818597ab861e..ccf5e4b6f64576c028607292e120beb01ddef298 100644 (file)
--- 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 c9f476ef44789dfee91aa0b19b85550ce89f7ae4..c0065a5c19e644038e6b81690155549dec6c5b0f 100644 (file)
--- 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 d0d825e38986669835a26bf663cf5d7587a82476..ff4986a6190269ed4659685fd9cb77d8c423fae2 100644 (file)
--- 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 5c63c769de274e721ae767fae96da61f013bb8be..c52f94512088dada17fd95bc4c47bfe9ec5c5d81 100644 (file)
--- 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 f17fa40c495c42ac3f9a68110d6befeee5547431..992ebbad51ac110e4e9f8cfbb0b5d7c27bdc7b4c 100644 (file)
--- 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 5b92fabc76e2a738001a18e197790c3b0749f6f7..ba955afc942a9c87e035eae3f5951e754ed5a271 100644 (file)
--- 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 f1ad8dc9dabf668d750ed2f3e725ab71d26976a9..cc5507f7573d82908e9b07af3f2a37ada8d7e116 100644 (file)
--- 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 51fa4a74ab25b3801400d9383641d110b62e5efb..b2e157d9c1ec3aaf5dbc96ce5d67c7ef4c7f3d7b 100644 (file)
--- 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 934ba5e6b80318bf52b5a5beb5598d5fa8b7ad96..116c0661e75057ab56eb59332cb4a61c6db36760 100644 (file)
--- 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 b4ba339c804ccc1a6a5b95031661c43d024a8fa9..19defd883182193cc418a700d47065882e6dea4d 100644 (file)
--- 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 9c54ea4db0c74f004840f76e830e746c52ede92c..9ce061c861308d90f9ae5566c680ed7c25ea4532 100644 (file)
--- 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 809782b3726d34fa67364c79ba20c14b9ebfdb04..0c8b998e7e14b9fc1033c3e88698da5e3caa1153 100644 (file)
--- 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 14368f9738cb7cf966e6f1930219096cc8dff8e9..646c778e87c5ad6894396ac229c92c78ea6ff755 100644 (file)
--- 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 688fb509d2c2dc4f5b0bd3cc5b32988cc64baa11..608dede49251f5a5e146be04487647c8a016fc1a 100644 (file)
--- 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 fb535c1a878044bb10547bdeffbc611f3c5b5404..9c46ef669569858e4e5ae3fac9269336bfd70390 100644 (file)
--- 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 3f3b9b43675f5b3ab68f587c7ce23be309dd7709..00102fcf748e6020b5de4ffee687ae9236ea2163 100644 (file)
--- 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 72d1294751454bd940e6a1b612620822e7409649..a6b0d87415f1664184a10be3ac9c2953fe4d79ac 100644 (file)
--- 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 4c9dce8dc57bc6a47739d0088a1b4d318e674f91..926cf81a07f0f06a7e8d0a87e30712ceead55fba 100644 (file)
--- 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 6e4d732a07a4f6e990f9e175925fd5ec4fdc04e3..24549ece653cf4a20d64e2daae236323cfc4a032 100644 (file)
--- 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 4daaa6faea60373a437677b25afe126e7f75aa98..0edb6fb04c254543db34a3e014843d240d0529fb 100644 (file)
--- 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 cb04d2ac8843903beec91f85e92c9ee840bc8b3a..f0bdf2a14167f157b881b28e30971a6bfa6ac87a 100644 (file)
--- 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 b94ed2b04f8dd4b79f52de16ff22f35ad06738f9..b487e6701ef82632372cbff55f307362112ceb09 100644 (file)
--- 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 e631bf2fdab5adc162743be492d9a64e97c73e71..8b0027d30472fe2cef56f13c95d2fcba739436c9 100644 (file)
--- 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 79201bd788be1ec83e41de807af570567e52dc23..a78db21623637299d7a9b6deea59779046b444f6 100644 (file)
--- 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 55faa1e5d0e8d2f9a0ed1563e1e826f094a5d3b8..50d77b8dfe0e552f6616c33a55fc4b665a5fca36 100644 (file)
--- 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 16dba115783545e46bcad07538e5360b982bb83d..5ef405521947a62f1d52bda91a05922742f2824b 100644 (file)
--- 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 4086616a94bcd4425d2bb8b6ea1352eb9f652410..91d13157a1e462134497047f9bac0514cfe5500d 100644 (file)
--- 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 6bf1943958246f66e1d258887810afa01d084cf3..5912cde83840f1b997cdb46251286f6912f8813f 100644 (file)
--- 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 8d7f8feebb5071be23a4cdd08d8585acc9aae69e..7fe94e1093a44bd26d2672df3457ef2f833d61ba 100644 (file)
--- 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 621804c6fd2ae180541a0b2a3ca7e1856b458d6f..b568012fec30bfa90205ce57d8776e43e7856293 100644 (file)
--- 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 86774f8fa27eb8907c949a7fb40d1a6aaaf300de..8afc08ad7d701924f9ba1a396ed53e5b4906abf7 100644 (file)
--- 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 b09c7aeddd48769d99df11b014e64ea2a0c4c97f..9c454fb1c8389730e209492c404327109fdb5729 100644 (file)
--- 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 dc7e183f1819f53cb31a6eb79e76862fdf9dce05..e9be3bf386e7bc3c86847a73320a0747c5830b56 100644 (file)
--- 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 493d906c641d1972ec7700398ac59a56f6765473..ea52b9539d5b37384ede55777bafffaf0b62c6a1 100644 (file)
--- 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 ced00516f73b412e7282405fe936910cb724c2a7..72555f07fc1c8b249fd8141fc4f1180cb8d6af9e 100644 (file)
--- 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 46f35bc60ba0d4cfdbeed1cf3c02758864ee4bce..c316bdfec0e40120a7a20ee55533667b25a0faa2 100644 (file)
--- 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 4467f492ac505a0331e2205410e0d40139bac7ae..2bf12b5bb68e4d8c3be31a94a3b96eda81770216 100644 (file)
--- 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 4881e8ac6f2d888822c8faf7144251f6864e61bf..19153c759aad975010d6d41acf17307b4d345f00 100644 (file)
--- 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 1d65616c13d4ded7dd84b302fbe8f9e12cae9d01..9e6ccd692a39d43607eaf5afbd62bc95765d9e69 100644 (file)
--- 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 9a20b7034483c32cdc528f2c14277796f1f1d09d..1fe58d5da6c7477abe4246fc5e03501bbd20eef4 100644 (file)
--- 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 f7990e28c0639852a8abe4951416c5f7647526f2..e164c0c27d1a757e32e0c877d2abbfed787f3ca4 100644 (file)
--- 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 e2801f595f6f824b16af1489227b1453c6a12481..30b5a190ab9b380dc0482bd3930e2946055fe4b2 100644 (file)
--- 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 3d2b457b31f83614dba8651340e6800b4866be72..b60fbfc8f8de1c9054cc8afa6b9dbe2f190f33b0 100644 (file)
--- 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 6e4360802719ca3f65d17fdc805430ae0f001bf4..bce77902476d65c4762980d3ea9fcbb4141f35c7 100644 (file)
--- 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 a8eebab6c33aa5265002f430d8caa11186e7e4f6..b05f83415f0f798b218255bc31bbc159c29737a0 100644 (file)
--- 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 0bb5c6aa6b994b5189d2fc4f9a2e20bcc7004061..002f4b525aac0fe4e871a2a76d1d5a7e0f96b6a7 100644 (file)
--- 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 06da1d92ffdd69a1406e989c78ae1501e774ff07..9b1ca55348bba6f7e0557b44cb6c8472e47b534c 100644 (file)
--- 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 d11f9afe24521cb78c2298c31c4700595b76f397..3c823e96cf17d127de25a0c42f18fed5a712eadc 100644 (file)
--- 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 72d8b96f54140c535276040890d5dfc2d05997cd..8fa098338b24a20924c2af6206cce1a26169ff7f 100644 (file)
--- 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>