Changeset 99de22b in mainline for boot/arch


Ignore:
Timestamp:
2010-01-15T18:30:25Z (16 years ago)
Author:
Pavel Rimsky <pavel@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
eeb643d
Parents:
387416b (diff), 563d6077 (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:

Merged latest trunk changes.

Location:
boot/arch
Files:
26 edited

Legend:

Unmodified
Added
Removed

  • boot/arch/amd64/Makefile.inc

    r387416b r99de22b  
    3030
    3131RD_SRVS += \
    32         $(USPACEDIR)/srv/pci/pci \
    33         $(USPACEDIR)/srv/bd/ata_bd/ata_bd
     32        $(USPACEDIR)/srv/bd/ata_bd/ata_bd \
     33        $(USPACEDIR)/srv/hw/char/i8042/i8042 \
     34        $(USPACEDIR)/srv/hw/bus/pci/pci \
     35        $(USPACEDIR)/srv/hid/c_mouse/c_mouse
    3436
    3537MODULES := $(notdir $(COMPONENTS))
    … …  
    4749        echo "  root (cd)" >> $(TMP)/boot/grub/menu.lst
    4850        for module in $(MODULES) $(INITRD).img ; do \
    49                 if [ $$module == kernel.bin ] ; then \
     51                if [ $$module = kernel.bin ] ; then \
    5052                        echo "  kernel /boot/$$module" >> $(TMP)/boot/grub/menu.lst ; \
    5153                else \

  • boot/arch/arm32/Makefile.inc

    r387416b r99de22b  
    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

    r387416b r99de22b  
    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

    r387416b r99de22b  
    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

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

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

    r387416b r99de22b  
    3939TOOLCHAIN_DIR = $(CROSS_PREFIX)/arm32/bin
    4040
     41JOBFILE = ../../../../tools/jobfile.py
     42
    4143ifeq ($(COMPILER),gcc_native)
    4244        CC = gcc

  • boot/arch/ia64/Makefile.inc

    r387416b r99de22b  
    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

    r387416b r99de22b  
    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

    r387416b r99de22b  
    6666%.o: %.S $(DEPEND)
    6767        $(CC) $(DEFS) $(CFLAGS) -D__ASM__ -c $< -o $@
     68ifeq ($(PRECHECK),y)
     69        $(JOBFILE) $(JOB) $< $@ as asm/preproc $(DEFS) $(CFLAGS) -D__ASM__
     70endif
    6871
    6972%.o: %.c $(DEPEND)
    7073        $(CC) $(DEFS) $(CFLAGS) -c $< -o $@
     74ifeq ($(PRECHECK),y)
     75        $(JOBFILE) $(JOB) $< $@ cc core $(DEFS) $(CFLAGS)
     76endif
    7177
    7278$(DEPEND):

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

    r387416b r99de22b  
    3131#
    3232
     33include ../../../../Makefile.config
    3334include ../../../Makefile.common
    3435
    3536DEPEND = Makefile.depend
    3637DEPEND_PREV = $(DEPEND).prev
     38JOB = image.job
    3739OUTPUT = image.boot
    3840HELLO = hello.efi
    … …  
    4345KERNELDIR = ../../../../kernel
    4446USPACEDIR = ../../../../uspace
     47
     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

    r387416b r99de22b  
    3939TOOLCHAIN_DIR = $(CROSS_PREFIX)/ia64/bin
    4040
     41JOBFILE = ../../../../tools/jobfile.py
     42
    4143ifeq ($(COMPILER),gcc_native)
    4244        CC = gcc

  • boot/arch/mips32/Makefile.inc

    r387416b r99de22b  
    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/mips32/loader/Makefile

    r387416b r99de22b  
    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) $(RAW) $(COMPS).h $(COMPS).c $(LINK) $(INITRD).img $(INITRD).fs
     45        rm -f $(DEPEND) $(DEPEND_PREV) $(JOB) $(OUTPUT) $(RAW) $(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/mips32/loader/Makefile.build

    r387416b r99de22b  
    6666%.o: %.S $(DEPEND)
    6767        $(CC) $(DEFS) $(CFLAGS) -D__ASM__ -c $< -o $@
     68ifeq ($(PRECHECK),y)
     69        $(JOBFILE) $(JOB) $< $@ as asm/preproc $(DEFS) $(CFLAGS) -D__ASM__
     70endif
    6871
    6972%.o: %.c $(DEPEND)
    7073        $(CC) $(DEFS) $(CFLAGS) -c $< -o $@
     74ifeq ($(PRECHECK),y)
     75        $(JOBFILE) $(JOB) $< $@ cc core $(DEFS) $(CFLAGS)
     76endif
    7177
    7278$(DEPEND):

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

    r387416b r99de22b  
    3636DEPEND_PREV = $(DEPEND).prev
    3737RAW = image.raw
     38JOB = image.job
    3839OUTPUT = image.boot
    3940

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

    r387416b r99de22b  
    3737TARGET = mipsel-linux-gnu
    3838TOOLCHAIN_DIR = $(CROSS_PREFIX)/mips32/bin
     39
     40JOBFILE = ../../../../tools/jobfile.py
    3941
    4042ifeq ($(MACHINE),lgxemul)

  • boot/arch/ppc32/Makefile.inc

    r387416b r99de22b  
    4242
    4343arch/$(BARCH)/loader/image.boot:
    44         $(MAKE) -C arch/$(BARCH)/loader
     44        $(MAKE) -C arch/$(BARCH)/loader PRECHECK=$(PRECHECK)
    4545
    4646clean: generic_clean

  • boot/arch/ppc32/loader/Makefile

    r387416b r99de22b  
    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/ppc32/loader/Makefile.build

    r387416b r99de22b  
    6666%.o: %.S $(DEPEND)
    6767        $(CC) $(DEFS) $(CFLAGS) -D__ASM__ -c $< -o $@
     68ifeq ($(PRECHECK),y)
     69        $(JOBFILE) $(JOB) $< $@ as asm/preproc $(DEFS) $(CFLAGS) -D__ASM__
     70endif
    6871
    6972%.o: %.c $(DEPEND)
    7073        $(CC) $(DEFS) $(CFLAGS) -c $< -o $@
     74ifeq ($(PRECHECK),y)
     75        $(JOBFILE) $(JOB) $< $@ cc core $(DEFS) $(CFLAGS)
     76endif
    7177
    7278$(DEPEND):

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

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

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

    r387416b r99de22b  
    3939TOOLCHAIN_DIR = $(CROSS_PREFIX)/ppc32/bin
    4040
     41JOBFILE = ../../../../tools/jobfile.py
     42
    4143ifeq ($(COMPILER),gcc_native)
    4244        CC = gcc

  • boot/arch/sparc64/Makefile.inc

    r387416b r99de22b  
    5555
    5656arch/$(BARCH)/loader/image.boot:
    57         $(MAKE) -C arch/$(BARCH)/loader
     57        $(MAKE) -C arch/$(BARCH)/loader PRECHECK=$(PRECHECK)
    5858
    5959clean: generic_clean

  • boot/arch/sparc64/loader/Makefile

    r387416b r99de22b  
    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/sparc64/loader/Makefile.build

    r387416b r99de22b  
    7777%.o: %.S $(DEPEND)
    7878        $(CC) $(DEFS) $(CFLAGS) -D__ASM__ -c $< -o $@
     79ifeq ($(PRECHECK),y)
     80        $(JOBFILE) $(JOB) $< $@ as asm/preproc $(DEFS) $(CFLAGS) -D__ASM__
     81endif
    7982
    8083%.o: %.c $(DEPEND)
    8184        $(CC) $(DEFS) $(CFLAGS) -c $< -o $@
     85ifeq ($(PRECHECK),y)
     86        $(JOBFILE) $(JOB) $< $@ cc core $(DEFS) $(CFLAGS)
     87endif
    8288
    8389$(DEPEND):

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

    r387416b r99de22b  
    3535DEPEND = Makefile.depend
    3636DEPEND_PREV = $(DEPEND).prev
     37JOB = image.job
    3738OUTPUT = image.boot
    3839
    … …  
    4546RD_SRVS_GENERIC = \
    4647        $(USPACEDIR)/srv/fs/fat/fat \
    47         $(USPACEDIR)/srv/cir/fhc/fhc \
    48         $(USPACEDIR)/srv/cir/obio/obio
     48        $(USPACEDIR)/srv/hw/cir/fhc/fhc \
     49        $(USPACEDIR)/srv/hw/cir/obio/obio
    4950
    5051RD_APPS_GENERIC = \

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

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