Changeset 25eec4e in mainline for boot/arch/mips32/src/main.c

Timestamp:

2013-04-19T18:38:18Z (12 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

6d717a4

Parents:

a1e2df13 (diff), 289cb7dd (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:

Merge mainline chages.

File:

• boot/arch/mips32/src/main.c (modified) (3 diffs)

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);