Changeset 8565a42 in mainline for boot/arch/arm32/src

Timestamp:

2018-03-02T20:34:50Z (8 years ago)

Author:

GitHub <noreply@…>

Branches:

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

Children:

a1a81f69, d5e5fd1

Parents:

3061bc1 (diff), 34e1206 (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.

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2018-03-02 20:34:50)

git-committer:

GitHub <noreply@…> (2018-03-02 20:34:50)

Message:

Remove all trailing whitespace, everywhere.

See individual commit messages for details.

Location:

boot/arch/arm32/src

Files:

• asm.S (modified) (3 diffs)
• main.c (modified) (6 diffs)
• mm.c (modified) (3 diffs)

boot/arch/arm32/src/asm.S

@@ -67 +67 @@
 #ifndef PROCESSOR_ARCH_armv7_a
         mrc     p15, 0, r4, c1, c0, 0
-        
+
         # Disable D-cache before the kernel is started.
         bic     r4, r4, #(1 << CP15_C1_DC)
@@ -76 +76 @@
         bic     r4, r4, #(1 << CP15_C1_BP)
 #endif
-        
+
         mcr     p15, 0, r4, c1, c0, 0
 #endif
-        
+
         # Wait for the operations to complete
 #ifdef PROCESSOR_ARCH_armv7_a
@@ -88 +88 @@
         mcr p15, 0, r4, c7, c10, 4
 #endif
-        
+
         # Clean ICache and BPredictors, r4 ignored (SBZ)
         mov r4, #0

boot/arch/arm32/src/main.c

@@ -89 +89 @@
         mmu_start();
         version_print();
-        
+
         printf("Boot data: %p -> %p\n", &bdata_start, &bdata_end);
         printf("\nMemory statistics\n");
@@ -97 +97 @@
         printf(" %p|%p: kernel entry point\n",
             (void *) PA2KA(BOOT_OFFSET), (void *) BOOT_OFFSET);
-        
+
         for (size_t i = 0; i < COMPONENTS; i++) {
                 printf(" %p|%p: %s image (%u/%u bytes)\n", components[i].addr,
@@ -103 +103 @@
                     components[i].size);
         }
-        
+
         void *dest[COMPONENTS];
         size_t top = 0;
@@ -110 +110 @@
         for (size_t i = 0; i < min(COMPONENTS, TASKMAP_MAX_RECORDS); i++) {
                 top = ALIGN_UP(top, PAGE_SIZE);
-                
+
                 if (i > 0) {
                         bootinfo.tasks[bootinfo.cnt].addr = TOP2ADDR(top);
                         bootinfo.tasks[bootinfo.cnt].size = components[i].inflated;
-                        
+
                         str_cpy(bootinfo.tasks[bootinfo.cnt].name,
                             BOOTINFO_TASK_NAME_BUFLEN, components[i].name);
-                        
+
                         bootinfo.cnt++;
                 }
-                
+
                 dest[i] = TOP2ADDR(top);
                 top += components[i].inflated;
                 cnt++;
         }
-        
+
         printf("\nInflating components ... ");
-        
+
         for (size_t i = cnt; i > 0; i--) {
                 void *tail = components[i - 1].addr + components[i - 1].size;
@@ -135 +135 @@
                         halt();
                 }
-                
+
                 printf("%s ", components[i - 1].name);
-                
+
                 int err = inflate(components[i - 1].addr, components[i - 1].size,
                     dest[i - 1], components[i - 1].inflated);
@@ -147 +147 @@
                 clean_dcache_poc(dest[i - 1], components[i - 1].inflated);
         }
-        
+
         printf(".\n");
 
         /* Flush PT too. We need this if we disable caches later */
         clean_dcache_poc(boot_pt, PTL0_ENTRIES * PTL0_ENTRY_SIZE);
-        
+
         printf("Booting the kernel...\n");
         jump_to_kernel((void *) PA2KA(BOOT_OFFSET), &bootinfo);

boot/arch/arm32/src/mm.c

@@ -209 +209 @@
                 /* Current settings */
                 "mrc p15, 0, r0, c1, c0, 0\n"
-                
+
                 /* Enable ICache, DCache, BPredictors and MMU,
                  * we disable caches before jumping to kernel
@@ -221 +221 @@
                 "ldr r1, =0x00001805\n"
 #endif
-                
+
                 "orr r0, r0, r1\n"
 
@@ -228 +228 @@
                  */
                 "mcr p15, 0, r0, c8, c7, 0\n"
-                
+
                 /* Store settings, enable the MMU */
                 "mcr p15, 0, r0, c1, c0, 0\n"