Changeset 4646710 in mainline for boot/arch/arm32/src/main.c
- Timestamp:
- 2017-06-07T15:39:23Z (7 years ago)
- Branches:
- lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
- Children:
- 239e32b8
- Parents:
- 22299ed
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
boot/arch/arm32/src/main.c
r22299ed r4646710 37 37 #include <arch/asm.h> 38 38 #include <arch/mm.h> 39 #include <arch/_components.h>40 39 #include <halt.h> 41 40 #include <printf.h> … … 49 48 #include <inflate.h> 50 49 #include <arch/cp15.h> 50 #include "../../components.h" 51 51 52 52 #define TOP2ADDR(top) (((void *) PA2KA(BOOT_OFFSET)) + (top)) … … 99 99 100 100 for (size_t i = 0; i < COMPONENTS; i++) { 101 printf(" %p|%p: %s image (%u/%u bytes)\n", components[i]. start,102 components[i]. start, components[i].name, components[i].inflated,101 printf(" %p|%p: %s image (%u/%u bytes)\n", components[i].addr, 102 components[i].addr, components[i].name, components[i].inflated, 103 103 components[i].size); 104 104 } … … 129 129 130 130 for (size_t i = cnt; i > 0; i--) { 131 void *tail = components[i - 1]. start+ components[i - 1].size;131 void *tail = components[i - 1].addr + components[i - 1].size; 132 132 if (tail >= dest[i - 1]) { 133 133 printf("\n%s: Image too large to fit (%p >= %p), halting.\n", … … 138 138 printf("%s ", components[i - 1].name); 139 139 140 int err = inflate(components[i - 1]. start, components[i - 1].size,140 int err = inflate(components[i - 1].addr, components[i - 1].size, 141 141 dest[i - 1], components[i - 1].inflated); 142 142 if (err != EOK) {
Note:
See TracChangeset
for help on using the changeset viewer.