Changeset f3386d7 in mainline for boot

Timestamp:

2013-07-15T20:44:54Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

f8d3df3

Parents:

273c976 (diff), a940f1d (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:

mainline changes

Location:

boot

Files:

• Makefile.common (modified) (2 diffs)
• arch/amd64/Makefile.inc (modified) (1 diff)

boot/Makefile.common

@@ -116 +116 @@
         $(USPACE_PATH)/srv/net/inetsrv/inetsrv \
         $(USPACE_PATH)/srv/net/loopip/loopip \
+        $(USPACE_PATH)/srv/net/slip/slip \
         $(USPACE_PATH)/srv/net/tcp/tcp \
         $(USPACE_PATH)/srv/net/udp/udp \
@@ -192 +193 @@
         $(USPACE_PATH)/app/nterm/nterm \
         $(USPACE_PATH)/app/ping/ping \
+        $(USPACE_PATH)/app/ping6/ping6 \
         $(USPACE_PATH)/app/stats/stats \
         $(USPACE_PATH)/app/sysinfo/sysinfo \

boot/arch/amd64/Makefile.inc

@@ -31 +31 @@
         $(USPACE_PATH)/srv/hw/irc/i8259/i8259
 
-RD_SRVS_NON_ESSENTIAL += \
-        $(USPACE_PATH)/srv/bd/ata_bd/ata_bd
-
 RD_DRVS += \
         infrastructure/rootpc \
+        block/ata_bd \
         bus/pci/pciintel \
         bus/isa \