WebSVN – HelenOS – Path Comparison – / – /branches/tracing/boot/arch/sparc64 Rev 3684 and /branches/tracing/boot/arch/sparc64/ Rev 4400

Ignore whitespace Rev 3684 → Rev 4400

 /branches/tracing/boot/arch/sparc64/Makefile.inc
 ,42 → 28,38
 TMP = distroot
-ifeq ($(CONFIG_AOUT_ISOFS_B),n)
-    SILO_PACKAGE=silo.patched.tar.gz
-endif
 ifeq ($(CONFIG_AOUT_ISOFS_B),y)
-    SILO_PACKAGE=silo.tar.gz
+    SILO_PACKAGE = silo.tar.gz
+else
+    SILO_PACKAGE = silo.patched.tar.gz
 endif
 build: $(BASE)/image.iso
+$(BASE)/image.iso: depend arch/$(BARCH)/loader/image.boot
+    mkdir -p $(TMP)/boot
+    mkdir -p $(TMP)/HelenOS
+    cat arch/$(BARCH)/silo/$(SILO_PACKAGE) | (cd $(TMP)/boot; tar xvfz -)
+    cp arch/$(BARCH)/silo/README arch/$(BARCH)/silo/COPYING $(TMP)/boot
 ifeq ($(CONFIG_RD_EXTERNAL),y)
-SILO_CONF_FILTER = cat
+    cp arch/$(BARCH)/silo/silo.conf $(TMP)/boot/silo.conf
 else
-SILO_CONF_FILTER = grep -v initrd
+    cat arch/$(BARCH)/silo/silo.conf | grep -v initrd > $(TMP)/boot/silo.conf
 endif
-$(BASE)/image.iso: depend arch/$(ARCH)/loader/image.boot
-    mkdir -p $(TMP)/boot
-    mkdir -p $(TMP)/HelenOS
-    cat arch/$(ARCH)/silo/$(SILO_PACKAGE) | (cd $(TMP)/boot; tar xvfz -)
-    cp arch/$(ARCH)/silo/README arch/$(ARCH)/silo/COPYING $(TMP)/boot
-    cat arch/$(ARCH)/silo/silo.conf | $(SILO_CONF_FILTER) >$(TMP)/boot/silo.conf
-    cp arch/$(ARCH)/loader/image.boot $(TMP)/HelenOS/image.boot
+    cp arch/$(BARCH)/loader/image.boot $(TMP)/HelenOS/image.boot
     gzip -f $(TMP)/HelenOS/image.boot
 ifeq ($(CONFIG_RD_EXTERNAL),y)
-    cp arch/$(ARCH)/loader/initrd.img $(TMP)/HelenOS/initrd.img
+    cp arch/$(BARCH)/loader/initrd.img $(TMP)/HelenOS/initrd.img
 endif
-    mkisofs -f -G $(TMP)/boot/isofs.b -B ... -r -o $(BASE)/image.iso $(TMP)/
+    mkisofs -f -G $(TMP)/boot/isofs.b -B ... -r -o $@ $(TMP)/
 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)
+    $(MAKE) -C arch/$(BARCH)/loader clean COMPILER=$(COMPILER) KERNELDIR=../../../$(KERNELDIR) USPACEDIR=../../../$(USPACEDIR)
     -rm -fr $(TMP)
     -rm -f $(BASE)/image.iso

 /branches/tracing/boot/arch/sparc64/loader/asm.S
 ,7 → 40,7
 .global jump_to_kernel
 halt:
-    b halt
+    ba %xcc, halt
     nop
 memcpy:
 ,7 → 116,7
     set subarchitecture, %g2
     ldub [%g2], %g2
     cmp %g2, 3
-    be 1f
+    be %xcc, 1f
     nop
 :
     call icache_flush

 /branches/tracing/boot/arch/sparc64/loader/boot.S
 ,7 → 43,7
 .global start
 start:
-    b 1f
+    ba %xcc, 1f
     nop
 /*
 ,7 → 83,7
     call ofw_init       ! initialize OpenFirmware
     stx %o4, [%l0]
-    b bootstrap
+    ba %xcc, bootstrap
     nop
 .align STACK_ALIGNMENT

 /branches/tracing/boot/arch/sparc64/loader/main.c
 ,6 → 36,7
 #include <ofw_tree.h>
 #include "ofwarch.h"
 #include <align.h>
+#include <macros.h>
 #include <string.h>
 bootinfo_t bootinfo;
 ,16 → 43,16
 component_t components[COMPONENTS];
-char *release = RELEASE;
+char *release = STRING(RELEASE);
 #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
 ,8 → 143,8
         silo_ramdisk_image += bootinfo.physmem_start;
         silo_ramdisk_image -= 0x400000;
         /* Install 1:1 mapping for the ramdisk. */
-        if (ofw_map((void *)((uintptr_t)silo_ramdisk_image),
-            (void *)((uintptr_t)silo_ramdisk_image),
+        if (ofw_map((void *)((uintptr_t) silo_ramdisk_image),
+            (void *)((uintptr_t) silo_ramdisk_image),
             silo_ramdisk_size, -1) != 0) {
             printf("Failed to map ramdisk.\n");
             halt();
 ,6 → 179,9
                 base + top;
             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++;
         }
         top += components[i].size;
 ,7 → 207,8
          * given to us by SILO.
          */
         (void) ofw_claim_phys(base + top, silo_ramdisk_size);
-        (void) ofw_map(base + top, base + top, silo_ramdisk_size, -1);
+        (void) ofw_map(bootinfo.physmem_start + base + top, base + top,
+            silo_ramdisk_size, -1);
         memmove(base + top, (void *)((uintptr_t)silo_ramdisk_image),
             silo_ramdisk_size);
         printf("done.\n");
 ,7 → 258,8
     balloc_base = base + ALIGN_UP(top, PAGE_SIZE);
     (void) ofw_claim_phys(bootinfo.physmem_start + balloc_base,
         BALLOC_MAX_SIZE);
-    (void) ofw_map(balloc_base, balloc_base, BALLOC_MAX_SIZE, -1);
+    (void) ofw_map(bootinfo.physmem_start + balloc_base, balloc_base,
+        BALLOC_MAX_SIZE, -1);
     balloc_init(&bootinfo.ballocs, (uintptr_t)balloc_base);
     printf("\nCanonizing OpenFirmware device tree...");
 ,7 → 266,7
     bootinfo.ofw_root = ofw_tree_build();
     printf("done.\n");
-#ifdef CONFIG_SMP
+#ifdef CONFIG_AP
     printf("\nChecking for secondary processors...");
     if (!ofw_cpu())
         printf("Error: unable to get CPU properties\n");
 ,7 → 273,7
     printf("done.\n");
 #endif
-    setup_palette();
+    ofw_setup_palette();
     printf("\nBooting the kernel...\n");
     jump_to_kernel((void *) KERNEL_VIRTUAL_ADDRESS,
 ,4 → 280,3
         bootinfo.physmem_start | BSP_PROCESSOR, &bootinfo,
         sizeof(bootinfo));
 }

 /branches/tracing/boot/arch/sparc64/loader/main.h
 ,6 → 38,9
 #define TASKMAP_MAX_RECORDS 32
+/** Size of buffer for storing task name in task_t. */
+#define BOOTINFO_TASK_NAME_BUFLEN 32
 #define BSP_PROCESSOR   1
 #define AP_PROCESSOR    0
 ,6 → 50,7
 typedef struct {
     void *addr;
     uint32_t size;
+    char name[BOOTINFO_TASK_NAME_BUFLEN];
 } task_t;
 typedef struct {

 /branches/tracing/boot/arch/sparc64/loader/ofwarch.c
 ,7 → 32,7
  * @brief   Architecture dependent parts of OpenFirmware interface.
  */
-#include <ofwarch.h>
+#include <ofwarch.h>
 #include <ofw.h>
 #include <printf.h>
 #include <string.h>

 /branches/tracing/boot/arch/sparc64/loader/Makefile
 ,7 → 27,7
 #
 include ../../../../version
-include ../../../Makefile.config
+-include ../../../../Makefile.config
 ## Toolchain configuration
 #
 ,16 → 57,8
     OBJDUMP = $(TOOLCHAIN_DIR)/$(TARGET)-objdump
 endif
-CFLAGS = -DRELEASE=\"$(RELEASE)\" -I. -I../../../generic -I../../../genarch -nostdinc -nostdlib -fno-builtin -Werror-implicit-function-declaration -Wmissing-prototypes -Werror -O3 -mcpu=ultrasparc -m64 -mno-fpu -pipe
+CFLAGS = -DRELEASE=$(RELEASE) -I. -I../../../generic -I../../../genarch -imacros ../../../../config.h -nostdinc -nostdlib -fno-builtin -Werror-implicit-function-declaration -Wmissing-prototypes -Werror -O3 -mcpu=ultrasparc -m64 -mno-fpu -pipe
-ifdef REVISION
-    CFLAGS += "-DREVISION=\"$(REVISION)\""
-endif
-ifdef TIMESTAMP
-    CFLAGS += "-DTIMESTAMP=\"$(TIMESTAMP)\""
-endif
 SOURCES = \
     main.c \
     _components.c \
 ,17 → 101,27
     $(USPACEDIR)/srv/fb/fb \
     $(USPACEDIR)/srv/kbd/kbd \
     $(USPACEDIR)/srv/console/console \
-    $(USPACEDIR)/srv/fs/tmpfs/tmpfs \
-    $(USPACEDIR)/srv/fs/fat/fat
+    $(USPACEDIR)/srv/fs/tmpfs/tmpfs
+ifeq ($(MACHINE),generic)
+RD_SRVS += \
+    $(USPACEDIR)/srv/fs/fat/fat \
+    $(USPACEDIR)/srv/fhc/fhc \
+    $(USPACEDIR)/srv/obio/obio
+endif
 RD_APPS = \
     $(USPACEDIR)/app/trace/trace \
     $(USPACEDIR)/app/tetris/tetris \
-    $(USPACEDIR)/app/tester/tester \
     $(USPACEDIR)/app/trace/trace \
     $(USPACEDIR)/app/bdsh/bdsh \
     $(USPACEDIR)/app/klog/klog
+ifeq ($(MACHINE),generic)
+RD_APPS += \
+    $(USPACEDIR)/app/tester/tester
+endif
 OBJECTS := $(addsuffix .o,$(basename $(SOURCES)))
 ALL_COMPONENT_OBJECTS := $(addsuffix .o,$(basename $(notdir $(ALL_COMPONENTS))))

Subversion Repositories HelenOS

Compare Revisions

Ignore whitespace Rev 3684 → Rev 4400