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

Merge remote-tracking branch 'remotes/armbru/tags/pull-pflash-2019-03-11' into staging 



Pflash and firmware configuration patches for 2019-03-11

# gpg: Signature made Mon 11 Mar 2019 21:59:12 GMT
# gpg:                using RSA key 3870B400EB918653
# gpg: Good signature from "Markus Armbruster <armbru@redhat.com>" [full]
# gpg:                 aka "Markus Armbruster <armbru@pond.sub.org>" [full]
# Primary key fingerprint: 354B C8B3 D7EB 2A6B 6867  4E5F 3870 B400 EB91 8653

* remotes/armbru/tags/pull-pflash-2019-03-11: (27 commits)
  docs/interop/firmware.json: Prefer -machine to if=pflash
  pc: Support firmware configuration with -blockdev
  pc_sysfw: Pass PCMachineState to pc_system_firmware_init()
  pc_sysfw: Remove unused PcSysFwDevice
  pflash_cfi01: Add pflash_cfi01_get_blk() helper
  vl: Create block backends before setting machine properties
  vl: Factor configure_blockdev() out of main()
  vl: Improve legibility of BlockdevOptions queue
  sysbus: Fix latent bug with onboard devices
  vl: Fix latent bug with -global and onboard devices
  qom: Move compat_props machinery from qdev to QOM
  qdev: Fix latent bug with compat_props and onboard devices
  pflash: Clean up after commit 368a354f, part 2
  pflash: Clean up after commit 368a354f, part 1
  mips_malta: Clean up definition of flash memory size somewhat
  hw/mips/malta: Restrict 'bios_size' variable scope
  hw/mips/malta: Remove fl_sectors variable
  mips_malta: Delete disabled, broken DEBUG_BOARD_INIT code
  r2d: Fix flash memory size, sector size, width, device ID
  ppc405_boards: Don't size flash memory to match backing image
  ...

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents bc76b714 e33763be

accel/accel.c

+1 −0
Original line number Diff line number Diff line
@@ -66,6 +66,7 @@ static int accel_init_machine(AccelClass *acc, MachineState *ms) 
        *(acc->allowed) = false;

        object_unref(OBJECT(accel));

    }

    object_set_accelerator_compat_props(acc->compat_props);

    return ret;

}

docs/interop/firmware.json

+14 −6
Original line number Diff line number Diff line
@@ -212,9 +212,13 @@ 
#

# @executable: Identifies the firmware executable. The firmware

#              executable may be shared by multiple virtual machine

#              definitions. The corresponding QEMU command line option

#              is "-drive

#              if=pflash,unit=0,readonly=on,file=@executable.@filename,format=@executable.@format".

#              definitions. The preferred corresponding QEMU command

#              line options are

#                  -drive if=none,id=pflash0,readonly=on,file=@executable.@filename,format=@executable.@format

#                  -machine pflash0=pflash0

#              or equivalent -blockdev instead of -drive.

#              With QEMU versions older than 4.0, you have to use

#                  -drive if=pflash,unit=0,readonly=on,file=@executable.@filename,format=@executable.@format

#

# @nvram-template: Identifies the NVRAM template compatible with

#                  @executable. Management software instantiates an
@@ -225,9 +229,13 @@ 
#                  individual copies of it are. An NVRAM file is

#                  typically used for persistently storing the

#                  non-volatile UEFI variables of a virtual machine

#                  definition. The corresponding QEMU command line

#                  option is "-drive

#                  if=pflash,unit=1,readonly=off,file=FILENAME_OF_PRIVATE_NVRAM_FILE,format=@nvram-template.@format".

#                  definition. The preferred corresponding QEMU

#                  command line options are

#                      -drive if=none,id=pflash1,readonly=off,file=FILENAME_OF_PRIVATE_NVRAM_FILE,format=@nvram-template.@format

#                      -machine pflash1=pflash1

#                  or equivalent -blockdev instead of -drive.

#                  With QEMU versions older than 4.0, you have to use

#                      -drive if=pflash,unit=1,readonly=off,file=FILENAME_OF_PRIVATE_NVRAM_FILE,format=@nvram-template.@format

#

# Since: 3.0

##

hw/arm/collie.c

+5 −4
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ 
 * GNU GPL, version 2 or (at your option) any later version.

 */

#include "qemu/osdep.h"

#include "qemu/units.h"

#include "hw/hw.h"

#include "hw/sysbus.h"

#include "hw/boards.h"
@@ -35,14 +36,14 @@ static void collie_init(MachineState *machine) 
    s = sa1110_init(sysmem, collie_binfo.ram_size, machine->cpu_type);



    dinfo = drive_get(IF_PFLASH, 0, 0);

    pflash_cfi01_register(SA_CS0, NULL, "collie.fl1", 0x02000000,

    pflash_cfi01_register(SA_CS0, "collie.fl1", 0x02000000,

                    dinfo ? blk_by_legacy_dinfo(dinfo) : NULL,

                    (64 * 1024), 512, 4, 0x00, 0x00, 0x00, 0x00, 0);

                    64 * KiB, 4, 0x00, 0x00, 0x00, 0x00, 0);



    dinfo = drive_get(IF_PFLASH, 0, 1);

    pflash_cfi01_register(SA_CS1, NULL, "collie.fl2", 0x02000000,

    pflash_cfi01_register(SA_CS1, "collie.fl2", 0x02000000,

                    dinfo ? blk_by_legacy_dinfo(dinfo) : NULL,

                    (64 * 1024), 512, 4, 0x00, 0x00, 0x00, 0x00, 0);

                    64 * KiB, 4, 0x00, 0x00, 0x00, 0x00, 0);



    sysbus_create_simple("scoop", 0x40800000, NULL);

hw/arm/digic_boards.c

+1 −2
Original line number Diff line number Diff line
@@ -129,9 +129,8 @@ static void digic4_add_k8p3215uqb_rom(DigicBoardState *s, hwaddr addr, 
#define FLASH_K8P3215UQB_SIZE (4 * 1024 * 1024)

#define FLASH_K8P3215UQB_SECTOR_SIZE (64 * 1024)



    pflash_cfi02_register(addr, NULL, "pflash", FLASH_K8P3215UQB_SIZE,

    pflash_cfi02_register(addr, "pflash", FLASH_K8P3215UQB_SIZE,

                          NULL, FLASH_K8P3215UQB_SECTOR_SIZE,

                          FLASH_K8P3215UQB_SIZE / FLASH_K8P3215UQB_SECTOR_SIZE,

                          DIGIC4_ROM_MAX_SIZE / FLASH_K8P3215UQB_SIZE,

                          4,

                          0x00EC, 0x007E, 0x0003, 0x0001,

hw/arm/gumstix.c

+4 −6
Original line number Diff line number Diff line
@@ -72,10 +72,9 @@ static void connex_init(MachineState *machine) 
#else

    be = 0;

#endif

    if (!pflash_cfi01_register(0x00000000, NULL, "connext.rom", connex_rom,

    if (!pflash_cfi01_register(0x00000000, "connext.rom", connex_rom,

                               dinfo ? blk_by_legacy_dinfo(dinfo) : NULL,

                               sector_len, connex_rom / sector_len,

                               2, 0, 0, 0, 0, be)) {

                               sector_len, 2, 0, 0, 0, 0, be)) {

        error_report("Error registering flash memory");

        exit(1);

    }
@@ -109,10 +108,9 @@ static void verdex_init(MachineState *machine) 
#else

    be = 0;

#endif

    if (!pflash_cfi01_register(0x00000000, NULL, "verdex.rom", verdex_rom,

    if (!pflash_cfi01_register(0x00000000, "verdex.rom", verdex_rom,

                               dinfo ? blk_by_legacy_dinfo(dinfo) : NULL,

                               sector_len, verdex_rom / sector_len,

                               2, 0, 0, 0, 0, be)) {

                               sector_len, 2, 0, 0, 0, 0, be)) {

        error_report("Error registering flash memory");

        exit(1);

    }