gwj / at91sam9263 · Commits

Commit bba831e80fd15f439ac694950759032a8c71793b

Authored by Paul Brook
1 parent fd6dc90b

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>
Inline Side-by-side
Showing 9 changed files with 14 additions and 33 deletions
hw/mips-bios.h 0 → 100644
  View file @bba831e
  1 +#include "cpu.h"
  2 +
  3 +#define BIOS_SIZE (4 * 1024 * 1024)
  4 +#ifdef TARGET_WORDS_BIGENDIAN
  5 +#define BIOS_FILENAME "mips_bios.bin"
  6 +#else
  7 +#define BIOS_FILENAME "mipsel_bios.bin"
  8 +#endif
hw/mips_jazz.c
  View file @bba831e
@@ -32,12 +32,7 @@ @@ -32,12 +32,7 @@
32 #include "boards.h" 32 #include "boards.h"
33 #include "net.h" 33 #include "net.h"
34 #include "scsi.h" 34 #include "scsi.h"
35 -  
36 -#ifdef TARGET_WORDS_BIGENDIAN  
37 -#define BIOS_FILENAME "mips_bios.bin"  
38 -#else  
39 -#define BIOS_FILENAME "mipsel_bios.bin"  
40 -#endif 35 +#include "mips-bios.h"
41 36
42 enum jazz_model_e 37 enum jazz_model_e
43 { 38 {
hw/mips_malta.c
  View file @bba831e
@@ -37,15 +37,10 @@ @@ -37,15 +37,10 @@
37 #include "audio/audio.h" 37 #include "audio/audio.h"
38 #include "boards.h" 38 #include "boards.h"
39 #include "qemu-log.h" 39 #include "qemu-log.h"
  40 +#include "mips-bios.h"
40 41
41 //#define DEBUG_BOARD_INIT 42 //#define DEBUG_BOARD_INIT
42 43
43 -#ifdef TARGET_WORDS_BIGENDIAN  
44 -#define BIOS_FILENAME "mips_bios.bin"  
45 -#else  
46 -#define BIOS_FILENAME "mipsel_bios.bin"  
47 -#endif  
48 -  
49 #ifdef TARGET_MIPS64 44 #ifdef TARGET_MIPS64
50 #define PHYS_TO_VIRT(x) ((x) | ~0x7fffffffULL) 45 #define PHYS_TO_VIRT(x) ((x) | ~0x7fffffffULL)
51 #else 46 #else
hw/mips_mipssim.c
  View file @bba831e
@@ -31,12 +31,7 @@ @@ -31,12 +31,7 @@
31 #include "net.h" 31 #include "net.h"
32 #include "sysemu.h" 32 #include "sysemu.h"
33 #include "boards.h" 33 #include "boards.h"
34 -  
35 -#ifdef TARGET_WORDS_BIGENDIAN  
36 -#define BIOS_FILENAME "mips_bios.bin"  
37 -#else  
38 -#define BIOS_FILENAME "mipsel_bios.bin"  
39 -#endif 34 +#include "mips-bios.h"
40 35
41 #ifdef TARGET_MIPS64 36 #ifdef TARGET_MIPS64
42 #define PHYS_TO_VIRT(x) ((x) | ~0x7fffffffULL) 37 #define PHYS_TO_VIRT(x) ((x) | ~0x7fffffffULL)
hw/mips_r4k.c
  View file @bba831e
@@ -16,12 +16,7 @@ @@ -16,12 +16,7 @@
16 #include "boards.h" 16 #include "boards.h"
17 #include "flash.h" 17 #include "flash.h"
18 #include "qemu-log.h" 18 #include "qemu-log.h"
19 -  
20 -#ifdef TARGET_WORDS_BIGENDIAN  
21 -#define BIOS_FILENAME "mips_bios.bin"  
22 -#else  
23 -#define BIOS_FILENAME "mipsel_bios.bin"  
24 -#endif 19 +#include "mips-bios.h"
25 20
26 #define PHYS_TO_VIRT(x) ((x) | ~(target_ulong)0x7fffffff) 21 #define PHYS_TO_VIRT(x) ((x) | ~(target_ulong)0x7fffffff)
27 22
hw/ppc405_boards.c
  View file @bba831e
@@ -32,7 +32,6 @@ @@ -32,7 +32,6 @@
32 #include "qemu-log.h" 32 #include "qemu-log.h"
33 33
34 #define BIOS_FILENAME "ppc405_rom.bin" 34 #define BIOS_FILENAME "ppc405_rom.bin"
35 -#undef BIOS_SIZE  
36 #define BIOS_SIZE (2048 * 1024) 35 #define BIOS_SIZE (2048 * 1024)
37 36
38 #define KERNEL_LOAD_ADDR 0x00000000 37 #define KERNEL_LOAD_ADDR 0x00000000
hw/ppc_mac.h
  View file @bba831e
@@ -28,6 +28,7 @@ @@ -28,6 +28,7 @@
28 /* SMP is not enabled, for now */ 28 /* SMP is not enabled, for now */
29 #define MAX_CPUS 1 29 #define MAX_CPUS 1
30 30
  31 +#define BIOS_SIZE (1024 * 1024)
31 #define BIOS_FILENAME "ppc_rom.bin" 32 #define BIOS_FILENAME "ppc_rom.bin"
32 #define VGABIOS_FILENAME "video.x" 33 #define VGABIOS_FILENAME "video.x"
33 #define NVRAM_SIZE 0x2000 34 #define NVRAM_SIZE 0x2000
hw/ppc_prep.c
  View file @bba831e
@@ -41,6 +41,7 @@ @@ -41,6 +41,7 @@
41 41
42 #define MAX_IDE_BUS 2 42 #define MAX_IDE_BUS 2
43 43
  44 +#define BIOS_SIZE (1024 * 1024)
44 #define BIOS_FILENAME "ppc_rom.bin" 45 #define BIOS_FILENAME "ppc_rom.bin"
45 #define KERNEL_LOAD_ADDR 0x01000000 46 #define KERNEL_LOAD_ADDR 0x01000000
46 #define INITRD_LOAD_ADDR 0x01800000 47 #define INITRD_LOAD_ADDR 0x01800000
sysemu.h
  View file @bba831e
@@ -123,14 +123,6 @@ extern const char *prom_envs[MAX_PROM_ENVS]; @@ -123,14 +123,6 @@ extern const char *prom_envs[MAX_PROM_ENVS];
123 extern unsigned int nb_prom_envs; 123 extern unsigned int nb_prom_envs;
124 #endif 124 #endif
125 125
126 -#if defined (TARGET_PPC)  
127 -#define BIOS_SIZE (1024 * 1024)  
128 -#elif defined (TARGET_SPARC64)  
129 -#define BIOS_SIZE ((512 + 32) * 1024)  
130 -#elif defined(TARGET_MIPS)  
131 -#define BIOS_SIZE (4 * 1024 * 1024)  
132 -#endif  
133 -  
134 typedef enum { 126 typedef enum {
135 IF_IDE, IF_SCSI, IF_FLOPPY, IF_PFLASH, IF_MTD, IF_SD, IF_VIRTIO, IF_XEN, 127 IF_IDE, IF_SCSI, IF_FLOPPY, IF_PFLASH, IF_MTD, IF_SD, IF_VIRTIO, IF_XEN,
136 IF_COUNT 128 IF_COUNT