WebSVN – HelenOS – Path Comparison – / – /branches/network/boot/arch Rev 3369 and /branches/network/boot/arch Rev 3386

Ignore whitespace Rev 3369 → Rev 3386

/branches/network/boot/arch/ia64/loader/pack
File deleted

Property changes:
Deleted: svn:executable
-*
\ No newline at end of property

 /branches/network/boot/arch/ia64/loader/Makefile
 ,8 → 32,14
 ## Toolchain configuration
 #
+ifndef CROSS_PREFIX
+    CROSS_PREFIX = /usr/local
+endif
+BFD_NAME = elf64-ia64-little
+BFD_ARCH = ia64
 TARGET = ia64-pc-linux-gnu
-TOOLCHAIN_DIR = /usr/local/ia64/bin
+TOOLCHAIN_DIR = $(CROSS_PREFIX)/ia64/bin
 ifeq ($(COMPILER),gcc_native)
     CC = gcc
 ,6 → 47,7
     LD = ld
     OBJCOPY = objcopy
     OBJDUMP = objdump
+    GEFI_PREXIX =
 endif
 ifeq ($(COMPILER),icc_native)
 ,6 → 64,7
     LD = $(TOOLCHAIN_DIR)/$(TARGET)-ld
     OBJCOPY = $(TOOLCHAIN_DIR)/$(TARGET)-objcopy
     OBJDUMP = $(TOOLCHAIN_DIR)/$(TARGET)-objdump
+    GEFI_PREFIX = $(TOOLCHAIN_DIR)/$(TARGET)-
 endif
 #-mno-pic means do not use gp + imm22 to address data
 ,6 → 83,7
     ../../../generic/printf.c \
     ../../../generic/string.c \
     ../../../genarch/balloc.c \
+    _components.c \
     asm.S \
     boot.S
 ,6 → 90,7
 COMPONENTS = \
     $(KERNELDIR)/kernel.bin \
     $(USPACEDIR)/srv/ns/ns \
+    $(USPACEDIR)/srv/loader/loader \
     $(USPACEDIR)/srv/fb/fb \
     $(USPACEDIR)/srv/kbd/kbd \
     $(USPACEDIR)/srv/console/console \
 ,7 → 103,6
     $(USPACEDIR)/app/tester/tester \
     $(USPACEDIR)/app/klog/klog
 OBJECTS := $(addsuffix .o,$(basename $(SOURCES)))
 COMPONENT_OBJECTS := $(addsuffix .o,$(basename $(notdir $(COMPONENTS))))
 ,25 → 112,25
 -include Makefile.depend
 hello.efi: image.boot
-    make -C gefi/HelenOS
+    make -C gefi/HelenOS PREFIX=$(GEFI_PREFIX)
     cp gefi/HelenOS/hello.efi ../../../../
-    cp gefi/HelenOS/hello.efi /boot/efi/
-    cp gefi/HelenOS/image.bin /boot/efi/
+#   cp gefi/HelenOS/hello.efi /boot/efi/
+    cp gefi/HelenOS/image.bin ../../../../
 image.boot: depend _components.h _link.ld $(COMPONENT_OBJECTS) $(OBJECTS)
-    $(LD) -Map boot.map -no-check-sections -N -T _link.ld $(COMPONENT_OBJECTS) $(OBJECTS) -o $@
+    $(LD) -Map image.map -no-check-sections -N -T _link.ld $(COMPONENT_OBJECTS) $(OBJECTS) -o $@
 depend:
     -makedepend $(DEFS) $(CFLAGS) -f - $(SOURCES) > Makefile.depend 2> /dev/null
 clean:
-    -rm -f _components.h _link.ld $(COMPONENT_OBJECTS) $(OBJECTS) image.boot boot.disasm Makefile.depend
+    -rm -f _components.h _components.c _link.ld $(COMPONENT_OBJECTS) $(OBJECTS) image.boot image.map image.disasm Makefile.depend ../../../../image.bin ../../../../hello.efi
+    make -C gefi clean
     make -C gefi/HelenOS clean
-_components.h _link.ld $(COMPONENT_OBJECTS): $(COMPONENTS)
-    ./pack $(IMAGE) $(OBJCOPY) $(COMPONENTS)
+_components.h _components.c _link.ld $(COMPONENT_OBJECTS): $(COMPONENTS) _link.ld.in
+    ../../../tools/pack.py $(OBJCOPY) $(BFD_NAME) $(BFD_ARCH) 16384 "unsigned long" $(COMPONENTS)
 %.o: %.S
     $(CC) $(DEFS) $(CFLAGS) -D__ASM__ -c $< -o $@
 ,4 → 139,4
     $(CC) $(DEFS) $(CFLAGS) -c $< -o $@
 disasm: image.boot
-    $(OBJDUMP) -d image.boot > boot.disasm
+    $(OBJDUMP) -d image.boot > image.disasm

 /branches/network/boot/arch/ia64/loader/gefi/apps/Makefile
 ,7 → 28,7
 CRTOBJS     = ../gnuefi/crt0-efi-$(ARCH).o
 LDSCRIPT    = ../gnuefi/elf_$(ARCH)_efi.lds
 LDFLAGS     += -T $(LDSCRIPT) -shared -Bsymbolic -L../lib -L../gnuefi $(CRTOBJS)
-LOADLIBES   = -lefi -lgnuefi $(shell $(CC) -print-libgcc-file-name)
+LOADLIBES   = -lefi -lgnuefi
 FORMAT      = efi-app-$(ARCH)
 TARGETS = t.efi t2.efi t3.efi t4.efi t5.efi t6.efi printenv.efi t7.efi

 /branches/network/boot/arch/ia64/loader/gefi/HelenOS/Makefile
 ,7 → 20,7
 #  Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 #  02111-1307, USA.
 #
+prefix=$(PREFIX)
 include ../Make.defaults
 CDIR=$(TOPDIR)/..
 LINUX_HEADERS   = /usr/src/sys/build
 ,15 → 28,15
 CRTOBJS     = ../gnuefi/crt0-efi-$(ARCH).o
 LDSCRIPT    = ../gnuefi/elf_$(ARCH)_efi.lds
 LDFLAGS     += -T $(LDSCRIPT) -shared -Bsymbolic -L../lib -L../gnuefi $(CRTOBJS)
-LOADLIBES   = -lefi -lgnuefi $(shell $(CC) -print-libgcc-file-name)
+LOADLIBES   = -lefi -lgnuefi
 FORMAT      = efi-app-$(ARCH)
-all:    hello.efi
+all:    gefi hello.efi
 clean:
-    rm -f *.efi *~ *.o *.so
+    rm -f *.efi *~ *.o *.so *.map *.disass *.bin
 .PHONY: install
 ,7 → 43,7
 hello.efi: hello.so
     $(OBJCOPY) -j .text -j .sdata -j .data -j .dynamic -j .dynsym -j .rel \
            -j .rela -j .reloc --target=$(FORMAT) hello.so hello.efi
-    objdump -d hello.efi > hello.disass
+    $(OBJDUMP) -d hello.efi > hello.disass
 hello.so: hello.o image.o
     $(LD) $(LDFLAGS) -Map hello.map hello.o -o hello.so $(LOADLIBES)
 ,8 → 52,9
     $(CC) $(INCDIR) $(CFLAGS) $(CPPFLAGS) -c hello.c -o hello.o
 image.o: ../../image.boot
-    objcopy -O binary ../../image.boot image.bin
-    objcopy -I binary -O elf64-ia64-little -B ia64 image.bin image.o
+    $(OBJCOPY) -O binary ../../image.boot image.bin
+    $(OBJCOPY) -I binary -O elf64-ia64-little -B ia64 image.bin image.o
+gefi:
+    make -C .. prefix=$(PREFIX)

 /branches/network/boot/arch/ia64/loader/gefi/Make.defaults
 ,14 → 38,14
 GCC_VERSION=$(shell $(CROSS_COMPILE)$(CC) -v 2>&1 | fgrep 'gcc version' | cut -f3 -d' ' | cut -f1 -d'.')
-ifeq ($(ARCH),ia64)
-  prefix    =
-  CC        = $(prefix)gcc
-  AS        = $(prefix)as
-  LD        = $(prefix)ld
-  AR        = $(prefix)ar
-  RANLIB    = $(prefix)ranlib
-  OBJCOPY   = $(prefix)objcopy
+#  prefix   =
+CC      = $(prefix)gcc
+AS      = $(prefix)as
+LD      = $(prefix)ld
+AR      = $(prefix)ar
+RANLIB  = $(prefix)ranlib
+OBJCOPY = $(prefix)objcopy
+OBJDUMP = $(prefix)objdump
 ifneq ($(GCC_VERSION),2)
 ,22 → 54,3
 CFLAGS += -mfixed-range=f32-f127
-else
- ifeq ($(ARCH),ia32)
-#
-# gcc-3.x is required
-#
-  prefix    =
-  ifneq ($(GCC_VERSION),2)
-    CC = $(prefix)gcc
-  else
-    CC = $(prefix)gcc3 #must have gcc 3.x
-  endif
-  AS        = $(prefix)as
-  LD        = $(prefix)ld
-  AR        = $(prefix)ar
-  RANLIB    = $(prefix)ranlib
-  OBJCOPY   = $(prefix)objcopy
- endif
-endif

 /branches/network/boot/arch/ia64/loader/_link.ld.in
 ,0 → 1,26
+OUTPUT_FORMAT("elf64-ia64-little")
+ENTRY(start)
+SECTIONS {
+    .boot 0x4400000: AT (0x4400000) {
+        *(BOOTSTRAP);
+[[COMPONENTS]]
+        . = ALIGN (16384);
+        *(.text);
+        *(.rodata);
+        *(.rodata.*);
+        *(.data);               /* initialized data */
+        _got = . ;
+        *(.got .got.*);
+        *(.sdata);
+        *(.sdata2);
+        *(.sbss);
+        *(.bss);                /* uninitialized static variables */
+        *(COMMON);
+    }
+    /DISCARD/ : {
+        *(.comment);
+        *(.note*);
+    }
+}

/branches/network/boot/arch/arm32/loader/pack
File deleted

Property changes:
Deleted: svn:executable
-*
\ No newline at end of property

 /branches/network/boot/arch/arm32/loader/Makefile
 ,21 → 27,29
 #
 include ../../../../version
-include ../../../../Makefile.config
+include ../../../Makefile.config
 ## Toolchain configuration
 #
+ifndef CROSS_PREFIX
+    CROSS_PREFIX = /usr/local
+endif
+BFD_NAME = elf32-littlearm
+BFD_ARCH = arm
 TARGET = arm-linux-gnu
-TOOLCHAIN_DIR = /usr/local/arm/bin
+TOOLCHAIN_DIR = $(CROSS_PREFIX)/arm/bin
-ifeq ($(COMPILER),native)
+ifeq ($(COMPILER),gcc_native)
     CC = gcc
     AS = as
     LD = ld
     OBJCOPY = objcopy
     OBJDUMP = objdump
-else
+endif
+ifeq ($(COMPILER),gcc_cross)
     CC = $(TOOLCHAIN_DIR)/$(TARGET)-gcc
     AS = $(TOOLCHAIN_DIR)/$(TARGET)-as
     LD = $(TOOLCHAIN_DIR)/$(TARGET)-ld
 ,28 → 76,36
     boot.S \
     asm.S \
     mm.c \
+    print/gxemul.c \
+    _components.c \
     ../../../generic/printf.c \
     ../../../genarch/division.c
-ifeq ($(MACHINE), gxemul_testarm)
-    SOURCES += print/gxemul.c
-endif
 COMPONENTS = \
     $(KERNELDIR)/kernel.bin \
     $(USPACEDIR)/srv/ns/ns \
+    $(USPACEDIR)/srv/loader/loader \
+    $(USPACEDIR)/app/init/init \
+    $(USPACEDIR)/srv/devmap/devmap \
+    $(USPACEDIR)/srv/rd/rd \
+    $(USPACEDIR)/srv/vfs/vfs
+ifeq ($(RDFMT),tmpfs)
+    COMPONENTS += $(USPACEDIR)/srv/fs/tmpfs/tmpfs
+endif
+ifeq ($(RDFMT),fat)
+    COMPONENTS += $(USPACEDIR)/srv/fs/fat/fat
+endif
+RD_TASKS = \
+    $(USPACEDIR)/srv/fb/fb \
     $(USPACEDIR)/srv/kbd/kbd \
     $(USPACEDIR)/srv/console/console \
-    $(USPACEDIR)/srv/fb/fb \
-    $(USPACEDIR)/srv/vfs/vfs \
     $(USPACEDIR)/srv/fs/tmpfs/tmpfs \
     $(USPACEDIR)/srv/fs/fat/fat \
-    $(USPACEDIR)/srv/devmap/devmap \
-    $(USPACEDIR)/app/init/init \
+    $(USPACEDIR)/app/tetris/tetris \
     $(USPACEDIR)/app/tester/tester \
     $(USPACEDIR)/app/klog/klog \
-    $(USPACEDIR)/app/tetris/tetris
+    $(USPACEDIR)/app/bdsh/bdsh
 OBJECTS := $(addsuffix .o,$(basename $(SOURCES)))
 COMPONENT_OBJECTS := $(addsuffix .o,$(basename $(notdir $(COMPONENTS))))
 ,17 → 116,31
 -include Makefile.depend
-image.boot: depend _components.h _link.ld $(OBJECTS) $(COMPONENT_OBJECTS)
-    $(LD) -no-check-sections -N -T _link.ld $(COMPONENT_OBJECTS) $(OBJECTS) -o $@
+image.boot: depend _components.h _link.ld $(COMPONENT_OBJECTS) initrd.o $(OBJECTS)
+    $(LD) -no-check-sections -N -T _link.ld $(COMPONENT_OBJECTS) initrd.o $(OBJECTS) -o $@
 depend:
     -makedepend $(DEFS) $(CFLAGS) -f - $(SOURCES) > Makefile.depend 2> /dev/null
 clean:
-    -rm -f _components.h _link.ld $(COMPONENT_OBJECTS) $(OBJECTS) image.boot Makefile.depend
+    -for task in $(RD_TASKS) ; do \
+        rm -f $(USPACEDIR)/dist/sbin/`basename $$task` ; \
+    done
+    -rm -f _components.h _components.c _link.ld $(COMPONENT_OBJECTS) initrd.o $(OBJECTS) initrd.img image.boot Makefile.depend
-_components.h _link.ld $(COMPONENT_OBJECTS): $(COMPONENTS)
-    ./pack $(IMAGE) $(OBJCOPY) $(COMPONENTS)
+_components.h _components.c _link.ld $(COMPONENT_OBJECTS) initrd.o: $(COMPONENTS) _link.ld.in
+    for task in $(RD_TASKS) ; do \
+        cp $$task $(USPACEDIR)/dist/sbin/ ; \
+    done
+ifeq ($(RDFMT),tmpfs)
+    ../../../../tools/mktmpfs.py $(USPACEDIR)/dist/ initrd.fs
+endif
+ifeq ($(RDFMT),fat)
+    ../../../../tools/mkfat.sh $(USPACEDIR)/dist/ initrd.fs
+endif
+    ../../../../tools/mkhord.py 4096 initrd.fs initrd.img
+    rm initrd.fs
+    ../../../tools/pack.py $(OBJCOPY) $(BFD_NAME) $(BFD_ARCH) 4096 "unsigned int" $(COMPONENTS) ./initrd.img
 %.o: %.S
     $(CC) $(DEFS) $(CFLAGS) -D__ASM__ -c $< -o $@

 /branches/network/boot/arch/arm32/loader/asm.S
 ,7 → 35,8
     add     r3, r1, #3
     bic     r3, r3, #3
     cmp     r1, r3
-    stmdb   sp!, {r4, lr}
+    stmdb   sp!, {r4, r5, lr}
+    mov r5, r0
     beq     4f
 :
     cmp     r2, #0
 ,8 → 49,8
     cmp     ip, r2
     bne     2b
 :
-    mov     r0, r1
-    ldmia   sp!, {r4, pc}
+    mov     r0, r5
+    ldmia   sp!, {r4, r5, pc}
 :
     add     r3, r0, #3
     bic     r3, r3, #3

 /branches/network/boot/arch/arm32/loader/boot.S
 ,6 → 39,11
     b bootstrap
 jump_to_kernel:
+    #
+    # TODO
+    # Make sure that the I-cache, D-cache and memory are mutually coherent
+    # before passing control to the copied code.
+    #
     bx r0

 /branches/network/boot/arch/arm32/loader/_link.ld.in
 ,0 → 1,24
+OUTPUT_FORMAT("elf32-littlearm")
+ENTRY(start)
+SECTIONS {
+    .boot 0x0: AT (0) {
+        *(BOOTSTRAP);
+        *(.text);
+        *(.rodata);
+        *(.rodata.*);
+        *(.data);       /* initialized data */
+        *(.sdata);
+        *(.sdata2);
+        *(.sbss);
+        *(.scommon);
+        *(.bss);        /* uninitialized static variables */
+        *(COMMON);      /* global variables */
+        *(.reginfo);
+        . = 0x4000;
+        *(PT);          /* page table placed at 0x4000 */
+[[COMPONENTS]]
+    }
+}

 /branches/network/boot/arch/arm32/loader/main.c
 ,9 → 76,10
     version_print();
     component_t components[COMPONENTS];
-    bootinfo_t bootinfo;
     init_components(components);
+    bootinfo_t bootinfo;
     printf("\nMemory statistics\n");
     printf(" kernel entry point at %L\n", KERNEL_VIRTUAL_ADDRESS);
     printf(" %L: boot info structure\n", &bootinfo);

/branches/network/boot/arch/ppc32/loader/pack
File deleted

Property changes:
Deleted: svn:executable
-*
\ No newline at end of property

 /branches/network/boot/arch/ppc32/loader/Makefile
 ,8 → 32,14
 ## Toolchain configuration
 #
+ifndef CROSS_PREFIX
+    CROSS_PREFIX = /usr/local
+endif
+BFD_NAME = elf32-powerpc
+BFD_ARCH = powerpc:common
 TARGET = ppc-linux-gnu
-TOOLCHAIN_DIR = /usr/local/ppc/bin
+TOOLCHAIN_DIR = $(CROSS_PREFIX)/ppc/bin
 ifeq ($(COMPILER),gcc_native)
     CC = gcc
 ,14 → 49,6
     OBJDUMP = objdump
 endif
-ifeq ($(COMPILER),icc_native)
-    CC = icc
-    AS = as
-    LD = ld
-    OBJCOPY = objcopy
-    OBJDUMP = objdump
-endif
 ifeq ($(COMPILER),gcc_cross)
     CC = $(TOOLCHAIN_DIR)/$(TARGET)-gcc
     AS = $(TOOLCHAIN_DIR)/$(TARGET)-as
 ,6 → 70,7
 SOURCES = \
     main.c \
     ofwarch.c \
+    _components.c \
     ../../../genarch/ofw.c \
     ../../../generic/printf.c \
     asm.S \
 ,17 → 79,28
 COMPONENTS = \
     $(KERNELDIR)/kernel.bin \
     $(USPACEDIR)/srv/ns/ns \
+    $(USPACEDIR)/srv/loader/loader \
+    $(USPACEDIR)/app/init/init \
+    $(USPACEDIR)/srv/devmap/devmap \
+    $(USPACEDIR)/srv/rd/rd \
+    $(USPACEDIR)/srv/vfs/vfs
+ifeq ($(RDFMT),tmpfs)
+    COMPONENTS += $(USPACEDIR)/srv/fs/tmpfs/tmpfs
+endif
+ifeq ($(RDFMT),fat)
+    COMPONENTS += $(USPACEDIR)/srv/fs/fat/fat
+endif
+RD_TASKS = \
     $(USPACEDIR)/srv/fb/fb \
     $(USPACEDIR)/srv/kbd/kbd \
     $(USPACEDIR)/srv/console/console \
-    $(USPACEDIR)/srv/vfs/vfs \
     $(USPACEDIR)/srv/fs/tmpfs/tmpfs \
     $(USPACEDIR)/srv/fs/fat/fat \
-    $(USPACEDIR)/srv/devmap/devmap \
-    $(USPACEDIR)/app/init/init \
     $(USPACEDIR)/app/tetris/tetris \
     $(USPACEDIR)/app/tester/tester \
-    $(USPACEDIR)/app/klog/klog
+    $(USPACEDIR)/app/klog/klog \
+    $(USPACEDIR)/app/bdsh/bdsh
 OBJECTS := $(addsuffix .o,$(basename $(SOURCES)))
 COMPONENT_OBJECTS := $(addsuffix .o,$(basename $(notdir $(COMPONENTS))))
 ,17 → 111,31
 -include Makefile.depend
-image.boot: depend _components.h _link.ld $(COMPONENT_OBJECTS) $(OBJECTS)
-    $(LD) -no-check-sections -N -T _link.ld $(COMPONENT_OBJECTS) $(OBJECTS) -o $@
+image.boot: depend _components.h _link.ld $(COMPONENT_OBJECTS) initrd.o $(OBJECTS)
+    $(LD) -no-check-sections -N -T _link.ld $(COMPONENT_OBJECTS) initrd.o $(OBJECTS) -o $@
 depend:
     -makedepend $(DEFS) $(CFLAGS) -f - $(SOURCES) > Makefile.depend 2> /dev/null
 clean:
-    -rm -f _components.h _link.ld $(COMPONENT_OBJECTS) $(OBJECTS) image.boot Makefile.depend
+    -for task in $(RD_TASKS) ; do \
+        rm -f $(USPACEDIR)/dist/sbin/`basename $$task` ; \
+    done
+    -rm -f _components.h _components.c _link.ld $(COMPONENT_OBJECTS) initrd.o $(OBJECTS) initrd.img image.boot Makefile.depend
-_components.h _link.ld $(COMPONENT_OBJECTS): $(COMPONENTS)
-    ./pack $(OBJCOPY) $(COMPONENTS)
+_components.h _components.c _link.ld $(COMPONENT_OBJECTS) initrd.o: $(COMPONENTS) $(RD_TASKS) _link.ld.in
+    for task in $(RD_TASKS) ; do \
+        cp $$task $(USPACEDIR)/dist/sbin/ ; \
+    done
+ifeq ($(RDFMT),tmpfs)
+    ../../../../tools/mktmpfs.py $(USPACEDIR)/dist/ initrd.fs
+endif
+ifeq ($(RDFMT),fat)
+    ../../../../tools/mkfat.sh $(USPACEDIR)/dist/ initrd.fs
+endif
+    ../../../../tools/mkhord.py 4096 initrd.fs initrd.img
+    rm initrd.fs
+    ../../../tools/pack.py $(OBJCOPY) $(BFD_NAME) $(BFD_ARCH) 4096 "unsigned int" $(COMPONENTS) ./initrd.img
 %.o: %.S
     $(CC) $(DEFS) $(CFLAGS) -D__ASM__ -c $< -o $@

 /branches/network/boot/arch/ppc32/loader/_link.ld.in
 ,0 → 1,21
+OUTPUT_FORMAT("elf32-powerpc")
+OUTPUT_ARCH(powerpc:common)
+ENTRY(start)
+SECTIONS {
+    .boot 0x10000000: AT (0) {
+        *(BOOTSTRAP);
+        *(REALMODE);
+        *(.text);
+        *(.rodata);
+        *(.rodata.*);
+        *(.data);       /* initialized data */
+        *(.sdata);
+        *(.sdata2);
+        *(.sbss);
+        *(.bss);        /* uninitialized static variables */
+        *(COMMON);      /* global variables */
+[[COMPONENTS]]
+    }
+}

 /branches/network/boot/arch/ppc32/loader/main.c
 ,10 → 96,10
 {
     version_print();
-    init_components();
+    component_t components[COMPONENTS];
+    init_components(components);
     unsigned int i;
     for (i = 0; i < COMPONENTS; i++)
         check_align(components[i].start, components[i].name);

/branches/network/boot/arch/ppc64/loader/pack
File deleted

Property changes:
Deleted: svn:executable
-*
\ No newline at end of property

 /branches/network/boot/arch/ppc64/loader/Makefile
 ,8 → 32,14
 ## Toolchain configuration
 #
+ifndef CROSS_PREFIX
+    CROSS_PREFIX = /usr/local
+endif
+BFD_NAME = elf64-powerpc
+BFD_ARCH = powerpc:common64
 TARGET = ppc64-linux-gnu
-TOOLCHAIN_DIR = /usr/local/ppc64/bin
+TOOLCHAIN_DIR = $(CROSS_PREFIX)/ppc64/bin
 ifeq ($(COMPILER),gcc_native)
     CC = gcc
 ,14 → 49,6
     OBJDUMP = objdump
 endif
-ifeq ($(COMPILER),icc_native)
-    CC = icc
-    AS = as
-    LD = ld
-    OBJCOPY = objcopy
-    OBJDUMP = objdump
-endif
 ifeq ($(COMPILER),gcc_cross)
     CC = $(TOOLCHAIN_DIR)/$(TARGET)-gcc
     AS = $(TOOLCHAIN_DIR)/$(TARGET)-as
 ,6 → 70,7
 SOURCES = \
     main.c \
     ofwarch.c \
+    _components.c \
     ../../../genarch/ofw.c \
     ../../../generic/printf.c \
     asm.S \
 ,10 → 107,10
     -makedepend $(DEFS) $(CFLAGS) -f - $(SOURCES) > Makefile.depend 2> /dev/null
 clean:
-    -rm -f _components.h _link.ld $(COMPONENT_OBJECTS) $(OBJECTS) image.boot Makefile.depend
+    -rm -f _components.h _components.c _link.ld $(COMPONENT_OBJECTS) $(OBJECTS) image.boot Makefile.depend
-_components.h _link.ld $(COMPONENT_OBJECTS): $(COMPONENTS)
-    ./pack $(OBJCOPY) $(COMPONENTS)
+_components.h _components.c _link.ld $(COMPONENT_OBJECTS): $(COMPONENTS) _link.ld.in
+    ../../../tools/pack.py $(OBJCOPY) $(BFD_NAME) $(BFD_ARCH) 4096 "unsigned long" $(COMPONENTS)
 %.o: %.S
     $(CC) $(DEFS) $(CFLAGS) -D__ASM__ -c $< -o $@

 /branches/network/boot/arch/ppc64/loader/_link.ld.in
 ,0 → 1,27
+OUTPUT_FORMAT("elf64-powerpc")
+OUTPUT_ARCH(powerpc:common64)
+ENTRY(start)
+SECTIONS {
+    .boot 0x0000000010000000: AT (0) {
+        *(BOOTSTRAP);
+        *(REALMODE);
+        *(.text);
+        *(.toc);
+        *(.opd);
+        *(.rodata);
+        *(.rodata.*);
+        *(.data);       /* initialized data */
+        *(.sdata);
+        *(.sdata2);
+        *(.sbss);
+        *(.bss);        /* uninitialized static variables */
+        *(COMMON);      /* global variables */
+[[COMPONENTS]]
+    }
+    /DISCARD/ : {
+        *(*);
+    }
+}

 /branches/network/boot/arch/ppc64/loader/main.c
 ,8 → 96,9
 {
     version_print();
-    init_components();
+    component_t components[COMPONENTS];
+    init_components(components);
     unsigned int i;
     for (i = 0; i < COMPONENTS; i++)

/branches/network/boot/arch/mips32/loader/pack
File deleted

Property changes:
Deleted: svn:executable
-*
\ No newline at end of property

 /branches/network/boot/arch/mips32/loader/Makefile
 ,8 → 32,20
 ## Toolchain configuration
 #
+ifndef CROSS_PREFIX
+    CROSS_PREFIX = /usr/local
+endif
+ifeq ($(IMAGE),binary)
+    LD_IN = binary
+endif
+ifeq ($(IMAGE),ecoff)
+    LD_IN = ecoff
+endif
+BFD_NAME = elf32-tradlittlemips
+BFD_ARCH = mips
 TARGET = mipsel-linux-gnu
-TOOLCHAIN_DIR = /usr/local/mipsel/bin
+TOOLCHAIN_DIR = $(CROSS_PREFIX)/mipsel/bin
 ifeq ($(COMPILER),gcc_native)
     CC = gcc
 ,14 → 55,6
     OBJDUMP = objdump
 endif
-ifeq ($(COMPILER),icc_native)
-    CC = icc
-    AS = as
-    LD = ld
-    OBJCOPY = objcopy
-    OBJDUMP = objdump
-endif
 ifeq ($(COMPILER),gcc_cross)
     CC = $(TOOLCHAIN_DIR)/$(TARGET)-gcc
     AS = $(TOOLCHAIN_DIR)/$(TARGET)-as
 ,6 → 76,7
 SOURCES = \
     main.c \
     msim.c \
+    _components.c \
     ../../../generic/printf.c \
     asm.S \
     boot.S
 ,18 → 84,30
 COMPONENTS = \
     $(KERNELDIR)/kernel.bin \
     $(USPACEDIR)/srv/ns/ns \
+    $(USPACEDIR)/srv/loader/loader \
+    $(USPACEDIR)/app/init/init \
+    $(USPACEDIR)/srv/devmap/devmap \
+    $(USPACEDIR)/srv/rd/rd \
+    $(USPACEDIR)/srv/vfs/vfs
+ifeq ($(RDFMT),tmpfs)
+    COMPONENTS += $(USPACEDIR)/srv/fs/tmpfs/tmpfs
+endif
+ifeq ($(RDFMT),fat)
+    COMPONENTS += $(USPACEDIR)/srv/fs/fat/fat
+endif
+RD_TASKS = \
     $(USPACEDIR)/srv/fb/fb \
     $(USPACEDIR)/srv/kbd/kbd \
     $(USPACEDIR)/srv/console/console \
-    $(USPACEDIR)/srv/vfs/vfs \
     $(USPACEDIR)/srv/fs/tmpfs/tmpfs \
     $(USPACEDIR)/srv/fs/fat/fat \
-    $(USPACEDIR)/srv/devmap/devmap \
-    $(USPACEDIR)/app/init/init \
     $(USPACEDIR)/app/tetris/tetris \
     $(USPACEDIR)/app/tester/tester \
+    $(USPACEDIR)/app/bdsh/bdsh \
     $(USPACEDIR)/app/klog/klog
 OBJECTS := $(addsuffix .o,$(basename $(SOURCES)))
 COMPONENT_OBJECTS := $(addsuffix .o,$(basename $(notdir $(COMPONENTS))))
 ,18 → 117,35
 -include Makefile.depend
-image.boot: depend _components.h _link.ld $(COMPONENT_OBJECTS) $(OBJECTS)
-    $(LD) -no-check-sections -N -T _link.ld $(COMPONENT_OBJECTS) $(OBJECTS) -o $@
+image.boot: depend _components.h _link.ld $(COMPONENT_OBJECTS) initrd.o $(OBJECTS)
+    $(LD) -no-check-sections -N -T _link.ld $(COMPONENT_OBJECTS) initrd.o $(OBJECTS) -o $@
 depend:
     -makedepend $(DEFS) $(CFLAGS) -f - $(SOURCES) > Makefile.depend 2> /dev/null
 clean:
-    -rm -f _components.h _link.ld $(COMPONENT_OBJECTS) $(OBJECTS) image.boot Makefile.depend
+    -for task in $(RD_TASKS) ; do \
+        rm -f $(USPACEDIR)/dist/sbin/`basename $$task` ; \
+    done
+    -rm -f _components.h _components.c _link.ld _link.ld.in $(COMPONENT_OBJECTS) initrd.o $(OBJECTS) initrd.img image.boot Makefile.depend
-_components.h _link.ld $(COMPONENT_OBJECTS): $(COMPONENTS)
-    ./pack $(IMAGE) $(OBJCOPY) $(COMPONENTS)
+_components.h _components.c _link.ld $(COMPONENT_OBJECTS) initrd.o: $(COMPONENTS) _link.ld.in
+    for task in $(RD_TASKS) ; do \
+        cp $$task $(USPACEDIR)/dist/sbin/ ; \
+    done
+ifeq ($(RDFMT),tmpfs)
+    ../../../../tools/mktmpfs.py $(USPACEDIR)/dist/ initrd.fs
+endif
+ifeq ($(RDFMT),fat)
+    ../../../../tools/mkfat.sh $(USPACEDIR)/dist/ initrd.fs
+endif
+    ../../../../tools/mkhord.py 16384 initrd.fs initrd.img
+    rm initrd.fs
+    ../../../tools/pack.py $(OBJCOPY) $(BFD_NAME) $(BFD_ARCH) 16384 "unsigned int" $(COMPONENTS) ./initrd.img
+_link.ld.in: _link.ld.in.$(LD_IN)
+    cp $< $@
 %.o: %.S
     $(CC) $(DEFS) $(CFLAGS) -D__ASM__ -c $< -o $@

 /branches/network/boot/arch/mips32/loader/asm.S
 ,6 → 48,7
     and $v0,$v0,$v1
     beq $a1,$v0,3f
     move    $t0,$a0
+    move    $t2,$a0         # save dst
 :
     beq $a2,$zero,2f
 ,7 → 64,7
 :
     jr  $ra
-    move    $v0,$a1
+    move    $v0,$t2
 :
     addiu   $v0,$a0,3
 ,9 → 104,13
     sb  $a0,0($v1)
     jr  $ra
-    move    $v0,$a1
+    move    $v0,$t2
 jump_to_kernel:
-#   .word 0x39
+    #
+    # TODO
+    # Make sure that the I-cache, D-cache and memory are mutually coherent
+    # before passing control to the copied code.
+    #
     j $a0
     nop

 /branches/network/boot/arch/mips32/loader/_link.ld.in.ecoff
 ,0 → 1,21
+OUTPUT_FORMAT("ecoff-littlemips")
+ENTRY(start)
+SECTIONS {
+    .boot 0xbfc00000: AT (0) {
+        *(BOOTSTRAP);
+        *(.text);
+        *(.rodata);
+        *(.rodata.*);
+        *(.data);       /* initialized data */
+        *(.sdata);
+        *(.sdata2);
+        *(.sbss);
+        *(.scommon);
+        *(.bss);        /* uninitialized static variables */
+        *(COMMON);      /* global variables */
+        *(.reginfo);
+[[COMPONENTS]]
+    }
+}

 /branches/network/boot/arch/mips32/loader/_link.ld.in.binary
 ,0 → 1,21
+OUTPUT_FORMAT("binary")
+ENTRY(start)
+SECTIONS {
+    .boot 0xbfc00000: AT (0) {
+        *(BOOTSTRAP);
+        *(.text);
+        *(.rodata);
+        *(.rodata.*);
+        *(.data);       /* initialized data */
+        *(.sdata);
+        *(.sdata2);
+        *(.sbss);
+        *(.scommon);
+        *(.bss);        /* uninitialized static variables */
+        *(COMMON);      /* global variables */
+        *(.reginfo);
+[[COMPONENTS]]
+    }
+}

 /branches/network/boot/arch/mips32/loader/main.c
 ,9 → 59,10
     version_print();
     component_t components[COMPONENTS];
-    bootinfo_t bootinfo;
     init_components(components);
+    bootinfo_t bootinfo;
     printf("\nMemory statistics\n");
     printf(" kernel entry point at %L\n", KERNEL_VIRTUAL_ADDRESS);
     printf(" %L: boot info structure\n", &bootinfo);

/branches/network/boot/arch/sparc64/loader/pack
File deleted

Property changes:
Deleted: svn:executable
-*
\ No newline at end of property

 /branches/network/boot/arch/sparc64/loader/Makefile
 ,8 → 32,14
 ## Toolchain configuration
 #
+ifndef CROSS_PREFIX
+    CROSS_PREFIX = /usr/local
+endif
+BFD_NAME = elf64-sparc
+BFD_ARCH = sparc
 TARGET = sparc64-linux-gnu
-TOOLCHAIN_DIR = /usr/local/sparc64/bin
+TOOLCHAIN_DIR = $(CROSS_PREFIX)/sparc64/bin
 ifeq ($(COMPILER),gcc_native)
     CC = gcc
 ,14 → 49,6
     OBJDUMP = objdump
 endif
-ifeq ($(COMPILER),icc_native)
-    CC = icc
-    AS = as
-    LD = ld
-    OBJCOPY = objcopy
-    OBJDUMP = objdump
-endif
 ifeq ($(COMPILER),gcc_cross)
     CC = $(TOOLCHAIN_DIR)/$(TARGET)-gcc
     AS = $(TOOLCHAIN_DIR)/$(TARGET)-as
 ,6 → 69,7
 SOURCES = \
     main.c \
+    _components.c \
     ../../../generic/printf.c \
     ../../../generic/string.c \
     ../../../genarch/balloc.c \
 ,16 → 82,27
 COMPONENTS = \
     $(KERNELDIR)/kernel.bin \
     $(USPACEDIR)/srv/ns/ns \
+    $(USPACEDIR)/app/init/init \
+    $(USPACEDIR)/srv/loader/loader \
+    $(USPACEDIR)/srv/devmap/devmap \
+    $(USPACEDIR)/srv/rd/rd \
+    $(USPACEDIR)/srv/vfs/vfs
+ifeq ($(RDFMT),tmpfs)
+    COMPONENTS += $(USPACEDIR)/srv/fs/tmpfs/tmpfs
+endif
+ifeq ($(RDFMT),fat)
+    COMPONENTS += $(USPACEDIR)/srv/fs/fat/fat
+endif
+RD_TASKS = \
     $(USPACEDIR)/srv/fb/fb \
     $(USPACEDIR)/srv/kbd/kbd \
     $(USPACEDIR)/srv/console/console \
-    $(USPACEDIR)/srv/vfs/vfs \
     $(USPACEDIR)/srv/fs/tmpfs/tmpfs \
     $(USPACEDIR)/srv/fs/fat/fat \
-    $(USPACEDIR)/srv/devmap/devmap \
-    $(USPACEDIR)/app/init/init \
     $(USPACEDIR)/app/tetris/tetris \
     $(USPACEDIR)/app/tester/tester \
+    $(USPACEDIR)/app/bdsh/bdsh \
     $(USPACEDIR)/app/klog/klog
 OBJECTS := $(addsuffix .o,$(basename $(SOURCES)))
 ,17 → 114,31
 -include Makefile.depend
-image.boot: depend _components.h _link.ld $(COMPONENT_OBJECTS) $(OBJECTS)
-    $(LD) -Map image.map -no-check-sections -N -T _link.ld $(COMPONENT_OBJECTS) $(OBJECTS) -o $@
+image.boot: depend _components.h _link.ld $(COMPONENT_OBJECTS) initrd.o $(OBJECTS)
+    $(LD) -Map image.map -no-check-sections -N -T _link.ld $(COMPONENT_OBJECTS) initrd.o $(OBJECTS) -o $@
 depend:
     -makedepend $(DEFS) $(CFLAGS) -f - $(SOURCES) > Makefile.depend 2> /dev/null
 clean:
-    -rm -f _components.h _link.ld $(COMPONENT_OBJECTS) $(OBJECTS) image.boot boot.disasm Makefile.depend
+    -for task in $(RD_TASKS) ; do \
+        rm -f $(USPACEDIR)/dist/sbin/`basename $$task` ; \
+    done
+    -rm -f _components.h _components.c _link.ld $(COMPONENT_OBJECTS) initrd.o $(OBJECTS) initrd.img image.boot image.map image.disasm Makefile.depend
-_components.h _link.ld $(COMPONENT_OBJECTS): $(COMPONENTS)
-    ./pack $(IMAGE) $(OBJCOPY) $(COMPONENTS)
+_components.h _components.c _link.ld $(COMPONENT_OBJECTS) initrd.o: $(COMPONENTS) $(RD_TASKS) _link.ld.in
+    for task in $(RD_TASKS) ; do \
+        cp $$task $(USPACEDIR)/dist/sbin/ ; \
+    done
+ifeq ($(RDFMT),tmpfs)
+    ../../../../tools/mktmpfs.py $(USPACEDIR)/dist/ initrd.fs
+endif
+ifeq ($(RDFMT),fat)
+    ../../../../tools/mkfat.sh $(USPACEDIR)/dist/ initrd.fs
+endif
+    ../../../../tools/mkhord.py 16384 initrd.fs initrd.img
+    rm initrd.fs
+    ../../../tools/pack.py $(OBJCOPY) $(BFD_NAME) $(BFD_ARCH) 1 "unsigned long" $(COMPONENTS) ./initrd.img
 %.o: %.S
     $(CC) $(DEFS) $(CFLAGS) -D__ASM__ -c $< -o $@
 ,4 → 147,4
     $(CC) $(DEFS) $(CFLAGS) -c $< -o $@
 disasm: image.boot
-    $(OBJDUMP) -d image.boot > boot.disasm
+    $(OBJDUMP) -d image.boot > image.disasm

 /branches/network/boot/arch/sparc64/loader/asm.S
 ,6 → 30,9
 #include <stack.h>
 #include <register.h>
+.register       %g2, #scratch
+.register       %g3, #scratch
 .text
 .global halt
 ,8 → 44,7
     nop
 memcpy:
-    .register       %g2, #scratch
-        .register       %g3, #scratch
+    mov %o0, %o3        ! save dst
     add %o1, 7, %g1
     and %g1, -8, %g1
     cmp %o1, %g1
 ,7 → 63,7
     mov %g2, %g3
 :
     jmp %o7 + 8         ! exit point
-    mov %o1, %o0
+    mov %o3, %o0
 :
     and %g1, -8, %g1
     cmp %o0, %g1
 ,9 → 97,19
     mov %g2, %g3
     jmp %o7 + 8         ! exit point
-    mov %o1, %o0
+    mov %o3, %o0
 jump_to_kernel:
+    /*
+     * We have copied code and now we need to guarantee cache coherence.
+     * 1. Make sure that the code we have moved has drained to main memory.
+     * 2. Invalidate I-cache.
+     * 3. Flush instruction pipeline.
+     */
+    call    icache_flush
+    membar  #StoreStore
+    flush   %i7
     mov %o0, %l1
     mov %o1, %o0
     mov %o2, %o1
 ,6 → 117,24
     jmp %l1             ! jump to kernel
     nop
+#define ICACHE_SIZE     8192
+#define ICACHE_LINE_SIZE    32
+#define ICACHE_SET_BIT      (1 << 13)
+#define ASI_ICACHE_TAG      0x67
+# Flush I-cache
+icache_flush:
+    set ((ICACHE_SIZE - ICACHE_LINE_SIZE) | ICACHE_SET_BIT), %g1
+    stxa    %g0, [%g1] ASI_ICACHE_TAG
+:  membar  #Sync
+    subcc   %g1, ICACHE_LINE_SIZE, %g1
+    bnz,pt  %xcc, 0b
+    stxa    %g0, [%g1] ASI_ICACHE_TAG
+    membar  #Sync
+    retl
+    ! SF Erratum #51
+    nop
 .global ofw
 ofw:
     save %sp, -STACK_WINDOW_SAVE_AREA_SIZE, %sp

 /branches/network/boot/arch/sparc64/loader/ofwarch.c
 ,18 → 69,23
     uint64_t current_mid;
-    asm volatile ("ldxa [%1] %2, %0\n" : "=r" (current_mid) : "r" (0), "i" (ASI_UPA_CONFIG));
+    asm volatile ("ldxa [%1] %2, %0\n"
+        : "=r" (current_mid)
+        : "r" (0), "i" (ASI_UPA_CONFIG));
     current_mid >>= UPA_CONFIG_MID_SHIFT;
     current_mid &= UPA_CONFIG_MID_MASK;
     int cpus;
-    for (cpus = 0; node != 0 && node != -1; node = ofw_get_peer_node(node), cpus++) {
-        if (ofw_get_property(node, "device_type", type_name, sizeof(type_name)) > 0) {
+    for (cpus = 0; node != 0 && node != -1; node = ofw_get_peer_node(node),
+        cpus++) {
+        if (ofw_get_property(node, "device_type", type_name,
+            sizeof(type_name)) > 0) {
             if (strcmp(type_name, "cpu") == 0) {
                 uint32_t mid;
-                if (ofw_get_property(node, "upa-portid", &mid, sizeof(mid)) <= 0)
+                if (ofw_get_property(node, "upa-portid", &mid,
+                    sizeof(mid)) <= 0)
                     continue;
                 if (current_mid != mid) {
 ,9 → 92,10
                     /*
                      * Start secondary processor.
                      */
-                    (void) ofw_call("SUNW,start-cpu", 3, 1, NULL, node,
-                         KERNEL_VIRTUAL_ADDRESS,
-                         bootinfo.physmem_start | AP_PROCESSOR);
+                    (void) ofw_call("SUNW,start-cpu", 3, 1,
+                        NULL, node, KERNEL_VIRTUAL_ADDRESS,
+                        bootinfo.physmem_start |
+                        AP_PROCESSOR);
                 }
             }
         }

 /branches/network/boot/arch/sparc64/loader/_link.ld.in
 ,0 → 1,23
+OUTPUT_FORMAT("elf64-sparc")
+ENTRY(start)
+SECTIONS {
+    .boot 0x4000: AT (0x4000) {
+        *(BOOTSTRAP);
+        *(.text);
+        *(.rodata);
+        *(.rodata.*);
+        *(.data);               /* initialized data */
+        *(.sdata);
+        *(.sdata2);
+        *(.sbss);
+        *(.bss);                /* uninitialized static variables */
+        *(COMMON);
+[[COMPONENTS]]
+    }
+    /DISCARD/ : {
+        *(.comment);
+        *(.note*);
+    }
+}

/branches/network/boot/arch/sparc64/Makefile.inc
36,6 → 36,7
cat arch/$(ARCH)/silo/silo.tar.gz \| (cd $(TMP)/boot; tar xvfz -)
cp arch/$(ARCH)/silo/README arch/$(ARCH)/silo/COPYING arch/$(ARCH)/silo/silo.conf $(TMP)/boot
cp arch/$(ARCH)/loader/image.boot $(TMP)/HelenOS/image.boot
gzip -f $(TMP)/HelenOS/image.boot
mkisofs -f -G $(TMP)/boot/isofs.b -B ... -r -o $(BASE)/image.iso $(TMP)/

depend:

/branches/network/boot/arch/sparc64/silo/silo.conf
1,3 → 1,3
timeout = 0
image = /HelenOS/image.boot
image = /HelenOS/image.boot.gz
label = HelenOS

 /branches/network/boot/arch/amd64/Makefile.inc
 ,33 → 26,63
 # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
-TASKS = \
+INIT_TASKS = \
     $(USPACEDIR)/srv/ns/ns \
+    $(USPACEDIR)/srv/loader/loader \
+    $(USPACEDIR)/app/init/init \
+    $(USPACEDIR)/srv/devmap/devmap \
+    $(USPACEDIR)/srv/rd/rd \
+    $(USPACEDIR)/srv/vfs/vfs
+ifeq ($(RDFMT),tmpfs)
+    INIT_TASKS += $(USPACEDIR)/srv/fs/tmpfs/tmpfs
+endif
+ifeq ($(RDFMT),fat)
+    INIT_TASKS += $(USPACEDIR)/srv/fs/fat/fat
+endif
+RD_TASKS = \
     $(USPACEDIR)/srv/pci/pci \
     $(USPACEDIR)/srv/fb/fb \
     $(USPACEDIR)/srv/kbd/kbd \
-    $(USPACEDIR)/srv/vfs/vfs \
-    $(USPACEDIR)/srv/fs/tmpfs/tmpfs \
-    $(USPACEDIR)/srv/fs/fat/fat \
-    $(USPACEDIR)/srv/devmap/devmap \
     $(USPACEDIR)/srv/console/console \
-    $(USPACEDIR)/app/init/init \
     $(USPACEDIR)/app/tetris/tetris \
     $(USPACEDIR)/app/tester/tester \
-    $(USPACEDIR)/app/klog/klog
+    $(USPACEDIR)/app/klog/klog \
+    $(USPACEDIR)/app/bdsh/bdsh \
+    $(USPACEDIR)/srv/fs/tmpfs/tmpfs \
+    $(USPACEDIR)/srv/fs/fat/fat
 build: $(BASE)/image.iso
-$(BASE)/image.iso: arch/$(ARCH)/grub/stage2_eltorito arch/$(ARCH)/grub/menu.lst $(KERNELDIR)/kernel.bin $(TASKS)
+$(BASE)/image.iso: arch/$(ARCH)/grub/stage2_eltorito arch/$(ARCH)/grub/menu.lst $(KERNELDIR)/kernel.bin $(INIT_TASKS) $(RD_TASKS)
     mkdir -p arch/$(ARCH)/iso/boot/grub
     cp arch/$(ARCH)/grub/stage2_eltorito arch/$(ARCH)/iso/boot/grub/
-    cp arch/$(ARCH)/grub/menu.lst arch/$(ARCH)/iso/boot/grub/
+ifneq ($(RDFMT),tmpfs)
+    cat arch/$(ARCH)/grub/menu.lst | grep -v "tmpfs" >arch/$(ARCH)/iso/boot/grub/menu.lst
+endif
+ifneq ($(RDFMT),fat)
+    cat arch/$(ARCH)/grub/menu.lst | grep -v "fat" >arch/$(ARCH)/iso/boot/grub/menu.lst
+endif
     cp $(KERNELDIR)/kernel.bin arch/$(ARCH)/iso/boot/
-    for task in $(TASKS) ; do \
+    for task in $(INIT_TASKS) ; do \
         cp $$task arch/$(ARCH)/iso/boot/ ; \
     done
+    for task in $(RD_TASKS) ; do \
+        cp $$task $(USPACEDIR)/dist/sbin/ ; \
+    done
+ifeq ($(RDFMT),tmpfs)
+    $(BASE)/tools/mktmpfs.py $(USPACEDIR)/dist/ arch/$(ARCH)/iso/boot/initrd.fs
+endif
+ifeq ($(RDFMT),fat)
+    $(BASE)/tools/mkfat.sh $(USPACEDIR)/dist/ arch/$(ARCH)/iso/boot/initrd.fs
+endif
+    $(BASE)/tools/mkhord.py 4096 arch/$(ARCH)/iso/boot/initrd.fs arch/$(ARCH)/iso/boot/initrd.img
+    rm arch/$(ARCH)/iso/boot/initrd.fs
     mkisofs -J -r -b boot/grub/stage2_eltorito -no-emul-boot -boot-load-size 4 -boot-info-table -o $(BASE)/image.iso arch/$(ARCH)/iso/
 clean:
+    -for task in $(RD_TASKS) ; do \
+        rm -f $(USPACEDIR)/dist/sbin/`basename $$task` ; \
+    done
     -rm -fr arch/$(ARCH)/iso
     -rm -f $(BASE)/image.iso

 /branches/network/boot/arch/amd64/grub/menu.lst
 ,18 → 2,14
 timeout 10
 title=HelenOS
-root (cd)
-kernel /boot/kernel.bin
-module /boot/ns
-module /boot/init
-module /boot/pci
-module /boot/fb
-module /boot/kbd
-module /boot/console
-module /boot/tetris
-module /boot/tester
-module /boot/klog
-module /boot/tmpfs
-module /boot/fat
-module /boot/vfs
-module /boot/devmap
+    root (cd)
+    kernel /boot/kernel.bin
+    module /boot/ns
+    module /boot/init
+    module /boot/devmap
+    module /boot/rd
+    module /boot/vfs
+    module /boot/tmpfs
+    module /boot/fat
+    module /boot/loader
+    module /boot/initrd.img

 /branches/network/boot/arch/ia32/Makefile.inc
 ,33 → 26,62
 # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
-TASKS = \
+INIT_TASKS = \
     $(USPACEDIR)/srv/ns/ns \
+    $(USPACEDIR)/srv/loader/loader \
+    $(USPACEDIR)/app/init/init \
+    $(USPACEDIR)/srv/devmap/devmap \
+    $(USPACEDIR)/srv/rd/rd \
+    $(USPACEDIR)/srv/vfs/vfs
+ifeq ($(RDFMT),tmpfs)
+    INIT_TASKS += $(USPACEDIR)/srv/fs/tmpfs/tmpfs
+endif
+ifeq ($(RDFMT),fat)
+    INIT_TASKS += $(USPACEDIR)/srv/fs/fat/fat
+endif
+RD_TASKS = \
     $(USPACEDIR)/srv/pci/pci \
     $(USPACEDIR)/srv/fb/fb \
     $(USPACEDIR)/srv/kbd/kbd \
     $(USPACEDIR)/srv/console/console \
-    $(USPACEDIR)/srv/vfs/vfs \
-    $(USPACEDIR)/srv/fs/tmpfs/tmpfs \
     $(USPACEDIR)/srv/fs/fat/fat \
-    $(USPACEDIR)/srv/devmap/devmap \
-    $(USPACEDIR)/app/init/init \
     $(USPACEDIR)/app/tetris/tetris \
     $(USPACEDIR)/app/tester/tester \
-    $(USPACEDIR)/app/klog/klog
+    $(USPACEDIR)/app/klog/klog \
+    $(USPACEDIR)/app/bdsh/bdsh
 build: $(BASE)/image.iso
-$(BASE)/image.iso: arch/$(ARCH)/grub/stage2_eltorito arch/$(ARCH)/grub/menu.lst $(KERNELDIR)/kernel.bin $(TASKS)
+$(BASE)/image.iso: arch/$(ARCH)/grub/stage2_eltorito arch/$(ARCH)/grub/menu.lst $(KERNELDIR)/kernel.bin $(INIT_TASKS) $(RD_TASKS)
     mkdir -p arch/$(ARCH)/iso/boot/grub
     cp arch/$(ARCH)/grub/stage2_eltorito arch/$(ARCH)/iso/boot/grub/
-    cp arch/$(ARCH)/grub/menu.lst arch/$(ARCH)/iso/boot/grub/
+ifneq ($(RDFMT),tmpfs)
+    cat arch/$(ARCH)/grub/menu.lst | grep -v "tmpfs" >arch/$(ARCH)/iso/boot/grub/menu.lst
+endif
+ifneq ($(RDFMT),fat)
+    cat arch/$(ARCH)/grub/menu.lst | grep -v "fat" >arch/$(ARCH)/iso/boot/grub/menu.lst
+endif
     cp $(KERNELDIR)/kernel.bin arch/$(ARCH)/iso/boot/
-    for task in $(TASKS) ; do \
+    for task in $(INIT_TASKS) ; do \
         cp $$task arch/$(ARCH)/iso/boot/ ; \
     done
+    for task in $(RD_TASKS) ; do \
+        cp $$task $(USPACEDIR)/dist/sbin/ ; \
+    done
+ifeq ($(RDFMT),tmpfs)
+    $(BASE)/tools/mktmpfs.py $(USPACEDIR)/dist/ arch/$(ARCH)/iso/boot/initrd.fs
+endif
+ifeq ($(RDFMT),fat)
+    $(BASE)/tools/mkfat.sh $(USPACEDIR)/dist/ arch/$(ARCH)/iso/boot/initrd.fs
+endif
+    $(BASE)/tools/mkhord.py 4096 arch/$(ARCH)/iso/boot/initrd.fs arch/$(ARCH)/iso/boot/initrd.img
+    rm arch/$(ARCH)/iso/boot/initrd.fs
     mkisofs -J -r -b boot/grub/stage2_eltorito -no-emul-boot -boot-load-size 4 -boot-info-table -o $(BASE)/image.iso arch/$(ARCH)/iso/
 clean:
+    -for task in $(RD_TASKS) ; do \
+        rm -f $(USPACEDIR)/dist/sbin/`basename $$task` ; \
+    done
     -rm -fr arch/$(ARCH)/iso
     -rm -f $(BASE)/image.iso

 /branches/network/boot/arch/ia32/grub/menu.lst
 ,18 → 2,14
 timeout 10
 title=HelenOS
-root (cd)
-kernel /boot/kernel.bin
-module /boot/ns
-module /boot/init
-module /boot/pci
-module /boot/fb
-module /boot/kbd
-module /boot/console
-module /boot/vfs
-module /boot/tmpfs
-module /boot/fat
-module /boot/devmap
-module /boot/tetris
-module /boot/tester
-module /boot/klog
+    root (cd)
+    kernel /boot/kernel.bin
+    module /boot/ns
+    module /boot/init
+    module /boot/devmap
+    module /boot/rd
+    module /boot/vfs
+    module /boot/tmpfs
+    module /boot/fat
+    module /boot/loader
+    module /boot/initrd.img

Subversion Repositories HelenOS

Compare Revisions

Ignore whitespace Rev 3369 → Rev 3386