summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYork Sun <yorksun@freescale.com>2010-09-28 15:20:32 -0700
committerKumar Gala <galak@kernel.crashing.org>2010-10-20 02:28:00 -0500
commitc02ce6e5a1bc65831c8f638268defa9c6ae70bf1 (patch)
treea186313138826e21e0578da84c84e4d50b805953
parent43b08af53e12fd96bd818f9a5f8471a264496f07 (diff)
downloadtalos-obmc-uboot-c02ce6e5a1bc65831c8f638268defa9c6ae70bf1.tar.gz
talos-obmc-uboot-c02ce6e5a1bc65831c8f638268defa9c6ae70bf1.zip
Adding more control to physical address mapping
A worker function setup_ddr_tlbs_phys() is introduced to implement more control on physical address mapping. Signed-off-by: York Sun <yorksun@freescale.com> Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
-rw-r--r--arch/powerpc/cpu/mpc85xx/tlb.c16
1 files changed, 10 insertions, 6 deletions
diff --git a/arch/powerpc/cpu/mpc85xx/tlb.c b/arch/powerpc/cpu/mpc85xx/tlb.c
index f2833a5df7..e3a71aec5c 100644
--- a/arch/powerpc/cpu/mpc85xx/tlb.c
+++ b/arch/powerpc/cpu/mpc85xx/tlb.c
@@ -245,7 +245,8 @@ void init_addr_map(void)
}
#endif
-unsigned int setup_ddr_tlbs(unsigned int memsize_in_meg)
+unsigned int
+setup_ddr_tlbs_phys(phys_addr_t p_addr, unsigned int memsize_in_meg)
{
int i;
unsigned int tlb_size;
@@ -275,21 +276,24 @@ unsigned int setup_ddr_tlbs(unsigned int memsize_in_meg)
tlb_size = (camsize - 10) / 2;
- set_tlb(1, ram_tlb_address, ram_tlb_address,
+ set_tlb(1, ram_tlb_address, p_addr,
MAS3_SX|MAS3_SW|MAS3_SR, 0,
0, ram_tlb_index, tlb_size, 1);
size -= 1ULL << camsize;
memsize -= 1ULL << camsize;
ram_tlb_address += 1UL << camsize;
+ p_addr += 1UL << camsize;
}
if (memsize)
print_size(memsize, " left unmapped\n");
-
- /*
- * Confirm that the requested amount of memory was mapped.
- */
return memsize_in_meg;
}
+
+unsigned int setup_ddr_tlbs(unsigned int memsize_in_meg)
+{
+ return
+ setup_ddr_tlbs_phys(CONFIG_SYS_DDR_SDRAM_BASE, memsize_in_meg);
+}
#endif /* !CONFIG_NAND_SPL */
OpenPOWER on IntegriCloud