[src/trunk]: src/sys/arch/sandpoint/stand/altboot The DSM-G600 U-Boot is so r...

[phx <phx%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/a5bb6d9e7c5b
branches:  trunk
changeset: 763441:a5bb6d9e7c5b
user:      phx <phx%NetBSD.org@localhost>
date:      Sun Mar 20 02:07:05 2011 +0000

description:
The DSM-G600 U-Boot is so restricted that there is no possibility to pass
any bootargs. So we will just do the default multiuser boot from wd0: when
altboot was started together with a Linux initrd image.

diffstat:

 sys/arch/sandpoint/stand/altboot/main.c |  18 +++++++++++++-----
 1 files changed, 13 insertions(+), 5 deletions(-)

diffs (32 lines):

diff -r a026d54b8009 -r a5bb6d9e7c5b sys/arch/sandpoint/stand/altboot/main.c
--- a/sys/arch/sandpoint/stand/altboot/main.c   Sat Mar 19 21:26:02 2011 +0000
+++ b/sys/arch/sandpoint/stand/altboot/main.c   Sun Mar 20 02:07:05 2011 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.12 2011/03/13 15:23:43 phx Exp $ */
+/* $NetBSD: main.c,v 1.13 2011/03/20 02:07:05 phx Exp $ */
 
 /*-
  * Copyright (c) 2007 The NetBSD Foundation, Inc.
@@ -184,10 +184,18 @@
         * "bootm".
         */
        if (argc > MAX_ARGS) {
-               /* parse Linux bootargs */
-               argv = new_argv;
-               argc = parse_cmdline(argv, MAX_ARGS, bootargs_start,
-                   bootargs_end);
+               if (argv != NULL) {
+                       /*
+                        * initrd image was loaded: assume extremely
+                        * restricted firmware and boot default
+                        */
+                       argc = 0;
+               } else {
+                       /* parse standard Linux bootargs */
+                       argc = parse_cmdline(new_argv, MAX_ARGS,
+                           bootargs_start, bootargs_end);
+                       argv = new_argv;
+               }
        }
 
        /* wait 2s for user to enter interactive mode */