Re: [Qemu-devel] [PATCH 2/4] mips_fulong2e: Fix bios flash size

[Philippe Mathieu-Daudé]

On 2/11/19 5:01 AM, BALATON Zoltan wrote:
> According to both the specifications on linux-mips.org referenced in a

This link: https://www.linux-mips.org/wiki/Fulong#Front:

> comment at the beginning of the file and the flash chip part number
> the bios size should be 512k not 1M.
> 
> Signed-off-by: BALATON Zoltan <address@hidden>

Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Tested-by: Philippe Mathieu-Daudé <address@hidden>

> ---
>  hw/mips/mips_fulong2e.c | 9 ++++-----
>  1 file changed, 4 insertions(+), 5 deletions(-)
> 
> diff --git a/hw/mips/mips_fulong2e.c b/hw/mips/mips_fulong2e.c
> index 02549d5c7e..10e6ed585a 100644
> --- a/hw/mips/mips_fulong2e.c
> +++ b/hw/mips/mips_fulong2e.c
> @@ -21,6 +21,7 @@
>  #include "qemu/osdep.h"
>  #include "qemu/units.h"
>  #include "qapi/error.h"
> +#include "cpu.h"
>  #include "hw/hw.h"
>  #include "hw/i386/pc.h"
>  #include "hw/dma/i8257.h"
> @@ -35,7 +36,6 @@
>  #include "audio/audio.h"
>  #include "qemu/log.h"
>  #include "hw/loader.h"
> -#include "hw/mips/bios.h"
>  #include "hw/ide.h"
>  #include "elf.h"
>  #include "hw/isa/vt82c686.h"
> @@ -51,6 +51,8 @@
>  #define ENVP_NB_ENTRIES              16
>  #define ENVP_ENTRY_SIZE              256
>  
> +/* fulong 2e has a 512k flash: Winbond W39L040AP70Z */
> +#define BIOS_SIZE (512 * KiB)
>  #define MAX_IDE_BUS 2
>  
>  /*
> @@ -307,12 +309,9 @@ static void mips_fulong2e_init(MachineState *machine)
>      /* fulong 2e has 256M ram. */
>      ram_size = 256 * MiB;
>  
> -    /* fulong 2e has a 1M flash.Winbond W39L040AP70Z */
> -    bios_size = 1 * MiB;
> -
>      /* allocate RAM */
>      memory_region_allocate_system_memory(ram, NULL, "fulong2e.ram", 
> ram_size);
> -    memory_region_init_ram(bios, NULL, "fulong2e.bios", bios_size,
> +    memory_region_init_ram(bios, NULL, "fulong2e.bios", BIOS_SIZE,
>                             &error_fatal);
>      memory_region_set_readonly(bios, true);
>  
>