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

Timestamp:

2013-07-11T08:21:10Z (13 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

64e63ce1

Parents:

80445cf (diff), c8bb1633 (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;