Changeset 15d0046 in mainline for boot/arch/amd64/Makefile.inc


Ignore:
Timestamp:
2014-09-12T13:22:33Z (11 years ago)
Author:
Vojtech Horky <vojtechhorky@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
9b20126
Parents:
8db09e4 (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

File:
1 edited

Legend:

Unmodified
Added
Removed

  • boot/arch/amd64/Makefile.inc

    r8db09e4 r15d0046  
    3535
    3636RD_DRVS_ESSENTIAL += \
    37         infrastructure/rootpc \
     37        platform/pc \
    3838        block/ata_bd \
    3939        bus/pci/pciintel \
    … …  
    4545
    4646RD_DRVS_NON_ESSENTIAL += \
     47        audio/hdaudio \
    4748        char/ns8250 \
    4849        time/cmos-rtc \
    … …  
    6465        $(USPACE_PATH)/app/edit/edit \
    6566        $(USPACE_PATH)/app/mixerctl/mixerctl \
    66         $(USPACE_PATH)/app/wavplay/wavplay \
    67        
     67        $(USPACE_PATH)/app/wavplay/wavplay
     68
    6869BOOT_OUTPUT = $(ROOT_PATH)/image.iso
    6970PREBUILD = $(INITRD).img
Note: See TracChangeset for help on using the changeset viewer.