Browse Source

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>
Simon Glass 4 years ago
parent
commit
3db7110857
65 changed files with 63 additions and 5 deletions
  1. 1 0
      api/api.c
  2. 1 0
      arch/arm/mach-meson/board-common.c
  3. 1 0
      arch/arm/mach-rockchip/misc.c
  4. 1 0
      board/CZ.NIC/turris_omnia/turris_omnia.c
  5. 1 0
      board/corscience/tricorder/tricorder-eeprom.c
  6. 1 0
      board/freescale/common/sys_eeprom.c
  7. 1 0
      board/freescale/mpc8323erdb/mpc8323erdb.c
  8. 1 0
      board/gardena/smart-gateway-mt7688/board.c
  9. 1 0
      board/gdsys/a38x/hre.c
  10. 1 0
      board/gdsys/p1022/controlcenterd-id.c
  11. 1 0
      board/sunxi/board.c
  12. 1 0
      board/theobroma-systems/puma_rk3399/puma-rk3399.c
  13. 1 0
      board/varisys/common/sys_eeprom.c
  14. 1 0
      cmd/i2c.c
  15. 1 0
      cmd/nvedit.c
  16. 1 0
      common/android_ab.c
  17. 1 0
      common/bloblist.c
  18. 1 0
      common/board_r.c
  19. 1 0
      common/hash.c
  20. 1 0
      common/image-fit.c
  21. 1 0
      common/image.c
  22. 1 0
      common/iotrace.c
  23. 1 0
      common/spl/spl.c
  24. 1 0
      disk/part_efi.c
  25. 1 0
      drivers/misc/atsha204a-i2c.c
  26. 1 0
      drivers/mtd/ubi/attach.c
  27. 1 0
      drivers/mtd/ubi/crc32.c
  28. 1 0
      drivers/mtd/ubi/eba.c
  29. 1 0
      drivers/mtd/ubi/fastmap.c
  30. 1 0
      drivers/mtd/ubi/io.c
  31. 1 0
      drivers/mtd/ubi/vtbl.c
  32. 1 0
      drivers/mtd/ubispl/ubispl.c
  33. 1 0
      drivers/net/fm/fdt.c
  34. 1 0
      drivers/net/fm/fm.c
  35. 1 0
      drivers/qe/qe.c
  36. 1 0
      env/common.c
  37. 1 0
      env/eeprom.c
  38. 1 0
      env/flash.c
  39. 1 0
      env/nand.c
  40. 1 0
      env/nvram.c
  41. 1 0
      env/remote.c
  42. 1 0
      env/sf.c
  43. 1 0
      examples/api/glue.c
  44. 1 0
      fs/jffs2/jffs2_1pass.c
  45. 1 0
      fs/ubifs/io.c
  46. 1 0
      fs/ubifs/recovery.c
  47. 1 0
      fs/ubifs/tnc.c
  48. 0 3
      include/common.h
  49. 1 0
      lib/crc32.c
  50. 1 0
      lib/efi_loader/efi_boottime.c
  51. 1 0
      lib/efi_loader/efi_runtime.c
  52. 1 0
      lib/efi_loader/efi_variable.c
  53. 1 0
      lib/efi_selftest/efi_selftest_config_table.c
  54. 1 0
      lib/efi_selftest/efi_selftest_crc32.c
  55. 1 0
      lib/gunzip.c
  56. 1 0
      lib/zlib/deflate.c
  57. 1 0
      tools/default_image.c
  58. 1 0
      tools/env/fw_env.c
  59. 0 2
      tools/env/fw_env.h
  60. 1 0
      tools/envcrc.c
  61. 1 0
      tools/mkenvimage.c
  62. 1 0
      tools/mxsimage.c
  63. 1 0
      tools/pbl_crc32.c
  64. 1 0
      tools/pblimage.c
  65. 1 0
      tools/socfpgaimage.c

+ 1 - 0
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"
 

+ 1 - 0
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>

+ 1 - 0
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>

+ 1 - 0
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"

+ 1 - 0
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"
 

+ 1 - 0
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"

+ 1 - 0
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

+ 1 - 0
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>

+ 1 - 0
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>

+ 1 - 0
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>

+ 1 - 0
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

+ 1 - 0
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>

+ 1 - 0
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"
 

+ 1 - 0
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.

+ 1 - 0
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>

+ 1 - 0
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.

+ 1 - 0
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;
 

+ 1 - 0
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>

+ 1 - 0
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>

+ 1 - 0
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>

+ 1 - 0
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

+ 1 - 0
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;
 

+ 1 - 0
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>

+ 1 - 0
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;
 

+ 1 - 0
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

+ 1 - 0
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>

+ 1 - 0
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>
 

+ 1 - 0
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

+ 1 - 0
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>

+ 1 - 0
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>

+ 1 - 0
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

+ 1 - 0
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>

+ 1 - 0
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
 /**

+ 1 - 0
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 */

+ 1 - 0
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>

+ 1 - 0
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;
 

+ 1 - 0
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

+ 1 - 0
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;
 

+ 1 - 0
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)

+ 1 - 0
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;
 

+ 1 - 0
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;

+ 1 - 0
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

+ 1 - 0
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"
 

+ 1 - 0
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>

+ 1 - 0
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>

+ 1 - 0
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

+ 1 - 0
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>

+ 0 - 3
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)
  */

+ 1 - 0
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>

+ 1 - 0
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;

+ 1 - 0
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;

+ 1 - 0
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)
 

+ 1 - 0
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;

+ 1 - 0
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,

+ 1 - 0
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>
 

+ 1 - 0
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 ";

+ 1 - 0
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>

+ 1 - 0
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>
 

+ 0 - 2
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);

+ 1 - 0
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>

+ 1 - 0
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>

+ 1 - 0
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>
 

+ 1 - 0
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;

+ 1 - 0
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

+ 1 - 0
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>