summaryrefslogtreecommitdiffstats
path: root/board/freescale/t1040qds/t1040qds.c
diff options
context:
space:
mode:
authorTom Rini <trini@ti.com>2014-07-28 14:54:29 -0400
committerTom Rini <trini@ti.com>2014-07-28 14:54:29 -0400
commitd5f8a6ddd41dee0de17888f8b5334fe1b636c4ca (patch)
tree1df8ab92fd228598d5884db37cceddcb18a0c020 /board/freescale/t1040qds/t1040qds.c
parentee860c60d2c5283c009f7ea740c6ee706da87cb7 (diff)
parentfb5368789a45ca5ee4396cbbf563a8f16ab24f9c (diff)
downloadtalos-obmc-uboot-d5f8a6ddd41dee0de17888f8b5334fe1b636c4ca.tar.gz
talos-obmc-uboot-d5f8a6ddd41dee0de17888f8b5334fe1b636c4ca.zip
Merge branch 'master' of git://git.denx.de/u-boot-mpc85xx
Diffstat (limited to 'board/freescale/t1040qds/t1040qds.c')
-rw-r--r--board/freescale/t1040qds/t1040qds.c12
1 files changed, 9 insertions, 3 deletions
diff --git a/board/freescale/t1040qds/t1040qds.c b/board/freescale/t1040qds/t1040qds.c
index 0e83d172da..19af46e48f 100644
--- a/board/freescale/t1040qds/t1040qds.c
+++ b/board/freescale/t1040qds/t1040qds.c
@@ -119,7 +119,7 @@ int board_early_init_r(void)
{
#ifdef CONFIG_SYS_FLASH_BASE
const unsigned int 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 + PROMJET region to caching-inhibited
@@ -130,8 +130,14 @@ int board_early_init_r(void)
flush_dcache();
invalidate_icache();
- /* invalidate existing TLB entry for flash + promjet */
- 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 = 2; /* give our best effort to continue */
+ } else {
+ /* invalidate existing TLB entry for flash + promjet */
+ disable_tlb(flash_esel);
+ }
set_tlb(1, flashbase, CONFIG_SYS_FLASH_BASE_PHYS,
MAS3_SX|MAS3_SW|MAS3_SR, MAS2_I|MAS2_G,
OpenPOWER on IntegriCloud