| Message ID | 1315816395-27304-1-git-send-email-peter.maydell@linaro.org |
|---|---|
| State | Rejected |
| Headers | show |
On 12 September 2011 09:33, Peter Maydell <peter.maydell@linaro.org> wrote: > Remove a spurious second map of the OMAP GPMC CS0 region on reset. > This fixes an assertion failure when we try to add the region to > its container when it was already added. (The old code did not > complain about mismatched map/unmap calls, but the new MemoryRegion > implementation does.) Whoops; please ignore this, it's an old patch which I accidentally resubmitted due to a fumble-fingered moment at the shell prompt and the git-send-email command being in my shell history... -- PMM
diff --git a/hw/omap_gpmc.c b/hw/omap_gpmc.c index 922d622..673dddd 100644 --- a/hw/omap_gpmc.c +++ b/hw/omap_gpmc.c @@ -135,7 +135,6 @@ void omap_gpmc_reset(struct omap_gpmc_s *s) s->cs_file[i].config[6] & 0x1f, /* MASKADDR */ (s->cs_file[i].config[6] >> 8 & 0xf)); /* BASEADDR */ } - omap_gpmc_cs_map(s->cs_file, 0, 0xf); s->ecc_cs = 0; s->ecc_ptr = 0; s->ecc_cfg = 0x3fcff000;
Remove a spurious second map of the OMAP GPMC CS0 region on reset. This fixes an assertion failure when we try to add the region to its container when it was already added. (The old code did not complain about mismatched map/unmap calls, but the new MemoryRegion implementation does.) Signed-off-by: Peter Maydell <peter.maydell@linaro.org> --- hw/omap_gpmc.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-)