Changeset 6ac14a70 in mainline for boot/arch

Timestamp:

2009-07-28T12:47:31Z (16 years ago)

Author:

Vineeth Pillai <vineethrp@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

5e73815

Parents:

7038f55

Message:

ARM port for development board integratorcp(ARM926EJ core module).

Location:

boot/arch/arm32

Files:

• Makefile.inc (modified) (1 diff)
• loader/Makefile (modified) (4 diffs)
• loader/_link.ld.in (modified) (1 diff)
• loader/boot.S (modified) (2 diffs)
• loader/main.c (modified) (3 diffs)
• loader/print/print.c (moved) (moved from boot/arch/arm32/loader/print/gxemul.c ) (4 diffs)

boot/arch/arm32/Makefile.inc

@@ -36 +36 @@
 
 arch/$(BARCH)/loader/image.boot:
-        make -C arch/$(BARCH)/loader COMPILER=$(COMPILER) KERNELDIR=../../../$(KERNELDIR) USPACEDIR=../../../$(USPACEDIR)
+        make -C arch/$(BARCH)/loader COMPILER=$(COMPILER) KERNELDIR=../../../$(KERNELDIR) USPACEDIR=../../../$(USPACEDIR) MACHINE=$(MACHINE)
 
 clean:

boot/arch/arm32/loader/Makefile

@@ -42 +42 @@
 TOOLCHAIN_DIR = $(CROSS_PREFIX)/arm/bin
 
+ifeq ($(MACHINE), testarm)
+        DMACHINE = MACHINE_GXEMUL_TESTARM
+endif
+
+ifeq ($(MACHINE), integratorcp)
+        DMACHINE = MACHINE_ICP
+endif
+
+
 ifeq ($(COMPILER),gcc_native)
         CC = gcc
@@ -65 +74 @@
         asm.S \
         mm.c \
-        print/gxemul.c \
+        print/print.c \
         _components.c \
         ../../../generic/printf.c \
@@ -93 +102 @@
         $(USPACEDIR)/srv/fs/tmpfs/tmpfs \
         $(USPACEDIR)/srv/fs/fat/fat \
-        $(USPACEDIR)/srv/bd/file_bd/file_bd \
-        $(USPACEDIR)/srv/bd/gxe_bd/gxe_bd
+        $(USPACEDIR)/srv/bd/file_bd/file_bd
+ifeq ($(MACHINE), testarm)
+        RD_SRVS += \
+                $(USPACEDIR)/srv/bd/gxe_bd/gxe_bd
+endif
 
 RD_APPS = \
@@ -149 +161 @@
 
 %.o: %.c
-        $(CC) $(DEFS) $(CFLAGS) -c $< -o $@
+        $(CC) -D$(DMACHINE) $(DEFS) $(CFLAGS) -c $< -o $@

boot/arch/arm32/loader/_link.ld.in

@@ -18 +18 @@
                 *(.reginfo);
 
+                . = 0x2000;
+                *(ST);                  /* bootloader stack section */
+
                 . = 0x4000;
                 *(PT);                  /* page table placed at 0x4000 */

boot/arch/arm32/loader/boot.S

@@ -35 +35 @@
 .global jump_to_kernel
 .global page_table
+.global boot_stack
 
 start:
+        ldr sp, =boot_stack
         b bootstrap
 
@@ -47 +49 @@
         bx r0
 
+#bootloader stack
+.section ST
+        .space 4096
+boot_stack:
 
 # place page_table to PT section

boot/arch/arm32/loader/main.c

@@ -68 +68 @@
 static void version_print(void)
 {
-        printf("HelenOS ARM32 Bootloader\nRelease %s%s%s\nCopyright (c) 2007 HelenOS project\n", 
+        printf("HelenOS ARM32 Bootloader\nRelease %s%s%s\nCopyright (c) 2009 HelenOS project\n", 
                 release, revision, timestamp);
 }
@@ -92 +92 @@
         unsigned int i, j;
         for (i = 0; i < COMPONENTS; i++) {
-                printf(" %L: %s image (size %d bytes)\n", 
-                    components[i].start, components[i].name, components[i].size);
                 top = ALIGN_UP(top, KERNEL_PAGE_SIZE);
                 if (i > 0) {
@@ -107 +105 @@
 
         printf("\nCopying components\n");
-
+        printf("Component\tAddress\t\tSize (Bytes)\n");
+        printf("============================================\n");
         for (i = COMPONENTS - 1; i > 0; i--, j--) {
-                printf(" %s...", components[i].name);
+                printf("%s\t\t0x%x\t%d\n", components[i].name, bootinfo.tasks[j].addr, components[i].size);
                 memcpy((void *)bootinfo.tasks[j].addr, components[i].start,
                     components[i].size);
-                printf("done.\n");
         }
-        
-        printf("\nCopying kernel...");
+        printf("KERNEL\t\t0x%x\t%d\n", KERNEL_VIRTUAL_ADDRESS, components[0].size);
+
         memcpy((void *)KERNEL_VIRTUAL_ADDRESS, components[0].start,
             components[0].size);
-        printf("done.\n");
 
         printf("\nBooting the kernel...\n");

boot/arch/arm32/loader/print/print.c

@@ -1 +1 @@
 /*
  * Copyright (c) 2007 Michal Kebrt
+ * Copyright (c) 2009 Vineeth Pillai
  * All rights reserved.
  *
@@ -32 +33 @@
  */
 /** @file
- *  @brief GXemul specific code.
+ *  @brief bootloader output logic
  */ 
 
@@ -40 +41 @@
 
 /** Address where characters to be printed are expected. */
+#ifdef MACHINE_GXEMUL_TESTARM
 #define PUTC_ADDRESS    0x10000000
+#endif
+#ifdef MACHINE_ICP
+#define  PUTC_ADDRESS    0x16000000
+#endif
+
 
 
@@ -49 +56 @@
 static void putc(char ch)
 {
+        if (ch == '\n')
+                *((volatile char *) PUTC_ADDRESS) = '\r';
         *((volatile char *) PUTC_ADDRESS) = ch;
 }