Public Git Hosting - qemu/ar7.git/commit

summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
(merge: 8b17612 cc75c64)

commit	f1d9c46c71c593c72678256425f67ecb1b5ed851
author	Stefan Weil <sw@weilnetz.de>
	Thu, 3 Mar 2016 19:56:21 +0000 (3 20:56 +0100)
committer	Stefan Weil <sw@weilnetz.de>
	Thu, 3 Mar 2016 19:56:21 +0000 (3 20:56 +0100)
tree	0431f57d76f2c3679f16ffecf8b3f18bcdcb84a7	tree \| snapshot (tar.gz zip)
parent	8b17612905acee72640725b5ef59f0d5510f5901	commit \| diff
parent	cc75c644f0694f7f5792bc5bcbe380ab23917edf	commit \| diff

Merge remote-tracking branch 'pcrost/arm-be.next'

Conflicts:
hw/arm/boot.c
target-arm/translate.c

Fix also changed API in ar7.c.

Signed-off-by: Stefan Weil <sw@weilnetz.de>

15 files changed:

hw/arm/armv7m.c	diff1 \|	diff2 \|	blob \| history
hw/arm/boot.c	diff1 \|	diff2 \|	blob \| history
hw/m68k/mcf5208.c	diff1 \|	diff2 \|	blob \| history
hw/mips/ar7.c	diff1 \|	\|	blob \| history
hw/mips/mips_malta.c	diff1 \|	diff2 \|	blob \| history
hw/mips/mips_r4k.c	diff1 \|	diff2 \|	blob \| history
hw/ppc/spapr.c	diff1 \|	diff2 \|	blob \| history
include/hw/arm/arm.h	diff1 \|	diff2 \|	blob \| history
linux-user/main.c	diff1 \|	diff2 \|	blob \| history
target-arm/cpu.c	diff1 \|	diff2 \|	blob \| history
target-arm/cpu.h	diff1 \|	diff2 \|	blob \| history
target-arm/helper.c	diff1 \|	diff2 \|	blob \| history
target-arm/op_helper.c	diff1 \|	diff2 \|	blob \| history
target-arm/translate.c	diff1 \|	diff2 \|	blob \| history
target-arm/translate.h	diff1 \|	diff2 \|	blob \| history

AR7 emulation for QEMU