Changeset 132ab5d1 in mainline for boot


Ignore:
Timestamp:
2018-01-30T03:20:45Z (8 years ago)
Author:
Jenda <jenda.jzqk73@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
5a6cc679
Parents:
8bfb163 (diff), 6a5d05b (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 commit '6a5d05bd2551e64111bea4f9332dd7448c26ce84' into forwardport

Separate return value from error code in gen_irq_code*().

Location:
boot
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • boot/Makefile.common

    r8bfb163 r132ab5d1  
    123123        $(USPACE_PATH)/srv/net/udp/udp \
    124124        $(USPACE_PATH)/srv/taskmon/taskmon \
     125        $(USPACE_PATH)/srv/test/chardev-test/chardev-test \
    125126        $(USPACE_PATH)/srv/volsrv/volsrv
    126127

  • boot/arch/amd64/Makefile.inc

    r8bfb163 r132ab5d1  
    3535        intctl/i8259 \
    3636        platform/pc \
     37        block/ata_bd \
    3738        bus/pci/pciintel \
    3839        bus/isa \

  • boot/arch/ppc32/Makefile.inc

    r8bfb163 r132ab5d1  
    5353        bus/usb/vhc \
    5454        block/usbmast \
     55        hid/adb-kbd \
     56        hid/adb-mouse \
    5557        hid/usbhid
    5658
Note: See TracChangeset for help on using the changeset viewer.