git.openpandora.org
/
pandora-u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of git://git.denx.de/u-boot-nand-flash
[pandora-u-boot.git]
/
arch
/
powerpc
/
cpu
/
mpc85xx
/
tlb.c
diff --git
a/arch/powerpc/cpu/mpc85xx/tlb.c
b/arch/powerpc/cpu/mpc85xx/tlb.c
index
a548dec
..
f44fadc
100644
(file)
--- a/
arch/powerpc/cpu/mpc85xx/tlb.c
+++ b/
arch/powerpc/cpu/mpc85xx/tlb.c
@@
-55,7
+55,7
@@
void init_tlbs(void)
return ;
}
-#if
ndef CONFIG_NAND_SPL
+#if
!defined(CONFIG_NAND_SPL) && !defined(CONFIG_SPL_BUILD)
void read_tlbcam_entry(int idx, u32 *valid, u32 *tsize, unsigned long *epn,
phys_addr_t *rpn)
{
@@
-332,4
+332,4
@@
void clear_ddr_tlbs(unsigned int memsize_in_meg)
}
-#endif /*
!CONFIG_NAND_
SPL */
+#endif /*
not
SPL */