Changeset 749fe15b in mainline for uspace/Makefile

Timestamp:

2015-04-12T13:52:49Z (10 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

6dd7f65, cc575ef9, dcba819

Parents:

eb94d84 (diff), 73e894c (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 from lp:~jakub/helenos/ddisk

• Add MSIM platform driver
• Add ddisk block device driver

File:

• uspace/Makefile (modified) (2 diffs)

uspace/Makefile

@@ -141 +141 @@
         drv/block/ahci \
         drv/block/ata_bd \
+        drv/block/ddisk \
         drv/char/i8042 \
         drv/char/pl050 \
@@ -180 +181 @@
 
 ifeq ($(UARCH), $(filter $(UARCH),mips32 mips32eb))
+ifeq ($(MACHINE),msim)
+        DIRS += \
+                drv/platform/msim
+else
         DIRS += \
                 drv/platform/malta \
                 drv/bus/pci/pciintel \
                 drv/bus/isa
+endif
 endif