Commit eaa49801 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/agraf/tags/signed-ppc-for-upstream' into staging 



Patch queue for ppc - 2014-07-08

A few bug fixes for 2.1:

  - Fix e500* TLB emulation with qemu-system-ppc
  - Update SLOF to current upstream (good number of bugfixes)
  - Make POWER7 / POWER8 PVR match more agnostic (needed in 2.1 for cmdline compat)
  - Fix u-boot.e500 install (how did that happen?)
  - Fix H_CAS on LE hosts
  - ppc64le-linux-user fixes

# gpg: Signature made Tue 08 Jul 2014 11:18:58 BST using RSA key ID 03FEDC60
# gpg: Can't check signature: public key not found

* remotes/agraf/tags/signed-ppc-for-upstream:
  PPC: e500: Actually install u-boot.e500
  target-ppc: Remove POWER7+ and POWER8E families
  target-ppc: Add pvr_match() callback
  pseries: Update SLOF firmware image to qemu-slof-20140630
  PPC: Fix booke206 TLB with phys addrs > 32bit
  target-ppc: Fix gdbstub for ppc64le-linux-user
  target-ppc: Change default cpu for ppc64le-linux-user
  target-ppc: KVMPPC_H_CAS fix cpu-version endianess

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 128f0e66 0c6ab8c9

Makefile

+2 −1
Original line number Diff line number Diff line
@@ -344,7 +344,8 @@ multiboot.bin linuxboot.bin kvmvapic.bin \ 
s390-zipl.rom \

s390-ccw.img \

spapr-rtas.bin slof.bin \

palcode-clipper

palcode-clipper \

u-boot.e500

else

BLOBS=

endif

hw/ppc/spapr.c

+1 −2
Original line number Diff line number Diff line
@@ -160,8 +160,7 @@ static int spapr_fixup_cpu_smt_dt(void *fdt, int offset, PowerPCCPU *cpu, 
    int index = ppc_get_vcpu_dt_id(cpu);



    if (cpu->cpu_version) {

        ret = fdt_setprop(fdt, offset, "cpu-version",

                          &cpu->cpu_version, sizeof(cpu->cpu_version));

        ret = fdt_setprop_cell(fdt, offset, "cpu-version", cpu->cpu_version);

        if (ret < 0) {

            return ret;

        }

linux-user/main.c

+4 −4
Original line number Diff line number Diff line
@@ -3902,7 +3902,7 @@ int main(int argc, char **argv, char **envp) 
        cpu_model = "or1200";

#elif defined(TARGET_PPC)

# ifdef TARGET_PPC64

        cpu_model = "970fx";

        cpu_model = "POWER7";

# else

        cpu_model = "750";

# endif

pc-bios/README

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 
- SLOF (Slimline Open Firmware) is a free IEEE 1275 Open Firmware

  implementation for certain IBM POWER hardware.  The sources are at

  https://github.com/aik/SLOF, and the image currently in qemu is

  built from git tag qemu-slof-20140404.

  built from git tag qemu-slof-20140630.



- sgabios (the Serial Graphics Adapter option ROM) provides a means for

  legacy x86 software to communicate with an attached serial console as

pc-bios/slof.bin

+2.13 KiB (902 KiB)

File changed.

No diff preview for this file type.

View original file
View changed file