Commit 7ebfece5 authored by Markus Armbruster's avatar Markus Armbruster
Browse files

mips_malta: Clean up definition of flash memory size somewhat 



pflash_cfi01_register() takes a size in bytes, a block size in bytes
and a number of blocks.  mips_malta_init() passes BIOS_SIZE, 65536,
FLASH_SIZE >> 16.  Actually consistent only because BIOS_SIZE (defined
in include/hw/mips/bios.h as (4 * MiB)) matches FLASH_SIZE (defined
locally as 0x400000).  Confusing all the same.

Pass FLASH_SIZE instead of BIOS_SIZE.

Cc: Aurelien Jarno <aurelien@aurel32.net>
Cc: Aleksandar Rikalo <arikalo@wavecomp.com>
Signed-off-by: default avatarMarkus Armbruster <armbru@redhat.com>
Reviewed-by: default avatarAlex Bennée <alex.bennee@linaro.org>
Reviewed-by: default avatarRichard Henderson <richard.henderson@linaro.org>
Message-Id: <20190308094610.21210-14-armbru@redhat.com>
Reviewed-by: default avatarPhilippe Mathieu-Daudé <philmd@redhat.com>
Tested-by: default avatarPhilippe Mathieu-Daudé <philmd@redhat.com>
parent 74c02ebd

hw/mips/mips_malta.c

+1 −1
Original line number Diff line number Diff line
@@ -1262,7 +1262,7 @@ void mips_malta_init(MachineState *machine) 
    /* Load firmware in flash / BIOS. */

    dinfo = drive_get(IF_PFLASH, 0, fl_idx);

    fl = pflash_cfi01_register(FLASH_ADDRESS, NULL, "mips_malta.bios",

                               BIOS_SIZE,

                               FLASH_SIZE,

                               dinfo ? blk_by_legacy_dinfo(dinfo) : NULL,

                               65536, FLASH_SIZE >> 16,

                               4, 0x0000, 0x0000, 0x0000, 0x0000, be);