summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2022-01-26 20:41:38 -0500
committerTom Rini <trini@konsulko.com>2022-01-26 20:41:38 -0500
commit9a1dd6dcfefc56c05ee7f7249faaa97c5f937fbc (patch)
tree171f14dc3ae19d1050b10d53a7d9ae63d36fda55 /lib
parent6146cd62aedc4849fec66f10ab0aa57f1dc64b8e (diff)
parentfc2b399ac03b91339a1cb1bfd4d1a9ca87fe95c6 (diff)
Merge https://source.denx.de/u-boot/custodians/u-boot-usb
Diffstat (limited to 'lib')
-rw-r--r--lib/Kconfig3
-rw-r--r--lib/Makefile8
2 files changed, 10 insertions, 1 deletions
diff --git a/lib/Kconfig b/lib/Kconfig
index 38051ccdd36..52d4b27ae51 100644
--- a/lib/Kconfig
+++ b/lib/Kconfig
@@ -299,6 +299,9 @@ config TRACE_EARLY_ADDR
the size is too small then the message which says the amount of early
data being coped will the the same as the
+config CIRCBUF
+ bool "Enable circular buffer support"
+
source lib/dhry/Kconfig
menu "Security support"
diff --git a/lib/Makefile b/lib/Makefile
index 7950e847a9e..f2238922bb6 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -29,7 +29,13 @@ ifneq ($(CONFIG_CHARSET),)
obj-y += charset.o
endif
endif
-obj-$(CONFIG_USB_TTY) += circbuf.o
+
+ifdef CONFIG_USB_TTY
+obj-y += circbuf.o
+else
+obj-$(CONFIG_CIRCBUF) += circbuf.o
+endif
+
obj-y += crc8.o
obj-y += crc16.o
obj-$(CONFIG_ERRNO_STR) += errno_str.o