Changes in boot/Makefile.common [9b9d37bb:80099c19] in mainline

File:

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

boot/Makefile.common

@@ -75 +75 @@
         $(USPACE_PATH)/srv/loc/loc \
         $(USPACE_PATH)/srv/bd/rd/rd \
-        $(USPACE_PATH)/srv/vfs/vfs \
-        
-# TODO: For comfort ext4fs debugging - delete before merge      
-INIT_TASKS += $(USPACE_PATH)/srv/bd/ata_bd/ata_bd
+        $(USPACE_PATH)/srv/vfs/vfs
 
 ifeq ($(RDFMT),tmpfs)
@@ -109 +106 @@
         $(USPACE_PATH)/srv/fs/exfat/exfat \
         $(USPACE_PATH)/srv/fs/ext2fs/ext2fs \
-        $(USPACE_PATH)/srv/fs/ext4fs/ext4fs \
         $(USPACE_PATH)/srv/taskmon/taskmon \
-        $(USPACE_PATH)/srv/hw/netif/ne2000/ne2000 \
-        $(USPACE_PATH)/srv/net/netif/lo/lo \
         $(USPACE_PATH)/srv/net/nil/eth/eth \
         $(USPACE_PATH)/srv/net/nil/nildummy/nildummy \
@@ -128 +122 @@
         test/test1 \
         test/test2 \
-        test/test3
+        test/test3 \
+        nic/lo \
+        nic/ne2k
 
 RD_DRV_CFG =
@@ -206 +202 @@
 NET_CFG = \
         $(USPACE_PATH)/srv/net/cfg/general \
-        $(USPACE_PATH)/srv/net/cfg/lo \
-        $(USPACE_PATH)/srv/net/cfg/ne2k
+        $(USPACE_PATH)/srv/net/cfg/lo.nic \
+        $(USPACE_PATH)/srv/net/cfg/ne2k.nic
 endif