Changeset fe6a74c in mainline


Ignore:
Timestamp:
2008-12-19T11:12:37Z (15 years ago)
Author:
Jiri Svoboda <jirik.svoboda@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
653a4f7
Parents:
bcb47fa
Message:

Support for initrd on ia64. Since console crashes if run by init, work around by starting it as an init task.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • boot/arch/ia64/loader/Makefile

    rbcb47fa rfe6a74c  
    9494        $(USPACEDIR)/srv/ns/ns \
    9595        $(USPACEDIR)/srv/loader/loader \
     96        $(USPACEDIR)/app/init/init \
     97        $(USPACEDIR)/srv/devmap/devmap \
     98        $(USPACEDIR)/srv/rd/rd \
     99        $(USPACEDIR)/srv/vfs/vfs \
    96100        $(USPACEDIR)/srv/fb/fb \
    97         $(USPACEDIR)/srv/kbd/kbd \
    98         $(USPACEDIR)/srv/console/console \
    99         $(USPACEDIR)/srv/vfs/vfs \
     101        $(USPACEDIR)/srv/kbd/kbd
     102ifeq ($(RDFMT),tmpfs)
     103        COMPONENTS += $(USPACEDIR)/srv/fs/tmpfs/tmpfs
     104endif
     105ifeq ($(RDFMT),fat)
     106        COMPONENTS += $(USPACEDIR)/srv/fs/fat/fat
     107endif
     108COMPONENTS += \
     109        $(USPACEDIR)/srv/console/console
     110
     111RD_SRVS = \
    100112        $(USPACEDIR)/srv/fs/tmpfs/tmpfs \
    101         $(USPACEDIR)/srv/fs/fat/fat \
    102         $(USPACEDIR)/srv/devmap/devmap \
    103         $(USPACEDIR)/app/init/init \
     113        $(USPACEDIR)/srv/fs/fat/fat
     114
     115RD_APPS = \
    104116        $(USPACEDIR)/app/tetris/tetris \
    105117        $(USPACEDIR)/app/tester/tester \
    106118        $(USPACEDIR)/app/trace/trace \
    107         $(USPACEDIR)/app/klog/klog
     119        $(USPACEDIR)/app/klog/klog \
     120        $(USPACEDIR)/app/bdsh/bdsh
    108121
    109122OBJECTS := $(addsuffix .o,$(basename $(SOURCES)))
     
    122135        cp gefi/HelenOS/image.bin ../../../../
    123136
    124 image.boot: depend _components.h _link.ld $(COMPONENT_OBJECTS) $(OBJECTS)
    125         $(LD) -Map image.map -no-check-sections -N -T _link.ld $(COMPONENT_OBJECTS) $(OBJECTS) -o $@
     137image.boot: depend _components.h _link.ld $(COMPONENT_OBJECTS) initrd.o $(OBJECTS)
     138        $(LD) -Map image.map -no-check-sections -N -T _link.ld $(COMPONENT_OBJECTS) initrd.o $(OBJECTS) -o $@
    126139
    127140depend:
     
    129142
    130143clean:
    131         -rm -f _components.h _components.c _link.ld $(COMPONENT_OBJECTS) $(OBJECTS) image.boot image.map image.disasm Makefile.depend ../../../../image.bin ../../../../hello.efi
     144        -for file in $(RD_SRVS) ; do \
     145                rm -f $(USPACEDIR)/dist/srv/`basename $$file` ; \
     146        done
     147        -for file in $(RD_APPS) ; do \
     148                rm -f $(USPACEDIR)/dist/app/`basename $$file` ; \
     149        done
     150        -rm -f _components.h _components.c _link.ld $(COMPONENT_OBJECTS) initrd.o $(OBJECTS) image.boot image.map image.disasm initrd.img image.boot Makefile.depend ../../../../image.bin ../../../../hello.efi
    132151        make -C gefi clean
    133152        make -C gefi/HelenOS clean
    134153
    135 _components.h _components.c _link.ld $(COMPONENT_OBJECTS): $(COMPONENTS) _link.ld.in
    136         ../../../tools/pack.py $(OBJCOPY) $(BFD_NAME) $(BFD_ARCH) 16384 "unsigned long" $(COMPONENTS)
     154_components.h _components.c _link.ld $(COMPONENT_OBJECTS) initrd.o: $(COMPONENTS) $(RD_SRVS) $(RD_APPS) _link.ld.in
     155        for file in $(RD_SRVS) ; do \
     156                cp $$file $(USPACEDIR)/dist/srv/ ; \
     157        done
     158        for file in $(RD_APPS) ; do \
     159                cp $$file $(USPACEDIR)/dist/app/ ; \
     160        done
     161ifeq ($(RDFMT),tmpfs)
     162        ../../../../tools/mktmpfs.py $(USPACEDIR)/dist/ initrd.fs
     163endif
     164ifeq ($(RDFMT),fat)
     165        ../../../../tools/mkfat.py $(USPACEDIR)/dist/ initrd.fs
     166endif
     167        ../../../../tools/mkhord.py 16384 initrd.fs initrd.img
     168        rm initrd.fs
     169        ../../../tools/pack.py $(OBJCOPY) $(BFD_NAME) $(BFD_ARCH) 16384 "unsigned long" $(COMPONENTS) ./initrd.img
    137170
    138171%.o: %.S
Note: See TracChangeset for help on using the changeset viewer.