Revision 1724f049 hw/omap_sx1.c
b/hw/omap_sx1.c | ||
---|---|---|
139 | 139 |
|
140 | 140 |
/* External Flash (EMIFS) */ |
141 | 141 |
cpu_register_physical_memory(OMAP_CS0_BASE, flash_size, |
142 |
qemu_ram_alloc(flash_size) | IO_MEM_ROM); |
|
142 |
qemu_ram_alloc(NULL, "omap_sx1.flash0-0", |
|
143 |
flash_size) | IO_MEM_ROM); |
|
143 | 144 |
|
144 | 145 |
io = cpu_register_io_memory(static_readfn, static_writefn, &cs0val); |
145 | 146 |
cpu_register_physical_memory(OMAP_CS0_BASE + flash_size, |
... | ... | |
157 | 158 |
#endif |
158 | 159 |
|
159 | 160 |
if ((dinfo = drive_get(IF_PFLASH, 0, fl_idx)) != NULL) { |
160 |
if (!pflash_cfi01_register(OMAP_CS0_BASE, qemu_ram_alloc(flash_size), |
|
161 |
if (!pflash_cfi01_register(OMAP_CS0_BASE, qemu_ram_alloc(NULL, |
|
162 |
"omap_sx1.flash0-1", flash_size), |
|
161 | 163 |
dinfo->bdrv, sector_size, |
162 | 164 |
flash_size / sector_size, |
163 | 165 |
4, 0, 0, 0, 0, be)) { |
... | ... | |
170 | 172 |
if ((version == 1) && |
171 | 173 |
(dinfo = drive_get(IF_PFLASH, 0, fl_idx)) != NULL) { |
172 | 174 |
cpu_register_physical_memory(OMAP_CS1_BASE, flash1_size, |
173 |
qemu_ram_alloc(flash1_size) | IO_MEM_ROM); |
|
175 |
qemu_ram_alloc(NULL, "omap_sx1.flash1-0", |
|
176 |
flash1_size) | IO_MEM_ROM); |
|
174 | 177 |
io = cpu_register_io_memory(static_readfn, static_writefn, &cs1val); |
175 | 178 |
cpu_register_physical_memory(OMAP_CS1_BASE + flash1_size, |
176 | 179 |
OMAP_CS1_SIZE - flash1_size, io); |
177 | 180 |
|
178 |
if (!pflash_cfi01_register(OMAP_CS1_BASE, qemu_ram_alloc(flash1_size), |
|
181 |
if (!pflash_cfi01_register(OMAP_CS1_BASE, qemu_ram_alloc(NULL, |
|
182 |
"omap_sx1.flash1-1", flash1_size), |
|
179 | 183 |
dinfo->bdrv, sector_size, |
180 | 184 |
flash1_size / sector_size, |
181 | 185 |
4, 0, 0, 0, 0, be)) { |
Also available in: Unified diff