summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Tyser <ptyser@xes-inc.com>2009-11-09 15:17:50 -0600
committerWolfgang Denk <wd@denx.de>2009-12-02 23:19:32 +0100
commit9ef78511cda39987e5fc10febf386fd19f58ecf7 (patch)
tree138195677feb52131cf7f4074739901a7be101cf
parent604f7ce55ad74694ef8743ad2e99933dc0265e46 (diff)
downloadu-boot-imx-9ef78511cda39987e5fc10febf386fd19f58ecf7.zip
u-boot-imx-9ef78511cda39987e5fc10febf386fd19f58ecf7.tar.gz
u-boot-imx-9ef78511cda39987e5fc10febf386fd19f58ecf7.tar.bz2
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>
-rw-r--r--common/Makefile1
-rw-r--r--lib_generic/Makefile1
-rw-r--r--lib_generic/circbuf.c (renamed from common/circbuf.c)0
3 files changed, 1 insertions, 1 deletions
diff --git a/common/Makefile b/common/Makefile
index 3781738..47f6a71 100644
--- 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 686601c..2ec261a 100644
--- 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
index 2332c63..2332c63 100644
--- a/common/circbuf.c
+++ b/lib_generic/circbuf.c