gwj / at91sam9263 · Commits

Commit 0ced6589701ec3716f7df86dbaf29db154a6a0d7

Authored by bellard
1 parent b415a407

PowerPC merge 


git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@857 c046a42c-6fe2-441c-8c8c-71466251a162
Inline Side-by-side
Showing 2 changed files with 13 additions and 2 deletions
@@ -110,11 +110,12 @@ IOPortReadFunc *ioport_read_table[3][MAX_IOPORTS]; @@ -110,11 +110,12 @@ IOPortReadFunc *ioport_read_table[3][MAX_IOPORTS];
110 IOPortWriteFunc *ioport_write_table[3][MAX_IOPORTS]; 110 IOPortWriteFunc *ioport_write_table[3][MAX_IOPORTS];
111 BlockDriverState *bs_table[MAX_DISKS], *fd_table[MAX_FD]; 111 BlockDriverState *bs_table[MAX_DISKS], *fd_table[MAX_FD];
112 int vga_ram_size; 112 int vga_ram_size;
  113 +int bios_size;
113 static DisplayState display_state; 114 static DisplayState display_state;
114 int nographic; 115 int nographic;
115 int64_t ticks_per_sec; 116 int64_t ticks_per_sec;
116 int boot_device = 'c'; 117 int boot_device = 'c';
117 -static int ram_size; 118 +int ram_size;
118 static char network_script[1024]; 119 static char network_script[1024];
119 int pit_min_timer_count = 0; 120 int pit_min_timer_count = 0;
120 int nb_nics; 121 int nb_nics;
@@ -2095,6 +2096,7 @@ int main(int argc, char **argv) @@ -2095,6 +2096,7 @@ int main(int argc, char **argv)
2095 hd_filename[i] = NULL; 2096 hd_filename[i] = NULL;
2096 ram_size = DEFAULT_RAM_SIZE * 1024 * 1024; 2097 ram_size = DEFAULT_RAM_SIZE * 1024 * 1024;
2097 vga_ram_size = VGA_RAM_SIZE; 2098 vga_ram_size = VGA_RAM_SIZE;
  2099 + bios_size = BIOS_SIZE;
2098 pstrcpy(network_script, sizeof(network_script), DEFAULT_NETWORK_SCRIPT); 2100 pstrcpy(network_script, sizeof(network_script), DEFAULT_NETWORK_SCRIPT);
2099 #ifdef CONFIG_GDBSTUB 2101 #ifdef CONFIG_GDBSTUB
2100 use_gdbstub = 0; 2102 use_gdbstub = 0;
@@ -2393,7 +2395,7 @@ int main(int argc, char **argv) @@ -2393,7 +2395,7 @@ int main(int argc, char **argv)
2393 } 2395 }
2394 2396
2395 /* init the memory */ 2397 /* init the memory */
2396 - phys_ram_size = ram_size + vga_ram_size; 2398 + phys_ram_size = ram_size + vga_ram_size + bios_size;
2397 2399
2398 #ifdef CONFIG_SOFTMMU 2400 #ifdef CONFIG_SOFTMMU
2399 #ifdef _BSD 2401 #ifdef _BSD
@@ -168,6 +168,15 @@ void vm_start(void); @@ -168,6 +168,15 @@ void vm_start(void);
168 void vm_stop(int reason); 168 void vm_stop(int reason);
169 169
170 extern int audio_enabled; 170 extern int audio_enabled;
  171 +extern int ram_size;
  172 +extern int bios_size;
  173 +
  174 +/* XXX: make it dynamic */
  175 +#if defined (TARGET_PPC)
  176 +#define BIOS_SIZE (512 * 1024)
  177 +#else
  178 +#define BIOS_SIZE 0
  179 +#endif
171 180
172 /* async I/O support */ 181 /* async I/O support */
173 182