Changeset b800b0e in mainline for boot/arch/ppc32/src/main.c

Timestamp:

2012-10-23T13:16:49Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

6ecf5b8

Parents:

32b3a12 (diff), b2ac3998 (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 changes

File:

• boot/arch/ppc32/src/main.c (modified) (1 diff)

boot/arch/ppc32/src/main.c

@@ -103 +103 @@
         }
         
+        if (top >= (size_t) loader_address_pa) {
+                printf("Inflated components overlap loader area.\n");
+                printf("The boot image is too large. Halting.\n");
+                halt();
+        }
+        
         void *balloc_base;
         void *balloc_base_pa;