|
@@ -24,6 +24,7 @@
|
|
*/
|
|
*/
|
|
|
|
|
|
#include "qemu/osdep.h"
|
|
#include "qemu/osdep.h"
|
|
|
|
+#include "qemu/units.h"
|
|
#include "qapi/error.h"
|
|
#include "qapi/error.h"
|
|
#include "qemu-common.h"
|
|
#include "qemu-common.h"
|
|
#include "cpu.h"
|
|
#include "cpu.h"
|
|
@@ -291,7 +292,7 @@ static void r2d_init(MachineState *machine)
|
|
dinfo = drive_get(IF_PFLASH, 0, 0);
|
|
dinfo = drive_get(IF_PFLASH, 0, 0);
|
|
pflash_cfi02_register(0x0, NULL, "r2d.flash", FLASH_SIZE,
|
|
pflash_cfi02_register(0x0, NULL, "r2d.flash", FLASH_SIZE,
|
|
dinfo ? blk_by_legacy_dinfo(dinfo) : NULL,
|
|
dinfo ? blk_by_legacy_dinfo(dinfo) : NULL,
|
|
- (16 * 1024), FLASH_SIZE >> 16,
|
|
|
|
|
|
+ 16 * KiB, FLASH_SIZE >> 16,
|
|
1, 4, 0x0000, 0x0000, 0x0000, 0x0000,
|
|
1, 4, 0x0000, 0x0000, 0x0000, 0x0000,
|
|
0x555, 0x2aa, 0);
|
|
0x555, 0x2aa, 0);
|
|
|
|
|