Commit 20e0d439 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/rth/tags/pull-hppa-20180204' into staging 



hppa-softmmu update

# gpg: Signature made Sun 04 Feb 2018 22:20:40 GMT
# gpg:                using RSA key 64DF38E8AF7E215F
# gpg: Good signature from "Richard Henderson <richard.henderson@linaro.org>"
# Primary key fingerprint: 7A48 1E78 868B 4DB6 A85A  05C0 64DF 38E8 AF7E 215F

* remotes/rth/tags/pull-hppa-20180204:
  roms/seabios-hppa: Update submodule and image
  tests: Enable boot-serial-test for hppa
  hw/hppa: Use qemu_log_mask instead of fprintf to stderr

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 2b3805f3 edf90bd0

hw/hppa/machine.c

+8 −9
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 
#include "hw/hppa/hppa_sys.h"

#include "qemu/cutils.h"

#include "qapi/error.h"

#include "qemu/log.h"



#define MAX_IDE_BUS 2
@@ -111,7 +112,6 @@ static void machine_hppa_init(MachineState *machine) 
        uint32_t addr = DINO_UART_HPA + 0x800;

        serial_mm_init(addr_space, addr, 0, serial_irq,

                       115200, serial_hds[0], DEVICE_BIG_ENDIAN);

        fprintf(stderr, "Serial port created at 0x%x\n", addr);

    }



    /* SCSI disk setup. */
@@ -146,8 +146,8 @@ static void machine_hppa_init(MachineState *machine) 
        error_report("could not load firmware '%s'", firmware_filename);

        exit(1);

    }

    fprintf(stderr, "Firmware loaded at 0x%08" PRIx64 "-0x%08" PRIx64

            ", entry at 0x%08" PRIx64 ".\n",

    qemu_log_mask(CPU_LOG_PAGE, "Firmware loaded at 0x%08" PRIx64

                  "-0x%08" PRIx64 ", entry at 0x%08" PRIx64 ".\n",

                  firmware_low, firmware_high, firmware_entry);

    if (firmware_low < ram_size || firmware_high >= FIRMWARE_END) {

        error_report("Firmware overlaps with memory or IO space");
@@ -163,7 +163,6 @@ static void machine_hppa_init(MachineState *machine) 


    /* Load kernel */

    if (kernel_filename) {

        fprintf(stderr, "LOADING kernel '%s'\n", kernel_filename);

        size = load_elf(kernel_filename, &cpu_hppa_to_phys,

                        NULL, &kernel_entry, &kernel_low, &kernel_high,

                        true, EM_PARISC, 0, 0);
@@ -177,9 +176,9 @@ static void machine_hppa_init(MachineState *machine) 
            error_report("could not load kernel '%s'", kernel_filename);

            exit(1);

        }



        fprintf(stderr, "Kernel loaded at 0x%08" PRIx64 "-0x%08" PRIx64

                ", entry at 0x%08" PRIx64 ", size %ld kB.\n",

        qemu_log_mask(CPU_LOG_PAGE, "Kernel loaded at 0x%08" PRIx64

                      "-0x%08" PRIx64 ", entry at 0x%08" PRIx64

                      ", size %ld kB.\n",

                      kernel_low, kernel_high, kernel_entry, size / 1024);



        if (kernel_cmdline) {

pc-bios/hppa-firmware.img

−240 KiB (211 KiB)

File changed.

No diff preview for this file type.

View original file
View changed file

seabios-hppa @ 649e6202

Compare 8fa4ca99 to 649e6202
Original line number Diff line number Diff line 
Subproject commit 8fa4ca9935669414a824ecda24f6e70c36e8dc94
 
Subproject commit 649e6202b8d65d46c69f542b1380f840fbe8ab13

tests/Makefile.include

+2 −0
Original line number Diff line number Diff line
@@ -299,6 +299,8 @@ gcov-files-x86_64-y = $(subst i386-softmmu/,x86_64-softmmu/,$(gcov-files-i386-y) 


check-qtest-alpha-y = tests/boot-serial-test$(EXESUF)



check-qtest-hppa-y = tests/boot-serial-test$(EXESUF)



check-qtest-m68k-y = tests/boot-serial-test$(EXESUF)



check-qtest-microblaze-y = tests/boot-serial-test$(EXESUF)

tests/boot-serial-test.c

+1 −0
Original line number Diff line number Diff line
@@ -87,6 +87,7 @@ static testdef_t tests[] = { 
      sizeof(kernel_plml605), kernel_plml605 },

    { "moxie", "moxiesim", "", "TT", sizeof(bios_moxiesim), 0, bios_moxiesim },

    { "arm", "raspi2", "", "TT", sizeof(bios_raspi2), 0, bios_raspi2 },

    { "hppa", "hppa", "", "SeaBIOS wants SYSTEM HALT" },



    { NULL }

};