[Qemu-devel] [Patch 2/2] switch support, Mainstone - resend

[Qemu-devel] [Patch 2/2] switch support, Mainstone - resend

[Armin]

[-- Attachment #1: Type: text/plain, Size: 62 bytes --]

Here is the use of the switches patch on a Mainstone.

-Armin

[-- Attachment #2: mst_switches.patch --]
[-- Type: text/x-patch, Size: 2217 bytes --]

Index: qemu/hw/mainstone.c
===================================================================
--- qemu.orig/hw/mainstone.c
+++ qemu/hw/mainstone.c
@@ -51,32 +51,28 @@ static void mainstone_common_init(int ra
     /* There are two 32MiB flash devices on the board */
     index = drive_get_index(IF_PFLASH, 0, 0);
     if (index == -1) {
-        fprintf(stderr, "Two flash images must be given with the "
+        fprintf(stderr, "One flash image must be given with the "
                 "'pflash' parameter\n");
         exit(1);
     }
-    if (!pflash_cfi01_register(MST_FLASH_0,
-                         mainstone_ram + PXA2XX_INTERNAL_SIZE,
-                         drives_table[index].bdrv,
-                         256 * 1024, 128, 4, 0, 0, 0, 0)) {
-        fprintf(stderr, "qemu: Error registering flash memory.\n");
-        exit(1);
-    }
 
-    index = drive_get_index(IF_PFLASH, 0, 1);
-    if (index == -1) {
-        fprintf(stderr, "Two flash images must be given with the "
-                "'pflash' parameter\n");
-        exit(1);
-    }
-    if (!pflash_cfi01_register(MST_FLASH_1,
-                         mainstone_ram + PXA2XX_INTERNAL_SIZE,
-                         drives_table[index].bdrv,
-                         256 * 1024, 128, 4, 0, 0, 0, 0)) {
-        fprintf(stderr, "qemu: Error registering flash memory.\n");
-        exit(1);
+    if(switch_get_value(CFG_SPDT_SWITCH, 7)) {
+        if (!pflash_cfi01_register(MST_FLASH_0,
+                            mainstone_ram + PXA2XX_INTERNAL_SIZE,
+                            drives_table[index].bdrv,
+                            256 * 1024, 128, 4, 0, 0, 0, 0)) {
+            fprintf(stderr, "qemu: Error registering flash memory.\n");
+            exit(1);
+        }
+    }else{
+        if (!pflash_cfi01_register(MST_FLASH_1,
+                            mainstone_ram + PXA2XX_INTERNAL_SIZE,
+                            drives_table[index].bdrv,
+                            256 * 1024, 128, 4, 0, 0, 0, 0)) {
+            fprintf(stderr, "qemu: Error registering flash memory.\n");
+            exit(1);
+        }
     }
-
     mst_irq = mst_irq_init(cpu, MST_FPGA_PHYS, PXA2XX_PIC_GPIO_0);
 
     /* MMC/SD host */