WebSVN – HelenOS – Path Comparison – / – /branches/dynload/boot/ Rev 3402 and /branches/dynload/boot/ Rev 3403

Ignore whitespace Rev 3402 → Rev 3403

/branches/dynload/boot/tools/ia64/vmaxlma.c
File deleted

/branches/dynload/boot/boot.config
78,3 → 78,7
@ "ecoff" Ecoff image (GXEmul)
! [ARCH=mips32] IMAGE (choice)

# Ramdisk format
@ "tmpfs" TMPFS image
@ "fat" FAT16 image
! RDFMT (choice)

 /branches/dynload/boot/arch/sparc64/Makefile.inc
 ,6 → 36,8
     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
+    cp arch/$(ARCH)/loader/initrd.img $(TMP)/HelenOS/initrd.img
     mkisofs -f -G $(TMP)/boot/isofs.b -B ... -r -o $(BASE)/image.iso $(TMP)/
 depend:

 /branches/dynload/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
 ,7 → 97,7
     mov %g2, %g3
     jmp %o7 + 8         ! exit point
-    mov %o1, %o0
+    mov %o3, %o0
 jump_to_kernel:
     /*

 /branches/dynload/boot/arch/sparc64/loader/boot.S
 ,6 → 53,15
     .ascii "HdrS"
     .word 0
     .half 0
+    .half 0
+    .half 0
+    .half 0
+.global silo_ramdisk_image
+silo_ramdisk_image:
+    .word 0
+.global silo_ramdisk_size
+silo_ramdisk_size:
+    .word 0
 .align 8
 :

 /branches/dynload/boot/arch/sparc64/loader/main.c
 ,11 → 57,18
 /** Print version information. */
 static void version_print(void)
 {
-    printf("HelenOS SPARC64 Bootloader\nRelease %s%s%s\nCopyright (c) 2006 HelenOS project\n", release, revision, timestamp);
+    printf("HelenOS SPARC64 Bootloader\nRelease %s%s%s\n"
+        "Copyright (c) 2006 HelenOS project\n",
+        release, revision, timestamp);
 }
 void bootstrap(void)
 {
+    void *base = (void *) KERNEL_VIRTUAL_ADDRESS;
+    void *balloc_base;
+    unsigned int top = 0;
+    int i, j;
     version_print();
     init_components(components);
 ,29 → 87,99
         printf("Error: no memory detected, halting.\n");
         halt();
     }
+    /*
+     * SILO for some reason adds 0x400000 and subtracts
+     * bootinfo.physmem_start to/from silo_ramdisk_image.
+     * We just need plain physical address so we fix it up.
+     */
+    if (silo_ramdisk_image) {
+        silo_ramdisk_image += bootinfo.physmem_start;
+        silo_ramdisk_image -= 0x400000;
+        /* Install 1:1 mapping for the ramdisk. */
+        if (ofw_map((void *)((uintptr_t)silo_ramdisk_image),
+            (void *)((uintptr_t)silo_ramdisk_image),
+            silo_ramdisk_size, -1) != 0) {
+            printf("Failed to map ramdisk.\n");
+            halt();
+        }
+    }
     printf("\nSystem info\n");
     printf(" memory: %dM starting at %P\n",
-        bootinfo.memmap.total >> 20, bootinfo.physmem_start);
+        bootinfo.memmap.total >> 20, bootinfo.physmem_start);
     printf("\nMemory statistics\n");
     printf(" kernel entry point at %P\n", KERNEL_VIRTUAL_ADDRESS);
     printf(" %P: boot info structure\n", &bootinfo);
-    unsigned int i;
-    for (i = 0; i < COMPONENTS; i++)
+    /*
+     * Figure out destination address for each component.
+     * In this phase, we don't copy the components yet because we want to
+     * to be careful not to overwrite anything, especially the components
+     * which haven't been copied yet.
+     */
+    bootinfo.taskmap.count = 0;
+    for (i = 0; i < COMPONENTS; i++) {
         printf(" %P: %s image (size %d bytes)\n", components[i].start,
             components[i].name, components[i].size);
+        top = ALIGN_UP(top, PAGE_SIZE);
+        if (i > 0) {
+            if (bootinfo.taskmap.count == TASKMAP_MAX_RECORDS) {
+                printf("Skipping superfluous components.\n");
+                break;
+            }
+            bootinfo.taskmap.tasks[bootinfo.taskmap.count].addr =
+                base + top;
+            bootinfo.taskmap.tasks[bootinfo.taskmap.count].size =
+                components[i].size;
+            bootinfo.taskmap.count++;
+        }
+        top += components[i].size;
+    }
-    void * base = (void *) KERNEL_VIRTUAL_ADDRESS;
-    unsigned int top = 0;
+    j = bootinfo.taskmap.count - 1; /* do not consider ramdisk */
-    printf("\nCopying components\n");
-    bootinfo.taskmap.count = 0;
-    for (i = 0; i < COMPONENTS; i++) {
-        printf(" %s...", components[i].name);
+    if (silo_ramdisk_image) {
+        /* Treat the ramdisk as the last bootinfo task. */
+        if (bootinfo.taskmap.count == TASKMAP_MAX_RECORDS) {
+            printf("Skipping ramdisk.\n");
+            goto skip_ramdisk;
+        }
         top = ALIGN_UP(top, PAGE_SIZE);
+        bootinfo.taskmap.tasks[bootinfo.taskmap.count].addr =
+            base + top;
+        bootinfo.taskmap.tasks[bootinfo.taskmap.count].size =
+            silo_ramdisk_size;
+        bootinfo.taskmap.count++;
+        printf("\nCopying ramdisk...");
+        /*
+         * Claim and map the whole ramdisk as it may exceed the area
+         * given to us by SILO.
+         */
+        (void) ofw_claim_phys(base + top, silo_ramdisk_size);
+        (void) ofw_map(base + top, base + top, silo_ramdisk_size, -1);
+        /*
+         * FIXME If the source and destination overlap, it may be
+         * desirable to copy in reverse order, depending on how the two
+         * regions overlap.
+         */
+        memcpy(base + top, (void *)((uintptr_t)silo_ramdisk_image),
+            silo_ramdisk_size);
+        printf("done.\n");
+        top += silo_ramdisk_size;
+    }
+skip_ramdisk:
+    /*
+     * Now we can proceed to copy the components. We do it in reverse order
+     * so that we don't overwrite anything even if the components overlap
+     * with base.
+     */
+    printf("\nCopying bootinfo tasks\n");
+    for (i = COMPONENTS - 1; i > 0; i--, j--) {
+        printf(" %s...", components[i].name);
         /*
          * At this point, we claim the physical memory that we are
          * going to use. We should be safe in case of the virtual
 ,30 → 187,34
          * SPARC binding, should restrict its use of virtual memory
          * to addresses from [0xffd00000; 0xffefffff] and
          * [0xfe000000; 0xfeffffff].
+         *
+         * XXX We don't map this piece of memory. We simply rely on
+         *     SILO to have it done for us already in this case.
          */
-        (void) ofw_claim_phys(bootinfo.physmem_start + base + top,
+        (void) ofw_claim_phys(bootinfo.physmem_start +
+            bootinfo.taskmap.tasks[j].addr,
             ALIGN_UP(components[i].size, PAGE_SIZE));
-        memcpy(base + top, components[i].start, components[i].size);
-        if (i > 0) {
-            bootinfo.taskmap.tasks[bootinfo.taskmap.count].addr =
-                base + top;
-            bootinfo.taskmap.tasks[bootinfo.taskmap.count].size =
-                components[i].size;
-            bootinfo.taskmap.count++;
-        }
-        top += components[i].size;
+        memcpy((void *)bootinfo.taskmap.tasks[j].addr,
+            components[i].start, components[i].size);
         printf("done.\n");
     }
+    printf("\nCopying kernel...");
+    (void) ofw_claim_phys(bootinfo.physmem_start + base,
+        ALIGN_UP(components[0].size, PAGE_SIZE));
+    memcpy(base, components[0].start, components[0].size);
+    printf("done.\n");
     /*
-     * Claim the physical memory for the boot allocator.
+     * Claim and map the physical memory for the boot allocator.
      * Initialize the boot allocator.
      */
-    (void) ofw_claim_phys(bootinfo.physmem_start +
-        base + ALIGN_UP(top, PAGE_SIZE), BALLOC_MAX_SIZE);
-    balloc_init(&bootinfo.ballocs, ALIGN_UP(((uintptr_t) base) + top,
-        PAGE_SIZE));
+    balloc_base = base + ALIGN_UP(top, PAGE_SIZE);
+    (void) ofw_claim_phys(bootinfo.physmem_start + balloc_base,
+        BALLOC_MAX_SIZE);
+    (void) ofw_map(balloc_base, balloc_base, BALLOC_MAX_SIZE, -1);
+    balloc_init(&bootinfo.ballocs, (uintptr_t)balloc_base);
     printf("\nCanonizing OpenFirmware device tree...");
     bootinfo.ofw_root = ofw_tree_build();

 /branches/dynload/boot/arch/sparc64/loader/main.h
 ,6 → 59,9
     ofw_tree_node_t *ofw_root;
 } bootinfo_t;
+extern uint32_t silo_ramdisk_image;
+extern uint32_t silo_ramdisk_size;
 extern bootinfo_t bootinfo;
 extern void start(void);

 /branches/dynload/boot/arch/sparc64/loader/Makefile
 ,10 → 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
 ,17 → 86,23
     $(USPACEDIR)/srv/loader/loader \
     $(USPACEDIR)/srv/devmap/devmap \
     $(USPACEDIR)/srv/rd/rd \
-    $(USPACEDIR)/srv/vfs/vfs \
-    $(USPACEDIR)/srv/fs/tmpfs/tmpfs
+    $(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/fs/tmpfs/tmpfs \
     $(USPACEDIR)/srv/fs/fat/fat \
     $(USPACEDIR)/app/tetris/tetris \
     $(USPACEDIR)/app/tester/tester \
-    $(USPACEDIR)/app/cli/cli \
+    $(USPACEDIR)/app/bdsh/bdsh \
     $(USPACEDIR)/app/klog/klog
 OBJECTS := $(addsuffix .o,$(basename $(SOURCES)))
 ,8 → 114,8
 -include Makefile.depend
-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 $@
+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 $@
 depend:
     -makedepend $(DEFS) $(CFLAGS) -f - $(SOURCES) > Makefile.depend 2> /dev/null
 ,14 → 124,21
     -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
+    -rm -f _components.h _components.c _link.ld $(COMPONENT_OBJECTS) $(OBJECTS) initrd.img image.boot image.map image.disasm Makefile.depend
 _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
-    ../../../../tools/mktmpfs.py 16384 $(USPACEDIR)/dist/ initrd.img
-    ../../../tools/pack.py $(OBJCOPY) $(BFD_NAME) $(BFD_ARCH) 1 "unsigned long" $(COMPONENTS) ./initrd.img
+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)
 %.o: %.S
     $(CC) $(DEFS) $(CFLAGS) -D__ASM__ -c $< -o $@

/branches/dynload/boot/arch/sparc64/silo/silo.conf
1,3 → 1,4
timeout = 0
image = /HelenOS/image.boot
image = /HelenOS/image.boot.gz
label = HelenOS
initrd = /HelenOS/initrd.img

 /branches/dynload/boot/arch/ia64/Makefile.inc
 ,23 → 28,6
 #ifeq ($(MACHINE),ski)
-#VMAXLMA_SRC = tools/ia64/vmaxlma.c
-#build: $(BASE)/kernel.bin
-#echo Building SKI
-#$(BASE)/kernel.bin: $(KERNELDIR)/kernel.bin vmaxlma
-#   cp $(KERNELDIR)/kernel.bin $(BASE)/kernel.bin
-#   ./vmaxlma $(BASE)/kernel.bin
-#vmaxlma: $(VMAXLMA_SRC)
-#   $(CC) $(VMAXLMA_SRC) -o $@
-#clean:
-#   -rm -f $(BASE)/kernel.bin vmaxlma
-#else
 build: $(BASE)/image.boot
 $(BASE)/image.boot: depend arch/$(ARCH)/loader/image.boot
 ,5 → 43,5
     make -C arch/$(ARCH)/loader clean COMPILER=$(COMPILER) KERNELDIR=../../../$(KERNELDIR) USPACEDIR=../../../$(USPACEDIR) "DEFS=$(DEFS)"
     -rm -f $(BASE)/image.boot
+#endif
-#endif

 /branches/dynload/boot/arch/ia64/loader/Makefile
 ,10 → 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

 /branches/dynload/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/dynload/boot/arch/arm32/loader/Makefile
 ,10 → 32,14
 ## 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),gcc_native)
     CC = gcc
 ,18 → 88,24
     $(USPACEDIR)/app/init/init \
     $(USPACEDIR)/srv/devmap/devmap \
     $(USPACEDIR)/srv/rd/rd \
-    $(USPACEDIR)/srv/vfs/vfs \
-    $(USPACEDIR)/srv/fs/tmpfs/tmpfs
+    $(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/fs/tmpfs/tmpfs \
     $(USPACEDIR)/srv/fs/fat/fat \
     $(USPACEDIR)/app/tetris/tetris \
     $(USPACEDIR)/app/tester/tester \
     $(USPACEDIR)/app/klog/klog \
-    $(USPACEDIR)/app/cli/cli
+    $(USPACEDIR)/app/bdsh/bdsh
 OBJECTS := $(addsuffix .o,$(basename $(SOURCES)))
 COMPONENT_OBJECTS := $(addsuffix .o,$(basename $(notdir $(COMPONENTS))))
 ,7 → 132,14
     for task in $(RD_TASKS) ; do \
         cp $$task $(USPACEDIR)/dist/sbin/ ; \
     done
-    ../../../../tools/mktmpfs.py 4096 $(USPACEDIR)/dist/ initrd.img
+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

 /branches/dynload/boot/arch/ppc32/loader/main.c
 ,15 → 116,11
         halt();
     }
-    if (!ofw_screen(&bootinfo.screen)) {
-        printf("Error: unable to get screen properties, halting.\n");
-        halt();
-    }
+    if (!ofw_screen(&bootinfo.screen))
+        printf("Warning: unable to get screen properties.\n");
-    if (!ofw_keyboard(&bootinfo.keyboard)) {
-        printf("Error: unable to get keyboard properties, halting.\n");
-        halt();
-    }
+    if (!ofw_keyboard(&bootinfo.keyboard))
+        printf("Warning: unable to get keyboard properties.\n");
     printf("\nDevice statistics\n");
     printf(" screen at %L, resolution %dx%d, %d bpp (scanline %d bytes)\n", bootinfo.screen.addr, bootinfo.screen.width, bootinfo.screen.height, bootinfo.screen.bpp, bootinfo.screen.scanline);

 /branches/dynload/boot/arch/ppc32/loader/ofwarch.c
 ,7 → 39,13
 void write(const char *str, const int len)
 {
-    ofw_write(str, len);
+    int i;
+    for (i = 0; i < len; i++) {
+        if (str[i] == '\n')
+            ofw_write("\r", 1);
+        ofw_write(&str[i], 1);
+    }
 }
 int ofw_keyboard(keyboard_t *keyboard)

 /branches/dynload/boot/arch/ppc32/loader/Makefile
 ,10 → 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
 ,19 → 83,25
     $(USPACEDIR)/app/init/init \
     $(USPACEDIR)/srv/devmap/devmap \
     $(USPACEDIR)/srv/rd/rd \
-    $(USPACEDIR)/srv/vfs/vfs \
-    $(USPACEDIR)/srv/fs/tmpfs/tmpfs
+    $(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/fs/tmpfs/tmpfs \
     $(USPACEDIR)/srv/fs/fat/fat \
     $(USPACEDIR)/app/tetris/tetris \
     $(USPACEDIR)/app/tester/tester \
-    $(USPACEDIR)/app/cli/cli \
     $(USPACEDIR)/app/dltest/dltest \
-    $(USPACEDIR)/app/klog/klog
+    $(USPACEDIR)/app/klog/klog \
+    $(USPACEDIR)/app/bdsh/bdsh
 RD_LIBS = \
     $(USPACEDIR)/lib/rtld/rtld.so \
 ,7 → 138,14
     for lib in $(RD_LIBS) ; do \
         cp $$lib $(USPACEDIR)/dist/lib/ ; \
     done
-    ../../../../tools/mktmpfs.py 4096 $(USPACEDIR)/dist/ initrd.img
+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

/branches/dynload/boot/arch/amd64/grub/menu.lst
10,5 → 10,6
module /boot/rd
module /boot/vfs
module /boot/tmpfs
module /boot/fat
module /boot/loader
module /boot/initrd.img

 /branches/dynload/boot/arch/amd64/Makefile.inc
 ,8 → 32,13
     $(USPACEDIR)/app/init/init \
     $(USPACEDIR)/srv/devmap/devmap \
     $(USPACEDIR)/srv/rd/rd \
-    $(USPACEDIR)/srv/vfs/vfs \
-    $(USPACEDIR)/srv/fs/tmpfs/tmpfs \
+    $(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 \
 ,11 → 45,12
     $(USPACEDIR)/srv/fb/fb \
     $(USPACEDIR)/srv/kbd/kbd \
     $(USPACEDIR)/srv/console/console \
-    $(USPACEDIR)/srv/fs/fat/fat \
     $(USPACEDIR)/app/tetris/tetris \
     $(USPACEDIR)/app/tester/tester \
     $(USPACEDIR)/app/klog/klog \
-    $(USPACEDIR)/app/cli/cli
+    $(USPACEDIR)/app/bdsh/bdsh \
+    $(USPACEDIR)/srv/fs/tmpfs/tmpfs \
+    $(USPACEDIR)/srv/fs/fat/fat
 build: $(BASE)/image.iso
 ,7 → 57,12
 $(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 $(INIT_TASKS) ; do \
         cp $$task arch/$(ARCH)/iso/boot/ ; \
 ,7 → 70,14
     for task in $(RD_TASKS) ; do \
         cp $$task $(USPACEDIR)/dist/sbin/ ; \
     done
-    $(BASE)/tools/mktmpfs.py 4096 $(USPACEDIR)/dist/ arch/$(ARCH)/iso/boot/initrd.img
+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:

 /branches/dynload/boot/arch/ppc64/loader/Makefile
 ,10 → 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

 /branches/dynload/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
 ,7 → 104,7
     sb  $a0,0($v1)
     jr  $ra
-    move    $v0,$a1
+    move    $v0,$t2
 jump_to_kernel:
     #

 /branches/dynload/boot/arch/mips32/loader/Makefile
 ,6 → 32,10
 ## Toolchain configuration
 #
+ifndef CROSS_PREFIX
+    CROSS_PREFIX = /usr/local
+endif
 ifeq ($(IMAGE),binary)
     LD_IN = binary
 endif
 ,7 → 45,7
 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
 ,17 → 88,23
     $(USPACEDIR)/app/init/init \
     $(USPACEDIR)/srv/devmap/devmap \
     $(USPACEDIR)/srv/rd/rd \
-    $(USPACEDIR)/srv/vfs/vfs \
-    $(USPACEDIR)/srv/fs/tmpfs/tmpfs
+    $(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/fs/tmpfs/tmpfs \
     $(USPACEDIR)/srv/fs/fat/fat \
     $(USPACEDIR)/app/tetris/tetris \
     $(USPACEDIR)/app/tester/tester \
-    $(USPACEDIR)/app/cli/cli \
+    $(USPACEDIR)/app/bdsh/bdsh \
     $(USPACEDIR)/app/klog/klog
 ,7 → 133,14
     for task in $(RD_TASKS) ; do \
         cp $$task $(USPACEDIR)/dist/sbin/ ; \
     done
-    ../../../../tools/mktmpfs.py 16384 $(USPACEDIR)/dist/ initrd.img
+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)

/branches/dynload/boot/arch/ia32/grub/menu.lst
10,5 → 10,6
module /boot/rd
module /boot/vfs
module /boot/tmpfs
module /boot/fat
module /boot/loader
module /boot/initrd.img

 /branches/dynload/boot/arch/ia32/Makefile.inc
 ,8 → 32,13
     $(USPACEDIR)/app/init/init \
     $(USPACEDIR)/srv/devmap/devmap \
     $(USPACEDIR)/srv/rd/rd \
-    $(USPACEDIR)/srv/vfs/vfs \
-    $(USPACEDIR)/srv/fs/tmpfs/tmpfs
+    $(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 \
 ,9 → 48,9
     $(USPACEDIR)/srv/fs/fat/fat \
     $(USPACEDIR)/app/tetris/tetris \
     $(USPACEDIR)/app/tester/tester \
-    $(USPACEDIR)/app/cli/cli \
     $(USPACEDIR)/app/dltest/dltest \
-    $(USPACEDIR)/app/klog/klog
+    $(USPACEDIR)/app/klog/klog \
+    $(USPACEDIR)/app/bdsh/bdsh
 RD_LIBS = \
     $(USPACEDIR)/lib/rtld/rtld.so \
 ,7 → 61,12
 $(BASE)/image.iso: arch/$(ARCH)/grub/stage2_eltorito arch/$(ARCH)/grub/menu.lst $(KERNELDIR)/kernel.bin $(INIT_TASKS) $(RD_TASKS) $(RD_LIBS)
     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 $(INIT_TASKS) ; do \
         cp $$task arch/$(ARCH)/iso/boot/ ; \
 ,10 → 74,17
     for task in $(RD_TASKS) ; do \
         cp $$task $(USPACEDIR)/dist/sbin/ ; \
     done
-    for task in $(RD_LIBS) ; do \
-        cp $$task $(USPACEDIR)/dist/lib/ ; \
+    for lib in $(RD_LIBS) ; do \
+        cp $$lib $(USPACEDIR)/dist/lib/ ; \
     done
-    $(BASE)/tools/mktmpfs.py 4096 $(USPACEDIR)/dist/ arch/$(ARCH)/iso/boot/initrd.img
+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:

Subversion Repositories HelenOS

Compare Revisions

Ignore whitespace Rev 3402 → Rev 3403