diff options
author | Tom Rini <trini@ti.com> | 2013-08-21 16:27:47 -0400 |
---|---|---|
committer | Tom Rini <trini@ti.com> | 2013-08-21 16:27:47 -0400 |
commit | 6612ab33956ae09c5ba2fde9c1540b519625ba37 (patch) | |
tree | b6da2e20793336cf0eed44292edb3b5e7ce88819 /arch/powerpc/cpu/mpc85xx/tlb.c | |
parent | 3fb858891273945ce2238e6d4dac3363a1fb0853 (diff) | |
parent | b6df9b01fb8c126b212aba92b6523407d3fa60a5 (diff) | |
download | blackbird-obmc-uboot-6612ab33956ae09c5ba2fde9c1540b519625ba37.tar.gz blackbird-obmc-uboot-6612ab33956ae09c5ba2fde9c1540b519625ba37.zip |
Merge branch 'master' of git://git.denx.de/u-boot-mpc85xx
Diffstat (limited to 'arch/powerpc/cpu/mpc85xx/tlb.c')
-rw-r--r-- | arch/powerpc/cpu/mpc85xx/tlb.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/powerpc/cpu/mpc85xx/tlb.c b/arch/powerpc/cpu/mpc85xx/tlb.c index da3c345d6f..8748ecd144 100644 --- a/arch/powerpc/cpu/mpc85xx/tlb.c +++ b/arch/powerpc/cpu/mpc85xx/tlb.c @@ -39,7 +39,8 @@ void init_tlbs(void) return ; } -#if !defined(CONFIG_NAND_SPL) && !defined(CONFIG_SPL_BUILD) +#if !defined(CONFIG_NAND_SPL) && \ + (!defined(CONFIG_SPL_BUILD) || !defined(CONFIG_SPL_INIT_MINIMAL)) void read_tlbcam_entry(int idx, u32 *valid, u32 *tsize, unsigned long *epn, phys_addr_t *rpn) { |