Merge branch 'master' of git://git.denx.de/u-boot-arm
Conflicts:
drivers/serial/serial_lh7a40x.c
Signed-off-by:
Tom Rini <trini@ti.com>
No related branches found
No related tags found
Showing
- MAINTAINERS 4 additions, 0 deletionsMAINTAINERS
- arch/arm/cpu/arm1176/tnetv107x/Makefile 1 addition, 1 deletionarch/arm/cpu/arm1176/tnetv107x/Makefile
- arch/arm/cpu/arm920t/s3c24x0/Makefile 0 additions, 3 deletionsarch/arm/cpu/arm920t/s3c24x0/Makefile
- arch/arm/cpu/arm920t/s3c24x0/usb.c 0 additions, 71 deletionsarch/arm/cpu/arm920t/s3c24x0/usb.c
- arch/arm/cpu/lh7a40x/config.mk 0 additions, 33 deletionsarch/arm/cpu/lh7a40x/config.mk
- arch/arm/cpu/lh7a40x/speed.c 0 additions, 83 deletionsarch/arm/cpu/lh7a40x/speed.c
- arch/arm/cpu/lh7a40x/start.S 0 additions, 506 deletionsarch/arm/cpu/lh7a40x/start.S
- arch/arm/cpu/lh7a40x/timer.c 0 additions, 182 deletionsarch/arm/cpu/lh7a40x/timer.c
- arch/arm/lib/board.c 22 additions, 0 deletionsarch/arm/lib/board.c
- board/actux1/u-boot.lds 1 addition, 1 deletionboard/actux1/u-boot.lds
- board/actux2/u-boot.lds 1 addition, 1 deletionboard/actux2/u-boot.lds
- board/actux3/u-boot.lds 1 addition, 1 deletionboard/actux3/u-boot.lds
- board/h2200/Makefile 14 additions, 12 deletionsboard/h2200/Makefile
- board/h2200/h2200-header.S 27 additions, 0 deletionsboard/h2200/h2200-header.S
- board/h2200/h2200.c 53 additions, 0 deletionsboard/h2200/h2200.c
- boards.cfg 1 addition, 0 deletionsboards.cfg
- doc/driver-model/UDM-serial.txt 14 additions, 18 deletionsdoc/driver-model/UDM-serial.txt
- drivers/serial/Makefile 0 additions, 1 deletiondrivers/serial/Makefile
- drivers/serial/serial_lh7a40x.c 0 additions, 197 deletionsdrivers/serial/serial_lh7a40x.c
- drivers/usb/gadget/gadget_chips.h 13 additions, 21 deletionsdrivers/usb/gadget/gadget_chips.h
Loading
Please register or sign in to comment