Changeset db71e2a in mainline for uspace/Makefile

Timestamp:

2013-07-24T17:42:25Z (11 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

69b264a9

Parents:

52f1882 (diff), cffa14e6 (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.

usb hc macro changes from mainline were reverted, too many conflicts

File:

• uspace/Makefile (modified) (7 diffs)

uspace/Makefile

@@ -39 +39 @@
         app/bnchmark \
         app/devctl \
+        app/dnscfg \
+        app/dnsres \
         app/edit \
         app/getterm \
@@ -70 +72 @@
         app/nettest3 \
         app/ping \
+        app/ping6 \
         app/sysinfo \
         app/mkbd \
@@ -82 +85 @@
         srv/devman \
         srv/loader \
+        srv/net/dnsrsrv \
         srv/net/ethip \
         srv/net/inetsrv \
         srv/net/loopip \
+        srv/net/slip \
         srv/net/tcp \
         srv/net/udp \
@@ -90 +95 @@
         srv/taskmon \
         srv/vfs \
-        srv/bd/ata_bd \
         srv/bd/sata_bd \
         srv/bd/file_bd \
-        srv/bd/gxe_bd \
         srv/bd/rd \
         srv/bd/part/guid_part \
@@ -116 +119 @@
         drv/infrastructure/rootvirt \
         drv/block/ahci \
+        drv/block/ata_bd \
         drv/char/i8042 \
         drv/char/ps2mouse \
@@ -134 +138 @@
         drv/nic/ne2k \
         drv/nic/e1k \
-        drv/nic/rtl8139 \
+        drv/nic/rtl8139
 
 ifeq ($(CONFIG_PCC),y)
@@ -193 +197 @@
 ifeq ($(UARCH),arm32)
         DIRS += \
-                drv/infrastructure/rootamdm37x
+                drv/infrastructure/rootamdm37x \
+                drv/fb/amdm37x_dispc
 endif