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

Timestamp:

2013-02-09T23:14:45Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

22dfd38

Parents:

b5d2e57 (diff), 005b765 (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.

Conflict resulting from bool.h → stdbool.h move and ddf structs turning opaque.
Fails to boot to shell console.

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;