WebSVN – HelenOS – Path Comparison – / – /branches/dynload/boot/ Rev 4336 and /branches/dynload/boot/ Rev 4337

Ignore whitespace Rev 4336 → Rev 4337

/branches/dynload/boot/genarch/ofw.h
123,6 → 123,7
extern int ofw_memmap(memmap_t *map);
extern int ofw_screen(screen_t *screen);
extern int ofw_keyboard(keyboard_t *keyboard);
extern int setup_palette(void);
extern void ofw_quiesce(void);

#endif

 /branches/dynload/boot/genarch/ofw.c
 ,7 → 298,6
         (sizeof(uintptr_t) / sizeof(uint32_t));
     unsigned int sc = ofw_get_size_cells(ofw_memory) /
         (sizeof(uintptr_t) / sizeof(uint32_t));
-    printf("address cells: %d, size cells: %d. ", ac, sc);
     uintptr_t buf[((ac + sc) * MEMMAP_MAX_RECORDS)];
     int ret = ofw_get_property(ofw_memory, "reg", buf, sizeof(buf));
 ,7 → 372,49
     return true;
 }
+/**
+ * Sets up the palette for the 8-bit color depth configuration so that the
+ * 3:2:3 color scheme can be used. Checks that setting the palette makes sense
+ * (appropriate nodes exist in the OBP tree and the color depth is not greater
+ * than 8).
+ *
+ * @return  true if the palette has been set, false otherwise
+ */
+int setup_palette(void)
+{
+    char device_name[BUF_SIZE];
+    /* resolve alias */
+    if (ofw_get_property(ofw_aliases, "screen", device_name,
+        sizeof(device_name)) <= 0)
+        return false;
+    /* for depth greater than 8 it makes no sense to set up the palette */
+    uint32_t depth;
+    phandle device = ofw_find_device(device_name);
+    if (device == -1)
+        return false;
+    if (ofw_get_property(device, "depth", &depth, sizeof(uint32_t)) <= 0)
+        return false;
+    if (depth != 8)
+        return false;
+    /* required in order to be able to make a method call */
+    ihandle screen = ofw_open(device_name);
+    if (screen == -1)
+        return false;
+    /* setup the palette so that the (inverted) 3:2:3 scheme is usable */
+    unsigned int i;
+    for (i = 0; i < 256; i++)
+        if (ofw_call("call-method", 6, 1, NULL, "color!", screen,
+- i,
+            i << 5,
+            (i >> 3) << 6,
+            (i >> 5) << 5) != 0);
+    return true;
+}
 void ofw_quiesce(void)
 {
     ofw_call("quiesce", 0, 0, NULL);

 /branches/dynload/boot/arch/sparc64/loader/main.c
 ,6 → 271,8
     printf("done.\n");
 #endif
+    setup_palette();
     printf("\nBooting the kernel...\n");
     jump_to_kernel((void *) KERNEL_VIRTUAL_ADDRESS,
         bootinfo.physmem_start | BSP_PROCESSOR, &bootinfo,

 /branches/dynload/boot/arch/ia64/loader/_link.ld.in
 ,11 → 12,14
         *(.data);               /* initialized data */
         _got = . ;
         *(.got .got.*);
+        *(.bss);                /* uninitialized static variables */
+        *(COMMON);
+    }
+    .sboot : {
         *(.sdata);
         *(.sdata2);
         *(.sbss);
-        *(.bss);                /* uninitialized static variables */
-        *(COMMON);
     }
     /DISCARD/ : {

 /branches/dynload/boot/arch/ia64/loader/gefi/HelenOS/hello.c
 ,7 → 12,7
 //Link image as a data array into hello - usefull with network boot
-#define IMAGE_LINKED
+//#define IMAGE_LINKED
 bootinfo_t *bootinfo=(bootinfo_t *)BOOTINFO_ADDRESS;
 ,6 → 86,7
     StrCpy(FileName,DevicePathToStr(LoadedImage->FilePath));
     for(i=StrLen(FileName);i>=0 && FileName[i]!='\\';i--);
     FileName[i] = 0;
+    FileName[0] = 0;
     Print(L"%s\n",LoadedImage->LoadOptions);
 ,9 → 106,9
         StrCat(FileName,L"\\image.bin");
         defaultLoad=1;
     }
-    else{
+/*  else{
         CHAR16 buf[1024];
-        buf[0]='\\';
+        //buf[0]='\\';
         i--;
         int j;
         for(j=0;LoadOptions[i+j]!=L' '&&LoadOptions[i+j]!=0;j++)
 ,6 → 116,17
         buf[j+1]=0;
         StrCat(FileName,buf);
         defaultLoad=0;
+    }*/
+    else{
+        CHAR16 buf[1024];
+        //buf[0]='\\';
+        i--;
+        int j;
+        for(j=0;LoadOptions[i+j]!=L' '&&LoadOptions[i+j]!=0;j++)
+            buf[j]=LoadOptions[i+j];
+        buf[j+1]=0;
+        StrCat(FileName,buf);
+        defaultLoad=0;
     }
     imageLoad=1;

 /branches/dynload/boot/arch/ia64/loader/gefi/HelenOS/Makefile
 ,7 → 48,7
 #When selected first lines or second lines, select if image is linked into hello or not - usefull for network boot
 #hello.so: hello.o image.o division.o
-hello.so: hello.o image.bin
+hello.so: hello.o image.bin division.o
 #   $(LD) $(LDFLAGS) -Map hello.map hello.o division.o image.o -o hello.so $(LOADLIBES) #link image inside hello
     $(LD) $(LDFLAGS) -Map hello.map hello.o division.o -o hello.so $(LOADLIBES) #dont link image inside hello

 /branches/dynload/boot/arch/ia64/loader/gefi/Makefile
 ,7 → 23,7
 include Make.defaults
-SUBDIRS = lib gnuefi inc apps
+SUBDIRS = lib gnuefi inc
 all:    check_gcc $(SUBDIRS)

 /branches/dynload/boot/arch/ia64/loader/Makefile
 ,21 → 87,37
     asm.S \
     boot.S
+NOCOMPONENTS = \
+    $(KERNELDIR)/kernel.bin
 COMPONENTS = \
-    $(KERNELDIR)/kernel.bin
-NOCOMPONENTS = \
     $(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 \
     $(USPACEDIR)/srv/fb/fb \
-    $(USPACEDIR)/srv/kbd/kbd \
-    $(USPACEDIR)/srv/console/console \
-    $(USPACEDIR)/srv/vfs/vfs \
+    $(USPACEDIR)/srv/kbd/kbd
+ifeq ($(RDFMT),tmpfs)
+    COMPONENTS += $(USPACEDIR)/srv/fs/tmpfs/tmpfs
+endif
+ifeq ($(RDFMT),fat)
+    COMPONENTS += $(USPACEDIR)/srv/fs/fat/fat
+endif
+COMPONENTS += \
+    $(USPACEDIR)/srv/console/console
+RD_SRVS = \
     $(USPACEDIR)/srv/fs/tmpfs/tmpfs \
-    $(USPACEDIR)/srv/devmap/devmap \
-    $(USPACEDIR)/app/cli/cli \
+    $(USPACEDIR)/srv/fs/fat/fat
+RD_APPS = \
+    $(USPACEDIR)/app/tetris/tetris \
+    $(USPACEDIR)/app/tester/tester \
     $(USPACEDIR)/app/trace/trace \
-    $(USPACEDIR)/app/klog/klog
+    $(USPACEDIR)/app/klog/klog \
+    $(USPACEDIR)/app/bdsh/bdsh
 OBJECTS := $(addsuffix .o,$(basename $(SOURCES)))
 COMPONENT_OBJECTS := $(addsuffix .o,$(basename $(notdir $(COMPONENTS))))
 ,19 → 134,39
 #   cp gefi/HelenOS/hello.efi /boot/efi/
     cp gefi/HelenOS/image.bin ../../../../
-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 -f - -- $(DEFS) $(CFLAGS) -- $(SOURCES) > Makefile.depend 2> /dev/null
 clean:
-    -rm -f _components.h _components.c _link.ld $(COMPONENT_OBJECTS) $(OBJECTS) image.boot image.map image.disasm Makefile.depend ../../../../image.bin ../../../../hello.efi
+    -for file in $(RD_SRVS) ; do \
+        rm -f $(USPACEDIR)/dist/srv/`basename $$file` ; \
+    done
+    -for file in $(RD_APPS) ; do \
+        rm -f $(USPACEDIR)/dist/app/`basename $$file` ; \
+    done
+    -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
     make -C gefi clean
     make -C gefi/HelenOS clean
-_components.h _components.c _link.ld $(COMPONENT_OBJECTS): $(COMPONENTS) _link.ld.in
-    ../../../tools/pack.py $(OBJCOPY) $(BFD_NAME) $(BFD_ARCH) 16384 "unsigned long" $(COMPONENTS)
+_components.h _components.c _link.ld $(COMPONENT_OBJECTS) initrd.o: $(COMPONENTS) $(RD_SRVS) $(RD_APPS) _link.ld.in
+    for file in $(RD_SRVS) ; do \
+        cp $$file $(USPACEDIR)/dist/srv/ ; \
+    done
+    for file in $(RD_APPS) ; do \
+        cp $$file $(USPACEDIR)/dist/app/ ; \
+    done
+ifeq ($(RDFMT),tmpfs)
+    ../../../../tools/mktmpfs.py $(USPACEDIR)/dist/ initrd.fs
+endif
+ifeq ($(RDFMT),fat)
+    ../../../../tools/mkfat.py $(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 long" $(COMPONENTS) ./initrd.img
 %.o: %.S
     $(CC) $(DEFS) $(CFLAGS) -D__ASM__ -c $< -o $@

Subversion Repositories HelenOS

Compare Revisions

Ignore whitespace Rev 4336 → Rev 4337