Changeset 077b9172 in mainline for boot/arch/arm32/src/main.c

Timestamp:

2013-01-24T21:18:56Z (12 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

6968948

Parents:

b1011dae (diff), 0e63d34 (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 changes from jan.vesely/helenos/arm

File:

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

boot/arch/arm32/src/main.c

@@ -153 +153 @@
         printf(".\n");
         
-        void *kernel_end = (void *) PA2KA(BOOT_OFFSET + components[0].inflated);
         printf("Booting the kernel...\n");
         jump_to_kernel((void *) PA2KA(BOOT_OFFSET), &bootinfo);