mirror of https://github.com/xemu-project/xemu.git
hw/arm/gumstix: Use the IEC binary prefix definitions
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:
parent
1c2addee1a
commit
38cb336fe9
|
@ -35,6 +35,7 @@
|
|||
*/
|
||||
|
||||
#include "qemu/osdep.h"
|
||||
#include "qemu/units.h"
|
||||
#include "qemu/error-report.h"
|
||||
#include "hw/arm/pxa.h"
|
||||
#include "net/net.h"
|
||||
|
@ -45,17 +46,20 @@
|
|||
#include "sysemu/qtest.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)
|
||||
{
|
||||
PXA2xxState *cpu;
|
||||
DriveInfo *dinfo;
|
||||
|
||||
uint32_t connex_rom = 0x01000000;
|
||||
uint32_t connex_ram = 0x04000000;
|
||||
|
||||
cpu = pxa255_init(connex_ram);
|
||||
cpu = pxa255_init(CONNEX_RAM_SIZE);
|
||||
|
||||
dinfo = drive_get(IF_PFLASH, 0, 0);
|
||||
if (!dinfo && !qtest_enabled()) {
|
||||
|
@ -65,9 +69,9 @@ static void connex_init(MachineState *machine)
|
|||
}
|
||||
|
||||
/* 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,
|
||||
sector_len, 2, 0, 0, 0, 0, 0)) {
|
||||
FLASH_SECTOR_SIZE, 2, 0, 0, 0, 0, 0)) {
|
||||
error_report("Error registering flash memory");
|
||||
exit(1);
|
||||
}
|
||||
|
@ -82,10 +86,7 @@ static void verdex_init(MachineState *machine)
|
|||
PXA2xxState *cpu;
|
||||
DriveInfo *dinfo;
|
||||
|
||||
uint32_t verdex_rom = 0x02000000;
|
||||
uint32_t verdex_ram = 0x10000000;
|
||||
|
||||
cpu = pxa270_init(verdex_ram, machine->cpu_type);
|
||||
cpu = pxa270_init(VERDEX_RAM_SIZE, machine->cpu_type);
|
||||
|
||||
dinfo = drive_get(IF_PFLASH, 0, 0);
|
||||
if (!dinfo && !qtest_enabled()) {
|
||||
|
@ -95,9 +96,9 @@ static void verdex_init(MachineState *machine)
|
|||
}
|
||||
|
||||
/* 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,
|
||||
sector_len, 2, 0, 0, 0, 0, 0)) {
|
||||
FLASH_SECTOR_SIZE, 2, 0, 0, 0, 0, 0)) {
|
||||
error_report("Error registering flash memory");
|
||||
exit(1);
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue