Commit 3f905a5b authored by Alex Bennée's avatar Alex Bennée Committed by Markus Armbruster
Browse files

pflash: Bury disabled code to limit device sizes 



We disabled code to limit device sizes to 8, 16, 32 or 64MiB more than
a decade ago in commit 95d1f3ed and c8b153d7, v0.9.1.  Bury.

Signed-off-by: default avatarAlex Bennée <alex.bennee@linaro.org>
Reviewed-by: default avatarLaszlo Ersek <lersek@redhat.com>
[Extracted from a larger patch, extended to pflash_cfi02.c]
Signed-off-by: default avatarMarkus Armbruster <armbru@redhat.com>
Message-Id: <20190319163551.32499-3-armbru@redhat.com>
parent 06f15217

hw/block/pflash_cfi01.c

+0 −7
Original line number Diff line number Diff line
@@ -731,13 +731,6 @@ static void pflash_cfi01_realize(DeviceState *dev, Error **errp) 
    }

    device_len = sector_len_per_device * blocks_per_device;



    /* XXX: to be fixed */

#if 0

    if (total_len != (8 * 1024 * 1024) && total_len != (16 * 1024 * 1024) &&

        total_len != (32 * 1024 * 1024) && total_len != (64 * 1024 * 1024))

        return NULL;

#endif



    memory_region_init_rom_device(

        &pfl->mem, OBJECT(dev),

        &pflash_cfi01_ops,

hw/block/pflash_cfi02.c

+0 −6
Original line number Diff line number Diff line
@@ -551,12 +551,6 @@ static void pflash_cfi02_realize(DeviceState *dev, Error **errp) 
    }



    chip_len = pfl->sector_len * pfl->nb_blocs;

    /* XXX: to be fixed */

#if 0

    if (total_len != (8 * 1024 * 1024) && total_len != (16 * 1024 * 1024) &&

        total_len != (32 * 1024 * 1024) && total_len != (64 * 1024 * 1024))

        return NULL;

#endif



    memory_region_init_rom_device(&pfl->orig_mem, OBJECT(pfl), pfl->be ?

                                  &pflash_cfi02_ops_be : &pflash_cfi02_ops_le,