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

Ignore whitespace Rev 4152 → Rev 4153

 /branches/network/boot/arch/arm32/Makefile.inc
 ,15 → 28,15
 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) IMAGE=$(IMAGE)
+arch/$(BARCH)/loader/image.boot:
+    make -C arch/$(BARCH)/loader COMPILER=$(COMPILER) KERNELDIR=../../../$(KERNELDIR) USPACEDIR=../../../$(USPACEDIR)
 clean:
-    make -C arch/$(ARCH)/loader clean COMPILER=$(COMPILER) KERNELDIR=../../../$(KERNELDIR) USPACEDIR=../../../$(USPACEDIR) IMAGE=$(IMAGE)
+    make -C arch/$(BARCH)/loader clean COMPILER=$(COMPILER) KERNELDIR=../../../$(KERNELDIR) USPACEDIR=../../../$(USPACEDIR)
     -rm -f $(BASE)/image.boot

/branches/network/boot/arch/arm32/loader/boot.S
53,5 → 53,3
# make place for PTL0 page table
page_table:
.skip PTL0_ENTRIES * PTL0_ENTRY_SIZE

 /branches/network/boot/arch/arm32/loader/main.c
 ,13 → 32,16
  */
 /** @file
  *  @brief Bootstrap.
- */
+ */
-#include "main.h"
+#include "main.h"
 #include "asm.h"
 #include "_components.h"
 #include <printf.h>
+#include <align.h>
+#include <macros.h>
+#include <string.h>
 #include "mm.h"
 ,16 → 49,16
 #define KERNEL_VIRTUAL_ADDRESS 0x80200000
-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
 ,6 → 104,8
         if (i > 0) {
             bootinfo.tasks[bootinfo.cnt].addr = ((void *) KERNEL_VIRTUAL_ADDRESS) + top;
             bootinfo.tasks[bootinfo.cnt].size = components[i].size;
+            strncpy(bootinfo.tasks[bootinfo.cnt].name,
+                components[i].name, BOOTINFO_TASK_NAME_BUFLEN);
             bootinfo.cnt++;
         }
         top += components[i].size;
 ,7 → 113,7
     }
     printf("\nBooting the kernel...\n");
-    jump_to_kernel((void *) KERNEL_VIRTUAL_ADDRESS, &bootinfo, sizeof(bootinfo));
+    jump_to_kernel((void *) KERNEL_VIRTUAL_ADDRESS, &bootinfo);
 }
 /** @}

 /branches/network/boot/arch/arm32/loader/asm.h
 ,7 → 32,7
  */
 /** @file
  *  @brief Functions implemented in assembly.
- */
+ */
 #ifndef BOOT_arm32_ASM_H
 ,10 → 40,10
 /** Copies cnt bytes from dst to src.
- *
+ *
  * @param dst Destination address.
  * @param src Source address.
- * @param cnt Count of bytes to be copied.
+ * @param cnt Count of bytes to be copied.
  */
 #define memcpy(dst, src, cnt) __builtin_memcpy((dst), (src), (cnt))
 ,12 → 58,11
 /** Jumps to the kernel entry point.
  *
- * @param entry          Kernel entry point address.
- * @param bootinfo       Structure holding information about loaded tasks.
- * @param bootinfo_size  Size of the bootinfo structure.
+ * @param entry    Kernel entry point address.
+ * @param bootinfo Structure holding information about loaded tasks.
+ *
  */
-extern void jump_to_kernel(void *entry, void *bootinfo,
-    unsigned int bootinfo_size) __attribute__((noreturn));
+extern void jump_to_kernel(void *entry, void *bootinfo) __attribute__((noreturn));
 #endif

 /branches/network/boot/arch/arm32/loader/main.h
 ,7 → 32,7
  */
 /** @file
  *  @brief Boot related declarations.
- */
+ */
 #ifndef BOOT_arm32_MAIN_H
 ,17 → 39,13
 #define BOOT_arm32_MAIN_H
-/** Aligns to the nearest higher address.
- *
- * @param addr  Address or number to be aligned.
- * @param align Size of alignment, must be power of 2.
- */
-#define ALIGN_UP(addr, align) (((addr) + ((align) - 1)) & ~((align) - 1))
 /** Maximum number of tasks in the #bootinfo_t struct. */
 #define TASKMAP_MAX_RECORDS 32
+/** Size of buffer for storing task name in task_t. */
+#define BOOTINFO_TASK_NAME_BUFLEN 32
 /** Struct holding information about single loaded task. */
 typedef struct {
     /** Address where the task was placed. */
 ,6 → 52,8
     void *addr;
     /** Size of the task's binary. */
     unsigned int size;
+    /** Task name. */
+    char name[BOOTINFO_TASK_NAME_BUFLEN];
 } task_t;
 ,4 → 72,3
 /** @}
  */

 /branches/network/boot/arch/arm32/loader/Makefile
 ,7 → 27,7
 #
 include ../../../../version
-include ../../../Makefile.config
+-include ../../../../Makefile.config
 ## Toolchain configuration
 #
 ,20 → 57,8
     OBJDUMP = $(TOOLCHAIN_DIR)/$(TARGET)-objdump
 endif
-CFLAGS = -DRELEASE=\"$(RELEASE)\" -I. -I../../../generic -I../../.. -nostdinc -nostdlib -fno-builtin -Werror-implicit-function-declaration -Wmissing-prototypes -Werror -O3
+CFLAGS = -DRELEASE=$(RELEASE) -I. -I../../../generic -I../../.. -imacros ../../../../config.h -nostdinc -nostdlib -fno-builtin -Werror-implicit-function-declaration -Wmissing-prototypes -Werror -O3 -pipe
-ifdef REVISION
-    CFLAGS += "-DREVISION=\"$(REVISION)\""
-endif
-ifdef TIMESTAMP
-    CFLAGS += "-DTIMESTAMP=\"$(TIMESTAMP)\""
-endif
-ifdef MACHINE
-    CFLAGS += "-DMACHINE=$(MACHINE)"
-endif
 SOURCES = \
     main.c \
     boot.S \
 ,6 → 67,7
     print/gxemul.c \
     _components.c \
     ../../../generic/printf.c \
+    ../../../generic/string.c \
     ../../../genarch/division.c
 COMPONENTS = \
 ,14 → 85,17
     COMPONENTS += $(USPACEDIR)/srv/fs/fat/fat
 endif
-RD_TASKS = \
+RD_SRVS = \
     $(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/fat/fat
+RD_APPS = \
     $(USPACEDIR)/app/tetris/tetris \
     $(USPACEDIR)/app/tester/tester \
+    $(USPACEDIR)/app/trace/trace \
     $(USPACEDIR)/app/klog/klog \
     $(USPACEDIR)/app/bdsh/bdsh
 ,23 → 112,29
     $(LD) -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:
-    -for task in $(RD_TASKS) ; do \
-        rm -f $(USPACEDIR)/dist/sbin/`basename $$task` ; \
+    -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) initrd.img image.boot Makefile.depend
-_components.h _components.c _link.ld $(COMPONENT_OBJECTS) initrd.o: $(COMPONENTS) _link.ld.in
-    for task in $(RD_TASKS) ; do \
-        cp $$task $(USPACEDIR)/dist/sbin/ ; \
+_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.sh $(USPACEDIR)/dist/ initrd.fs
+    ../../../../tools/mkfat.py $(USPACEDIR)/dist/ initrd.fs
 endif
     ../../../../tools/mkhord.py 4096 initrd.fs initrd.img
     rm initrd.fs

Subversion Repositories HelenOS

Compare Revisions

Ignore whitespace Rev 4152 → Rev 4153