emulator: clean-up legacy board init

Clean-up legacy board initializtion.
Remove unused variables.

Change-Id: I480b179c34cece682a13253bd3f0f3c37e2d21d4
Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>

diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c
index ff92135fc0447e1b7b54adb41911c2c1f0a41725..89636909e9ef0adb45c3b65cc00317b036ab5f0b 100644 (file)
--- a/hw/i386/pc_piix.c
+++ b/hw/i386/pc_piix.c
@@ -54,13 +54,6 @@
 
 #define MAX_IDE_BUS 2
 
-#ifdef CONFIG_MARU
-void pc_init_pci(QEMUMachineInitArgs *args);
-
-extern MemoryRegion *global_ram_memory; 
-extern void *preallocated_ram_ptr;
-#endif
-
 static const int ide_iobase[MAX_IDE_BUS] = { 0x1f0, 0x170 };
 static const int ide_iobase2[MAX_IDE_BUS] = { 0x3f6, 0x376 };
 static const int ide_irq[MAX_IDE_BUS] = { 14, 15 };
@@ -155,10 +148,6 @@ static void pc_init1(QEMUMachineInitArgs *args,
         smbios_set_type1_defaults("QEMU", "Standard PC (i440FX + PIIX, 1996)",
                                   args->machine->name);
     }
-#ifdef CONFIG_MARU
-    // for ramdump...
-    global_ram_memory = ram_memory;
-#endif
 
     /* allocate ram and load rom/bios */
     if (!xen_enabled()) {
@@ -268,15 +257,20 @@ static void pc_init1(QEMUMachineInitArgs *args,
     }
 }
 
-#ifdef CONFIG_MARU
-void pc_init_pci(QEMUMachineInitArgs *args)
-#else
 static void pc_init_pci(QEMUMachineInitArgs *args)
-#endif
 {
     pc_init1(args, 1, 1);
 }
 
+#ifdef CONFIG_MARU
+void maru_pc_init_pci(QEMUMachineInitArgs *args);
+
+void maru_pc_init_pci(QEMUMachineInitArgs *args)
+{
+    pc_init_pci(args);
+}
+#endif
+
 static void pc_compat_1_7(QEMUMachineInitArgs *args)
 {
     smbios_type1_defaults = false;

diff --git a/tizen/src/hw/maru_board.c b/tizen/src/hw/maru_board.c
index 59d5422fbb669d33a23fe970b07ba65b9cfce7cb..ea61612524d3cbbf641c0aaa5535bc522a6d7179 100644 (file)
--- a/tizen/src/hw/maru_board.c
+++ b/tizen/src/hw/maru_board.c
@@ -76,27 +76,17 @@ static const int ide_iobase[MAX_IDE_BUS] = { 0x1f0, 0x170 };
 static const int ide_iobase2[MAX_IDE_BUS] = { 0x3f6, 0x376 };
 static const int ide_irq[MAX_IDE_BUS] = { 14, 15 };
 
-static bool has_pci_info = true;
-
-MemoryRegion *global_ram_memory;
-
-MemoryRegion *get_ram_memory(void)
-{
-    return global_ram_memory;
-}
-
 /* maru specialized device init */
 static void maru_device_init(void)
 {
     // do nothing for now...
 }
 
-extern void pc_init_pci(QEMUMachineInitArgs *args);
+extern void maru_pc_init_pci(QEMUMachineInitArgs *args);
 static void maru_x86_board_init(QEMUMachineInitArgs *args)
 {
-    pc_init_pci(args);
+    maru_pc_init_pci(args);
 
-    has_pci_info = false;
     maru_device_init();
 }