From 710ffe604810676f9385263ba10f71f41b330cce Mon Sep 17 00:00:00 2001 From: Peter Maydell Date: Tue, 23 Aug 2011 19:24:32 +0100 Subject: [PATCH] hw/omap_gpmc: Don't try to map CS0 twice on reset 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 Signed-off-by: Edgar E. Iglesias --- hw/omap_gpmc.c | 1 - 1 file changed, 1 deletion(-) diff --git a/hw/omap_gpmc.c b/hw/omap_gpmc.c index 922d622008..673dddd237 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;