[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 03/13] hw/arm/collie: Use the IEC binary prefix definitions
From: |
Philippe Mathieu-Daudé |
Subject: |
[PATCH 03/13] hw/arm/collie: Use the IEC binary prefix definitions |
Date: |
Mon, 9 Jan 2023 12:53:06 +0100 |
IEC binary prefixes ease code review: the unit is explicit.
Add definitions for RAM / Flash / Flash blocksize.
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
hw/arm/collie.c | 16 ++++++++++------
1 file changed, 10 insertions(+), 6 deletions(-)
diff --git a/hw/arm/collie.c b/hw/arm/collie.c
index 8df31e2793..d59c376e60 100644
--- a/hw/arm/collie.c
+++ b/hw/arm/collie.c
@@ -20,6 +20,10 @@
#include "cpu.h"
#include "qom/object.h"
+#define RAM_SIZE (512 * MiB)
+#define FLASH_SIZE (32 * MiB)
+#define FLASH_SECTOR_SIZE (64 * KiB)
+
struct CollieMachineState {
MachineState parent;
@@ -31,7 +35,7 @@ OBJECT_DECLARE_SIMPLE_TYPE(CollieMachineState, COLLIE_MACHINE)
static struct arm_boot_info collie_binfo = {
.loader_start = SA_SDCS0,
- .ram_size = 0x20000000,
+ .ram_size = RAM_SIZE,
};
static void collie_init(MachineState *machine)
@@ -52,14 +56,14 @@ static void collie_init(MachineState *machine)
memory_region_add_subregion(get_system_memory(), SA_SDCS0, machine->ram);
dinfo = drive_get(IF_PFLASH, 0, 0);
- pflash_cfi01_register(SA_CS0, "collie.fl1", 0x02000000,
+ pflash_cfi01_register(SA_CS0, "collie.fl1", FLASH_SIZE,
dinfo ? blk_by_legacy_dinfo(dinfo) : NULL,
- 64 * KiB, 4, 0x00, 0x00, 0x00, 0x00, 0);
+ FLASH_SECTOR_SIZE, 4, 0x00, 0x00, 0x00, 0x00, 0);
dinfo = drive_get(IF_PFLASH, 0, 1);
- pflash_cfi01_register(SA_CS1, "collie.fl2", 0x02000000,
+ pflash_cfi01_register(SA_CS1, "collie.fl2", FLASH_SIZE,
dinfo ? blk_by_legacy_dinfo(dinfo) : NULL,
- 64 * KiB, 4, 0x00, 0x00, 0x00, 0x00, 0);
+ FLASH_SECTOR_SIZE, 4, 0x00, 0x00, 0x00, 0x00, 0);
sysbus_create_simple("scoop", 0x40800000, NULL);
@@ -75,7 +79,7 @@ static void collie_machine_class_init(ObjectClass *oc, void
*data)
mc->init = collie_init;
mc->ignore_memory_transaction_failures = true;
mc->default_cpu_type = ARM_CPU_TYPE_NAME("sa1110");
- mc->default_ram_size = 0x20000000;
+ mc->default_ram_size = RAM_SIZE;
mc->default_ram_id = "strongarm.sdram";
}
--
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é <=
- [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é, 2023/01/09
- [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