hvmloader: drop the ovmf32 support and rename ovmf64 -> ovmf.

- Remove the 15cpus hack from ovmf because it should be unnecessary on
nowadays windows/EFI supported.

Signed-off-by: Attilio Rao <attilio.rao@citrix.com>
Acked-by: Ian Campbell <ian.campbell@citrix.com>
Committed-by: Keir Fraser <keir@xen.org>

tools/firmware/hvmloader/hvmloader.c

@@ -212,11 +212,8 @@ struct bios_info {
 #ifdef ENABLE_SEABIOS
     { "seabios", &seabios_config, },
 #endif
-#ifdef ENABLE_OVMF32
-    { "ovmf-ia32", &ovmf32_config, },
-#endif
-#ifdef ENABLE_OVMF64
-    { "ovmf-x64", &ovmf64_config, },
+#ifdef ENABLE_OVMF
+    { "ovmf", &ovmf_config, },
 #endif
     { NULL, NULL }
 };