Changeset 6ef2c11 in mainline for boot/arch/arm32


Ignore:
Timestamp:
2010-01-06T20:33:50Z (16 years ago)
Author:
Jiri Svoboda <jiri@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
385a3d6
Parents:
4da7d79 (diff), 23efd30 (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/arch/arm32
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • boot/arch/arm32/Makefile.inc

    r4da7d79 r6ef2c11  
    3030
    3131$(BASE)/image.boot:
    32         $(MAKE) -C arch/$(BARCH)/loader
     32        $(MAKE) -C arch/$(BARCH)/loader PRECHECK=$(PRECHECK)
    3333        cp arch/$(BARCH)/loader/image.boot $@
    3434

  • boot/arch/arm32/loader/Makefile

    r4da7d79 r6ef2c11  
    3434all: ../../../../version ../../../../Makefile.config ../../../../config.h ../../../../config.defs
    3535        -[ -f $(DEPEND) ] && mv -f $(DEPEND) $(DEPEND_PREV)
    36         $(MAKE) -f Makefile.build
     36        $(MAKE) -f Makefile.build PRECHECK=$(PRECHECK)
    3737
    3838clean:
    … …  
    4343                rm -f $(USPACEDIR)/dist/app/`basename $$file` ; \
    4444        done
    45         rm -f $(DEPEND) $(DEPEND_PREV) $(OUTPUT) $(COMPS).h $(COMPS).c $(LINK) $(INITRD).img $(INITRD).fs
     45        rm -f $(DEPEND) $(DEPEND_PREV) $(JOB) $(OUTPUT) $(COMPS).h $(COMPS).c $(LINK) $(INITRD).img $(INITRD).fs
    4646        find . -name '*.o' -follow -exec rm \{\} \;
    4747        find . -name '*.co' -follow -exec rm \{\} \;

  • boot/arch/arm32/loader/Makefile.build

    r4da7d79 r6ef2c11  
    6565%.o: %.S $(DEPEND)
    6666        $(CC) $(DEFS) $(CFLAGS) -D__ASM__ -c $< -o $@
     67ifeq ($(PRECHECK),y)
     68        $(JOBFILE) $(JOB) $< $@ as asm/preproc $(DEFS) $(CFLAGS) -D__ASM__
     69endif
    6770
    6871%.o: %.c $(DEPEND)
    6972        $(CC) $(DEFS) $(CFLAGS) -c $< -o $@
     73ifeq ($(PRECHECK),y)
     74        $(JOBFILE) $(JOB) $< $@ cc core $(DEFS) $(CFLAGS)
     75endif
    7076
    7177$(DEPEND):

  • boot/arch/arm32/loader/Makefile.common

    r4da7d79 r6ef2c11  
    3535DEPEND = Makefile.depend
    3636DEPEND_PREV = $(DEPEND).prev
     37JOB = image.job
    3738OUTPUT = image.boot
    3839

  • boot/arch/arm32/loader/Makefile.toolchain

    r4da7d79 r6ef2c11  
    3939TOOLCHAIN_DIR = $(CROSS_PREFIX)/arm32/bin
    4040
     41JOBFILE = ../../../../tools/jobfile.py
     42
    4143ifeq ($(COMPILER),gcc_native)
    4244        CC = gcc
Note: See TracChangeset for help on using the changeset viewer.