diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2011-08-23 19:24:32 +0100 |
|---|---|---|
| committer | Edgar E. Iglesias <edgar.iglesias@gmail.com> | 2011-08-23 21:51:47 +0200 |
| commit | 710ffe604810676f9385263ba10f71f41b330cce (patch) | |
| tree | a714de2cd78dea19e6ddc659e0caa54c0695f52f | |
| parent | f412c762e2c2798088c0188e7fdb714def549e05 (diff) | |
| download | qemu-710ffe604810676f9385263ba10f71f41b330cce.zip qemu-710ffe604810676f9385263ba10f71f41b330cce.tar.gz qemu-710ffe604810676f9385263ba10f71f41b330cce.tar.bz2 | |
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 <peter.maydell@linaro.org>
Signed-off-by: Edgar E. Iglesias <edgar.iglesias@gmail.com>
| -rw-r--r-- | hw/omap_gpmc.c | 1 |
1 files changed, 0 insertions, 1 deletions
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; |