|
 |
7711c0 |
From 43d46e014933fd009b39dd780ef33ac8cd2081d3 Mon Sep 17 00:00:00 2001
|
|
|
7711c0 |
From: Markus Armbruster <armbru@redhat.com>
|
|
|
7711c0 |
Date: Fri, 17 May 2019 06:51:04 +0200
|
|
|
7711c0 |
Subject: [PATCH 37/53] mips_malta: Clean up definition of flash memory size
|
|
|
7711c0 |
somewhat
|
|
|
7711c0 |
MIME-Version: 1.0
|
|
|
7711c0 |
Content-Type: text/plain; charset=UTF-8
|
|
|
7711c0 |
Content-Transfer-Encoding: 8bit
|
|
|
7711c0 |
|
|
|
7711c0 |
RH-Author: Markus Armbruster <armbru@redhat.com>
|
|
|
7711c0 |
Message-id: <20190517065120.12028-16-armbru@redhat.com>
|
|
|
7711c0 |
Patchwork-id: 88009
|
|
|
7711c0 |
O-Subject: [RHEL-7.7 qemu-kvm-rhev PATCH v3 15/31] mips_malta: Clean up definition of flash memory size somewhat
|
|
|
7711c0 |
Bugzilla: 1624009
|
|
|
7711c0 |
RH-Acked-by: Philippe Mathieu-Daudé <philmd@redhat.com>
|
|
|
7711c0 |
RH-Acked-by: Thomas Huth <thuth@redhat.com>
|
|
|
7711c0 |
RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
7711c0 |
|
|
|
7711c0 |
pflash_cfi01_register() takes a size in bytes, a block size in bytes
|
|
|
7711c0 |
and a number of blocks. mips_malta_init() passes BIOS_SIZE, 65536,
|
|
|
7711c0 |
FLASH_SIZE >> 16. Actually consistent only because BIOS_SIZE (defined
|
|
|
7711c0 |
in include/hw/mips/bios.h as (4 * MiB)) matches FLASH_SIZE (defined
|
|
|
7711c0 |
locally as 0x400000). Confusing all the same.
|
|
|
7711c0 |
|
|
|
7711c0 |
Pass FLASH_SIZE instead of BIOS_SIZE.
|
|
|
7711c0 |
|
|
|
7711c0 |
Cc: Aurelien Jarno <aurelien@aurel32.net>
|
|
|
7711c0 |
Cc: Aleksandar Rikalo <arikalo@wavecomp.com>
|
|
|
7711c0 |
Signed-off-by: Markus Armbruster <armbru@redhat.com>
|
|
|
7711c0 |
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
|
|
|
7711c0 |
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
|
|
|
7711c0 |
Message-Id: <20190308094610.21210-14-armbru@redhat.com>
|
|
|
7711c0 |
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
|
|
|
7711c0 |
Tested-by: Philippe Mathieu-Daudé <philmd@redhat.com>
|
|
|
7711c0 |
(cherry picked from commit 7ebfece56a9370eecd4b425b109dd722b09b9303)
|
|
|
7711c0 |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
7711c0 |
---
|
|
|
7711c0 |
hw/mips/mips_malta.c | 2 +-
|
|
|
7711c0 |
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
7711c0 |
|
|
|
7711c0 |
diff --git a/hw/mips/mips_malta.c b/hw/mips/mips_malta.c
|
|
|
7711c0 |
index 857bdb8..e46a252 100644
|
|
|
7711c0 |
--- a/hw/mips/mips_malta.c
|
|
|
7711c0 |
+++ b/hw/mips/mips_malta.c
|
|
|
7711c0 |
@@ -1063,7 +1063,7 @@ void mips_malta_init(MachineState *machine)
|
|
|
7711c0 |
/* Load firmware in flash / BIOS. */
|
|
|
7711c0 |
dinfo = drive_get(IF_PFLASH, 0, fl_idx);
|
|
|
7711c0 |
fl = pflash_cfi01_register(FLASH_ADDRESS, NULL, "mips_malta.bios",
|
|
|
7711c0 |
- BIOS_SIZE,
|
|
|
7711c0 |
+ FLASH_SIZE,
|
|
|
7711c0 |
dinfo ? blk_by_legacy_dinfo(dinfo) : NULL,
|
|
|
7711c0 |
65536, FLASH_SIZE >> 16,
|
|
|
7711c0 |
4, 0x0000, 0x0000, 0x0000, 0x0000, be);
|
|
|
7711c0 |
--
|
|
|
7711c0 |
1.8.3.1
|
|
|
7711c0 |
|