Changeset 85f2064 in mainline for boot/arch

Timestamp:

2012-04-12T14:21:46Z (14 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

bb8f69d

Parents:

751cabc (diff), d11a181 (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

Location:

boot/arch

Files:

• arm32/Makefile.inc (modified) (2 diffs)
• arm32/src/asm.S (modified) (1 diff)
• arm32/src/eabi.S (added)
• ia64/src/main.c (modified) (1 diff)

boot/arch/arm32/Makefile.inc

@@ -39 +39 @@
 BITS = 32
 ENDIANESS = LE
+EXTRA_CFLAGS = -march=armv4
 
 RD_SRVS_ESSENTIAL += \
@@ -49 +50 @@
 SOURCES = \
         arch/$(BARCH)/src/asm.S \
+        arch/$(BARCH)/src/eabi.S \
         arch/$(BARCH)/src/main.c \
         arch/$(BARCH)/src/mm.c \

boot/arch/arm32/src/asm.S

@@ -60 +60 @@
         # before passing control to the copied code.
         #
-        bx r0
+        mov pc, r0

boot/arch/ia64/src/main.c

@@ -189 +189 @@
         printf("\nInflating components ... ");
         
+        /*
+         * We will use the next available address for a copy of each component to
+         * make sure that inflate() works with disjunctive memory regions.
+         */
+        top = ALIGN_UP(top, PAGE_SIZE);
+
         for (i = cnt; i > 0; i--) {
                 printf("%s ", components[i - 1].name);
                 
-                int err = inflate(components[i - 1].start, components[i - 1].size,
+                /*
+                 * Copy the component to a location which is guaranteed not to
+                 * overlap with the destination for inflate().
+                 */
+                memmove((void *) top, components[i - 1].start, components[i - 1].size);
+                
+                int err = inflate((void *) top, components[i - 1].size,
                     dest[i - 1], components[i - 1].inflated);