Changeset 3b10ae36 in mainline for boot/Makefile.common

Timestamp:

2018-08-02T14:14:14Z (6 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

0c27956

Parents:

82d9087 (diff), 42964a7 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge SIF.

File:

• boot/Makefile.common (modified) (2 diffs)

boot/Makefile.common

@@ -176 +176 @@
         $(USPACE_PATH)/app/blkdump/blkdump \
         $(USPACE_PATH)/app/bnchmark/bnchmark \
+        $(USPACE_PATH)/app/contacts/contacts \
         $(USPACE_PATH)/app/corecfg/corecfg \
         $(USPACE_PATH)/app/cpptest/cpptest \
@@ -240 +241 @@
         $(USPACE_PATH)/lib/label/test-liblabel \
         $(USPACE_PATH)/lib/posix/test-libposix \
+        $(USPACE_PATH)/lib/sif/test-libsif \
         $(USPACE_PATH)/lib/uri/test-liburi \
         $(USPACE_PATH)/drv/bus/usb/xhci/test-xhci \