Merge branch 'master-sync' of git://git.denx.de/u-boot-arm

[u-boot] / cpu / mpc85xx / tlb.c

diff --git a/cpu/mpc85xx/tlb.c b/cpu/mpc85xx/tlb.c
index 44e80b1b74544b3d4ee0d9feea0c0c30abe56f3a..6e94c237ad8b16db1b82f22a052f81107699696d 100644 (file)
--- a/cpu/mpc85xx/tlb.c
+++ b/cpu/mpc85xx/tlb.c
@@ -55,6 +55,7 @@ void init_tlbs(void)
        return ;
 }
 
+#ifndef CONFIG_NAND_SPL
 void set_tlb(u8 tlb, u32 epn, u64 rpn,
             u8 perms, u8 wimge,
             u8 ts, u8 esel, u8 tsize, u8 iprot)
@@ -209,3 +210,4 @@ unsigned int setup_ddr_tlbs(unsigned int memsize_in_meg)
         */
        return memsize_in_meg;
 }
+#endif /* !CONFIG_NAND_SPL */