diff options
| author | Tom Rini <trini@ti.com> | 2014-07-28 14:54:29 -0400 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2014-07-28 14:54:29 -0400 |
| commit | d5f8a6ddd41dee0de17888f8b5334fe1b636c4ca (patch) | |
| tree | 1df8ab92fd228598d5884db37cceddcb18a0c020 /board/freescale/c29xpcie | |
| parent | ee860c60d2c5283c009f7ea740c6ee706da87cb7 (diff) | |
| parent | fb5368789a45ca5ee4396cbbf563a8f16ab24f9c (diff) | |
| download | u-boot-imx-d5f8a6ddd41dee0de17888f8b5334fe1b636c4ca.zip u-boot-imx-d5f8a6ddd41dee0de17888f8b5334fe1b636c4ca.tar.gz u-boot-imx-d5f8a6ddd41dee0de17888f8b5334fe1b636c4ca.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-mpc85xx
Diffstat (limited to 'board/freescale/c29xpcie')
| -rw-r--r-- | board/freescale/c29xpcie/c29xpcie.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/board/freescale/c29xpcie/c29xpcie.c b/board/freescale/c29xpcie/c29xpcie.c index f964d61..534c6d1 100644 --- a/board/freescale/c29xpcie/c29xpcie.c +++ b/board/freescale/c29xpcie/c29xpcie.c @@ -49,7 +49,7 @@ int board_early_init_f(void) int board_early_init_r(void) { const unsigned long flashbase = CONFIG_SYS_FLASH_BASE; - const u8 flash_esel = find_tlb_idx((void *)flashbase, 1); + int flash_esel = find_tlb_idx((void *)flashbase, 1); /* * Remap Boot flash region to caching-inhibited @@ -60,8 +60,14 @@ int board_early_init_r(void) flush_dcache(); invalidate_icache(); - /* invalidate existing TLB entry for flash */ - disable_tlb(flash_esel); + if (flash_esel == -1) { + /* very unlikely unless something is messed up */ + puts("Error: Could not find TLB for FLASH BASE\n"); + flash_esel = 1; /* give our best effort to continue */ + } else { + /* invalidate existing TLB entry for flash */ + disable_tlb(flash_esel); + } set_tlb(1, flashbase, CONFIG_SYS_FLASH_BASE_PHYS, MAS3_SW|MAS3_SR, MAS2_I|MAS2_G, |