Merge branch 'master' of git://git.denx.de/u-boot-mips
Conflict over SPDX changes means that one change was effectively dropped
as it was fixing typos in a removed hunk of text.
Conflicts:
arch/mips/cpu/mips64/start.S
Signed-off-by:
Tom Rini <trini@ti.com>
No related branches found
No related tags found
Showing
- arch/mips/cpu/mips32/cache.S 8 additions, 9 deletionsarch/mips/cpu/mips32/cache.S
- arch/mips/cpu/mips32/start.S 19 additions, 13 deletionsarch/mips/cpu/mips32/start.S
- arch/mips/cpu/mips32/time.c 3 additions, 2 deletionsarch/mips/cpu/mips32/time.c
- arch/mips/cpu/mips64/interrupts.c 0 additions, 1 deletionarch/mips/cpu/mips64/interrupts.c
- arch/mips/cpu/mips64/start.S 1 addition, 1 deletionarch/mips/cpu/mips64/start.S
- arch/mips/cpu/xburst/start.S 22 additions, 19 deletionsarch/mips/cpu/xburst/start.S
- arch/mips/include/asm/malta.h 23 additions, 0 deletionsarch/mips/include/asm/malta.h
- board/qemu-malta/Makefile 45 additions, 0 deletionsboard/qemu-malta/Makefile
- board/qemu-malta/lowlevel_init.S 71 additions, 0 deletionsboard/qemu-malta/lowlevel_init.S
- board/qemu-malta/qemu-malta.c 49 additions, 0 deletionsboard/qemu-malta/qemu-malta.c
- boards.cfg 2 additions, 0 deletionsboards.cfg
- doc/README.mips 0 additions, 4 deletionsdoc/README.mips
- drivers/net/pcnet.c 1 addition, 1 deletiondrivers/net/pcnet.c
- drivers/pci/Makefile 1 addition, 0 deletionsdrivers/pci/Makefile
- drivers/pci/pci_gt64120.c 178 additions, 0 deletionsdrivers/pci/pci_gt64120.c
- include/configs/qemu-malta.h 116 additions, 0 deletionsinclude/configs/qemu-malta.h
- include/gt64120.h 550 additions, 0 deletionsinclude/gt64120.h
- include/pci_gt64120.h 19 additions, 0 deletionsinclude/pci_gt64120.h
Loading
Please register or sign in to comment