Changeset f14291b in mainline for boot


Ignore:
Timestamp:
2010-10-19T20:55:53Z (15 years ago)
Author:
Jakub Jermar <jakub@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
a93d79a
Parents:
1882525 (diff), a7a85d16 (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:
3 edited

Legend:

Unmodified
Added
Removed

  • boot/Makefile

    r1882525 rf14291b  
    4848endif
    4949ifeq ($(RDFMT),fat)
    50         $(MKFAT) $(DIST_PATH) $@
     50        $(MKFAT) 1048576 $(DIST_PATH) $@
    5151endif
    5252

  • boot/Makefile.build

    r1882525 rf14291b  
    6161        GCC_CFLAGS += -Werror
    6262        ICC_CFLAGS += -Werror
     63endif
     64
     65ifeq ($(CONFIG_LINE_DEBUG),y)
     66        GCC_CFLAGS += -g
     67        ICC_CFLAGS += -g
     68        SUNCC_CFLAGS += -g
     69        CLANG_CFLAGS += -g
    6370endif
    6471

  • boot/arch/arm32/Makefile.inc

    r1882525 rf14291b  
    4141PAGE_SIZE = 4096
    4242
    43 RD_SRVS_ESSENTIAL +=
     43RD_SRVS_ESSENTIAL += \
     44        $(USPACE_PATH)/srv/hid/s3c24xx_ts/s3c24ts \
     45        $(USPACE_PATH)/srv/hw/char/s3c24xx_uart/s3c24ser
    4446
    4547RD_SRVS_NON_ESSENTIAL += \
Note: See TracChangeset for help on using the changeset viewer.