Commit b7dff23a authored by Peter Crosthwaite's avatar Peter Crosthwaite Committed by Peter Maydell
Browse files

pflash_cfi0x: remove unused base field 



This field is completely unused. The base address should also be abstracted
away from the device anyway. Removed.

Signed-off-by: default avatarPeter Crosthwaite <peter.crosthwaite@xilinx.com>
Reviewed-by: default avatarPeter Maydell <peter.maydell@linaro.org>
Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parent 5170d661

hw/pflash_cfi01.c

+0 −2
Original line number Diff line number Diff line
@@ -61,7 +61,6 @@ do { \ 


struct pflash_t {

    BlockDriverState *bs;

    hwaddr base;

    hwaddr sector_len;

    hwaddr total_len;

    int width;
@@ -594,7 +593,6 @@ pflash_t *pflash_cfi01_register(hwaddr base, 
    }



    pfl->timer = qemu_new_timer_ns(vm_clock, pflash_timer, pfl);

    pfl->base = base;

    pfl->sector_len = sector_len;

    pfl->total_len = total_len;

    pfl->width = width;

hw/pflash_cfi02.c

+1 −3
Original line number Diff line number Diff line
@@ -56,7 +56,6 @@ do { \ 


struct pflash_t {

    BlockDriverState *bs;

    hwaddr base;

    uint32_t sector_len;

    uint32_t chip_len;

    int mappings;
@@ -602,7 +601,6 @@ pflash_t *pflash_cfi02_register(hwaddr base, 
        name, size);

    vmstate_register_ram(&pfl->orig_mem, qdev);

    pfl->storage = memory_region_get_ram_ptr(&pfl->orig_mem);

    pfl->base = base;

    pfl->chip_len = chip_len;

    pfl->mappings = nb_mappings;

    pfl->bs = bs;
@@ -618,7 +616,7 @@ pflash_t *pflash_cfi02_register(hwaddr base, 


    pflash_setup_mappings(pfl);

    pfl->rom_mode = 1;

    memory_region_add_subregion(get_system_memory(), pfl->base, &pfl->mem);

    memory_region_add_subregion(get_system_memory(), base, &pfl->mem);



    if (pfl->bs) {

        pfl->ro = bdrv_is_read_only(pfl->bs);