From 3b7d68179f60b98da12fb126e5378bd37bdc4744 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Fri, 4 Sep 2009 15:57:21 +0100 Subject: [PATCH] stdvga + videoram config option This is a cherry pick of e0bb6b8df60863bca0163a1688baf4854e931e55 and its predecessor. Signed-off-by: KUWAMURA Shin'ya Signed-off-by: Andrew Lyon --- vl.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/vl.c b/vl.c index 85adc540..476d36b7 100644 --- a/vl.c +++ b/vl.c @@ -4803,7 +4803,6 @@ int main(int argc, char **argv, char **envp) machine = first_machine; cpu_model = NULL; initrd_filename = NULL; - ram_size = VGA_RAM_SIZE; #ifdef CONFIG_GDBSTUB use_gdbstub = 0; gdbstub_port = DEFAULT_GDBSTUB_PORT; @@ -5656,13 +5655,6 @@ int main(int argc, char **argv, char **envp) } #endif -#if defined (__ia64__) - if (ram_size > VGA_IO_START) - ram_size += VGA_IO_SIZE; /* skip VGA I/O hole */ - if (ram_size > MMIO_START) - ram_size += 1 * MEM_G; /* skip 3G-4G MMIO, LEGACY_IO_SPACE etc. */ -#endif - /* init the bluetooth world */ for (i = 0; i < nb_bt_opts; i++) if (bt_parse(bt_opts[i])) @@ -5679,6 +5671,13 @@ int main(int argc, char **argv, char **envp) phys_ram_size = (machine->ram_require + vga_ram_size) & ~RAMSIZE_FIXED; +#if defined (__ia64__) + if (ram_size > VGA_IO_START) + ram_size += VGA_IO_SIZE; /* skip VGA I/O hole */ + if (ram_size > MMIO_START) + ram_size += 1 * MEM_G; /* skip 3G-4G MMIO, LEGACY_IO_SPACE etc. */ +#endif + if (machine->ram_require & RAMSIZE_FIXED) { if (ram_size > 0) { if (ram_size < phys_ram_size) { -- 2.39.5