Changeset 25eec4e in mainline for uspace/Makefile

Timestamp:

2013-04-19T18:38:18Z (11 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

6d717a4

Parents:

a1e2df13 (diff), 289cb7dd (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 chages.

File:

• uspace/Makefile (modified) (5 diffs)

uspace/Makefile

@@ -40 +40 @@
         app/devctl \
         app/edit \
-        app/ext2info \
         app/getterm \
         app/init \
@@ -95 +94 @@
         srv/bd/sata_bd \
         srv/bd/file_bd \
-        srv/bd/gxe_bd \
         srv/bd/rd \
         srv/bd/part/guid_part \
@@ -106 +104 @@
         srv/fs/mfs \
         srv/fs/locfs \
-        srv/fs/ext2fs \
         srv/fs/ext4fs \
         srv/hid/compositor \
@@ -195 +192 @@
 endif
 
+ifeq ($(UARCH),arm32)
+        DIRS += \
+                drv/infrastructure/rootamdm37x \
+                drv/fb/amdm37x_dispc
+endif
+
 ## System libraries
 #
@@ -214 +217 @@
         lib/net \
         lib/nic \
-        lib/ext2 \
         lib/ext4 \
         lib/usb \