Changeset 8e7c9fe in mainline for uspace/Makefile

Timestamp:

2014-09-12T03:45: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:

c53b58e

Parents:

3eb0c85 (diff), 105d8d6 (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

most usb changes were reverted. blink and usbmass were fixed
known problems:
ehci won't initialize
usbmast asserts on unmount (happens on mainline too)

File:

• uspace/Makefile (modified) (7 diffs)

uspace/Makefile

@@ -44 +44 @@
         app/download \
         app/edit \
+        app/fontviewer \
         app/getterm \
         app/hdisk \
@@ -77 +78 @@
         app/nettest2 \
         app/nettest3 \
+        app/nic \
         app/ping \
         app/sysinfo \
@@ -129 +131 @@
         srv/hw/char/s3c24xx_uart \
         srv/hid/rfb \
+        drv/audio/hdaudio \
         drv/audio/sb16 \
-        drv/infrastructure/root \
-        drv/infrastructure/rootvirt \
+        drv/root/root \
+        drv/root/virt \
         drv/block/ahci \
         drv/block/ata_bd \
         drv/char/i8042 \
+        drv/char/pl050 \
         drv/char/ps2mouse \
         drv/char/xtkbd \
@@ -152 +156 @@
         drv/nic/ne2k \
         drv/nic/e1k \
-        drv/nic/rtl8139
-
-ifeq ($(CONFIG_PCC),y)
-DIRS += \
-        app/cc \
-        app/ccom \
-        app/ccom/mkext \
-        app/cpp
-endif
-
-ifeq ($(CONFIG_BINUTILS),y)
-DIRS += \
-        app/binutils
-endif
-
-ifeq ($(CONFIG_MSIM),y)
-DIRS += \
-        app/msim
-endif
+        drv/nic/rtl8139 \
+        drv/nic/rtl8169 \
+        drv/platform/icp
 
 ## Platform-specific hardware support
 #
 
-ifeq ($(UARCH),amd64)
-        DIRS += \
-                drv/infrastructure/rootpc \
+ifeq ($(UARCH), $(filter $(UARCH),amd64 ia32 ia64))
+        DIRS += \
+                drv/platform/pc \
                 drv/bus/pci/pciintel \
                 drv/bus/isa \
@@ -186 +174 @@
 endif
 
-ifeq ($(UARCH),ia32)
-        DIRS += \
-                drv/infrastructure/rootpc \
-                drv/bus/pci/pciintel \
-                drv/bus/isa \
-                drv/char/ns8250 \
-                drv/time/cmos-rtc \
-                srv/hw/irc/apic \
-                srv/hw/irc/i8259
-endif
-
 ifeq ($(UARCH), $(filter $(UARCH),mips32 mips32eb))
         DIRS += \
-                drv/infrastructure/rootmalta \
+                drv/platform/malta \
                 drv/bus/pci/pciintel \
                 drv/bus/isa
@@ -206 +183 @@
 ifeq ($(UARCH),ppc32)
         DIRS += \
-                drv/infrastructure/rootmac \
+                drv/platform/mac \
                 drv/bus/pci/pciintel \
                 srv/hw/bus/cuda_adb
@@ -218 +195 @@
 ifeq ($(UARCH),arm32)
         DIRS += \
-                drv/infrastructure/rootamdm37x \
-                drv/fb/amdm37x_dispc
+                drv/platform/amdm37x \
+                drv/fb/amdm37x_dispc \
+                srv/hw/irc/icp-ic
 endif