diff options
| author | Stefano Babic <sbabic@denx.de> | 2014-08-11 10:21:03 +0200 |
|---|---|---|
| committer | Stefano Babic <sbabic@denx.de> | 2014-08-11 10:21:03 +0200 |
| commit | e82abaeb7f2a0833fccf90460c48b9f2100258f8 (patch) | |
| tree | de701f5c90b7373966412d566b5c00d3837954bc /board/freescale/b4860qds | |
| parent | f93f21906e374d46c6abfbdf4eb9cb1ab51b6384 (diff) | |
| parent | 1899fac925eda817e12234aef3d01d354788662e (diff) | |
| download | u-boot-imx-e82abaeb7f2a0833fccf90460c48b9f2100258f8.zip u-boot-imx-e82abaeb7f2a0833fccf90460c48b9f2100258f8.tar.gz u-boot-imx-e82abaeb7f2a0833fccf90460c48b9f2100258f8.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-arm
Conflicts:
boards.cfg
Signed-off-by: Stefano Babic <sbabic@denx.de>
Diffstat (limited to 'board/freescale/b4860qds')
| -rw-r--r-- | board/freescale/b4860qds/Kconfig | 15 | ||||
| -rw-r--r-- | board/freescale/b4860qds/MAINTAINERS | 17 | ||||
| -rw-r--r-- | board/freescale/b4860qds/b4860qds.c | 12 |
3 files changed, 41 insertions, 3 deletions
diff --git a/board/freescale/b4860qds/Kconfig b/board/freescale/b4860qds/Kconfig new file mode 100644 index 0000000..c5321d6 --- /dev/null +++ b/board/freescale/b4860qds/Kconfig @@ -0,0 +1,15 @@ +if TARGET_B4860QDS + +config SYS_BOARD + string + default "b4860qds" + +config SYS_VENDOR + string + default "freescale" + +config SYS_CONFIG_NAME + string + default "B4860QDS" + +endif diff --git a/board/freescale/b4860qds/MAINTAINERS b/board/freescale/b4860qds/MAINTAINERS new file mode 100644 index 0000000..9f9a612 --- /dev/null +++ b/board/freescale/b4860qds/MAINTAINERS @@ -0,0 +1,17 @@ +B4860QDS BOARD +M: - +S: Maintained +F: board/freescale/b4860qds/ +F: include/configs/B4860QDS.h +F: configs/B4420QDS_defconfig +F: configs/B4420QDS_NAND_defconfig +F: configs/B4420QDS_SPIFLASH_defconfig +F: configs/B4860QDS_defconfig +F: configs/B4860QDS_NAND_defconfig +F: configs/B4860QDS_SPIFLASH_defconfig +F: configs/B4860QDS_SRIO_PCIE_BOOT_defconfig + +B4860QDS_SECURE_BOOT BOARD +M: Aneesh Bansal <aneesh.bansal@freescale.com> +S: Maintained +F: configs/B4860QDS_SECURE_BOOT_defconfig diff --git a/board/freescale/b4860qds/b4860qds.c b/board/freescale/b4860qds/b4860qds.c index 9d6b9a7..34d66d5 100644 --- a/board/freescale/b4860qds/b4860qds.c +++ b/board/freescale/b4860qds/b4860qds.c @@ -913,7 +913,7 @@ out: int board_early_init_r(void) { 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); int ret; /* @@ -925,8 +925,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, |