Changeset 1a23f6e in mainline for boot


Ignore:
Timestamp:
2012-05-04T10:41:44Z (14 years ago)
Author:
Vojtech Horky <vojtechhorky@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
af42a2b
Parents:
6efb4d2 (diff), d21e935c (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

Location:
boot
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • boot/Makefile.common

    r6efb4d2 r1a23f6e  
    9898        $(USPACE_PATH)/srv/bd/part/guid_part/g_part \
    9999        $(USPACE_PATH)/srv/bd/part/mbr_part/mbr_part \
    100         $(USPACE_PATH)/srv/clip/clip \
     100        $(USPACE_PATH)/srv/clipboard/clipboard \
    101101        $(USPACE_PATH)/srv/fs/tmpfs/tmpfs \
    102102        $(USPACE_PATH)/srv/fs/fat/fat \

  • boot/arch/arm32/Makefile.inc

    r6efb4d2 r1a23f6e  
    4242
    4343RD_SRVS_ESSENTIAL += \
    44         $(USPACE_PATH)/srv/hid/s3c24xx_ts/s3c24ts \
    45         $(USPACE_PATH)/srv/hw/char/s3c24xx_uart/s3c24ser
     44        $(USPACE_PATH)/srv/hid/s3c24xx_ts/s3c24xx_ts \
     45        $(USPACE_PATH)/srv/hw/char/s3c24xx_uart/s3c24xx_uart
    4646
    4747RD_SRVS_NON_ESSENTIAL += \
Note: See TracChangeset for help on using the changeset viewer.