r405 - openbios-devel/arch/ppc/qemu

Author: laurent
Date: 2009-01-13 21:07:43 +0100 (Tue, 13 Jan 2009)
New Revision: 405

Modified:
   openbios-devel/arch/ppc/qemu/main.c
Log:
Don't try to start Quik from hard disk if booting from the CD-ROM
(Aurelien Jarno)

Modified: openbios-devel/arch/ppc/qemu/main.c
===================================================================
--- openbios-devel/arch/ppc/qemu/main.c	2009-01-13 20:02:40 UTC (rev 404)
+++ openbios-devel/arch/ppc/qemu/main.c	2009-01-13 20:07:43 UTC (rev 405)
@@ -393,8 +393,13 @@
 void
 boot( void )
 {
+	char boot_device = nvram_read(0x34);
    fword("update-chosen");
-        check_preloaded_kernel();
-	quik_startup();
+	if (boot_device == 'm') {
+	        check_preloaded_kernel();
+	}
+	if (boot_device == 'c') {
+		quik_startup();
+	}
    yaboot_startup();
 }