Changeset 03362fbd in mainline for boot/arch/arm32/_link.ld.in

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/arm32/_link.ld.in (modified) (2 diffs)

boot/arch/arm32/_link.ld.in

@@ -11 +11 @@
         . = BOOT_BASE + 0x8000;
         .data : {
+                bdata_start = .;
                 *(BOOTPT);      /* bootstrap page table */
                 *(BOOTSTACK);   /* bootstrap stack */
@@ -24 +25 @@
 [[COMPONENTS]]
         }
-        
+        bdata_end = .;
+
         /DISCARD/ : {
                 *(.gnu.*);