Changeset bb74e8ab in mainline

Timestamp:

2008-12-12T05:34:10Z (16 years ago)

Author:

Jakub Vana <jakub.vana@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

4b8f1c3

Parents:

925fdd7

Message:

IA64:Disable searching for image in actual directory in hello, fix Makefile

Location:

boot/arch/ia64/loader/gefi/HelenOS

Files:

• Makefile (modified) (1 diff)
• hello.c (modified) (3 diffs)

boot/arch/ia64/loader/gefi/HelenOS/Makefile

@@ -49 +49 @@
 #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

boot/arch/ia64/loader/gefi/HelenOS/hello.c

@@ -13 +13 @@
 
 //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;
@@ -87 +87 @@
         for(i=StrLen(FileName);i>=0 && FileName[i]!='\\';i--);
         FileName[i] = 0;
+        FileName[0] = 0;
         
         Print(L"%s\n",LoadedImage->LoadOptions);
@@ -108 +109 @@
         else{
                 CHAR16 buf[1024];
-                buf[0]='\\';
+                //buf[0]='\\';
                 i--;
                 int j;