Fork us on GitHub Follow us on Facebook Follow us on Twitter

Changeset 25a76ab8 in mainline for boot/arch/arm32/Makefile.inc


Ignore:
Timestamp:
2010-05-08T07:53:23Z (12 years ago)
Author:
Jiri Svoboda <jiri@…>
Branches:
lfn, master
Children:
051bc69a
Parents:
6c39a907 (diff), 1317380 (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/arm32/Makefile.inc

    r6c39a907 r25a76ab8  
    2727#
    2828
    29 include Makefile.common
     29BFD_NAME = elf32-littlearm
     30BFD_OUTPUT = $(BFD_NAME)
     31BFD_ARCH = arm
    3032
    31 build: $(BASE)/image.boot
     33BITS = 32
     34ENDIANESS = LE
     35PAGE_SIZE = 4096
    3236
    33 $(BASE)/image.boot: $(COMPONENTS) $(INIT_TASKS) $(RD_SRVS) $(RD_APPS) $(CFG)
    34         $(MAKE) -C arch/$(BARCH)/loader PRECHECK=$(PRECHECK)
    35         cp arch/$(BARCH)/loader/image.boot $@
     37RD_SRVS += \
     38        $(USPACE_PATH)/srv/bd/gxe_bd/gxe_bd
    3639
    37 clean:
    38         $(MAKE) -C arch/$(BARCH)/loader clean
    39         rm -f $(BASE)/image.boot
     40SOURCES = \
     41        arch/$(BARCH)/src/asm.S \
     42        arch/$(BARCH)/src/main.c \
     43        arch/$(BARCH)/src/mm.c \
     44        arch/$(BARCH)/src/putchar.c \
     45        $(COMPS_C) \
     46        genarch/src/division.c \
     47        generic/src/printf_core.c \
     48        generic/src/vprintf.c \
     49        generic/src/printf.c \
     50        generic/src/str.c \
     51        generic/src/version.c \
     52        generic/src/inflate.c
Note: See TracChangeset for help on using the changeset viewer.