[Qemu-commits] [qemu/qemu] f9681f: sun4m: Set HostID in NVRAM

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: f9681f116ce06612b12ef41d8637f6659255ec98
      
https://github.com/qemu/qemu/commit/f9681f116ce06612b12ef41d8637f6659255ec98
  Author: Mark Cave-Ayland <address@hidden>
  Date:   2014-02-27 (Thu, 27 Feb 2014)

  Changed paths:
    M include/hw/nvram/openbios_firmware_abi.h

  Log Message:
  -----------
  sun4m: Set HostID in NVRAM

On SparcStations, the HostID field in the NVRAM is equal to the last
three bytes of the MAC address (which is also stored in the NVRAM).

This constant is used as an identification/serial number on Solaris.

Signed-off-by: Olivier Danet <address@hidden>
Signed-off-by: Mark Cave-Ayland <address@hidden>


  Commit: ead4cf04f855575c24e795d7179d93b1601575b7
      
https://github.com/qemu/qemu/commit/ead4cf04f855575c24e795d7179d93b1601575b7
  Author: Mark Cave-Ayland <address@hidden>
  Date:   2014-02-27 (Thu, 27 Feb 2014)

  Changed paths:
    M hw/timer/slavio_timer.c

  Log Message:
  -----------
  sun4m: fix slavio timer RUN/STOP bit

The sun4m architecture has one 'system' timer and one timer per CPU.
The CPU timers can be configured in two modes:

  * 22 bits Counter/Timer. Periodic interrupts.
  * 54 bits User timer. For profiling. In this mode, the Run/Stop bit
    controls the timer.

The run/stop bit controls the timer only when it is in "User" mode, but
its state shall be persistent.

Signed-off-by: Olivier Danet <address@hidden>
Signed-off-by: Mark Cave-Ayland <address@hidden>


  Commit: 9eb08a435a5380f3fe07d9019f49c0358cb2d491
      
https://github.com/qemu/qemu/commit/9eb08a435a5380f3fe07d9019f49c0358cb2d491
  Author: Mark Cave-Ayland <address@hidden>
  Date:   2014-02-27 (Thu, 27 Feb 2014)

  Changed paths:
    M Makefile
    M default-configs/sparc-softmmu.mak
    M hw/display/Makefile.objs
    A hw/display/cg3.c
    A pc-bios/QEMU,cgthree.bin
    M pc-bios/README

  Log Message:
  -----------
  sun4m: Add Sun CG3 framebuffer and corresponding OpenBIOS FCode ROM

The CG3 framebuffer is a simple 8-bit framebuffer for use with operating
systems such as early Solaris that do not have drivers for TCX.

Signed-off-by: Mark Cave-Ayland <address@hidden>
CC: Blue Swirl <address@hidden>
CC: Anthony Liguori <address@hidden>
CC: Peter Maydell <address@hidden>
CC: Bob Breuer <address@hidden>
CC: Artyom Tarasenko <address@hidden>


  Commit: af87bf290f31d8ef0aaf8f20259fa34e51ed1e7a
      
https://github.com/qemu/qemu/commit/af87bf290f31d8ef0aaf8f20259fa34e51ed1e7a
  Author: Mark Cave-Ayland <address@hidden>
  Date:   2014-02-27 (Thu, 27 Feb 2014)

  Changed paths:
    M hw/sparc/sun4m.c
    M include/sysemu/sysemu.h
    M vl.c

  Log Message:
  -----------
  sun4m: Add Sun CG3 framebuffer initialisation function

In order to allow the user to choose the framebuffer for sparc-softmmu, add
-vga tcx and -vga cg3 options to the QEMU command line. If no option is
specified, the default TCX framebuffer is used.

Since proprietary FCode ROMs use a resolution of 1152x900, slightly relax the
validation rules to allow both displays to be initiated at the higher
resolution used by these ROMs upon request (OpenBIOS FCode ROMs default to
the normal QEMU sun4m default resolution of 1024x768).

Finally move any fprintf(stderr ...) statements in the areas affected by this
patch over to the new error_report() function.

Signed-off-by: Mark Cave-Ayland <address@hidden>
CC: Blue Swirl <address@hidden>
CC: Anthony Liguori <address@hidden>
CC: Peter Maydell <address@hidden>
CC: Bob Breuer <address@hidden>
CC: Artyom Tarasenko <address@hidden>


  Commit: d47e95c0c86ea5d8d050bf201ee27bcec617c10e
      
https://github.com/qemu/qemu/commit/d47e95c0c86ea5d8d050bf201ee27bcec617c10e
  Author: Peter Maydell <address@hidden>
  Date:   2014-03-04 (Tue, 04 Mar 2014)

  Changed paths:
    M Makefile
    M default-configs/sparc-softmmu.mak
    M hw/display/Makefile.objs
    A hw/display/cg3.c
    M hw/sparc/sun4m.c
    M hw/timer/slavio_timer.c
    M include/hw/nvram/openbios_firmware_abi.h
    M include/sysemu/sysemu.h
    A pc-bios/QEMU,cgthree.bin
    M pc-bios/README
    M vl.c

  Log Message:
  -----------
  Merge remote-tracking branch 'remotes/mcayland/qemu-sparc' into staging

* remotes/mcayland/qemu-sparc:
  sun4m: Add Sun CG3 framebuffer initialisation function
  sun4m: Add Sun CG3 framebuffer and corresponding OpenBIOS FCode ROM
  sun4m: fix slavio timer RUN/STOP bit
  sun4m: Set HostID in NVRAM

Signed-off-by: Peter Maydell <address@hidden>


Compare: https://github.com/qemu/qemu/compare/57f45b6207a6...d47e95c0c86e