circbuf: Move to lib_generic and conditionally compile

circbuf could be used as a generic library and is only currently
needed when CONFIG_USB_TTY is defined.

Signed-off-by: Peter Tyser <ptyser@xes-inc.com>

diff --git a/common/Makefile b/common/Makefile
index 3781738e19ad1b5d1a802fd19e457e8e16c3ae80..47f6a71e2e1f6ee5d7cb856e38281c4480e23796 100644 (file)
--- a/common/Makefile
+++ b/common/Makefile
@@ -29,7 +29,6 @@ AOBJS =
 
 # core
 COBJS-y += main.o
-COBJS-y += circbuf.o
 COBJS-y += console.o
 COBJS-y += command.o
 COBJS-y += dlmalloc.o

diff --git a/lib_generic/Makefile b/lib_generic/Makefile
index 686601cc18932b28c2040490accdfdddd583d2ca..2ec261af4a785194fee04ab7ff49435ea528c7c3 100644 (file)
--- a/lib_generic/Makefile
+++ b/lib_generic/Makefile
@@ -31,6 +31,7 @@ COBJS-$(CONFIG_BZIP2) += bzlib_crctable.o
 COBJS-$(CONFIG_BZIP2) += bzlib_decompress.o
 COBJS-$(CONFIG_BZIP2) += bzlib_randtable.o
 COBJS-$(CONFIG_BZIP2) += bzlib_huffman.o
+COBJS-$(CONFIG_USB_TTY) += circbuf.o
 COBJS-y += crc16.o
 COBJS-y += crc32.o
 COBJS-y += ctype.o

diff --git a/common/circbuf.c b/lib_generic/circbuf.c
similarity index 100%
rename from common/circbuf.c
rename to lib_generic/circbuf.c