WebSVN – HelenOS – Path Comparison – / – /branches/sparc/boot/arch/ia64/loader/gefi/HelenOS Rev 3665 and /branches/sparc/boot/arch/ia64/loader/gefi/HelenOS Rev 3742

Ignore whitespace Rev 3665 → Rev 3742

 /branches/sparc/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/sparc/boot/arch/ia64/loader/gefi/HelenOS/division.c
0,0 → 1,0
link ../../../../../../uspace/lib/softint/generic/division.c
Property changes:
Added: svn:special
+*
\ No newline at end of property

/branches/sparc/boot/arch/ia64/loader/gefi/HelenOS/division.h
0,0 → 1,0
link ../../../../../../uspace/lib/softint/include/division.h
Property changes:
Added: svn:special
+*
\ No newline at end of property

 /branches/sparc/boot/arch/ia64/loader/gefi/HelenOS/Makefile
 ,7 → 28,8
 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 $(shell $(CC) -print-libgcc-file-name)
+LOADLIBES   = -lefi -lgnuefi
 FORMAT      = efi-app-$(ARCH)
 ,15 → 47,18
     $(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
-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.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.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