| /branches/sparc/boot/arch/ia64/loader/gefi/HelenOS/division.c |
|---|
| File deleted |
| \ No newline at end of file |
| Property changes: |
| Deleted: svn:special |
| -* |
| \ No newline at end of property |
| /branches/sparc/boot/arch/ia64/loader/gefi/HelenOS/division.h |
|---|
| File deleted |
| \ No newline at end of file |
| Property changes: |
| Deleted: svn:special |
| -* |
| \ No newline at end of property |
| /branches/sparc/boot/arch/ia64/loader/gefi/HelenOS/hello.c |
|---|
| 12,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; |
| 86,7 → 86,6 |
| 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); |
| 106,9 → 105,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++) |
| 116,17 → 115,6 |
| 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/sparc/boot/arch/ia64/loader/gefi/HelenOS/Makefile |
|---|
| 28,8 → 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 |
| LOADLIBES = -lefi -lgnuefi $(shell $(CC) -print-libgcc-file-name) |
| FORMAT = efi-app-$(ARCH) |
| 47,18 → 46,15 |
| $(OBJDUMP) -d hello.efi > hello.disass |
| #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 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 |
| #hello.so: hello.o image.o |
| hello.so: hello.o image.bin |
| # $(LD) $(LDFLAGS) -Map hello.map hello.o image.o -o hello.so $(LOADLIBES) #link image inside hello |
| $(LD) $(LDFLAGS) -Map hello.map hello.o -o hello.so $(LOADLIBES) #dont link image inside hello |
| hello.o: hello.c |
| $(CC) $(INCDIR) $(CFLAGS) $(CPPFLAGS) -c hello.c -o hello.o |
| division.o: division.c |
| $(CC) $(INCDIR) $(CFLAGS) $(CPPFLAGS) -c division.c -o division.o |
| image.bin: ../../image.boot |
| $(OBJCOPY) -O binary ../../image.boot image.bin |
| /branches/sparc/boot/arch/ia64/loader/gefi/Makefile |
|---|
| 23,7 → 23,7 |
| include Make.defaults |
| SUBDIRS = lib gnuefi inc |
| SUBDIRS = lib gnuefi inc apps |
| all: check_gcc $(SUBDIRS) |
| /branches/sparc/boot/arch/ia64/loader/Makefile |
|---|
| 87,37 → 87,24 |
| asm.S \ |
| boot.S |
| COMPONENTS = \ |
| $(KERNELDIR)/kernel.bin |
| NOCOMPONENTS = \ |
| $(KERNELDIR)/kernel.bin |
| 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/fb/fb \ |
| $(USPACEDIR)/srv/kbd/kbd \ |
| $(USPACEDIR)/srv/console/console \ |
| $(USPACEDIR)/srv/vfs/vfs \ |
| $(USPACEDIR)/srv/fb/fb \ |
| $(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/fs/fat/fat |
| RD_APPS = \ |
| $(USPACEDIR)/srv/fs/fat/fat \ |
| $(USPACEDIR)/srv/devmap/devmap \ |
| $(USPACEDIR)/app/init/init \ |
| $(USPACEDIR)/app/tetris/tetris \ |
| $(USPACEDIR)/app/tester/tester \ |
| $(USPACEDIR)/app/trace/trace \ |
| $(USPACEDIR)/app/klog/klog \ |
| $(USPACEDIR)/app/bdsh/bdsh |
| $(USPACEDIR)/app/klog/klog |
| OBJECTS := $(addsuffix .o,$(basename $(SOURCES))) |
| COMPONENT_OBJECTS := $(addsuffix .o,$(basename $(notdir $(COMPONENTS)))) |
| 134,39 → 121,19 |
| # cp gefi/HelenOS/hello.efi /boot/efi/ |
| cp gefi/HelenOS/image.bin ../../../../ |
| 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 -f - -- $(DEFS) $(CFLAGS) -- $(SOURCES) > Makefile.depend 2> /dev/null |
| clean: |
| -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 |
| -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 _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 |
| _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 $@ |
| /branches/sparc/boot/arch/ia64/loader/_link.ld.in |
|---|
| 12,14 → 12,11 |
| *(.data); /* initialized data */ |
| _got = . ; |
| *(.got .got.*); |
| *(.bss); /* uninitialized static variables */ |
| *(COMMON); |
| } |
| .sboot : { |
| *(.sdata); |
| *(.sdata2); |
| *(.sbss); |
| *(.bss); /* uninitialized static variables */ |
| *(COMMON); |
| } |
| /DISCARD/ : { |
| /branches/sparc/boot/arch/sparc64/loader/main.c |
|---|
| 267,8 → 267,6 |
| 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/sparc/boot/arch/sparc64/loader/ofwarch.c |
|---|
| 64,12 → 64,11 |
| * Starts all CPUs represented by following siblings of the given node, |
| * except for the current CPU. |
| * |
| * @param child The first child of the OFW tree node whose children |
| * represent CPUs to be woken up. |
| * @param child the first child of the OFW tree node whose children represent |
| * CPUs to be woken up |
| * @param current_mid MID of the current CPU, the current CPU will |
| * (of course) not be woken up. |
| * @return Number of CPUs which have the same parent node as |
| * "child". |
| * (of course) not be woken up |
| * @return number of CPUs which have the same parent node as "child" |
| */ |
| static int wake_cpus_in_node(phandle child, uint64_t current_mid) |
| { |
| 161,10 → 160,10 |
| /** Get physical memory starting address. |
| * |
| * @param start Pointer to variable where the physical memory starting |
| * address will be stored. |
| * @param start Pointer to variable where the physical memory starting |
| * address will be stored. |
| * |
| * @return Non-zero on succes, zero on failure. |
| * @return Non-zero on succes, zero on failure. |
| */ |
| int ofw_get_physmem_start(uintptr_t *start) |
| { |
| /branches/sparc/boot/genarch/ofw.c |
|---|
| 48,8 → 48,7 |
| if (ofw_chosen == -1) |
| halt(); |
| if (ofw_get_property(ofw_chosen, "stdout", &ofw_stdout, |
| sizeof(ofw_stdout)) <= 0) |
| if (ofw_get_property(ofw_chosen, "stdout", &ofw_stdout, sizeof(ofw_stdout)) <= 0) |
| ofw_stdout = 0; |
| ofw_root = ofw_find_device("/"); |
| 58,13 → 57,11 |
| halt(); |
| } |
| if (ofw_get_property(ofw_chosen, "mmu", &ofw_mmu, |
| sizeof(ofw_mmu)) <= 0) { |
| if (ofw_get_property(ofw_chosen, "mmu", &ofw_mmu, sizeof(ofw_mmu)) <= 0) { |
| puts("\r\nError: Unable to get mmu property, halted.\r\n"); |
| halt(); |
| } |
| if (ofw_get_property(ofw_chosen, "memory", &ofw_memory_prop, |
| sizeof(ofw_memory_prop)) <= 0) { |
| if (ofw_get_property(ofw_chosen, "memory", &ofw_memory_prop, sizeof(ofw_memory_prop)) <= 0) { |
| puts("\r\nError: Unable to get memory property, halted.\r\n"); |
| halt(); |
| } |
| 84,18 → 81,14 |
| /** Perform a call to OpenFirmware client interface. |
| * |
| * @param service String identifying the service requested. |
| * @param nargs Number of input arguments. |
| * @param nret Number of output arguments. This includes the return |
| * value. |
| * @param rets Buffer for output arguments or NULL. The buffer must |
| * accommodate nret - 1 items. |
| * @param service String identifying the service requested. |
| * @param nargs Number of input arguments. |
| * @param nret Number of output arguments. This includes the return value. |
| * @param rets Buffer for output arguments or NULL. The buffer must accommodate nret - 1 items. |
| * |
| * @return Return value returned by the client interface. |
| * @return Return value returned by the client interface. |
| */ |
| unsigned long |
| ofw_call(const char *service, const int nargs, const int nret, ofw_arg_t *rets, |
| ...) |
| unsigned long ofw_call(const char *service, const int nargs, const int nret, ofw_arg_t *rets, ...) |
| { |
| va_list list; |
| ofw_args_t args; |
| 126,9 → 119,7 |
| return ofw_call("finddevice", 1, 1, NULL, name); |
| } |
| int |
| ofw_get_property(const phandle device, const char *name, void *buf, |
| const int buflen) |
| int ofw_get_property(const phandle device, const char *name, void *buf, const int buflen) |
| { |
| return ofw_call("getprop", 4, 1, NULL, device, name, buf, buflen); |
| } |
| 153,8 → 144,7 |
| unsigned int ret = 1; |
| if (ofw_get_property(device, "#address-cells", &ret, sizeof(ret)) <= 0) |
| if (ofw_get_property(ofw_root, "#address-cells", &ret, |
| sizeof(ret)) <= 0) |
| if (ofw_get_property(ofw_root, "#address-cells", &ret, sizeof(ret)) <= 0) |
| ret = OFW_ADDRESS_CELLS; |
| return ret; |
| 166,8 → 156,7 |
| unsigned int ret; |
| if (ofw_get_property(device, "#size-cells", &ret, sizeof(ret)) <= 0) |
| if (ofw_get_property(ofw_root, "#size-cells", &ret, |
| sizeof(ret)) <= 0) |
| if (ofw_get_property(ofw_root, "#size-cells", &ret, sizeof(ret)) <= 0) |
| ret = OFW_SIZE_CELLS; |
| return ret; |
| 203,8 → 192,7 |
| ofw_arg_t result[4]; |
| int shift; |
| if (ofw_call("call-method", 3, 5, result, "translate", ofw_mmu, |
| virt) != 0) { |
| if (ofw_call("call-method", 3, 5, result, "translate", ofw_mmu, virt) != 0) { |
| puts("Error: MMU method translate() failed, halting.\n"); |
| halt(); |
| } |
| 224,8 → 212,7 |
| { |
| ofw_arg_t retaddr; |
| if (ofw_call("call-method", 5, 2, &retaddr, "claim", ofw_mmu, 0, len, |
| virt) != 0) { |
| if (ofw_call("call-method", 5, 2, &retaddr, "claim", ofw_mmu, 0, len, virt) != 0) { |
| puts("Error: MMU method claim() failed, halting.\n"); |
| halt(); |
| } |
| 282,8 → 269,8 |
| phys_lo = (uintptr_t) phys; |
| } |
| return ofw_call("call-method", 7, 1, NULL, "map", ofw_mmu, mode, size, |
| virt, phys_hi, phys_lo); |
| return ofw_call("call-method", 7, 1, NULL, "map", ofw_mmu, mode, size, virt, |
| phys_hi, phys_lo); |
| } |
| /** Save OpenFirmware physical memory map. |
| 295,9 → 282,10 |
| int ofw_memmap(memmap_t *map) |
| { |
| unsigned int ac = ofw_get_address_cells(ofw_memory) / |
| (sizeof(uintptr_t) / sizeof(uint32_t)); |
| (sizeof(uintptr_t) / sizeof(uint32_t)); |
| unsigned int sc = ofw_get_size_cells(ofw_memory) / |
| (sizeof(uintptr_t) / sizeof(uint32_t)); |
| (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)); |
| 319,8 → 307,9 |
| * memory, we will ignore any memory detected behind |
| * the hole and pretend the hole does not exist. |
| */ |
| if ((map->count > 0) && (map->zones[map->count - 1].start + |
| map->zones[map->count - 1].size < start)) |
| if ((map->count > 0) && |
| (map->zones[map->count - 1].start + map->zones[map->count - 1].size |
| < start)) |
| break; |
| if (size > 0) { |
| 339,8 → 328,7 |
| char device_name[BUF_SIZE]; |
| uint32_t virtaddr; |
| if (ofw_get_property(ofw_aliases, "screen", device_name, |
| sizeof(device_name)) <= 0) |
| if (ofw_get_property(ofw_aliases, "screen", device_name, sizeof(device_name)) <= 0) |
| return false; |
| phandle device = ofw_find_device(device_name); |
| 347,74 → 335,27 |
| if (device == -1) |
| return false; |
| if (ofw_get_property(device, "address", &virtaddr, |
| sizeof(virtaddr)) <= 0) |
| if (ofw_get_property(device, "address", &virtaddr, sizeof(virtaddr)) <= 0) |
| return false; |
| screen->addr = (void *) ((uintptr_t) virtaddr); |
| if (ofw_get_property(device, "width", &screen->width, |
| sizeof(screen->width)) <= 0) |
| if (ofw_get_property(device, "width", &screen->width, sizeof(screen->width)) <= 0) |
| return false; |
| if (ofw_get_property(device, "height", &screen->height, |
| sizeof(screen->height)) <= 0) |
| if (ofw_get_property(device, "height", &screen->height, sizeof(screen->height)) <= 0) |
| return false; |
| if (ofw_get_property(device, "depth", &screen->bpp, |
| sizeof(screen->bpp)) <= 0) |
| if (ofw_get_property(device, "depth", &screen->bpp, sizeof(screen->bpp)) <= 0) |
| return false; |
| if (ofw_get_property(device, "linebytes", &screen->scanline, |
| sizeof(screen->scanline)) <= 0) |
| if (ofw_get_property(device, "linebytes", &screen->scanline, sizeof(screen->scanline)) <= 0) |
| return false; |
| 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, |
| 255 - i, |
| i << 5, |
| (i >> 3) << 6, |
| (i >> 5) << 5) != 0); |
| return true; |
| } |
| void ofw_quiesce(void) |
| { |
| ofw_call("quiesce", 0, 0, NULL); |
| /branches/sparc/boot/genarch/ofw.h |
|---|
| 123,7 → 123,6 |
| 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 |