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/exmeritus | |
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/exmeritus')
-rw-r--r-- | board/exmeritus/hww1u1a/Kconfig | 15 | ||||
-rw-r--r-- | board/exmeritus/hww1u1a/MAINTAINERS | 6 | ||||
-rw-r--r-- | board/exmeritus/hww1u1a/hww1u1a.c | 12 |
3 files changed, 30 insertions, 3 deletions
diff --git a/board/exmeritus/hww1u1a/Kconfig b/board/exmeritus/hww1u1a/Kconfig new file mode 100644 index 0000000..126ce2f --- /dev/null +++ b/board/exmeritus/hww1u1a/Kconfig @@ -0,0 +1,15 @@ +if TARGET_HWW1U1A + +config SYS_BOARD + string + default "hww1u1a" + +config SYS_VENDOR + string + default "exmeritus" + +config SYS_CONFIG_NAME + string + default "HWW1U1A" + +endif diff --git a/board/exmeritus/hww1u1a/MAINTAINERS b/board/exmeritus/hww1u1a/MAINTAINERS new file mode 100644 index 0000000..e2fe2a6 --- /dev/null +++ b/board/exmeritus/hww1u1a/MAINTAINERS @@ -0,0 +1,6 @@ +HWW1U1A BOARD +M: Kyle Moffett <Kyle.D.Moffett@boeing.com> +S: Orphan (since 2014-06) +F: board/exmeritus/hww1u1a/ +F: include/configs/HWW1U1A.h +F: configs/HWW1U1A_defconfig diff --git a/board/exmeritus/hww1u1a/hww1u1a.c b/board/exmeritus/hww1u1a/hww1u1a.c index 97b84b3..643ece1 100644 --- a/board/exmeritus/hww1u1a/hww1u1a.c +++ b/board/exmeritus/hww1u1a/hww1u1a.c @@ -203,7 +203,7 @@ void pci_init_board(void) 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); /* * Remap bootflash region to caching-inhibited @@ -214,8 +214,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, |