Changeset bb74e8ab in mainline


Ignore:
Timestamp:
2008-12-12T05:34:10Z (15 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:
2 edited

Legend:

Unmodified
Added
Removed
  • boot/arch/ia64/loader/gefi/HelenOS/Makefile

    r925fdd7 rbb74e8ab  
    4949#When selected first lines or second lines, select if image is linked into hello or not - usefull for network boot
    5050#hello.so: hello.o image.o division.o
    51 hello.so: hello.o image.bin
     51hello.so: hello.o image.bin division.o
    5252#       $(LD) $(LDFLAGS) -Map hello.map hello.o division.o image.o -o hello.so $(LOADLIBES) #link image inside hello
    5353        $(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

    r925fdd7 rbb74e8ab  
    1313
    1414//Link image as a data array into hello - usefull with network boot
    15 #define IMAGE_LINKED
     15//#define IMAGE_LINKED
    1616
    1717bootinfo_t *bootinfo=(bootinfo_t *)BOOTINFO_ADDRESS;
     
    8787        for(i=StrLen(FileName);i>=0 && FileName[i]!='\\';i--);
    8888        FileName[i] = 0;
     89        FileName[0] = 0;
    8990       
    9091        Print(L"%s\n",LoadedImage->LoadOptions);
     
    108109        else{
    109110                CHAR16 buf[1024];
    110                 buf[0]='\\';
     111                //buf[0]='\\';
    111112                i--;
    112113                int j;
Note: See TracChangeset for help on using the changeset viewer.