Changeset 61c0402 in mainline for boot/arch/ia64


Ignore:
Timestamp:
2010-01-15T19:36:53Z (16 years ago)
Author:
Jakub Jermar <jakub@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
92bee46
Parents:
50f9c3a (diff), 963462af (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/ia64
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • boot/arch/ia64/Makefile.inc

    r50f9c3a r61c0402  
    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/ia64/loader/Makefile

    r50f9c3a r61c0402  
    2929
    3030include Makefile.common
     31include ../../../../Makefile.config
    3132
    3233.PHONY: all clean
    … …  
    3435all: ../../../../version ../../../../Makefile.config ../../../../config.h ../../../../config.defs
    3536        -[ -f $(DEPEND) ] && mv -f $(DEPEND) $(DEPEND_PREV)
    36         $(MAKE) -f Makefile.build
     37        $(MAKE) -f Makefile.build PRECHECK=$(PRECHECK)
    3738
    3839clean:
    … …  
    4546                rm -f $(USPACEDIR)/dist/app/`basename $$file` ; \
    4647        done
    47         rm -f $(DEPEND) $(DEPEND_PREV) $(OUTPUT) $(HELLO) $(COMPS).h $(COMPS).c $(LINK) $(INITRD).img $(INITRD).fs
     48        rm -f $(DEPEND) $(DEPEND_PREV) $(JOB) $(OUTPUT) $(HELLO) $(COMPS).h $(COMPS).c $(LINK) $(INITRD).img $(INITRD).fs
    4849        find . -name '*.o' -follow -exec rm \{\} \;
    4950        find . -name '*.co' -follow -exec rm \{\} \;

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

    r50f9c3a r61c0402  
    4949        boot.S
    5050
    51 COMPONENTS = \
    52         $(KERNELDIR)/kernel.bin \
    53         $(USPACEDIR)/srv/ns/ns \
    54         $(USPACEDIR)/srv/loader/loader \
    55         $(USPACEDIR)/app/init/init \
    56         $(USPACEDIR)/srv/devmap/devmap \
    57         $(USPACEDIR)/srv/bd/rd/rd \
    58         $(USPACEDIR)/srv/vfs/vfs
    59 ifeq ($(RDFMT),tmpfs)
    60         COMPONENTS += $(USPACEDIR)/srv/fs/tmpfs/tmpfs
    61 endif
    62 ifeq ($(RDFMT),fat)
    63         COMPONENTS += $(USPACEDIR)/srv/fs/fat/fat
    64 endif
    65 
    6651OBJECTS := $(addsuffix .o,$(basename $(SOURCES)))
    6752COMPONENT_OBJECTS := $(addsuffix .co,$(basename $(notdir $(COMPONENTS)))) $(INITRD).co
    … …  
    8166%.o: %.S $(DEPEND)
    8267        $(CC) $(DEFS) $(CFLAGS) -D__ASM__ -c $< -o $@
     68ifeq ($(PRECHECK),y)
     69        $(JOBFILE) $(JOB) $< $@ as asm/preproc $(DEFS) $(CFLAGS) -D__ASM__
     70endif
    8371
    8472%.o: %.c $(DEPEND)
    8573        $(CC) $(DEFS) $(CFLAGS) -c $< -o $@
     74ifeq ($(PRECHECK),y)
     75        $(JOBFILE) $(JOB) $< $@ cc core $(DEFS) $(CFLAGS)
     76endif
    8677
    8778$(DEPEND):

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

    r50f9c3a r61c0402  
    3131#
    3232
     33include ../../../../Makefile.config
     34include ../../../Makefile.common
     35
    3336DEPEND = Makefile.depend
    3437DEPEND_PREV = $(DEPEND).prev
     38JOB = image.job
    3539OUTPUT = image.boot
    3640HELLO = hello.efi
    … …  
    3842LINK = _link.ld
    3943COMPS = _components
    40 INITRD = initrd
    4144
    4245KERNELDIR = ../../../../kernel
    4346USPACEDIR = ../../../../uspace
    4447
    45 RD_SRVS = \
    46         $(USPACEDIR)/srv/fb/fb \
    47         $(USPACEDIR)/srv/kbd/kbd \
    48         $(USPACEDIR)/srv/console/console \
    49         $(USPACEDIR)/srv/fs/devfs/devfs \
    50         $(USPACEDIR)/srv/fs/tmpfs/tmpfs \
    51         $(USPACEDIR)/srv/fs/fat/fat \
    52         $(USPACEDIR)/srv/bd/file_bd/file_bd \
    53         $(USPACEDIR)/srv/part/mbr_part/mbr_part
    54 
    55 RD_APPS = \
    56         $(USPACEDIR)/app/edit/edit \
    57         $(USPACEDIR)/app/getvc/getvc \
    58         $(USPACEDIR)/app/redir/redir \
    59         $(USPACEDIR)/app/tetris/tetris \
    60         $(USPACEDIR)/app/tester/tester \
    61         $(USPACEDIR)/app/trace/trace \
    62         $(USPACEDIR)/app/klog/klog \
    63         $(USPACEDIR)/app/bdsh/bdsh
     48ifeq ($(MACHINE),i460GX)
     49        RD_SRVS += \
     50                $(USPACEDIR)/srv/hw/char/i8042/i8042 \
     51                $(USPACEDIR)/srv/hid/c_mouse/c_mouse
     52endif

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

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