fs: ext4: Fix building ext4 in SPL if write is enabled

If EXT4_WRITE is enabled, write capabilities will be compiled into SPL, but
not CRC16. Add an option to enable CRC16 to avoid linker errors.

Signed-off-by: Sean Anderson <seanga2@gmail.com>
Reviewed-by: Simon Glass <sjg@chromium.org>

diff --git a/common/spl/Kconfig b/common/spl/Kconfig
index ad574a600e31c9e90e3401a7a073bec86dfcb48c..6bc4066fad7a055bf8b6d7eb3157e9ccc55a740a 100644 (file)
--- a/common/spl/Kconfig
+++ b/common/spl/Kconfig
@@ -657,6 +657,7 @@ config SPL_ETH
 
 config SPL_FS_EXT4
        bool "Support EXT filesystems"
+       select SPL_CRC16 if EXT4_WRITE
        help
          Enable support for EXT2/3/4 filesystems with SPL. This permits
          U-Boot (or Linux in Falcon mode) to be loaded from an EXT

diff --git a/lib/Kconfig b/lib/Kconfig
index 79cf9ef0fa31c3141e71dbf5d335fc4f9ec981a6..f6ca559897e724fb741e667b9d58237181c2762c 100644 (file)
--- a/lib/Kconfig
+++ b/lib/Kconfig
@@ -687,6 +687,12 @@ config SPL_CRC8
          checksum with feedback to produce an 8-bit result. The code is small
          and it does not require a lookup table (unlike CRC32).
 
+config SPL_CRC16
+       bool "Support CRC16 in SPL"
+       depends on SPL
+       help
+         Enables CRC16 support in SPL. This is not normally required.
+
 config CRC32
        def_bool y
        help

diff --git a/lib/Makefile b/lib/Makefile
index 1c31ad9531e8f97149fc9b76c76828a9db109a01..2a76acf100d05a94f007b73a876a2824d01e1425 100644 (file)
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -64,6 +64,7 @@ obj-$(CONFIG_TPM_V2) += tpm-v2.o
 endif
 
 obj-$(CONFIG_$(SPL_TPL_)CRC8) += crc8.o
+obj-$(CONFIG_$(SPL_TPL_)CRC16) += crc16.o
 
 obj-y += crypto/