Changeset 72cf064 in mainline for boot/Makefile.common

Timestamp:

2012-08-13T17:17:04Z (12 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

33fee91

Parents:

f4a8734 (diff), 4820360 (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

File:

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

boot/Makefile.common

@@ -55 +55 @@
 MKTMPFS = $(TOOLS_PATH)/mktmpfs.py
 MKFAT = $(TOOLS_PATH)/mkfat.py
-MKEXT2 = $(TOOLS_PATH)/mkext2.py
+MKEXT4 = $(TOOLS_PATH)/mkext4.py
 MKUIMAGE = $(TOOLS_PATH)/mkuimage.py
 
@@ -84 +84 @@
 endif
 
-ifeq ($(RDFMT),ext2fs)
-        INIT_TASKS += $(USPACE_PATH)/srv/fs/ext2fs/ext2fs
+ifeq ($(RDFMT),ext4fs)
+        INIT_TASKS += $(USPACE_PATH)/srv/fs/ext4fs/ext4fs
 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 \
@@ -105 +106 @@
         $(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 \
@@ -122 +124 @@
         nic/ne2k \
         nic/e1k \
-        nic/rtl8139
+        nic/rtl8139 \
+        block/ahci
 
 RD_DRV_CFG =
@@ -171 +174 @@
         $(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 \