Changeset dcc2c5d in mainline for boot/arch

Timestamp:

2018-10-12T17:44:35Z (7 years ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Branches:

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

Children:

68a0d60

Parents:

d4eba6d

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2018-10-12 17:38:51)

git-committer:

Jiří Zárevúcky <zarevucky.jiri@…> (2018-10-12 17:44:35)

Message:

Make bootimage compression optional

Fixes issue #411

Location:

boot/arch

Files:

• ppc32/src/main.c (modified) (3 diffs)
• sparc64/src/main.c (modified) (1 diff)

boot/arch/ppc32/src/main.c

@@ -73 +73 @@
             (void *) LOADER_ADDRESS, loader_address_pa);
 
-        size_t uncompressed_size = payload_uncompressed_size();
-        printf("Payload uncompressed size: %d bytes\n", uncompressed_size);
+        size_t unpacked_size = payload_unpacked_size();
+        printf("Payload uncompressed size: %d bytes\n", unpacked_size);
 
-        if (uncompressed_size >= (size_t) loader_address_pa) {
+        if (unpacked_size >= (size_t) loader_address_pa) {
                 printf("Inflated components overlap loader area.\n");
                 printf("The boot image is too large. Halting.\n");
@@ -91 +91 @@
         void *inflate_base_pa;
         ofw_alloc("inflate area", &inflate_base, &inflate_base_pa,
-            uncompressed_size, loader_address_pa);
+            unpacked_size, loader_address_pa);
         printf(" %p|%p: inflate area\n", inflate_base, inflate_base_pa);
 
-        uintptr_t balloc_start = ALIGN_UP(uncompressed_size, PAGE_SIZE);
+        uintptr_t balloc_start = ALIGN_UP(unpacked_size, PAGE_SIZE);
         size_t pages = (balloc_start + ALIGN_UP(BALLOC_MAX_SIZE, PAGE_SIZE)) >>
             PAGE_WIDTH;
@@ -109 +109 @@
         /* Inflate components. */
         extract_payload(&bootinfo.taskmap, inflate_base,
-            inflate_base + uncompressed_size, PA2KA(0), NULL);
+            inflate_base + unpacked_size, PA2KA(0), NULL);
 
         printf("Setting up boot allocator ...\n");

boot/arch/sparc64/src/main.c

@@ -225 +225 @@
          */
 
-        size_t sz = ALIGN_UP(payload_uncompressed_size(), PAGE_SIZE);
+        size_t sz = ALIGN_UP(payload_unpacked_size(), PAGE_SIZE);
         ofw_claim_phys((void *) (bootinfo.physmem_start + KERNEL_ADDRESS), sz);
         ofw_map((void *) (bootinfo.physmem_start + KERNEL_ADDRESS),