aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Brook <paul@codesourcery.com>2009-05-19 14:52:42 +0100
committerPaul Brook <paul@codesourcery.com>2009-05-19 14:52:42 +0100
commitbba831e80fd15f439ac694950759032a8c71793b (patch)
tree61769b2a2112c24c5e96ceaf59092eeb33a62fbc
parentfd6dc90ba0932f082ac8284cc957dd7efd89d014 (diff)
downloadqemu-bba831e80fd15f439ac694950759032a8c71793b.zip
qemu-bba831e80fd15f439ac694950759032a8c71793b.tar.gz
qemu-bba831e80fd15f439ac694950759032a8c71793b.tar.bz2
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>
-rw-r--r--hw/mips-bios.h8
-rw-r--r--hw/mips_jazz.c7
-rw-r--r--hw/mips_malta.c7
-rw-r--r--hw/mips_mipssim.c7
-rw-r--r--hw/mips_r4k.c7
-rw-r--r--hw/ppc405_boards.c1
-rw-r--r--hw/ppc_mac.h1
-rw-r--r--hw/ppc_prep.c1
-rw-r--r--sysemu.h8
9 files changed, 14 insertions, 33 deletions
diff --git a/hw/mips-bios.h b/hw/mips-bios.h
new file mode 100644
index 0000000..b4b88ac
--- /dev/null
+++ b/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
diff --git a/hw/mips_jazz.c b/hw/mips_jazz.c
index 292137f..49c0b46 100644
--- a/hw/mips_jazz.c
+++ b/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
{
diff --git a/hw/mips_malta.c b/hw/mips_malta.c
index 747143d..564eaa6 100644
--- a/hw/mips_malta.c
+++ b/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
diff --git a/hw/mips_mipssim.c b/hw/mips_mipssim.c
index 54656ad..b3f190e 100644
--- a/hw/mips_mipssim.c
+++ b/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)
diff --git a/hw/mips_r4k.c b/hw/mips_r4k.c
index aea82cc..9ad8de6 100644
--- a/hw/mips_r4k.c
+++ b/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)
diff --git a/hw/ppc405_boards.c b/hw/ppc405_boards.c
index bc5f1cf..0b4eb93 100644
--- a/hw/ppc405_boards.c
+++ b/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
diff --git a/hw/ppc_mac.h b/hw/ppc_mac.h
index 74d19a1..dc39338 100644
--- a/hw/ppc_mac.h
+++ b/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
diff --git a/hw/ppc_prep.c b/hw/ppc_prep.c
index b98c6c2..a805c29 100644
--- a/hw/ppc_prep.c
+++ b/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
diff --git a/sysemu.h b/sysemu.h
index 2ff6194..1e4be53 100644
--- a/sysemu.h
+++ b/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