Merge branch 'u-boot/master' into 'u-boot-arm/master'

[karo-tx-uboot.git] / lib / Makefile

diff --git a/lib/Makefile b/lib/Makefile
index d7ff7caa350ce5b086393984a65e5b5ca52b8883..27e4f78bfd01a2bfe9ecc5b1c65f5fea4d5f060f 100644 (file)
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -60,8 +60,7 @@ obj-$(CONFIG_REGEX) += slre.o
 obj-y += string.o
 obj-y += time.o
 obj-$(CONFIG_TRACE) += trace.o
-obj-$(CONFIG_BOOTP_PXE) += uuid.o
-obj-$(CONFIG_PARTITION_UUIDS) += uuid.o
+obj-$(CONFIG_LIB_UUID) += uuid.o
 obj-y += vsprintf.o
 obj-$(CONFIG_LIB_RAND) += rand.o