Changeset 295732b in mainline

Timestamp:

2012-12-06T00:06:29Z (11 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

bcad855

Parents:

232cd4f

Message:

Make the mips32 loader machine-neutral, not preferring msim.

• Allow load address it be in both KSEG0 and KSEG1

Location:

boot/arch/mips32

Files:

• _link.ld.in (modified) (1 diff)
• include/arch.h (modified) (1 diff)
• src/main.c (modified) (3 diffs)
• src/putchar.c (modified) (1 diff)

boot/arch/mips32/_link.ld.in

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

boot/arch/mips32/include/arch.h

@@ -37 +37 @@
 #define BOOTINFO_OFFSET  0x00003000
 #define BOOT_OFFSET      0x00100000
+
+#if defined(MACHINE_msim)
 #define LOADER_OFFSET    0x1fc00000
+#elif defined(MACHINE_lmalta) || defined(MACHINE_bmalta)
+#define LOADER_OFFSET    0x00004000
+#endif
 
+#if defined(MACHINE_msim)
 #define MSIM_VIDEORAM_ADDRESS  0xb0000000
 #define MSIM_DORDER_ADDRESS    0xb0000100
+#endif
+
+#if defined(MACHINE_lmalta) || defined(MACHINE_bmalta)
+#define MALTA_SERIAL     0xb80003f8
+#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/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_ADDRESS MSIM_VIDEORAM_ADDRESS
+#endif
+
+#if defined(MACHINE_lmalta) || defined(MACHINE_bmalta)
+#define PUTCHAR_ADDRESS MALTA_SERIAL
+#endif
+
 void putchar(const wchar_t ch)
 {
         if (ascii_check(ch))
-                *((char *) MSIM_VIDEORAM_ADDRESS) = ch;
+                *((char *) PUTCHAR_ADDRESS) = ch;
         else
-                *((char *) MSIM_VIDEORAM_ADDRESS) = U_SPECIAL;
+                *((char *) PUTCHAR_ADDRESS) = U_SPECIAL;
 }
+