Changeset 89ac5513 in mainline for boot

Timestamp:

2013-06-23T19:54:53Z (12 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

ddb1922

Parents:

3abf0760 (diff), 96cbd18 (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 mainline changes.

Location:

boot

Files:

• Makefile.build (modified) (1 diff)
• Makefile.common (modified) (2 diffs)

boot/Makefile.build

@@ -52 +52 @@
         -Wall -Wextra -Wno-unused-parameter -Wmissing-prototypes \
         -Werror-implicit-function-declaration -Wwrite-strings \
-        -pipe -arch $(CLANG_ARCH)
+        -pipe
 
 ifeq ($(CONFIG_DEBUG),y)

boot/Makefile.common

@@ -112 +112 @@
         $(USPACE_PATH)/srv/hid/remcons/remcons \
         $(USPACE_PATH)/srv/hid/isdv4_tablet/isdv4_tablet \
+        $(USPACE_PATH)/srv/net/dnsrsrv/dnsrsrv \
         $(USPACE_PATH)/srv/net/ethip/ethip \
         $(USPACE_PATH)/srv/net/inetsrv/inetsrv \
@@ -166 +167 @@
         $(USPACE_PATH)/app/dltest2/dltest2 \
         $(USPACE_PATH)/app/dload/dload \
+        $(USPACE_PATH)/app/dnscfg/dnscfg \
+        $(USPACE_PATH)/app/dnsres/dnsres \
         $(USPACE_PATH)/app/edit/edit \
         $(USPACE_PATH)/app/inet/inet \