Revision 2c9b15ca hw/arm/omap_sx1.c
| b/hw/arm/omap_sx1.c | ||
|---|---|---|
| 120 | 120 |
mpu = omap310_mpu_init(address_space, sx1_binfo.ram_size, args->cpu_model); |
| 121 | 121 |
|
| 122 | 122 |
/* External Flash (EMIFS) */ |
| 123 |
memory_region_init_ram(flash, "omap_sx1.flash0-0", flash_size); |
|
| 123 |
memory_region_init_ram(flash, NULL, "omap_sx1.flash0-0", flash_size);
|
|
| 124 | 124 |
vmstate_register_ram_global(flash); |
| 125 | 125 |
memory_region_set_readonly(flash, true); |
| 126 | 126 |
memory_region_add_subregion(address_space, OMAP_CS0_BASE, flash); |
| 127 | 127 |
|
| 128 |
memory_region_init_io(&cs[0], &static_ops, &cs0val, |
|
| 128 |
memory_region_init_io(&cs[0], NULL, &static_ops, &cs0val,
|
|
| 129 | 129 |
"sx1.cs0", OMAP_CS0_SIZE - flash_size); |
| 130 | 130 |
memory_region_add_subregion(address_space, |
| 131 | 131 |
OMAP_CS0_BASE + flash_size, &cs[0]); |
| 132 | 132 |
|
| 133 | 133 |
|
| 134 |
memory_region_init_io(&cs[2], &static_ops, &cs2val, |
|
| 134 |
memory_region_init_io(&cs[2], NULL, &static_ops, &cs2val,
|
|
| 135 | 135 |
"sx1.cs2", OMAP_CS2_SIZE); |
| 136 | 136 |
memory_region_add_subregion(address_space, |
| 137 | 137 |
OMAP_CS2_BASE, &cs[2]); |
| 138 | 138 |
|
| 139 |
memory_region_init_io(&cs[3], &static_ops, &cs3val, |
|
| 139 |
memory_region_init_io(&cs[3], NULL, &static_ops, &cs3val,
|
|
| 140 | 140 |
"sx1.cs3", OMAP_CS3_SIZE); |
| 141 | 141 |
memory_region_add_subregion(address_space, |
| 142 | 142 |
OMAP_CS2_BASE, &cs[3]); |
| ... | ... | |
| 162 | 162 |
|
| 163 | 163 |
if ((version == 1) && |
| 164 | 164 |
(dinfo = drive_get(IF_PFLASH, 0, fl_idx)) != NULL) {
|
| 165 |
memory_region_init_ram(flash_1, "omap_sx1.flash1-0", flash1_size); |
|
| 165 |
memory_region_init_ram(flash_1, NULL, "omap_sx1.flash1-0", flash1_size);
|
|
| 166 | 166 |
vmstate_register_ram_global(flash_1); |
| 167 | 167 |
memory_region_set_readonly(flash_1, true); |
| 168 | 168 |
memory_region_add_subregion(address_space, OMAP_CS1_BASE, flash_1); |
| 169 | 169 |
|
| 170 |
memory_region_init_io(&cs[1], &static_ops, &cs1val, |
|
| 170 |
memory_region_init_io(&cs[1], NULL, &static_ops, &cs1val,
|
|
| 171 | 171 |
"sx1.cs1", OMAP_CS1_SIZE - flash1_size); |
| 172 | 172 |
memory_region_add_subregion(address_space, |
| 173 | 173 |
OMAP_CS1_BASE + flash1_size, &cs[1]); |
| ... | ... | |
| 182 | 182 |
} |
| 183 | 183 |
fl_idx++; |
| 184 | 184 |
} else {
|
| 185 |
memory_region_init_io(&cs[1], &static_ops, &cs1val, |
|
| 185 |
memory_region_init_io(&cs[1], NULL, &static_ops, &cs1val,
|
|
| 186 | 186 |
"sx1.cs1", OMAP_CS1_SIZE); |
| 187 | 187 |
memory_region_add_subregion(address_space, |
| 188 | 188 |
OMAP_CS1_BASE, &cs[1]); |
Also available in: Unified diff