Changeset 973ef9fc in mainline for boot/genarch/src/ofw.c

Timestamp:

2010-12-25T21:20:28Z (13 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

631ee0c

Parents:

1bfd3d3 (diff), 09178b7f (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.

File:

• boot/genarch/src/ofw.c (modified) (5 diffs)

boot/genarch/src/ofw.c

@@ -243 +243 @@
         void *addr = ofw_claim_virt_internal(virt, len, 0);
         if (addr != virt) {
-                printf("Error: Unable to claim virtual memory %p (size %u), halting.\n",
+                printf("Error: Unable to claim virtual memory %p (size %zu), halting.\n",
                     virt, len);
                 halt();
@@ -254 +254 @@
         
         if (addr == NULL) {
-                printf("Error: Unable to claim %u bytes in virtual memory, halting.\n",
+                printf("Error: Unable to claim %zu bytes in virtual memory, halting.\n",
                     len);
                 halt();
@@ -305 +305 @@
         void *addr = ofw_claim_phys_internal(phys, len, 0);
         if (addr != phys) {
-                printf("Error: Unable to claim physical memory %p (size %u), halting.\n",
+                printf("Error: Unable to claim physical memory %p (size %zu), halting.\n",
                     phys, len);
                 halt();
@@ -315 +315 @@
         void *addr = ofw_claim_phys_internal(NULL, len, alignment);
         if (addr == NULL) {
-                printf("Error: Unable to claim %u bytes in physical memory, halting.\n",
+                printf("Error: Unable to claim %zu bytes in physical memory, halting.\n",
                     len);
                 halt();
@@ -343 +343 @@
         
         if (ret != 0) {
-                printf("Error: Unable to map %p to %p (size %u), halting.\n",
+                printf("Error: Unable to map %p to %p (size %zu), halting.\n",
                     virt, phys, size);
                 halt();