From 77c2cf2aa81e45906d9853f881506057b055e7c1 Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Mon, 16 Dec 2013 13:48:20 -0600 Subject: [PATCH] Cosmetic changes to comments and README files --- arch/arm/src/a1x/a1x_boot.c | 4 +++- arch/arm/src/armv7-a/arm_head.S | 2 +- arch/arm/src/armv7-a/arm_mmu.c | 4 ++-- arch/arm/src/sama5/sam_boot.c | 6 +++++- 4 files changed, 11 insertions(+), 5 deletions(-) diff --git a/arch/arm/src/a1x/a1x_boot.c b/arch/arm/src/a1x/a1x_boot.c index 203de866f8..8b0cf23c1a 100644 --- a/arch/arm/src/a1x/a1x_boot.c +++ b/arch/arm/src/a1x/a1x_boot.c @@ -139,6 +139,8 @@ static inline void a1x_setupmappings(void) { int i; + /* Set up each group of section mappings */ + for (i = 0; i < NMAPPINGS; i++) { mmu_l1_map_region(§ion_mapping[i]); @@ -162,7 +164,7 @@ static void a1x_vectorpermissions(uint32_t mmuflags) uint32_t pte = mmu_l2_getentry(PG_L2_VECT_VADDR, 0); - /* String the MMU flags from the page table entry. + /* Mask out the old MMU flags from the page table entry. * * The pte might be zero the first time this function is called. */ diff --git a/arch/arm/src/armv7-a/arm_head.S b/arch/arm/src/armv7-a/arm_head.S index a049f1c017..25ccb38bcc 100644 --- a/arch/arm/src/armv7-a/arm_head.S +++ b/arch/arm/src/armv7-a/arm_head.S @@ -225,7 +225,7 @@ __start: * mapped RAM in either case. So we will need to create a special * mapping for the page table. * - * Load informtion needed to map the page table. After the ldmia, we + * Load information needed to map the page table. After the ldmia, we * will have * * R1 = The aligned, physical base address of the page table diff --git a/arch/arm/src/armv7-a/arm_mmu.c b/arch/arm/src/armv7-a/arm_mmu.c index ee310c25e3..f82490caf8 100644 --- a/arch/arm/src/armv7-a/arm_mmu.c +++ b/arch/arm/src/armv7-a/arm_mmu.c @@ -165,7 +165,7 @@ void mmu_l1_map_region(const struct section_mapping_s *mapping) uint32_t mmuflags = mapping->mmuflags; int i; - /* Loop, writting each mapping into the L1 page table */ + /* Loop, writing each mapping into the L1 page table */ for (i = 0; i < mapping->nsections; i++) { @@ -194,7 +194,7 @@ void mmu_invalidate_region(uint32_t vstart, size_t size) uint32_t vaddr = vstart & 0xfffff000; uint32_t vend = vaddr + size; - /* Loop, writting each mapping into the L1 page table */ + /* Loop, writing each mapping into the L1 page table */ while (vaddr < vend) { diff --git a/arch/arm/src/sama5/sam_boot.c b/arch/arm/src/sama5/sam_boot.c index 2351e26daa..a2a7fc8628 100644 --- a/arch/arm/src/sama5/sam_boot.c +++ b/arch/arm/src/sama5/sam_boot.c @@ -321,6 +321,8 @@ static inline void sam_setupmappings(void) { int i; + /* Set up each group of section mappings */ + for (i = 0; i < NMAPPINGS; i++) { mmu_l1_map_region(§ion_mapping[i]); @@ -341,6 +343,8 @@ static inline void sam_remap(void) { int i; + /* Re-map each group of section */ + for (i = 0; i < NREMAPPINGS; i++) { mmu_l1_map_region(&operational_mapping[i]); @@ -364,7 +368,7 @@ static void sam_vectorpermissions(uint32_t mmuflags) uint32_t pte = mmu_l2_getentry(PG_L2_VECT_VADDR, 0); - /* String the MMU flags from the page table entry. + /* Mask out the old MMU flags from the page table entry. * * The pte might be zero the first time this function is called. */