Changeset c6a7b3a in mainline for boot

Timestamp:

2013-03-28T20:39:16Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

2d1fdcad

Parents:

cc3c27ad (diff), 5d9fce4 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

mainline changes

Location:

boot

Files:

• arch/mips32/Makefile.inc (modified) (1 diff)
• arch/mips32/_link.ld.in (modified) (1 diff)
• arch/mips32/include/arch.h (modified) (2 diffs)
• arch/mips32/include/types.h (modified) (1 diff)
• arch/mips32/src/asm.S (modified) (1 diff)
• arch/mips32/src/main.c (modified) (3 diffs)
• arch/mips32/src/putchar.c (modified) (1 diff)
• generic/include/memstr.h (modified) (1 diff)
• generic/src/memstr.c (modified) (1 diff)

boot/arch/mips32/Makefile.inc

@@ -29 +29 @@
 BFD_ARCH = mips
 BITS = 32
-EXTRA_CFLAGS = -msoft-float -mno-abicalls -G 0 -fno-zero-initialized-in-bss -mips3 -mabi=32
+EXTRA_CFLAGS = -msoft-float -mno-abicalls -G 0 -fno-zero-initialized-in-bss -mabi=32
 
-RD_SRVS_NON_ESSENTIAL += \
-        $(USPACE_PATH)/srv/bd/gxe_bd/gxe_bd
-
-ifeq ($(MACHINE),lgxemul)
-        BFD_NAME = elf32-tradlittlemips
-        BFD_OUTPUT = ecoff-littlemips
-        ENDIANESS = LE
-endif
-ifeq ($(MACHINE),bgxemul)
-        BFD_NAME = elf32-tradbigmips
-        BFD_OUTPUT = ecoff-bigmips
-        ENDIANESS = BE
-endif
 ifeq ($(MACHINE),msim)
         BFD_NAME = elf32-tradlittlemips
         BFD_OUTPUT = binary
         ENDIANESS = LE
+        EXTRA_CFLAGS += -march=r4000
 endif
+ifeq ($(MACHINE),lmalta)
+        BFD_NAME = elf32-tradlittlemips
+        BFD_OUTPUT = elf32-tradlittlemips 
+        ENDIANESS = LE
+        EXTRA_CFLAGS += -march=4kc
+endif
+ifeq ($(MACHINE),bmalta)
+        BFD_NAME = elf32-tradbigmips
+        BFD_OUTPUT = elf32-tradbigmips 
+        ENDIANESS = BE
+        EXTRA_CFLAGS += -march=4kc
+endif
+
 
 SOURCES = \

boot/arch/mips32/_link.ld.in

@@ -2 +2 @@
 
 SECTIONS {
+#if defined(MACHINE_msim)
         . = 0xbfc00000;
+#elif defined(MACHINE_lmalta) || defined(MACHINE_bmalta)
+        . = 0x80103000;
+#endif
         .text : {
                 *(BOOTSTRAP);

boot/arch/mips32/include/arch.h

@@ -33 +33 @@
 #define PAGE_SIZE   (1 << PAGE_WIDTH)
 
+#if defined(MACHINE_msim)
 #define CPUMAP_OFFSET    0x00001000
 #define STACK_OFFSET     0x00002000
@@ -41 +42 @@
 #define MSIM_VIDEORAM_ADDRESS  0xb0000000
 #define MSIM_DORDER_ADDRESS    0xb0000100
+#endif
+
+#if defined(MACHINE_lmalta) || defined(MACHINE_bmalta)
+#define CPUMAP_OFFSET    0x00100000
+#define STACK_OFFSET     0x00101000
+#define BOOTINFO_OFFSET  0x00102000
+#define BOOT_OFFSET      0x00200000
+#define LOADER_OFFSET    0x00103000
+
+#define YAMON_SUBR_BASE         PA2KA(0x1fc00500)
+#define YAMON_SUBR_PRINT_COUNT  (YAMON_SUBR_BASE + 0x4)
+#endif
 
 #ifndef __ASM__
         #define PA2KA(addr)    (((uintptr_t) (addr)) + 0x80000000)
+        #define PA2KSEG(addr)  (((uintptr_t) (addr)) + 0xa0000000)
+        #define KA2PA(addr)    (((uintptr_t) (addr)) - 0x80000000)
         #define KSEG2PA(addr)  (((uintptr_t) (addr)) - 0xa0000000)
 #else

boot/arch/mips32/include/types.h

@@ -47 +47 @@
 
 typedef struct {
+#if defined(MACHINE_lmalta) || defined(MACHINE_bmalta)
+        uint32_t sdram_size;
+#endif
         uint32_t cpumap;
         size_t cnt;

boot/arch/mips32/src/asm.S

@@ -51 +51 @@
         and $a0, $a1, $a0
         mtc0 $a0, $status
+
+#if defined(MACHINE_lmalta) || defined(MACHINE_bmalta)
+        /*
+         * Remember the size of the SDRAM in bootinfo.
+         */
+        la $a0, PA2KA(BOOTINFO_OFFSET)
+        sw $a3, 0($a0)
+#endif
         
         /*

boot/arch/mips32/src/main.c

@@ -65 +65 @@
         for (i = 0; i < COMPONENTS; i++)
                 printf(" %p|%p: %s image (%zu/%zu bytes)\n", components[i].start,
-                    (void *) KSEG2PA(components[i].start), components[i].name,
-                    components[i].inflated, components[i].size);
+                    (uintptr_t) components[i].start >= PA2KSEG(0) ?
+                    (void *) KSEG2PA(components[i].start) :
+                    (void *) KA2PA(components[i].start),
+                    components[i].name, components[i].inflated,
+                    components[i].size);
         
         void *dest[COMPONENTS];
@@ -93 +96 @@
         
         for (i = cnt; i > 0; i--) {
+#ifdef MACHINE_msim
                 void *tail = dest[i - 1] + components[i].inflated;
                 if (tail >= ((void *) PA2KA(LOADER_OFFSET))) {
@@ -99 +103 @@
                         halt();
                 }
+#endif
                 
                 printf("%s ", components[i - 1].name);

boot/arch/mips32/src/putchar.c

@@ -32 +32 @@
 #include <str.h>
 
+#ifdef PUTCHAR_ADDRESS
+#undef PUTCHAR_ADDRESS
+#endif
+
+#if defined(MACHINE_msim)
+#define _putchar(ch)    msim_putchar((ch))
+static void msim_putchar(const wchar_t ch)
+{
+        *((char *) MSIM_VIDEORAM_ADDRESS) = ch;
+}
+#endif
+
+#if defined(MACHINE_lmalta) || defined(MACHINE_bmalta)
+#define _putchar(ch)    yamon_putchar((ch))
+typedef void (**yamon_print_count_ptr_t)(uint32_t, const char *, uint32_t);
+yamon_print_count_ptr_t yamon_print_count =
+    (yamon_print_count_ptr_t) YAMON_SUBR_PRINT_COUNT;
+
+static void yamon_putchar(const wchar_t wch)
+{
+        const char ch = (char) wch;
+
+        (*yamon_print_count)(0, &ch, 1);
+}
+#endif
+
 void putchar(const wchar_t ch)
 {
         if (ascii_check(ch))
-                *((char *) MSIM_VIDEORAM_ADDRESS) = ch;
+                _putchar(ch);
         else
-                *((char *) MSIM_VIDEORAM_ADDRESS) = U_SPECIAL;
+                _putchar(U_SPECIAL);
 }
+

boot/generic/include/memstr.h

@@ -36 +36 @@
 
 extern void *memcpy(void *, const void *, size_t);
+extern void *memset(void *, int, size_t);
 extern void *memmove(void *, const void *, size_t);
 

boot/generic/src/memstr.c

@@ -30 +30 @@
 #include <typedefs.h>
 
-/** Copy block of memory.
+/** Move memory block without overlapping.
  *
- * Copy cnt bytes from src address to dst address.The source and destination
- * memory areas cannot overlap.
+ * Copy cnt bytes from src address to dst address. The source
+ * and destination memory areas cannot overlap.
  *
- * @param src           Source address to copy from.
- * @param dst           Destination address to copy to.
- * @param cnt           Number of bytes to copy.
+ * @param dst Destination address to copy to.
+ * @param src Source address to copy from.
+ * @param cnt Number of bytes to copy.
  *
- * @return              Destination address.
+ * @return Destination address.
+ *
  */
 void *memcpy(void *dst, const void *src, size_t cnt)
 {
-        size_t i;
+        uint8_t *dp = (uint8_t *) dst;
+        const uint8_t *sp = (uint8_t *) src;
+        
+        while (cnt-- != 0)
+                *dp++ = *sp++;
+        
+        return dst;
+}
 
-        for (i = 0; i < cnt; i++)
-                ((uint8_t *) dst)[i] = ((uint8_t *) src)[i];
-
+/** Fill block of memory.
+ *
+ * Fill cnt bytes at dst address with the value val.
+ *
+ * @param dst Destination address to fill.
+ * @param val Value to fill.
+ * @param cnt Number of bytes to fill.
+ *
+ * @return Destination address.
+ *
+ */
+void *memset(void *dst, int val, size_t cnt)
+{
+        uint8_t *dp = (uint8_t *) dst;
+        
+        while (cnt-- != 0)
+                *dp++ = val;
+        
         return dst;
 }