mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

hw/arm/mainstone: Use the IEC binary prefix definitions

Browse Source 
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>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-id: 20230109115316.2235-8-philmd@linaro.org
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Philippe Mathieu-Daudé 2023-01-09 12:53:10 +01:00 committed by Peter Maydell
parent 38cb336fe9
commit c0e3a4bf77
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
hw/arm/mainstone.c
View File

@ -12,6 +12,7 @@
* GNU GPL, version 2 or (at your option) any later version. * GNU GPL, version 2 or (at your option) any later version.
*/ */
#include "qemu/osdep.h" #include "qemu/osdep.h"
#include "qemu/units.h"
#include "qemu/error-report.h" #include "qemu/error-report.h"
#include "qapi/error.h" #include "qapi/error.h"
#include "hw/arm/pxa.h" #include "hw/arm/pxa.h"
@ -99,19 +100,20 @@ static const struct keymap map[0xE0] = {
enum mainstone_model_e { mainstone }; enum mainstone_model_e { mainstone };
#define MAINSTONE_RAM 0x04000000 #define MAINSTONE_RAM_SIZE (64 * MiB)
#define MAINSTONE_ROM 0x00800000 #define MAINSTONE_ROM_SIZE (8 * MiB)
#define MAINSTONE_FLASH 0x02000000 #define MAINSTONE_FLASH_SIZE (32 * MiB)
static struct arm_boot_info mainstone_binfo = { static struct arm_boot_info mainstone_binfo = {
.loader_start = PXA2XX_SDRAM_BASE, .loader_start = PXA2XX_SDRAM_BASE,
.ram_size = 0x04000000, .ram_size = MAINSTONE_RAM_SIZE,
}; };
#define FLASH_SECTOR_SIZE (256 * KiB)
static void mainstone_common_init(MachineState *machine, static void mainstone_common_init(MachineState *machine,
enum mainstone_model_e model, int arm_id) enum mainstone_model_e model, int arm_id)
{ {
uint32_t sector_len = 256 * 1024;
hwaddr mainstone_flash_base[] = { MST_FLASH_0, MST_FLASH_1 }; hwaddr mainstone_flash_base[] = { MST_FLASH_0, MST_FLASH_1 };
PXA2xxState *mpu; PXA2xxState *mpu;
DeviceState *mst_irq; DeviceState *mst_irq;
@ -121,7 +123,7 @@ static void mainstone_common_init(MachineState *machine,
/* Setup CPU & memory */ /* Setup CPU & memory */
mpu = pxa270_init(mainstone_binfo.ram_size, machine->cpu_type); mpu = pxa270_init(mainstone_binfo.ram_size, machine->cpu_type);
memory_region_init_rom(rom, NULL, "mainstone.rom", MAINSTONE_ROM, memory_region_init_rom(rom, NULL, "mainstone.rom", MAINSTONE_ROM_SIZE,
&error_fatal); &error_fatal);
memory_region_add_subregion(get_system_memory(), 0x00000000, rom); memory_region_add_subregion(get_system_memory(), 0x00000000, rom);
@ -130,9 +132,9 @@ static void mainstone_common_init(MachineState *machine,
dinfo = drive_get(IF_PFLASH, 0, i); dinfo = drive_get(IF_PFLASH, 0, i);
if (!pflash_cfi01_register(mainstone_flash_base[i], if (!pflash_cfi01_register(mainstone_flash_base[i],
i ? "mainstone.flash1" : "mainstone.flash0", i ? "mainstone.flash1" : "mainstone.flash0",
MAINSTONE_FLASH, MAINSTONE_FLASH_SIZE,
dinfo ? blk_by_legacy_dinfo(dinfo) : NULL, dinfo ? blk_by_legacy_dinfo(dinfo) : NULL,
sector_len, 4, 0, 0, 0, 0, 0)) { FLASH_SECTOR_SIZE, 4, 0, 0, 0, 0, 0)) {
error_report("Error registering flash memory"); error_report("Error registering flash memory");
exit(1); exit(1);
} }