From cfa8174fe42177d1653ca15ea22a1fa4c1679e72 Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Mon, 25 Aug 2014 15:27:58 -0600 Subject: [PATCH] Bugfixes.. still integrating SAMA5 ELF with address environment --- arch/arm/src/armv7-a/arm_addrenv.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/arm/src/armv7-a/arm_addrenv.c b/arch/arm/src/armv7-a/arm_addrenv.c index 25e3d88f224..cd03bddce50 100644 --- a/arch/arm/src/armv7-a/arm_addrenv.c +++ b/arch/arm/src/armv7-a/arm_addrenv.c @@ -213,7 +213,7 @@ int up_addrenv_create(size_t textsize, size_t datasize, { /* Allocate one physical page */ - paddr = mm_pgalloc(ARCH_SECT2PG(1)); + paddr = mm_pgalloc(1); if (!paddr) { ret = -ENOMEM; @@ -226,7 +226,7 @@ int up_addrenv_create(size_t textsize, size_t datasize, /* Temporarily map the page into the virtual address space */ flags = irqsave(); - l1save = mmu_l1_getentry(vaddr); + l1save = mmu_l1_getentry(ARCH_SCRATCH_VBASE); set_l1_entry(ARCH_SCRATCH_VBASE, paddr); l2table = (FAR uint32_t *)ARCH_SCRATCH_VBASE; @@ -256,7 +256,7 @@ int up_addrenv_create(size_t textsize, size_t datasize, { /* Allocate one physical page */ - paddr = mm_pgalloc(ARCH_SECT2PG(1)); + paddr = mm_pgalloc(1); if (!paddr) { ret = -ENOMEM; @@ -269,7 +269,7 @@ int up_addrenv_create(size_t textsize, size_t datasize, /* Temporarily map the page into the virtual address space */ flags = irqsave(); - l1save = mmu_l1_getentry(vaddr); + l1save = mmu_l1_getentry(ARCH_SCRATCH_VBASE); set_l1_entry(ARCH_SCRATCH_VBASE, paddr); l2table = (FAR uint32_t *)ARCH_SCRATCH_VBASE;