WebSVN – HelenOS – Path Comparison – / – /branches/tracing/boot/arch/ia64/ Rev 4376 and /branches/tracing/boot/arch/ia64/ Rev 4377

Ignore whitespace Rev 4376 → Rev 4377

 /branches/tracing/boot/arch/ia64/Makefile.inc
 ,22 → 26,17
 # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
-#ifeq ($(MACHINE),ski)
 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/tracing/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/tracing/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>
 extern bootinfo_t binfo;
 component_t components[COMPONENTS];
-char *release = RELEASE;
+char *release = STRING(RELEASE);
 void write(const char *str, const int len)
 {
 ,23 → 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_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
+#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
 ,27 → 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;
-    bootinfo_t *bootinfo=&binfo;
-    //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");
 ,42 → 92,46
         printf(" %P: %s image (size %d bytes)\n", components[i].start,
             components[i].name, components[i].size);
-    if(!bootinfo->hello_configured)
-    {
+    if (!bootinfo->hello_configured) {
         /*
-         * Load configuration defaults for simulators
+         * Load configuration defaults for simulators.
          */
-         bootinfo->memmap_items=0;
+         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[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->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[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.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);
 }

 /branches/tracing/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/tracing/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/tracing/boot/arch/ia64/loader/gefi/HelenOS/Makefile
 ,6 → 20,7
 #  Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 #  02111-1307, USA.
 #
 prefix=$(PREFIX)
 include ../Make.defaults
 CDIR=$(TOPDIR)/..
 ,14 → 29,11
 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)
 all:    gefi hello.efi
 clean:
     rm -f *.efi *~ *.o *.so *.map *.disass *.bin
 ,11 → 42,10
 hello.efi: hello.so
     $(OBJCOPY) -j .text -j .sdata -j .data -j .dynamic -j .dynsym -j .rel \
            -j .rela -j .reloc --target=$(FORMAT) hello.so hello.efi
-    $(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
+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
 ,11 → 55,9
 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
 image.o: ../../image.boot mkimage
     $(OBJCOPY) -O binary ../../image.boot image.bin
     ./mkimage
 ,6 → 67,5
 mkimage: mkimage.c
     gcc -o mkimage mkimage.c
 gefi:
     make -C .. prefix=$(PREFIX)

 /branches/tracing/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/tracing/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 -pipe
+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 \
 ,24 → 79,36
     asm.S \
     boot.S
+NOCOMPONENTS = \
+    $(KERNELDIR)/kernel.bin
 COMPONENTS = \
-    $(KERNELDIR)/kernel.bin
-NOCOMPONENTS = \
     $(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/trace/trace \
     $(USPACEDIR)/app/tetris/tetris \
     $(USPACEDIR)/app/tester/tester \
-    $(USPACEDIR)/app/klog/klog
+    $(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 -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 4376 → Rev 4377