WebSVN – HelenOS – Path Comparison – / – /branches/network/boot/arch/ia64/ Rev 4152 and /branches/network/boot/arch/ia64/ Rev 4153

Ignore whitespace Rev 4152 → Rev 4153

 /branches/network/boot/arch/ia64/Makefile.inc
 ,39 → 26,17
 # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
-#ifeq ($(MACHINE),ski)
-#VMAXLMA_SRC = tools/ia64/vmaxlma.c
-#build: $(BASE)/kernel.bin
-#echo Building SKI
-#$(BASE)/kernel.bin: $(KERNELDIR)/kernel.bin vmaxlma
-#   cp $(KERNELDIR)/kernel.bin $(BASE)/kernel.bin
-#   ./vmaxlma $(BASE)/kernel.bin
-#vmaxlma: $(VMAXLMA_SRC)
-#   $(CC) $(VMAXLMA_SRC) -o $@
-#clean:
-#   -rm -f $(BASE)/kernel.bin vmaxlma
-#else
 build: $(BASE)/image.boot
-$(BASE)/image.boot: depend arch/$(ARCH)/loader/image.boot
-    cp arch/$(ARCH)/loader/image.boot $(BASE)/image.boot
+$(BASE)/image.boot: depend arch/$(BARCH)/loader/image.boot
+    cp arch/$(BARCH)/loader/image.boot $(BASE)/image.boot
 depend:
-    -rm arch/$(ARCH)/loader/image.boot
+    -rm arch/$(BARCH)/loader/image.boot
-arch/$(ARCH)/loader/image.boot:
-    make -C arch/$(ARCH)/loader COMPILER=$(COMPILER) KERNELDIR=../../../$(KERNELDIR) USPACEDIR=../../../$(USPACEDIR) "DEFS=$(DEFS)"
+arch/$(BARCH)/loader/image.boot:
+    make -C arch/$(BARCH)/loader COMPILER=$(COMPILER) KERNELDIR=../../../$(KERNELDIR) USPACEDIR=../../../$(USPACEDIR)
 clean: generic_clean
-    make -C arch/$(ARCH)/loader clean COMPILER=$(COMPILER) KERNELDIR=../../../$(KERNELDIR) USPACEDIR=../../../$(USPACEDIR) "DEFS=$(DEFS)"
+    make -C arch/$(BARCH)/loader clean COMPILER=$(COMPILER) KERNELDIR=../../../$(KERNELDIR) USPACEDIR=../../../$(USPACEDIR)
     -rm -f $(BASE)/image.boot
-#endif

 /branches/network/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/network/boot/arch/ia64/loader/asm.S
 ,7 → 37,5
     alloc loc0 = ar.pfs, 1, 1, 0, 0
     movl r8 = 0x4404000;;
     mov b1 = r8 ;;
-    mov r1 = in0;
+    mov r1 = in0;               #Save bootinfo prt
     br.call.sptk.many b0 = b1;;
-.global ofw
-ofw:

 /branches/network/boot/arch/ia64/loader/boot.S
 ,6 → 34,7
 .global start
 start:
     mov ar.rsc = r0
 #   movl r8 = (VRN_KERNEL << VRN_SHIFT) ;;
     movl r1 = 0x4400000
 ,6 → 58,22
     mov b1 = r18 ;;
     br.call.sptk.many b0 = b1
+.align 512
+ap_start:
+ap_loop:
+    movl r18=0x4405000;;
+    mov b1 = r18 ;;
+    br.call.sptk.many b0 = b1;;
+.align 1024
+.align 4096
+.global binfo
+binfo:
 .bss #on this line is ".bss", it cannot be seen in my mcedit :-(

 /branches/network/boot/arch/ia64/loader/main.c
 ,6 → 1,6
 /*
  * Copyright (c) 2005 Martin Decky
- * Copyright (c) 2006 Jakub Jermar
+ * Copyright (c) 2006 Jakub Jermar
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
 ,11 → 33,13
 #include "_components.h"
 #include <align.h>
 #include <balloc.h>
+#include <macros.h>
+#include <string.h>
-bootinfo_t bootinfo;
+extern bootinfo_t binfo;
 component_t components[COMPONENTS];
-char *release = RELEASE;
+char *release = STRING(RELEASE);
 void write(const char *str, const int len)
 {
 ,15 → 46,22
     return;
 }
+#define DEFAULT_MEMORY_BASE     0x4000000
+#define DEFAULT_MEMORY_SIZE     0x4000000
+#define DEFAULT_LEGACY_IO_BASE      0x00000FFFFC000000
+#define DEFAULT_LEGACY_IO_SIZE      0x4000000
+#define DEFAULT_FREQ_SCALE      0x0000000100000001 /* 1/1 */
+#define DEFAULT_SYS_FREQ        100000000 /* 100MHz */
 #ifdef REVISION
-    char *revision = ", revision " REVISION;
+    char *revision = ", revision " STRING(REVISION);
 #else
     char *revision = "";
 #endif
 #ifdef TIMESTAMP
-    char *timestamp = "\nBuilt on " TIMESTAMP;
+    char *timestamp = "\nBuilt on " STRING(TIMESTAMP);
 #else
     char *timestamp = "";
 #endif
 ,26 → 69,18
 /** Print version information. */
 static void version_print(void)
 {
-    printf("HelenOS IA64 Bootloader\nRelease %s%s%s\nCopyright (c) 2006 HelenOS project\n", release, revision, timestamp);
+    printf("HelenOS IA64 Bootloader\nRelease %s%s%s\n"
+        "Copyright (c) 2006 HelenOS project\n", release, revision,
+        timestamp);
 }
 void bootstrap(void)
 {
     int ii;
-    //for(ii=0;ii<KERNEL_SIZE;ii++) ((char *)(0x100000))[ii] = ((char *)KERNEL_START)[ii+1];
-    //((int *)(0x100000))[0]++;
+    bootinfo_t *bootinfo = &binfo;
     version_print();
     init_components(components);
     printf("\nSystem info\n");
 ,20 → 92,46
         printf(" %P: %s image (size %d bytes)\n", components[i].start,
             components[i].name, components[i].size);
+    if (!bootinfo->hello_configured) {
+        /*
+         * Load configuration defaults for simulators.
+         */
+         bootinfo->memmap_items = 0;
+         bootinfo->memmap[bootinfo->memmap_items].base =
+             DEFAULT_MEMORY_BASE;
+         bootinfo->memmap[bootinfo->memmap_items].size =
+             DEFAULT_MEMORY_SIZE;
+         bootinfo->memmap[bootinfo->memmap_items].type =
+             EFI_MEMMAP_FREE_MEM;
+         bootinfo->memmap_items++;
-    bootinfo.taskmap.count = 0;
+         bootinfo->memmap[bootinfo->memmap_items].base =
+             DEFAULT_LEGACY_IO_BASE;
+         bootinfo->memmap[bootinfo->memmap_items].size =
+             DEFAULT_LEGACY_IO_SIZE;
+         bootinfo->memmap[bootinfo->memmap_items].type =
+             EFI_MEMMAP_IO_PORTS;
+         bootinfo->memmap_items++;
+         bootinfo->freq_scale = DEFAULT_FREQ_SCALE;
+         bootinfo->sys_freq = DEFAULT_SYS_FREQ;
+    }
+    bootinfo->taskmap.count = 0;
     for (i = 0; i < COMPONENTS; i++) {
         if (i > 0) {
-            bootinfo.taskmap.tasks[bootinfo.taskmap.count].addr = components[i].start;
-            bootinfo.taskmap.tasks[bootinfo.taskmap.count].size = components[i].size;
-            bootinfo.taskmap.count++;
+            bootinfo->taskmap.tasks[bootinfo->taskmap.count].addr =
+                components[i].start;
+            bootinfo->taskmap.tasks[bootinfo->taskmap.count].size =
+                components[i].size;
+            strncpy(bootinfo->taskmap.tasks[
+                bootinfo->taskmap.count].name,
+                components[i].name, BOOTINFO_TASK_NAME_BUFLEN);
+            bootinfo->taskmap.count++;
         }
     }
-    jump_to_kernel(&bootinfo);
+    jump_to_kernel(bootinfo);
 }

 /branches/network/boot/arch/ia64/loader/gefi/Make.defaults
 ,30 → 27,19
 #
 INSTALLROOT=/usr/local
-TOPDIR    := $(shell if [ "$$PWD" != "" ]; then echo $$PWD; else pwd; fi)
+TOPDIR    := $(shell pwd)
-ARCH       = $(shell uname -m | sed s,i[3456789]86,ia32,)
-INCDIR     = -I. -I$(CDIR)/inc -I$(CDIR)/inc/$(ARCH) -I$(CDIR)/inc/protocol
+ARCH       = ia64
+INCDIR     = -I. -I$(CDIR)/inc -I$(CDIR)/inc/$(ARCH) -I$(CDIR)/inc/protocol
 CPPFLAGS   = -DCONFIG_$(ARCH)
-CFLAGS     = -O2 -fpic -Wall -fshort-wchar -fno-strict-aliasing -fno-merge-constants
-LDFLAGS    = -nostdlib
-INSTALL    = install
+CFLAGS     = -O2 -fpic -Wall -fshort-wchar -fno-strict-aliasing -fno-merge-constants -frename-registers -mfixed-range=f32-f127
+LDFLAGS    = -nostdlib
+INSTALL    = install
-GCC_VERSION=$(shell $(CROSS_COMPILE)$(CC) -v 2>&1 | fgrep 'gcc version' | cut -f3 -d' ' | cut -f1 -d'.')
-#  prefix   =
-CC      = $(prefix)gcc
-AS      = $(prefix)as
-LD      = $(prefix)ld
-AR      = $(prefix)ar
-RANLIB  = $(prefix)ranlib
-OBJCOPY = $(prefix)objcopy
-OBJDUMP = $(prefix)objdump
-ifneq ($(GCC_VERSION),2)
-        CFLAGS += -frename-registers
-endif
-CFLAGS += -mfixed-range=f32-f127
+CC         = $(prefix)gcc
+AS         = $(prefix)as
+LD         = $(prefix)ld
+AR         = $(prefix)ar
+RANLIB     = $(prefix)ranlib
+OBJCOPY    = $(prefix)objcopy
+OBJDUMP    = $(prefix)objdump

 /branches/network/boot/arch/ia64/loader/gefi/apps/Makefile
 ,7 → 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
+LOADLIBES   = -lefi -lgnuefi $(shell $(CC) -print-libgcc-file-name)
 FORMAT      = efi-app-$(ARCH)
 TARGETS = t.efi t2.efi t3.efi t4.efi t5.efi t6.efi printenv.efi t7.efi

 /branches/network/boot/arch/ia64/loader/gefi/HelenOS/hello.c
 ,9 → 1,29
 #include <efi.h>
 #include <efilib.h>
+#include <../../../../../../kernel/arch/ia64/include/bootinfo.h>
 #define KERNEL_LOAD_ADDRESS 0x4400000
+#define MEM_MAP_DESCRIPTOR_OFFSET_TYPE 0
+#define MEM_MAP_DESCRIPTOR_OFFSET_BASE 8
+#define MEM_MAP_DESCRIPTOR_OFFSET_PAGES 24
+//Link image as a data array into hello - usefull with network boot
+//#define IMAGE_LINKED
+bootinfo_t *bootinfo=(bootinfo_t *)BOOTINFO_ADDRESS;
+#ifdef IMAGE_LINKED
+extern char HOSimage[];
+extern int HOSimagesize;
+#endif
 static CHAR16 *
 a2u (char *str)
 {
 ,24 → 35,7
     mem[i] = 0;
     return mem;
 }
-char HEX[256];
-char hexs[]="0123456789ABCDEF";
-/*
-void to_hex(unsigned long long num)
-{
-    int a;
-    for(a=15;a>=0;a--)
-    {
-    char c=num - (num & 0xfffffffffffffff0LL);
-    num/=16;
-    c=hexs[c];
-    HEX[a]=c;
-    }
-}
-*/
 EFI_STATUS
 efi_main (EFI_HANDLE image, EFI_SYSTEM_TABLE *systab)
 {
 ,16 → 75,18
     EFI_FILE *FileHandle;
     BS->HandleProtocol(LoadedImage->DeviceHandle, &FileSystemProtocol, &Vol);
-    Vol->OpenVolume (Vol, &CurDir);
     char FileName[1024];
     char *OsKernelBuffer;
     int i;
+    int defaultLoad;
+    int imageLoad;
     UINTN Size;
     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);
 ,11 → 102,13
     }
     while(LoadOptions[i]==L' ') if(LoadOptions[i++]==0) break;
-    if(LoadOptions[i++]==0)
+    if(LoadOptions[i++]==0){
         StrCat(FileName,L"\\image.bin");
-    else{
+        defaultLoad=1;
+    }
+/*  else{
         CHAR16 buf[1024];
-        buf[0]='\\';
+        //buf[0]='\\';
         i--;
         int j;
         for(j=0;LoadOptions[i+j]!=L' '&&LoadOptions[i+j]!=0;j++)
 ,38 → 115,101
             buf[j+1]=LoadOptions[i+j];
         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;
     }
-    //Print(L"%s\n",FileName);
-    EFI_STATUS stat;
-    stat=CurDir->Open(CurDir, &FileHandle, FileName, EFI_FILE_MODE_READ, 0);
-    if(EFI_ERROR(stat)){
-        Print(L"Error Opening Image %s\n",FileName);
-        return 0;
+    imageLoad=1;
+#ifdef IMAGE_LINKED
+    if(defaultLoad) {
+        Print(L"Using Linked Image\n");
+        imageLoad=0;
     }
-    Size = 0x00400000;
-    BS->AllocatePool(EfiLoaderData, Size, &OsKernelBuffer);
-    FileHandle->Read(FileHandle, &Size, OsKernelBuffer);
-    FileHandle->Close(FileHandle);
+#endif
-    if(Size<1) return 0;
+    char *  HOS;
+    if(imageLoad)
+    {
+        Size = 0x00400000;
+            Vol->OpenVolume (Vol, &CurDir);
-    char *  HOS = OsKernelBuffer;
+        EFI_STATUS stat;
+        stat=CurDir->Open(CurDir, &FileHandle, FileName, EFI_FILE_MODE_READ, 0);
+        if(EFI_ERROR(stat)){
+            Print(L"Error Opening Image %s\n",FileName);
+            return 0;
+        }
+            BS->AllocatePool(EfiLoaderData, Size, &OsKernelBuffer);
+        FileHandle->Read(FileHandle, &Size, OsKernelBuffer);
+        FileHandle->Close(FileHandle);
+        HOS = OsKernelBuffer;
+            if(Size<1) return 0;
+    }
+#ifdef IMAGE_LINKED
+    else {
+        HOS = HOSimage;
+        Size = HOSimagesize;
+        Print(L"Image start %llX\n",(long long)HOS);
+        Print(L"Image size %llX\n",(long long)Size);
+        Print(L"Image &size %llX\n",(long long)&Size);
+    }
+#endif
     int HOSSize = Size;
-    {
+    rArg rSAL;
+    rArg rPAL;
+    //Setup AP's wake up address
+    LibSalProc(0x01000000,2,0x4400200,0,0,0,0,0,&rSAL);
+    //Get System Frequency
+    UINT64 sys_freq;
+    LibSalProc(0x01000012,0,0,0,0,0,0,0,&rSAL);
+    sys_freq=rSAL.p1;
+    UINT64 freq_scale;
+    //Get CPU Frequency to System Frequency ratio
+    LibPalProc(14,0,0,0,&rPAL);
+    freq_scale=rPAL.p1;
+        UINT64 sapic;
+        LibGetSalIpiBlock(&sapic);
+        Print (L"SAPIC:%X\n", sapic);
+    //bootinfo->sapic=sapic;
+        UINT64 wakeup_intno;
+        LibGetSalWakeupVector(&wakeup_intno);
+        Print (L"WAKEUP INTNO:%X\n", wakeup_intno);
         UINTN cookie;
         void *p=(void *)KERNEL_LOAD_ADDRESS;
         UINTN mapsize,descsize;
         UINT32 desver;
         EFI_STATUS status;
-        EFI_MEMORY_DESCRIPTOR emd[1024];
-        mapsize=1024*sizeof(emd);
         status=BS->AllocatePages(AllocateAnyPages,EfiLoaderData,/*(HOSSize>>12)+1*/ 1,p);
         if(EFI_ERROR(status)){
 ,10 → 220,18
         return EFI_SUCCESS;
         }
-        status=BS->GetMemoryMap(&mapsize,emd,&cookie,&descsize,&desver);
-        if(EFI_ERROR(status)){
-        Print(L"Error 1\n");
-        return EFI_SUCCESS;
+        UINTN no_entryes;
+        void * mds;
+        mds=LibMemoryMap(&no_entryes,&cookie,&descsize,&desver);
+        for(i=0;i<no_entryes;i++)
+        {
+            unsigned int type=*((unsigned int *)(mds+i*descsize+MEM_MAP_DESCRIPTOR_OFFSET_TYPE));
+            unsigned long long base=*((unsigned long long *)(mds+i*descsize+MEM_MAP_DESCRIPTOR_OFFSET_BASE));
+            unsigned long long pages=*((unsigned long long *)(mds+i*descsize+MEM_MAP_DESCRIPTOR_OFFSET_PAGES));
+            Print(L"T:%02d %016llX %016llX\n",type,base,pages*EFI_PAGE_SIZE);
         }
         status=BS->ExitBootServices(image,cookie);
         if(EFI_ERROR(status)){
 ,12 → 239,62
         return EFI_SUCCESS;
         }
-    }
     int a;
     for(a=0;a<HOSSize;a++){
         ((char *)(0x4400000))[a]=HOS[a];
     }
+    bootinfo->sapic=(unsigned long *)sapic;
+    bootinfo->wakeup_intno=wakeup_intno;
+    bootinfo->sys_freq=sys_freq;
+    bootinfo->freq_scale=freq_scale;
+    bootinfo->hello_configured=1;
+        bootinfo->memmap_items=0;
+        for(i=0;i<no_entryes;i++)
+        {
+            unsigned int type=*((unsigned int *)(mds+i*descsize+MEM_MAP_DESCRIPTOR_OFFSET_TYPE));
+            unsigned long long base=*((unsigned long long *)(mds+i*descsize+MEM_MAP_DESCRIPTOR_OFFSET_BASE));
+            unsigned long long pages=*((unsigned long long *)(mds+i*descsize+MEM_MAP_DESCRIPTOR_OFFSET_PAGES));
+            switch (type)
+            {
+                case EfiConventionalMemory:
+                bootinfo->memmap[bootinfo->memmap_items].type=EFI_MEMMAP_FREE_MEM;
+                bootinfo->memmap[bootinfo->memmap_items].base=base;
+                bootinfo->memmap[bootinfo->memmap_items].size=pages*EFI_PAGE_SIZE;
+                    bootinfo->memmap_items++;
+                    break;
+                case EfiMemoryMappedIO:
+                bootinfo->memmap[bootinfo->memmap_items].type=EFI_MEMMAP_IO;
+                bootinfo->memmap[bootinfo->memmap_items].base=base;
+                bootinfo->memmap[bootinfo->memmap_items].size=pages*EFI_PAGE_SIZE;
+                    bootinfo->memmap_items++;
+                    break;
+                case EfiMemoryMappedIOPortSpace:
+                bootinfo->memmap[bootinfo->memmap_items].type=EFI_MEMMAP_IO_PORTS;
+                bootinfo->memmap[bootinfo->memmap_items].base=base;
+                bootinfo->memmap[bootinfo->memmap_items].size=pages*EFI_PAGE_SIZE;
+                    bootinfo->memmap_items++;
+                    break;
+                default :
+                    break;
+            }
+        }
     //Run Kernel
     asm volatile(
 ,8 → 305,6
     );
-    while(1){
-        ((volatile int *)(0x80000000000b8000))[0]++;
-    }
+    //Not reached
     return EFI_SUCCESS;
 }

/branches/network/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/network/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/network/boot/arch/ia64/loader/gefi/HelenOS/mkimage.c
 ,0 → 1,17
+#include<stdio.h>
+#include<stdlib.h>
+int main(int argc,char** argv)
+{
+    FILE *fi,*fo;
+    int count=0;
+    int ch;
+    fi=fopen("image.bin","rb");
+    fo=fopen("image.c","wb");
+    fprintf(fo,"char HOSimage[]={\n");
+    if((ch=getc(fi))!=EOF) {fprintf(fo,"0x%02X",ch);count++;}
+    while((ch=getc(fi))!=EOF) {fprintf(fo,",0x%02X",ch);count++;}
+    fprintf(fo,"};\nint HOSimagesize=%d;\n",count);
+    return EXIT_SUCCESS;
+}

 /branches/network/boot/arch/ia64/loader/gefi/HelenOS/Makefile
 ,6 → 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
 FORMAT      = efi-app-$(ARCH)
 ,16 → 46,32
            -j .rela -j .reloc --target=$(FORMAT) hello.so hello.efi
     $(OBJDUMP) -d hello.efi > hello.disass
-hello.so: hello.o image.o
-    $(LD) $(LDFLAGS) -Map hello.map hello.o -o hello.so $(LOADLIBES)
+#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.o: hello.c
     $(CC) $(INCDIR) $(CFLAGS) $(CPPFLAGS) -c hello.c -o hello.o
-image.o: ../../image.boot
+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
-    $(OBJCOPY) -I binary -O elf64-ia64-little -B ia64 image.bin image.o
+image.o: ../../image.boot mkimage
+    $(OBJCOPY) -O binary ../../image.boot image.bin
+    ./mkimage
+    $(CC) $(INCDIR) $(CFLAGS) $(CPPFLAGS) -c image.c -o image.o
+#   $(OBJCOPY) -I binary -O elf64-ia64-little -B ia64  image.bin image.o
+mkimage: mkimage.c
+    gcc -o mkimage mkimage.c
 gefi:
     make -C .. prefix=$(PREFIX)

 /branches/network/boot/arch/ia64/loader/gefi/Makefile
 ,9 → 23,9
 include Make.defaults
-SUBDIRS = lib gnuefi inc apps
+SUBDIRS = lib gnuefi inc
-all:    check_gcc $(SUBDIRS)
+all: $(SUBDIRS)
 $(SUBDIRS):
     $(MAKE) -C $@
 ,13 → 39,4
 .PHONY: $(SUBDIRS) clean depend
-#
-# on both platforms you must use gcc 3.0 or higher
-#
-check_gcc:
-ifeq ($(GCC_VERSION),2)
-    @echo "you need to use a version of gcc >= 3.0, you are using `$(CC) --version`"
-    @exit 1
-endif
 include Make.rules

 /branches/network/boot/arch/ia64/loader/main.h
 ,29 → 29,14
 #ifndef BOOT_ia64_MAIN_H_
 #define BOOT_ia64_MAIN_H_
-#include <ofw.h>
-#include <ofw_tree.h>
 #include <types.h>
+#include <../../../../kernel/arch/ia64/include/bootinfo.h>
 #define CONFIG_INIT_TASKS   32
-typedef struct {
-    void *addr;
-    size_t size;
-} init_task_t;
-typedef struct {
-    count_t count;
-    init_task_t tasks[CONFIG_INIT_TASKS];
-} init_t;
-typedef struct {
-    init_t taskmap;
-} bootinfo_t;
-extern bootinfo_t bootinfo;
 extern void start(void);
 extern void bootstrap(void);

 /branches/network/boot/arch/ia64/loader/Makefile
 ,7 → 27,7
 #
 include ../../../../version
-include ../../../Makefile.config
+-include ../../../../Makefile.config
 ## Toolchain configuration
 #
 ,7 → 47,7
     LD = ld
     OBJCOPY = objcopy
     OBJDUMP = objdump
-    GEFI_PREXIX =
+    GEFI_PREFIX =
 endif
 ifeq ($(COMPILER),icc_native)
 ,16 → 68,8
 endif
 #-mno-pic means do not use gp + imm22 to address data
-CFLAGS = -DRELEASE=\"$(RELEASE)\" -I. -I../../../generic -I../../../genarch -I../../../../kernel/generic/include -nostdinc -nostdlib -fno-builtin -Werror-implicit-function-declaration -Wmissing-prototypes -Werror -O3 -fno-unwind-tables -mfixed-range=f32-f127 -mno-pic
+CFLAGS = -DRELEASE=$(RELEASE) -I. -I../../../generic -I../../../genarch -I../../../../kernel/generic/include -imacros ../../../../config.h -nostdinc -nostdlib -fno-builtin -Werror-implicit-function-declaration -Wmissing-prototypes -Werror -O3 -fno-unwind-tables -mfixed-range=f32-f127 -mno-pic -pipe
-ifdef REVISION
-    CFLAGS += "-DREVISION=\"$(REVISION)\""
-endif
-ifdef TIMESTAMP
-    CFLAGS += "-DTIMESTAMP=\"$(TIMESTAMP)\""
-endif
 SOURCES = \
     main.c \
     ../../../generic/printf.c \
 ,21 → 79,36
     asm.S \
     boot.S
+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/vfs/vfs
+ifeq ($(RDFMT),tmpfs)
+    COMPONENTS += $(USPACEDIR)/srv/fs/tmpfs/tmpfs
+endif
+ifeq ($(RDFMT),fat)
+    COMPONENTS += $(USPACEDIR)/srv/fs/fat/fat
+endif
+RD_SRVS = \
     $(USPACEDIR)/srv/fb/fb \
     $(USPACEDIR)/srv/kbd/kbd \
     $(USPACEDIR)/srv/console/console \
-    $(USPACEDIR)/srv/vfs/vfs \
     $(USPACEDIR)/srv/fs/tmpfs/tmpfs \
-    $(USPACEDIR)/srv/fs/fat/fat \
-    $(USPACEDIR)/srv/devmap/devmap \
-    $(USPACEDIR)/app/init/init \
+    $(USPACEDIR)/srv/fs/fat/fat
+RD_APPS = \
     $(USPACEDIR)/app/tetris/tetris \
     $(USPACEDIR)/app/tester/tester \
-    $(USPACEDIR)/app/klog/klog
+    $(USPACEDIR)/app/trace/trace \
+    $(USPACEDIR)/app/klog/klog \
+    $(USPACEDIR)/app/bdsh/bdsh
 OBJECTS := $(addsuffix .o,$(basename $(SOURCES)))
 COMPONENT_OBJECTS := $(addsuffix .o,$(basename $(notdir $(COMPONENTS))))
 ,22 → 122,41
 hello.efi: image.boot
     make -C gefi/HelenOS PREFIX=$(GEFI_PREFIX)
     cp gefi/HelenOS/hello.efi ../../../../
-#   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 $(DEFS) $(CFLAGS) -f - $(SOURCES) > Makefile.depend 2> /dev/null
+    -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 4152 → Rev 4153