On 4/12/22 11:20, Pali Rohár wrote:
U-Boot CRC-16 implementation uses polynomial x^16 + x^12 + x^5 + 1 which is
not standard CRC-16 algorithm, but it is known as CRC-16-CCITT. Rename file
crc16.c to crc16-ccitt.c to reduce confusion.

Signed-off-by: Pali Rohár <[email protected]>

Reviewed-by: Stefan Roese <[email protected]>

Thanks,
Stefan

---
  include/u-boot/crc.h           | 2 +-
  lib/Makefile                   | 8 ++++----
  lib/{crc16.c => crc16-ccitt.c} | 2 +-
  tools/Makefile                 | 2 +-
  4 files changed, 7 insertions(+), 7 deletions(-)
  rename lib/{crc16.c => crc16-ccitt.c} (99%)

diff --git a/include/u-boot/crc.h b/include/u-boot/crc.h
index 52ec6a9e2d4b..eba8edfb4f31 100644
--- a/include/u-boot/crc.h
+++ b/include/u-boot/crc.h
@@ -25,7 +25,7 @@
   */
  unsigned int crc8(unsigned int crc_start, const unsigned char *vptr, int len);
-/* lib/crc16.c - 16 bit CRC with polynomial x^16+x^12+x^5+1 (CRC-CCITT) */
+/* lib/crc16-ccitt.c - 16 bit CRC with polynomial x^16+x^12+x^5+1 (CRC-CCITT) 
*/
  uint16_t crc16_ccitt(uint16_t crc_start, const unsigned char *s, int len);
  /**
   * crc16_ccitt_wd_buf - Perform CRC16-CCIT on an input buffer and return the
diff --git a/lib/Makefile b/lib/Makefile
index 11b03d1cbec8..b4f03cc149d3 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -37,7 +37,7 @@ obj-$(CONFIG_CIRCBUF) += circbuf.o
  endif
obj-y += crc8.o
-obj-y += crc16.o
+obj-y += crc16-ccitt.o
  obj-$(CONFIG_ERRNO_STR) += errno_str.o
  obj-$(CONFIG_FIT) += fdtdec_common.o
  obj-$(CONFIG_TEST_FDTDEC) += fdtdec_test.o
@@ -90,9 +90,9 @@ obj-$(CONFIG_$(SPL_TPL_)OF_LIBFDT) += libfdt/
  obj-$(CONFIG_$(SPL_TPL_)OF_REAL) += fdtdec_common.o fdtdec.o
ifdef CONFIG_SPL_BUILD
-obj-$(CONFIG_SPL_YMODEM_SUPPORT) += crc16.o
-obj-$(CONFIG_$(SPL_TPL_)HASH) += crc16.o
-obj-$(CONFIG_MMC_SPI_CRC_ON) += crc16.o
+obj-$(CONFIG_SPL_YMODEM_SUPPORT) += crc16-ccitt.o
+obj-$(CONFIG_$(SPL_TPL_)HASH) += crc16-ccitt.o
+obj-$(CONFIG_MMC_SPI_CRC_ON) += crc16-ccitt.o
  obj-y += net_utils.o
  endif
  obj-$(CONFIG_ADDR_MAP) += addr_map.o
diff --git a/lib/crc16.c b/lib/crc16-ccitt.c
similarity index 99%
rename from lib/crc16.c
rename to lib/crc16-ccitt.c
index f46ba727c9a8..6cadbc103d3e 100644
--- a/lib/crc16.c
+++ b/lib/crc16-ccitt.c
@@ -2,7 +2,7 @@
  /*
   *==========================================================================
   *
- *      crc16.c
+ *      crc16-ccitt.c
   *
   *      16 bit CRC with polynomial x^16+x^12+x^5+1
   *
diff --git a/tools/Makefile b/tools/Makefile
index 60231c728ceb..852dc638f418 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -131,7 +131,7 @@ dumpimage-mkimage-objs := aisimage.o \
                        $(ROCKCHIP_OBS) \
                        socfpgaimage.o \
                        sunxi_egon.o \
-                       lib/crc16.o \
+                       lib/crc16-ccitt.o \
                        lib/hash-checksum.o \
                        lib/sha1.o \
                        lib/sha256.o \

Viele Grüße,
Stefan Roese

--
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-51 Fax: (+49)-8142-66989-80 Email: [email protected]

Reply via email to