Changeset 040068c in mainline for uspace/Makefile


Ignore:
Timestamp:
2010-12-09T00:28:58Z (14 years ago)
Author:
Vojtech Horky <vojtechhorky@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
cdc1aa1
Parents:
818dc00 (diff), 0a5a950 (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 + minor changes

The marge with mainline includes the hands-off configure and merge with
our DDF fixes.

The virtual USB host controller is now under the virtual devices hierarchy
(the path is /virt/usbhc now).

File:
1 edited

Legend:

Unmodified
Added
Removed

  • uspace/Makefile

    r818dc00 r040068c  
    8888        srv/net/net \
    8989        drv/root \
     90        drv/rootvirt \
     91        drv/test1 \
     92        drv/test2 \
    9093        drv/vhc
    9194
    … …  
    111114
    112115ifeq ($(UARCH),amd64)
     116        DIRS += drv/rootpc
     117        DIRS += drv/pciintel
     118        DIRS += drv/isa
     119        DIRS += drv/ns8250
    113120endif
    114121
    115122ifeq ($(UARCH),ia32)
    116         DIRS += drv/rootia32
     123        DIRS += drv/rootpc
    117124        DIRS += drv/pciintel
    118125        DIRS += drv/isa
Note: See TracChangeset for help on using the changeset viewer.