| Message ID | 1378280128-3826-3-git-send-email-antonynpavlov@gmail.com |
|---|---|
| State | New |
| Headers | show |
On Wed, Sep 04, 2013 at 11:35:28AM +0400, Antony Pavlov wrote: > Signed-off-by: Antony Pavlov <antonynpavlov@gmail.com> > --- > hw/mips/mips_malta.c | 3 ++- > include/hw/mips/bios.h | 3 ++- > 2 files changed, 4 insertions(+), 2 deletions(-) > > diff --git a/hw/mips/mips_malta.c b/hw/mips/mips_malta.c > index ae0921c..7e8978b 100644 > --- a/hw/mips/mips_malta.c > +++ b/hw/mips/mips_malta.c > @@ -51,6 +51,7 @@ > #include "sysemu/qtest.h" > #include "qemu/error-report.h" > #include "hw/empty_slot.h" > +#include "sizes.h" > > //#define DEBUG_BOARD_INIT > > @@ -63,7 +64,7 @@ > #define FPGA_ADDRESS 0x1f000000ULL > #define RESET_ADDRESS 0x1fc00000ULL > > -#define FLASH_SIZE 0x400000 > +#define FLASH_SIZE SZ_4M > > #define MAX_IDE_BUS 2 > > diff --git a/include/hw/mips/bios.h b/include/hw/mips/bios.h > index b4b88ac..e744425 100644 > --- a/include/hw/mips/bios.h > +++ b/include/hw/mips/bios.h > @@ -1,6 +1,7 @@ > #include "cpu.h" > +#include "sizes.h" > > -#define BIOS_SIZE (4 * 1024 * 1024) > +#define BIOS_SIZE SZ_4M > #ifdef TARGET_WORDS_BIGENDIAN > #define BIOS_FILENAME "mips_bios.bin" > #else Besides the comments from the previous patch: Reviewed-by: Aurelien Jarno <aurelien@aurel32.net>
diff --git a/hw/mips/mips_malta.c b/hw/mips/mips_malta.c index ae0921c..7e8978b 100644 --- a/hw/mips/mips_malta.c +++ b/hw/mips/mips_malta.c @@ -51,6 +51,7 @@ #include "sysemu/qtest.h" #include "qemu/error-report.h" #include "hw/empty_slot.h" +#include "sizes.h" //#define DEBUG_BOARD_INIT @@ -63,7 +64,7 @@ #define FPGA_ADDRESS 0x1f000000ULL #define RESET_ADDRESS 0x1fc00000ULL -#define FLASH_SIZE 0x400000 +#define FLASH_SIZE SZ_4M #define MAX_IDE_BUS 2 diff --git a/include/hw/mips/bios.h b/include/hw/mips/bios.h index b4b88ac..e744425 100644 --- a/include/hw/mips/bios.h +++ b/include/hw/mips/bios.h @@ -1,6 +1,7 @@ #include "cpu.h" +#include "sizes.h" -#define BIOS_SIZE (4 * 1024 * 1024) +#define BIOS_SIZE SZ_4M #ifdef TARGET_WORDS_BIGENDIAN #define BIOS_FILENAME "mips_bios.bin" #else
Signed-off-by: Antony Pavlov <antonynpavlov@gmail.com> --- hw/mips/mips_malta.c | 3 ++- include/hw/mips/bios.h | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-)