Merge branch 'master' of git://git.denx.de/u-boot-ti
Conflicts: CONFLICT (rename/add): Rename board/davinci/da830evm/Makefile->board/ti/tnetv107xevm/Makefile in 89b765c7. board/ti/tnetv107xevm/Makefile added in HEAD But files were identical, so no problem. Signed-off-by:Wolfgang Denk <wd@denx.de>
No related branches found
No related tags found
Showing
- MAINTAINERS 4 additions, 0 deletionsMAINTAINERS
- MAKEALL 1 addition, 0 deletionsMAKEALL
- Makefile 3 additions, 2 deletionsMakefile
- arch/arm/include/asm/arch-davinci/hardware.h 1 addition, 0 deletionsarch/arm/include/asm/arch-davinci/hardware.h
- board/davinci/da8xxevm/Makefile 5 additions, 1 deletionboard/davinci/da8xxevm/Makefile
- board/davinci/da8xxevm/common.c 55 additions, 0 deletionsboard/davinci/da8xxevm/common.c
- board/davinci/da8xxevm/common.h 30 additions, 0 deletionsboard/davinci/da8xxevm/common.h
- board/davinci/da8xxevm/config.mk 0 additions, 0 deletionsboard/davinci/da8xxevm/config.mk
- board/davinci/da8xxevm/da830evm.c 12 additions, 17 deletionsboard/davinci/da8xxevm/da830evm.c
- board/davinci/da8xxevm/da850evm.c 111 additions, 0 deletionsboard/davinci/da8xxevm/da850evm.c
- board/pandora/pandora.c 9 additions, 0 deletionsboard/pandora/pandora.c
- include/configs/da850evm.h 140 additions, 0 deletionsinclude/configs/da850evm.h
Loading
Please register or sign in to comment