Changeset 6ef2c11 in mainline for boot


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
Files:
27 edited

Legend:

Unmodified
Added
Removed

  • boot/Makefile.common

    r4da7d79 r6ef2c11  
    4545
    4646RD_SRVS = \
    47         $(USPACEDIR)/srv/fb/fb \
    48         $(USPACEDIR)/srv/kbd/kbd \
    49         $(USPACEDIR)/srv/console/console \
     47        $(USPACEDIR)/srv/bd/file_bd/file_bd \
     48        $(USPACEDIR)/srv/bd/part/mbr_part/mbr_part \
    5049        $(USPACEDIR)/srv/clip/clip \
     50        $(USPACEDIR)/srv/hid/fb/fb \
     51        $(USPACEDIR)/srv/hid/kbd/kbd \
     52        $(USPACEDIR)/srv/hid/console/console \
    5153        $(USPACEDIR)/srv/fs/devfs/devfs \
    5254        $(USPACEDIR)/srv/fs/tmpfs/tmpfs \
    53         $(USPACEDIR)/srv/fs/fat/fat \
    54         $(USPACEDIR)/srv/bd/file_bd/file_bd \
    55         $(USPACEDIR)/srv/part/mbr_part/mbr_part
     55        $(USPACEDIR)/srv/fs/fat/fat
    5656
    5757RD_APPS = \
     58        $(USPACEDIR)/app/bdsh/bdsh \
    5859        $(USPACEDIR)/app/edit/edit \
    5960        $(USPACEDIR)/app/getterm/getterm \
     61        $(USPACEDIR)/app/klog/klog \
    6062        $(USPACEDIR)/app/redir/redir \
     63        $(USPACEDIR)/app/tester/tester \
    6164        $(USPACEDIR)/app/tetris/tetris \
    62         $(USPACEDIR)/app/tester/tester \
    63         $(USPACEDIR)/app/trace/trace \
    64         $(USPACEDIR)/app/klog/klog \
    65         $(USPACEDIR)/app/bdsh/bdsh
     65        $(USPACEDIR)/app/trace/trace
    6666
    6767COMPONENTS = \
    6868        $(KERNELDIR)/kernel.bin \
    6969        $(USPACEDIR)/srv/ns/ns \
     70        $(USPACEDIR)/srv/loader/loader \
    7071        $(USPACEDIR)/app/init/init \
    71         $(USPACEDIR)/srv/loader/loader \
    7272        $(USPACEDIR)/srv/devmap/devmap \
    7373        $(USPACEDIR)/srv/bd/rd/rd \

  • boot/arch/amd64/Makefile.inc

    r4da7d79 r6ef2c11  
    3030
    3131RD_SRVS += \
    32         $(USPACEDIR)/srv/pci/pci \
    3332        $(USPACEDIR)/srv/bd/ata_bd/ata_bd \
    34         $(USPACEDIR)/srv/char/i8042/i8042 \
    35         $(USPACEDIR)/srv/mouse/c_mouse/c_mouse
     33        $(USPACEDIR)/srv/hw/char/i8042/i8042 \
     34        $(USPACEDIR)/srv/hw/bus/pci/pci \
     35        $(USPACEDIR)/srv/hid/c_mouse/c_mouse
    3636
    3737MODULES := $(notdir $(COMPONENTS))

  • 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

  • boot/arch/ia64/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/ia64/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:
    … …  
    4545                rm -f $(USPACEDIR)/dist/app/`basename $$file` ; \
    4646        done
    47         rm -f $(DEPEND) $(DEPEND_PREV) $(OUTPUT) $(HELLO) $(COMPS).h $(COMPS).c $(LINK) $(INITRD).img $(INITRD).fs
     47        rm -f $(DEPEND) $(DEPEND_PREV) $(JOB) $(OUTPUT) $(HELLO) $(COMPS).h $(COMPS).c $(LINK) $(INITRD).img $(INITRD).fs
    4848        find . -name '*.o' -follow -exec rm \{\} \;
    4949        find . -name '*.co' -follow -exec rm \{\} \;

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

    r4da7d79 r6ef2c11  
    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

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

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

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

  • boot/arch/mips32/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/mips32/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) $(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

    r4da7d79 r6ef2c11  
    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

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

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

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

  • boot/arch/ppc32/Makefile.inc

    r4da7d79 r6ef2c11  
    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

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

    r4da7d79 r6ef2c11  
    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

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

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

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

  • boot/arch/sparc64/Makefile.inc

    r4da7d79 r6ef2c11  
    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

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

    r4da7d79 r6ef2c11  
    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

    r4da7d79 r6ef2c11  
    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

    r4da7d79 r6ef2c11  
    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.