Changeset a35b458 in mainline for boot/arch/arm32/src


Ignore:
Timestamp:
2018-03-02T20:10:49Z (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:
f1380b7
Parents:
3061bc1
git-author:
Jiří Zárevúcky <zarevucky.jiri@…> (2018-02-28 17:38:31)
git-committer:
Jiří Zárevúcky <zarevucky.jiri@…> (2018-03-02 20:10:49)
Message:

style: Remove trailing whitespace on _all_ lines, including empty ones, for particular file types.

Command used: tools/srepl '\s\+$' '' -- *.c *.h *.py *.sh *.s *.S *.ag

Currently, whitespace on empty lines is very inconsistent.
There are two basic choices: Either remove the whitespace, or keep empty lines
indented to the level of surrounding code. The former is AFAICT more common,
and also much easier to do automatically.

Alternatively, we could write script for automatic indentation, and use that
instead. However, if such a script exists, it's possible to use the indented
style locally, by having the editor apply relevant conversions on load/save,
without affecting remote repository. IMO, it makes more sense to adopt
the simpler rule.

Location:
boot/arch/arm32/src
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • boot/arch/arm32/src/asm.S

    r3061bc1 ra35b458  
    6767#ifndef PROCESSOR_ARCH_armv7_a
    6868        mrc     p15, 0, r4, c1, c0, 0
    69        
     69
    7070        # Disable D-cache before the kernel is started.
    7171        bic     r4, r4, #(1 << CP15_C1_DC)
    … …  
    7676        bic     r4, r4, #(1 << CP15_C1_BP)
    7777#endif
    78        
     78
    7979        mcr     p15, 0, r4, c1, c0, 0
    8080#endif
    81        
     81
    8282        # Wait for the operations to complete
    8383#ifdef PROCESSOR_ARCH_armv7_a
    … …  
    8888        mcr p15, 0, r4, c7, c10, 4
    8989#endif
    90        
     90
    9191        # Clean ICache and BPredictors, r4 ignored (SBZ)
    9292        mov r4, #0

  • boot/arch/arm32/src/main.c

    r3061bc1 ra35b458  
    8989        mmu_start();
    9090        version_print();
    91        
     91
    9292        printf("Boot data: %p -> %p\n", &bdata_start, &bdata_end);
    9393        printf("\nMemory statistics\n");
    … …  
    9797        printf(" %p|%p: kernel entry point\n",
    9898            (void *) PA2KA(BOOT_OFFSET), (void *) BOOT_OFFSET);
    99        
     99
    100100        for (size_t i = 0; i < COMPONENTS; i++) {
    101101                printf(" %p|%p: %s image (%u/%u bytes)\n", components[i].addr,
    … …  
    103103                    components[i].size);
    104104        }
    105        
     105
    106106        void *dest[COMPONENTS];
    107107        size_t top = 0;
    … …  
    110110        for (size_t i = 0; i < min(COMPONENTS, TASKMAP_MAX_RECORDS); i++) {
    111111                top = ALIGN_UP(top, PAGE_SIZE);
    112                
     112
    113113                if (i > 0) {
    114114                        bootinfo.tasks[bootinfo.cnt].addr = TOP2ADDR(top);
    115115                        bootinfo.tasks[bootinfo.cnt].size = components[i].inflated;
    116                        
     116
    117117                        str_cpy(bootinfo.tasks[bootinfo.cnt].name,
    118118                            BOOTINFO_TASK_NAME_BUFLEN, components[i].name);
    119                        
     119
    120120                        bootinfo.cnt++;
    121121                }
    122                
     122
    123123                dest[i] = TOP2ADDR(top);
    124124                top += components[i].inflated;
    125125                cnt++;
    126126        }
    127        
     127
    128128        printf("\nInflating components ... ");
    129        
     129
    130130        for (size_t i = cnt; i > 0; i--) {
    131131                void *tail = components[i - 1].addr + components[i - 1].size;
    … …  
    135135                        halt();
    136136                }
    137                
     137
    138138                printf("%s ", components[i - 1].name);
    139                
     139
    140140                int err = inflate(components[i - 1].addr, components[i - 1].size,
    141141                    dest[i - 1], components[i - 1].inflated);
    … …  
    147147                clean_dcache_poc(dest[i - 1], components[i - 1].inflated);
    148148        }
    149        
     149
    150150        printf(".\n");
    151151
    152152        /* Flush PT too. We need this if we disable caches later */
    153153        clean_dcache_poc(boot_pt, PTL0_ENTRIES * PTL0_ENTRY_SIZE);
    154        
     154
    155155        printf("Booting the kernel...\n");
    156156        jump_to_kernel((void *) PA2KA(BOOT_OFFSET), &bootinfo);

  • boot/arch/arm32/src/mm.c

    r3061bc1 ra35b458  
    209209                /* Current settings */
    210210                "mrc p15, 0, r0, c1, c0, 0\n"
    211                
     211
    212212                /* Enable ICache, DCache, BPredictors and MMU,
    213213                 * we disable caches before jumping to kernel
    … …  
    221221                "ldr r1, =0x00001805\n"
    222222#endif
    223                
     223
    224224                "orr r0, r0, r1\n"
    225225
    … …  
    228228                 */
    229229                "mcr p15, 0, r0, c8, c7, 0\n"
    230                
     230
    231231                /* Store settings, enable the MMU */
    232232                "mcr p15, 0, r0, c1, c0, 0\n"
Note: See TracChangeset for help on using the changeset viewer.