commit 05ee37ebf630fa970feb362671a5aee22bcb529f
author balrog <balrog@c046a42c-6fe2-441c-8c8c-71466251a162> Sat Nov 17 11:50:55 2007 +0000
committer balrog <balrog@c046a42c-6fe2-441c-8c8c-71466251a162> Sat Nov 17 11:50:55 2007 +0000
tree 1fad6afb399872f0aa65ac87c1ee0d61224dc596
parent 7f1559c644a8a44391cf10c7700a1ece4106a7f7

Gumstix 'connex' board support by Thorsten Zitterell.


git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@3667 c046a42c-6fe2-441c-8c8c-71466251a162

vl.c

diff --git a/vl.c b/vl.c
index 166bacf..8defc30 100644
--- a/vl.c
+++ b/vl.c
@@ -7435,6 +7435,7 @@
     qemu_register_machine(&palmte_machine);
     qemu_register_machine(&lm3s811evb_machine);
     qemu_register_machine(&lm3s6965evb_machine);
+    qemu_register_machine(&connex_machine);
 #elif defined(TARGET_SH4)
     qemu_register_machine(&shix_machine);
     qemu_register_machine(&r2d_machine);
@@ -8260,7 +8261,8 @@
     if (!linux_boot && net_boot == 0 &&
         hd_filename[0] == '\0' &&
         (cdrom_index >= 0 && hd_filename[cdrom_index] == '\0') &&
-        fd_filename[0] == '\0')
+        fd_filename[0] == '\0' &&
+        pflash_filename[0] == '\0')
         help(1);
 
     /* boot to floppy or the default cd if no hard disk defined yet */