[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 08/13] hw/arm/musicpal: Use the IEC binary prefix definitions
From: |
Philippe Mathieu-Daudé |
Subject: |
[PATCH 08/13] hw/arm/musicpal: Use the IEC binary prefix definitions |
Date: |
Mon, 9 Jan 2023 12:53:11 +0100 |
IEC binary prefixes ease code review: the unit is explicit.
Add the FLASH_SECTOR_SIZE definition.
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
hw/arm/musicpal.c | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/hw/arm/musicpal.c b/hw/arm/musicpal.c
index b65c020115..73e2b7e4ce 100644
--- a/hw/arm/musicpal.c
+++ b/hw/arm/musicpal.c
@@ -10,6 +10,7 @@
*/
#include "qemu/osdep.h"
+#include "qemu/units.h"
#include "qapi/error.h"
#include "cpu.h"
#include "hw/sysbus.h"
@@ -1196,6 +1197,8 @@ static const TypeInfo musicpal_key_info = {
.class_init = musicpal_key_class_init,
};
+#define FLASH_SECTOR_SIZE (64 * KiB)
+
static struct arm_boot_info musicpal_binfo = {
.loader_start = 0x0,
.board_id = 0x20e,
@@ -1264,8 +1267,8 @@ static void musicpal_init(MachineState *machine)
BlockBackend *blk = blk_by_legacy_dinfo(dinfo);
flash_size = blk_getlength(blk);
- if (flash_size != 8*1024*1024 && flash_size != 16*1024*1024 &&
- flash_size != 32*1024*1024) {
+ if (flash_size != 8 * MiB && flash_size != 16 * MiB &&
+ flash_size != 32 * MiB) {
error_report("Invalid flash image size");
exit(1);
}
@@ -1277,7 +1280,7 @@ static void musicpal_init(MachineState *machine)
*/
pflash_cfi02_register(0x100000000ULL - MP_FLASH_SIZE_MAX,
"musicpal.flash", flash_size,
- blk, 0x10000,
+ blk, FLASH_SECTOR_SIZE,
MP_FLASH_SIZE_MAX / flash_size,
2, 0x00BF, 0x236D, 0x0000, 0x0000,
0x5555, 0x2AAA, 0);
--
2.38.1
- [PATCH 00/13] hw/arm: Cleanups before pflash refactor, Philippe Mathieu-Daudé, 2023/01/09
- [PATCH 01/13] hw/arm/pxa2xx: Simplify pxa255_init(), Philippe Mathieu-Daudé, 2023/01/09
- [PATCH 02/13] hw/arm/pxa2xx: Simplify pxa270_init(), Philippe Mathieu-Daudé, 2023/01/09
- [PATCH 03/13] hw/arm/collie: Use the IEC binary prefix definitions, Philippe Mathieu-Daudé, 2023/01/09
- [PATCH 04/13] hw/arm/collie: Simplify flash creation using for() loop, Philippe Mathieu-Daudé, 2023/01/09
- [PATCH 05/13] hw/arm/gumstix: Improve documentation, Philippe Mathieu-Daudé, 2023/01/09
- [PATCH 06/13] hw/arm/gumstix: Use the IEC binary prefix definitions, Philippe Mathieu-Daudé, 2023/01/09
- [PATCH 07/13] hw/arm/mainstone: Use the IEC binary prefix definitions, Philippe Mathieu-Daudé, 2023/01/09
- [PATCH 08/13] hw/arm/musicpal: Use the IEC binary prefix definitions,
Philippe Mathieu-Daudé <=
- [PATCH 09/13] hw/arm/omap_sx1: Remove unused 'total_ram' definitions, Philippe Mathieu-Daudé, 2023/01/09
- [PATCH 10/13] hw/arm/omap_sx1: Use the IEC binary prefix definitions, Philippe Mathieu-Daudé, 2023/01/09
- [PATCH 11/13] hw/arm/z2: Use the IEC binary prefix definitions, Philippe Mathieu-Daudé, 2023/01/09
- [PATCH 12/13] hw/arm/vexpress: Remove dead code in vexpress_common_init(), Philippe Mathieu-Daudé, 2023/01/09
- [PATCH 13/13] hw/arm: Remove unreachable code calling pflash_cfi01_register(), Philippe Mathieu-Daudé, 2023/01/09
- Re: [PATCH 00/13] hw/arm: Cleanups before pflash refactor, Richard Henderson, 2023/01/09
- Re: [PATCH 00/13] hw/arm: Cleanups before pflash refactor, Peter Maydell, 2023/01/12