Browse Source

Remove obsolete BIOS_SIZE from sysemu.h

BIOS_SIZE is no longer needed by vl.c, so there's no point having it in
sysemu.h.

Signed-off-by: Paul Brook <paul@codesourcery.com>
stable-0.11
Paul Brook 17 years ago
parent
commit
bba831e80f
  1. 8
      hw/mips-bios.h
  2. 7
      hw/mips_jazz.c
  3. 7
      hw/mips_malta.c
  4. 7
      hw/mips_mipssim.c
  5. 7
      hw/mips_r4k.c
  6. 1
      hw/ppc405_boards.c
  7. 1
      hw/ppc_mac.h
  8. 1
      hw/ppc_prep.c
  9. 8
      sysemu.h

8
hw/mips-bios.h

@ -0,0 +1,8 @@
#include "cpu.h"
#define BIOS_SIZE (4 * 1024 * 1024)
#ifdef TARGET_WORDS_BIGENDIAN
#define BIOS_FILENAME "mips_bios.bin"
#else
#define BIOS_FILENAME "mipsel_bios.bin"
#endif

7
hw/mips_jazz.c

@ -32,12 +32,7 @@
#include "boards.h"
#include "net.h"
#include "scsi.h"
#ifdef TARGET_WORDS_BIGENDIAN
#define BIOS_FILENAME "mips_bios.bin"
#else
#define BIOS_FILENAME "mipsel_bios.bin"
#endif
#include "mips-bios.h"
enum jazz_model_e
{

7
hw/mips_malta.c

@ -37,15 +37,10 @@
#include "audio/audio.h"
#include "boards.h"
#include "qemu-log.h"
#include "mips-bios.h"
//#define DEBUG_BOARD_INIT
#ifdef TARGET_WORDS_BIGENDIAN
#define BIOS_FILENAME "mips_bios.bin"
#else
#define BIOS_FILENAME "mipsel_bios.bin"
#endif
#ifdef TARGET_MIPS64
#define PHYS_TO_VIRT(x) ((x) | ~0x7fffffffULL)
#else

7
hw/mips_mipssim.c

@ -31,12 +31,7 @@
#include "net.h"
#include "sysemu.h"
#include "boards.h"
#ifdef TARGET_WORDS_BIGENDIAN
#define BIOS_FILENAME "mips_bios.bin"
#else
#define BIOS_FILENAME "mipsel_bios.bin"
#endif
#include "mips-bios.h"
#ifdef TARGET_MIPS64
#define PHYS_TO_VIRT(x) ((x) | ~0x7fffffffULL)

7
hw/mips_r4k.c

@ -16,12 +16,7 @@
#include "boards.h"
#include "flash.h"
#include "qemu-log.h"
#ifdef TARGET_WORDS_BIGENDIAN
#define BIOS_FILENAME "mips_bios.bin"
#else
#define BIOS_FILENAME "mipsel_bios.bin"
#endif
#include "mips-bios.h"
#define PHYS_TO_VIRT(x) ((x) | ~(target_ulong)0x7fffffff)

1
hw/ppc405_boards.c

@ -32,7 +32,6 @@
#include "qemu-log.h"
#define BIOS_FILENAME "ppc405_rom.bin"
#undef BIOS_SIZE
#define BIOS_SIZE (2048 * 1024)
#define KERNEL_LOAD_ADDR 0x00000000

1
hw/ppc_mac.h

@ -28,6 +28,7 @@
/* SMP is not enabled, for now */
#define MAX_CPUS 1
#define BIOS_SIZE (1024 * 1024)
#define BIOS_FILENAME "ppc_rom.bin"
#define VGABIOS_FILENAME "video.x"
#define NVRAM_SIZE 0x2000

1
hw/ppc_prep.c

@ -41,6 +41,7 @@
#define MAX_IDE_BUS 2
#define BIOS_SIZE (1024 * 1024)
#define BIOS_FILENAME "ppc_rom.bin"
#define KERNEL_LOAD_ADDR 0x01000000
#define INITRD_LOAD_ADDR 0x01800000

8
sysemu.h

@ -123,14 +123,6 @@ extern const char *prom_envs[MAX_PROM_ENVS];
extern unsigned int nb_prom_envs;
#endif
#if defined (TARGET_PPC)
#define BIOS_SIZE (1024 * 1024)
#elif defined (TARGET_SPARC64)
#define BIOS_SIZE ((512 + 32) * 1024)
#elif defined(TARGET_MIPS)
#define BIOS_SIZE (4 * 1024 * 1024)
#endif
typedef enum {
IF_IDE, IF_SCSI, IF_FLOPPY, IF_PFLASH, IF_MTD, IF_SD, IF_VIRTIO, IF_XEN,
IF_COUNT

Loading…
Cancel
Save