move digest to crypto/

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

19 files changed, 36 insertions, 32 deletions

diff --git a/Makefile b/Makefile
index 5843db5ceb..f3ea67b1e6 100644
--- a/Makefile
+++ b/Makefile
@@ -410,7 +410,7 @@ scripts: scripts_basic include/config/auto.conf
 	$(Q)$(MAKE) $(build)=$(@)
 
 # Objects we will link into barebox / subdirs we need to visit
-common-y		:= common/ drivers/ commands/ lib/ net/ fs/
+common-y		:= common/ drivers/ commands/ lib/ crypto/ net/ fs/
 
 ifeq ($(dot-config),1)
 # Read in config
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index d123787266..da3300002d 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -144,3 +144,4 @@ source net/Kconfig
 source drivers/Kconfig
 source fs/Kconfig
 source lib/Kconfig
+source crypto/Kconfig
diff --git a/arch/blackfin/Kconfig b/arch/blackfin/Kconfig
index 587f802992..1c58ba83b7 100644
--- a/arch/blackfin/Kconfig
+++ b/arch/blackfin/Kconfig
@@ -73,4 +73,4 @@ source net/Kconfig
 source drivers/Kconfig
 source fs/Kconfig
 source lib/Kconfig
-
+source crypto/Kconfig
diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index 8970470def..50d5c67738 100644
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -225,3 +225,4 @@ source net/Kconfig
 source drivers/Kconfig
 source fs/Kconfig
 source lib/Kconfig
+source crypto/Kconfig
diff --git a/arch/nios2/Kconfig b/arch/nios2/Kconfig
index b4b0429226..e1af0c007b 100644
--- a/arch/nios2/Kconfig
+++ b/arch/nios2/Kconfig
@@ -36,4 +36,4 @@ source net/Kconfig
 source drivers/Kconfig
 source fs/Kconfig
 source lib/Kconfig
-
+source crypto/Kconfig
diff --git a/arch/ppc/Kconfig b/arch/ppc/Kconfig
index 50ccaac5f3..4c7b7cd140 100644
--- a/arch/ppc/Kconfig
+++ b/arch/ppc/Kconfig
@@ -55,3 +55,4 @@ source net/Kconfig
 source drivers/Kconfig
 source fs/Kconfig
 source lib/Kconfig
+source crypto/Kconfig
diff --git a/arch/sandbox/Kconfig b/arch/sandbox/Kconfig
index 36f8afb91d..10e682976a 100644
--- a/arch/sandbox/Kconfig
+++ b/arch/sandbox/Kconfig
@@ -20,3 +20,4 @@ source net/Kconfig
 source drivers/Kconfig
 source fs/Kconfig
 source lib/Kconfig
+source crypto/Kconfig
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 6e70760f58..711bbfe0e5 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -65,3 +65,4 @@ source net/Kconfig
 source drivers/Kconfig
 source fs/Kconfig
 source lib/Kconfig
+source crypto/Kconfig
diff --git a/crypto/Kconfig b/crypto/Kconfig
new file mode 100644
index 0000000000..9f01810ee4
--- /dev/null
+++ b/crypto/Kconfig
@@ -0,0 +1,21 @@
+config CRC32
+	bool
+
+config CRC16
+	bool
+
+menuconfig DIGEST
+	bool "Digest                        "
+
+if DIGEST
+
+config MD5
+	bool "MD5"
+
+config SHA1
+	bool "SHA1"
+
+config SHA256
+	bool "SHA256"
+
+endif
diff --git a/crypto/Makefile b/crypto/Makefile
new file mode 100644
index 0000000000..a88c5b7ada
--- /dev/null
+++ b/crypto/Makefile
@@ -0,0 +1,5 @@
+obj-$(CONFIG_CRC32)	+= crc32.o
+obj-$(CONFIG_CRC16)	+= crc16.o
+obj-$(CONFIG_MD5)	+= md5.o
+obj-$(CONFIG_SHA1)	+= sha1.o
+obj-$(CONFIG_SHA256)	+= sha256.o
diff --git a/lib/crc16.c b/crypto/crc16.c
index 6904365e59..6904365e59 100644
--- a/lib/crc16.c
+++ b/crypto/crc16.c
diff --git a/lib/crc32.c b/crypto/crc32.c
index 275edb4c52..275edb4c52 100644
--- a/lib/crc32.c
+++ b/crypto/crc32.c
diff --git a/lib/md5.c b/crypto/md5.c
index 6c4ca1dd59..6c4ca1dd59 100644
--- a/lib/md5.c
+++ b/crypto/md5.c
diff --git a/lib/sha1.c b/crypto/sha1.c
index b4e2abc003..b4e2abc003 100644
--- a/lib/sha1.c
+++ b/crypto/sha1.c
diff --git a/lib/sha256.c b/crypto/sha256.c
index 975ebe9f94..975ebe9f94 100644
--- a/lib/sha256.c
+++ b/crypto/sha256.c
diff --git a/lib/Kconfig b/lib/Kconfig
index ad2b3cf0c8..51f43e0158 100644
--- a/lib/Kconfig
+++ b/lib/Kconfig
@@ -4,28 +4,6 @@ config ZLIB
 config BZLIB
 	bool
 
-config CRC32
-	bool
-
-config CRC16
-	bool
-
-menuconfig DIGEST
-	bool "Digest                        "
-
-if DIGEST
-
-config MD5
-	bool "MD5"
-
-config SHA1
-	bool "SHA1"
-
-config SHA256
-	bool "SHA256"
-
-endif
-
 config GENERIC_FIND_NEXT_BIT
 	def_bool n
 
diff --git a/lib/Makefile b/lib/Makefile
index d96cfe7c67..c66da7a3fa 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -17,8 +17,6 @@ obj-y			+= recursive_action.o
 obj-y			+= make_directory.o
 obj-$(CONFIG_BZLIB)	+= bzlib.o bzlib_crctable.o bzlib_decompress.o bzlib_huffman.o bzlib_randtable.o
 obj-$(CONFIG_ZLIB)	+= zlib.o gunzip.o
-obj-$(CONFIG_CRC32)	+= crc32.o
-obj-$(CONFIG_CRC16)	+= crc16.o
 obj-$(CONFIG_CMDLINE_EDITING)	+= readline.o
 obj-$(CONFIG_SIMPLE_READLINE)	+= readline_simple.o
 obj-$(CONFIG_GLOB)		+= fnmatch.o
@@ -31,6 +29,3 @@ obj-y			+= lzo/
 obj-y			+= show_progress.o
 obj-$(CONFIG_LZO_DECOMPRESS)		+= decompress_unlzo.o
 obj-$(CONFIG_PROCESS_ESCAPE_SEQUENCE)	+= process_escape_sequence.o
-obj-$(CONFIG_MD5)	+= md5.o
-obj-$(CONFIG_SHA1)	+= sha1.o
-obj-$(CONFIG_SHA256)	+= sha256.o
diff --git a/scripts/bareboxenv.c b/scripts/bareboxenv.c
index 5c7f10e6b9..b0d5818bac 100644
--- a/scripts/bareboxenv.c
+++ b/scripts/bareboxenv.c
@@ -117,7 +117,7 @@ char *concat_subpath_file(const char *path, const char *f)
 
 #include "../lib/recursive_action.c"
 #include "../include/envfs.h"
-#include "../lib/crc32.c"
+#include "../crypto/crc32.c"
 #include "../lib/make_directory.c"
 #include "../include/environment.h"
 #include "../common/environment.c"
diff --git a/scripts/mkimage.c b/scripts/mkimage.c
index d3a8bfb887..3beab91fad 100644
--- a/scripts/mkimage.c
+++ b/scripts/mkimage.c
@@ -34,7 +34,7 @@
 char *cmdname;
 
 #include "../include/zlib.h"
-#include "../lib/crc32.c"
+#include "../crypto/crc32.c"
 
 //extern unsigned long crc32 (unsigned long crc, const char *buf, unsigned int len);