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/t104xrdb | |
| parent | f93f21906e374d46c6abfbdf4eb9cb1ab51b6384 (diff) | |
| parent | 1899fac925eda817e12234aef3d01d354788662e (diff) | |
| download | blackbird-obmc-uboot-e82abaeb7f2a0833fccf90460c48b9f2100258f8.tar.gz blackbird-obmc-uboot-e82abaeb7f2a0833fccf90460c48b9f2100258f8.zip | |
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/t104xrdb')
| -rw-r--r-- | board/freescale/t104xrdb/Kconfig | 15 | ||||
| -rw-r--r-- | board/freescale/t104xrdb/MAINTAINERS | 22 | ||||
| -rw-r--r-- | board/freescale/t104xrdb/t104xrdb.c | 12 |
3 files changed, 46 insertions, 3 deletions
diff --git a/board/freescale/t104xrdb/Kconfig b/board/freescale/t104xrdb/Kconfig new file mode 100644 index 0000000000..d0fd3de0c4 --- /dev/null +++ b/board/freescale/t104xrdb/Kconfig @@ -0,0 +1,15 @@ +if TARGET_T104XRDB + +config SYS_BOARD + string + default "t104xrdb" + +config SYS_VENDOR + string + default "freescale" + +config SYS_CONFIG_NAME + string + default "T104xRDB" + +endif diff --git a/board/freescale/t104xrdb/MAINTAINERS b/board/freescale/t104xrdb/MAINTAINERS new file mode 100644 index 0000000000..364b0a961e --- /dev/null +++ b/board/freescale/t104xrdb/MAINTAINERS @@ -0,0 +1,22 @@ +T104XRDB BOARD +M: Priyanka Jain <Priyanka.Jain@freescale.com> +S: Maintained +F: board/freescale/t104xrdb/ +F: include/configs/T104xRDB.h +F: configs/T1040RDB_defconfig +F: configs/T1040RDB_NAND_defconfig +F: configs/T1040RDB_SPIFLASH_defconfig +F: configs/T1042RDB_PI_defconfig +F: configs/T1042RDB_PI_NAND_defconfig +F: configs/T1042RDB_PI_SPIFLASH_defconfig + +T1040RDB_SDCARD BOARD +M: - +S: Maintained +F: configs/T1040RDB_SDCARD_defconfig +F: configs/T1042RDB_PI_SDCARD_defconfig + +T1040RDB_SECURE_BOOT BOARD +M: Aneesh Bansal <aneesh.bansal@freescale.com> +S: Maintained +F: configs/T1040RDB_SECURE_BOOT_defconfig diff --git a/board/freescale/t104xrdb/t104xrdb.c b/board/freescale/t104xrdb/t104xrdb.c index a5e5fffac4..ddb669fb06 100644 --- a/board/freescale/t104xrdb/t104xrdb.c +++ b/board/freescale/t104xrdb/t104xrdb.c @@ -48,7 +48,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 region to caching-inhibited @@ -59,8 +59,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 = 2; /* 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_SX|MAS3_SW|MAS3_SR, MAS2_I|MAS2_G, |
