SYS-OSS/FRET-qemu
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

Browse Source 
IEC binary prefixes ease code review: the unit is explicit.

Add definitions for RAM / Flash / Flash blocksize.

Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-id: 20230109115316.2235-7-philmd@linaro.org
Message-Id: <20200223231044.8003-3-philmd@redhat.com>
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Philippe Mathieu-Daudé 2023-01-09 12:53:09 +01:00 committed by Peter Maydell
parent 1c2addee1a
commit 38cb336fe9
1 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
hw/arm/gumstix.c
View File

@ -35,6 +35,7 @@
*/ */
#include "qemu/osdep.h" #include "qemu/osdep.h"
#include "qemu/units.h"
#include "qemu/error-report.h" #include "qemu/error-report.h"
#include "hw/arm/pxa.h" #include "hw/arm/pxa.h"
#include "net/net.h" #include "net/net.h"
@ -45,17 +46,20 @@
#include "sysemu/qtest.h" #include "sysemu/qtest.h"
#include "cpu.h" #include "cpu.h"
static const int sector_len = 128 * 1024; #define CONNEX_FLASH_SIZE (16 * MiB)
#define CONNEX_RAM_SIZE (64 * MiB)
#define VERDEX_FLASH_SIZE (32 * MiB)
#define VERDEX_RAM_SIZE (256 * MiB)
#define FLASH_SECTOR_SIZE (128 * KiB)
static void connex_init(MachineState *machine) static void connex_init(MachineState *machine)
{ {
PXA2xxState *cpu; PXA2xxState *cpu;
DriveInfo *dinfo; DriveInfo *dinfo;
uint32_t connex_rom = 0x01000000; cpu = pxa255_init(CONNEX_RAM_SIZE);
uint32_t connex_ram = 0x04000000;
cpu = pxa255_init(connex_ram);
dinfo = drive_get(IF_PFLASH, 0, 0); dinfo = drive_get(IF_PFLASH, 0, 0);
if (!dinfo && !qtest_enabled()) { if (!dinfo && !qtest_enabled()) {
@ -65,9 +69,9 @@ static void connex_init(MachineState *machine)
} }
/* Numonyx RC28F128J3F75 */ /* Numonyx RC28F128J3F75 */
if (!pflash_cfi01_register(0x00000000, "connext.rom", connex_rom, if (!pflash_cfi01_register(0x00000000, "connext.rom", CONNEX_FLASH_SIZE,
dinfo ? blk_by_legacy_dinfo(dinfo) : NULL, dinfo ? blk_by_legacy_dinfo(dinfo) : NULL,
sector_len, 2, 0, 0, 0, 0, 0)) { FLASH_SECTOR_SIZE, 2, 0, 0, 0, 0, 0)) {
error_report("Error registering flash memory"); error_report("Error registering flash memory");
exit(1); exit(1);
} }
@ -82,10 +86,7 @@ static void verdex_init(MachineState *machine)
PXA2xxState *cpu; PXA2xxState *cpu;
DriveInfo *dinfo; DriveInfo *dinfo;
uint32_t verdex_rom = 0x02000000; cpu = pxa270_init(VERDEX_RAM_SIZE, machine->cpu_type);
uint32_t verdex_ram = 0x10000000;
cpu = pxa270_init(verdex_ram, machine->cpu_type);
dinfo = drive_get(IF_PFLASH, 0, 0); dinfo = drive_get(IF_PFLASH, 0, 0);
if (!dinfo && !qtest_enabled()) { if (!dinfo && !qtest_enabled()) {
@ -95,9 +96,9 @@ static void verdex_init(MachineState *machine)
} }
/* Micron RC28F256P30TFA */ /* Micron RC28F256P30TFA */
if (!pflash_cfi01_register(0x00000000, "verdex.rom", verdex_rom, if (!pflash_cfi01_register(0x00000000, "verdex.rom", VERDEX_FLASH_SIZE,
dinfo ? blk_by_legacy_dinfo(dinfo) : NULL, dinfo ? blk_by_legacy_dinfo(dinfo) : NULL,
sector_len, 2, 0, 0, 0, 0, 0)) { FLASH_SECTOR_SIZE, 2, 0, 0, 0, 0, 0)) {
error_report("Error registering flash memory"); error_report("Error registering flash memory");
exit(1); exit(1);
} }