Changes in boot/Makefile.common [d06c4ae:3e67ab1] in mainline

File:

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

boot/Makefile.common

@@ -55 +55 @@
 MKTMPFS = $(TOOLS_PATH)/mktmpfs.py
 MKFAT = $(TOOLS_PATH)/mkfat.py
-MKEXT4 = $(TOOLS_PATH)/mkext4.py
+MKEXT2 = $(TOOLS_PATH)/mkext2.py
 MKUIMAGE = $(TOOLS_PATH)/mkuimage.py
 
@@ -84 +84 @@
 endif
 
-ifeq ($(RDFMT),ext4fs)
-        INIT_TASKS += $(USPACE_PATH)/srv/fs/ext4fs/ext4fs
+ifeq ($(RDFMT),ext2fs)
+        INIT_TASKS += $(USPACE_PATH)/srv/fs/ext2fs/ext2fs
 endif
 
@@ -98 +98 @@
         $(USPACE_PATH)/srv/bd/part/guid_part/g_part \
         $(USPACE_PATH)/srv/bd/part/mbr_part/mbr_part \
-        $(USPACE_PATH)/srv/bd/sata_bd/sata_bd \
         $(USPACE_PATH)/srv/clipboard/clipboard \
         $(USPACE_PATH)/srv/fs/tmpfs/tmpfs \
@@ -106 +105 @@
         $(USPACE_PATH)/srv/fs/exfat/exfat \
         $(USPACE_PATH)/srv/fs/ext2fs/ext2fs \
-        $(USPACE_PATH)/srv/fs/ext4fs/ext4fs \
         $(USPACE_PATH)/srv/hid/remcons/remcons \
         $(USPACE_PATH)/srv/net/ethip/ethip \
@@ -124 +122 @@
         nic/ne2k \
         nic/e1k \
-        nic/rtl8139 \
-        block/ahci
+        nic/rtl8139
 
 RD_DRV_CFG =
@@ -174 +171 @@
         $(USPACE_PATH)/app/tester/tester \
         $(USPACE_PATH)/app/testread/testread \
-        $(USPACE_PATH)/app/testwrit/testwrit \
         $(USPACE_PATH)/app/tetris/tetris \
         $(USPACE_PATH)/app/trace/trace \
@@ -205 +201 @@
 endif
 
-ifeq ($(CONFIG_MSIM),y)
-RD_APPS_NON_ESSENTIAL += \
-        $(USPACE_PATH)/app/msim/msim
-endif
-
 COMPONENTS = \
         $(KERNEL_PATH)/kernel.bin \